From 95d233dc5b5ab0bf125ce761ace782bc2f1ac78e Mon Sep 17 00:00:00 2001 From: DerFrZocker Date: Tue, 24 May 2022 20:45:57 +1000 Subject: [PATCH] SPIGOT-1807: PlayerTeleportEvent is called twice --- .../net/minecraft/server/network/PlayerConnection.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nms-patches/net/minecraft/server/network/PlayerConnection.patch b/nms-patches/net/minecraft/server/network/PlayerConnection.patch index 2a9927e4d..74cb3af48 100644 --- a/nms-patches/net/minecraft/server/network/PlayerConnection.patch +++ b/nms-patches/net/minecraft/server/network/PlayerConnection.patch @@ -495,9 +495,12 @@ double d12 = d8; d7 = d0 - this.player.getX(); -@@ -945,6 +1199,69 @@ +@@ -943,8 +1197,71 @@ + + this.player.absMoveTo(d0, d1, d2, f, f1); if (!this.player.noPhysics && !this.player.isSleeping() && (flag2 && worldserver.noCollision(this.player, axisalignedbb) || this.isPlayerCollidingWithAnythingNew(worldserver, axisalignedbb))) { - this.teleport(d3, d4, d5, f, f1); +- this.teleport(d3, d4, d5, f, f1); ++ this.internalTeleport(d3, d4, d5, f, f1, Collections.emptySet(), false); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet. } else { + // CraftBukkit start - fire PlayerMoveEvent + // Rest to old location first