diff --git a/Spigot-Server-Patches/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index 3b9f6b0394..4345b70327 100644 --- a/Spigot-Server-Patches/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/Spigot-Server-Patches/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -1134,9 +1134,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn { + this.A = this.e; this.player.setLocation(d0, d1, d2, f, f1); - this.syncPosition(); // Paper + this.player.forceCheckHighPriority(); // Paper this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait)); } diff --git a/Spigot-Server-Patches/Sync-position-on-teleportation.patch b/Spigot-Server-Patches/Sync-position-on-teleportation.patch deleted file mode 100644 index c371fbcee0..0000000000 --- a/Spigot-Server-Patches/Sync-position-on-teleportation.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Sun, 3 May 2020 14:25:55 -0400 -Subject: [PATCH] Sync position on teleportation - -We've seen many a cases where the "last good" x/y/z is desynced from -the x/y/z that is checked for moving too fast. - -Theory is that when you have multiple movement packets queued up, -and the player is teleported after the first then the 2nd and 3rd come in, -it is triggering a massive movement velocity. - -This will ensure that the servers position is synchronized anytime player is teleported. - -diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/PlayerConnection.java -+++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn { - this.o = this.teleportPos.x; - this.p = this.teleportPos.y; - this.q = this.teleportPos.z; -+ this.syncPosition(); // Paper - if (this.player.H()) { - this.player.I(); - } -@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn { - - this.A = this.e; - this.player.setLocation(d0, d1, d2, f, f1); -+ this.syncPosition(); // Paper - this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait)); - } -