From e7bb50eac65b07ff60a778d23c4fd6eee626292c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 28 Jan 2025 14:13:41 -0800 Subject: [PATCH] Add missing throw for ServerPlayer#teleport override All teleports must use teleportAsync, so we need to throw on the old implementations to prevent their usage. --- .../net/minecraft/server/level/ServerPlayer.java.patch | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/folia-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/folia-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch index ee3e8de..51efc0e 100644 --- a/folia-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch +++ b/folia-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch @@ -188,7 +188,7 @@ } else { LOGGER.warn("Failed to spawn player ender pearl in level ({}), skipping", optional.get()); } -@@ -1357,6 +_,324 @@ +@@ -1357,9 +_,332 @@ } } @@ -513,6 +513,14 @@ @Nullable @Override public ServerPlayer teleport(TeleportTransition teleportTransition) { ++ // Folia start - region threading ++ if (true) { ++ throw new UnsupportedOperationException("Must use teleportAsync while in region threading"); ++ } ++ // Folia end - region threading + if (this.isSleeping()) return null; // CraftBukkit - SPIGOT-3154 + if (this.isRemoved()) { + return null; @@ -2398,6 +_,11 @@ }