summaryrefslogtreecommitdiffstats
path: root/nms-patches/PlayerConnection.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/PlayerConnection.patch')
-rw-r--r--nms-patches/PlayerConnection.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/nms-patches/PlayerConnection.patch b/nms-patches/PlayerConnection.patch
index 947c67e7..ea53e3f9 100644
--- a/nms-patches/PlayerConnection.patch
+++ b/nms-patches/PlayerConnection.patch
@@ -273,6 +273,15 @@
this.minecraftServer.getPlayerList().d(this.player);
this.player.checkMovement(this.player.locX - d0, this.player.locY - d1, this.player.locZ - d2);
this.D = d11 >= -0.03125D && !this.minecraftServer.getAllowFlight() && !worldserver.c(entity.getBoundingBox().g(0.0625D).b(0.0D, -0.55D, 0.0D));
+@@ -244,7 +436,7 @@
+
+ public void a(PacketPlayInTeleportAccept packetplayinteleportaccept) {
+ PlayerConnectionUtils.ensureMainThread(packetplayinteleportaccept, this, this.player.x());
+- if (packetplayinteleportaccept.a() == this.teleportAwait) {
++ if (packetplayinteleportaccept.a() == this.teleportAwait && this.teleportPos != null) { // CraftBukkit
+ this.player.setLocation(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
+ if (this.player.L()) {
+ this.o = this.teleportPos.x;
@@ -289,7 +481,7 @@
} else {
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);