Drop syncPosition on teleportation patch

I'm not sure it was really helping, and now suspecting it might be causing issues
Movement sucks

77 files changed, 39 insertions, 73 deletions

diff --git a/Spigot-Server-Patches/0475-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0474-Optimize-Voxel-Shape-Merging.patch
index 94143e356b..94143e356b 100644
--- a/Spigot-Server-Patches/0475-Optimize-Voxel-Shape-Merging.patch
+++ b/Spigot-Server-Patches/0474-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0474-Sync-position-on-teleportation.patch b/Spigot-Server-Patches/0474-Sync-position-on-teleportation.patch
deleted file mode 100644
index 83099f36b2..0000000000
--- a/Spigot-Server-Patches/0474-Sync-position-on-teleportation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-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 0ece15a8457debc7d8343c894b060e81be845488..7fd991fd3994a18625c193aeb15ed521d3b6a447 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -501,6 +501,7 @@ 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();
-             }
-@@ -1300,6 +1301,7 @@ 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));
-     }
- 
diff --git a/Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0475-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 5f8b1c974c..5f8b1c974c 100644
--- a/Spigot-Server-Patches/0476-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/Spigot-Server-Patches/0475-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/Spigot-Server-Patches/0477-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0476-Implement-Mob-Goal-API.patch
index eb050137a8..eb050137a8 100644
--- a/Spigot-Server-Patches/0477-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0476-Implement-Mob-Goal-API.patch
diff --git a/Spigot-Server-Patches/0478-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0477-Use-distance-map-to-optimise-entity-tracker.patch
index 96251a29bd..f414762158 100644
--- a/Spigot-Server-Patches/0478-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/Spigot-Server-Patches/0477-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 449a687399f38d3ef79685ff80531cf1212f054a..3bbacebc3397f2c1d695f64bf3f4eb2b89b112b6 100644
+index 22ebf74762f543316800016dcca67ebad84d2ec9..af9f906b4eb806c73f8ec98ea562393c2b48419e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -245,6 +245,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -44,7 +44,7 @@ index 9b89c0c8a3f1dada4e9b2aaeed0b92e56229b7ca..0c46297e6ff229538d77b2f481e4ab13
          List<Entity> list = this.tracker.getPassengers();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fb65978d783a91b341658e0ebe393ab77153a0d9..752ef8c1f99c6ef224e4df0c544f7894c2b3d3ab 100644
+index 8b7c64c0d2315ba3ad70d0104511bfa9f7a64d35..31ce31936a5100f0512103c70c09d097dac64863 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1527,6 +1527,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -56,7 +56,7 @@ index fb65978d783a91b341658e0ebe393ab77153a0d9..752ef8c1f99c6ef224e4df0c544f7894
          return i;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index da7d4003ef9b9d5959a969eda6d864076666b09e..443d40ea6f2008ed16af801e7216f59ae2042ca4 100644
+index ef42536bca76beb2c5002605563854fdf1498c31..d751c3ec9d799a0c2bfe835cae1645287af79ec2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -145,21 +145,55 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0479-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0478-Optimize-isOutsideRange-to-use-distance-maps.patch
index 1188eab2b6..5dd3b946ea 100644
--- a/Spigot-Server-Patches/0479-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/Spigot-Server-Patches/0478-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -148,7 +148,7 @@ index eebd4c50a7324250d3ebe7060739a71af4243f72..319059ba31f3614cc59cd4c4e4fa9242
                              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ab38ad863d112be39ee676d0ff14fdefe2679048..747657396a855d56a6746a9b827de69ad3710b3d 100644
+index b615199b2f44b6e5169113cca7cd48d37ead997a..ca93c9f3ab6ae50eb7dbc825a70620325033ccad 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -113,6 +113,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -192,7 +192,7 @@ index 9cb2ff09da0b8832e58eed4d70741853a25c9011..7f660d3c528f5fb4150e4ee8b2991343
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 443d40ea6f2008ed16af801e7216f59ae2042ca4..15a5c85cab5a5d9e74a577f648258e205fcb6251 100644
+index d751c3ec9d799a0c2bfe835cae1645287af79ec2..8b36a14b2896d32f99e788a5db928a4100de3912 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -159,6 +159,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0480-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0479-Stop-copy-on-write-operations-for-updating-light-dat.patch
index 99aea0ca9c..99aea0ca9c 100644
--- a/Spigot-Server-Patches/0480-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/Spigot-Server-Patches/0479-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0480-No-Tick-view-distance-implementation.patch
index 6a81e9378b..6a81e9378b 100644
--- a/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0480-No-Tick-view-distance-implementation.patch
diff --git a/Spigot-Server-Patches/0482-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0481-Add-villager-reputation-API.patch
index a4b89e4b69..a4b89e4b69 100644
--- a/Spigot-Server-Patches/0482-Add-villager-reputation-API.patch
+++ b/Spigot-Server-Patches/0481-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0483-Fix-Light-Command.patch b/Spigot-Server-Patches/0482-Fix-Light-Command.patch
index d4d8453264..d4d8453264 100644
--- a/Spigot-Server-Patches/0483-Fix-Light-Command.patch
+++ b/Spigot-Server-Patches/0482-Fix-Light-Command.patch
diff --git a/Spigot-Server-Patches/0484-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0483-Fix-PotionEffect-ignores-icon-flag.patch
index 43fcc1a798..43fcc1a798 100644
--- a/Spigot-Server-Patches/0484-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/Spigot-Server-Patches/0483-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0485-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0484-Optimize-brigadier-child-sorting-performance.patch
index a9d88ce863..a9d88ce863 100644
--- a/Spigot-Server-Patches/0485-Optimize-brigadier-child-sorting-performance.patch
+++ b/Spigot-Server-Patches/0484-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0486-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0485-Don-t-toString-block-unless-actually-showing-the-mes.patch
index 11c031b70c..11c031b70c 100644
--- a/Spigot-Server-Patches/0486-Don-t-toString-block-unless-actually-showing-the-mes.patch
+++ b/Spigot-Server-Patches/0485-Don-t-toString-block-unless-actually-showing-the-mes.patch
diff --git a/Spigot-Server-Patches/0487-Potential-bed-API.patch b/Spigot-Server-Patches/0486-Potential-bed-API.patch
index 75be78853a..75be78853a 100644
--- a/Spigot-Server-Patches/0487-Potential-bed-API.patch
+++ b/Spigot-Server-Patches/0486-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0488-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0487-Wait-for-Async-Tasks-during-shutdown.patch
index d37ec7f0f7..a19892b34a 100644
--- a/Spigot-Server-Patches/0488-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/Spigot-Server-Patches/0487-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 752ef8c1f99c6ef224e4df0c544f7894c2b3d3ab..aaea027a3c3f6797e2c763f0ae7159e2d431049e 100644
+index 31ce31936a5100f0512103c70c09d097dac64863..84cd55ae46bd09ba2470998155ba64877b2d4cda 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -773,6 +773,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0489-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0488-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index 7bdfe0e2d8..7bdfe0e2d8 100644
--- a/Spigot-Server-Patches/0489-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/Spigot-Server-Patches/0488-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0489-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index a05bea1609..c3c3e5ce98 100644
--- a/Spigot-Server-Patches/0490-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/Spigot-Server-Patches/0489-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ac01d492872fde6df2b7113005457c714b91fe44..754e2f84526ce9d9eab1a5a4180be643d030b70a 100644
+index 093605fe8e079d9ec973702c55ea6caddf0369f1..3d63215a855c71d257b18a247eb7f0b2d7908bce 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -411,4 +411,17 @@ public class PaperConfig {
@@ -54,7 +54,7 @@ index 4f9c6b25f152b348a00dadf4b8f58ec3adc3476e..81725611d5b8c10c05d561984f92dc67
      public co.aikar.timings.Timing getTiming() {
          if (timing == null) {
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index aa4bfc9fe8e917c1c19838b0a7b045a11fc9300b..ff770a3b0e5c4fcccc498ecca51dad9863b0fe0e 100644
+index 4c7343a1192dd1a8dc7594b57329e6bb6fefb6b2..7b0cc7833448a9e77e85be10f4e02ce43fdead58 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -138,7 +138,7 @@ public abstract class BlockBase {
@@ -152,7 +152,7 @@ index 22a19e761fdec68cc9405988b977021a8b6398eb..e408ec8c645e9ceb278a13a5b0de8ecf
  
                      this.world.getMethodProfiler().enter("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 302b0eda863dcaf7eeea7b0e1820929a46f44c54..5f81997db78c989e942351e80a0d2558f4b90fcd 100644
+index d0e0fb0780e97102d0010f05902cd3218d4b7d3d..a173d2562e0c549184f5e82f112843a9893cb502 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -406,6 +406,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0491-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0490-Optimize-NibbleArray-to-use-pooled-buffers.patch
index b6213c209b..b6213c209b 100644
--- a/Spigot-Server-Patches/0491-Optimize-NibbleArray-to-use-pooled-buffers.patch
+++ b/Spigot-Server-Patches/0490-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0492-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0491-Reduce-MutableInt-allocations-from-light-engine.patch
index 2524f18f3d..2524f18f3d 100644
--- a/Spigot-Server-Patches/0492-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/Spigot-Server-Patches/0491-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0493-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0492-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index dff167d6b7..399c2f2b28 100644
--- a/Spigot-Server-Patches/0493-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/Spigot-Server-Patches/0492-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -39,7 +39,7 @@ index 0c46297e6ff229538d77b2f481e4ab13ea14c48e..f75c09d44a19f84588f21a55ea8f0dd8
  
                      if (!flag4 && this.o <= 400 && !this.q && this.r == this.tracker.isOnGround()) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index f6f77583d398c0a03464b0e318d6a93ab72dd206..9f1fa69912ea05798cffe4f520db92a3a2602dac 100644
+index 3711914d59c61b652c6c675812ca5ecc29f95130..31bde9518d8fcda2b0f776db22f7fdbbb2953a64 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -2133,9 +2133,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0494-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0493-Ensure-safe-gateway-teleport.patch
index af8fb316e3..dd6019dd4b 100644
--- a/Spigot-Server-Patches/0494-Ensure-safe-gateway-teleport.patch
+++ b/Spigot-Server-Patches/0493-Ensure-safe-gateway-teleport.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure safe gateway teleport
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index ea61a473d8e47428ed5cd4541a5855f0e2c50815..ce239d2b2fe942915aa093b86343c3740d10e273 100644
+index 50bb2ca7235781cd80ecde2bb378f37d67514658..89537dec8ed278e79e078cb2fd3d3e839cdbab59 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -62,10 +62,14 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
diff --git a/Spigot-Server-Patches/0495-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0494-Add-option-for-console-having-all-permissions.patch
index f04a091b9c..5b79a61f25 100644
--- a/Spigot-Server-Patches/0495-Add-option-for-console-having-all-permissions.patch
+++ b/Spigot-Server-Patches/0494-Add-option-for-console-having-all-permissions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 754e2f84526ce9d9eab1a5a4180be643d030b70a..353f453dba9603a45f7dd53d07f0da441331190a 100644
+index 3d63215a855c71d257b18a247eb7f0b2d7908bce..f2f0b9f011bf5b5aa7d80c605cc885104bb934f8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -424,4 +424,9 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0496-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0495-Workaround-for-Client-Lag-Spikes-MC-162253.patch
index a667eb97bd..b8f7801a05 100644
--- a/Spigot-Server-Patches/0496-Workaround-for-Client-Lag-Spikes-MC-162253.patch
+++ b/Spigot-Server-Patches/0495-Workaround-for-Client-Lag-Spikes-MC-162253.patch
@@ -12,7 +12,7 @@ to the client, so that it doesn't attempt to calculate them.
 This mitigates the frametime impact to a minimum (but it's still there).
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7f508b9ef616071b1adeef7c00da7f4565ef4ddd..84dc89d961bde16f96dba5cf7f2ce4b85564215a 100644
+index fb3b626a3dbeca14a2b89e2480f81e7b45a432d3..7e8e1547337c7da451129a1529d372f27b07e6e5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -278,7 +278,7 @@ public class Chunk implements IChunkAccess {
@@ -25,7 +25,7 @@ index 7f508b9ef616071b1adeef7c00da7f4565ef4ddd..84dc89d961bde16f96dba5cf7f2ce4b8
                          Object temp = backingSet[index];
                          if (!(temp instanceof EntityPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 860dc98ab4f84c470b27726314943936d23fcb79..8d45588ecfa33b8c7335df3db58ed6865b8c956c 100644
+index f451c69ce705fcaf564cd3916fca01391dc2fe60..3588fe10017cf2341b9121bbb0438ef3fdf8cda6 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -100,6 +100,7 @@ public class ChunkSection {
@@ -37,7 +37,7 @@ index 860dc98ab4f84c470b27726314943936d23fcb79..8d45588ecfa33b8c7335df3db58ed686
          return chunksection == Chunk.a || chunksection.c();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9f1fa69912ea05798cffe4f520db92a3a2602dac..1147f58c6a0bc153e03a461588efabdfd9ed6357 100644
+index 31bde9518d8fcda2b0f776db22f7fdbbb2953a64..f0dc6efce2e0ff053f134993cce94afb9b5cd6f3 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1958,12 +1958,112 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0496-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 6d16c39327..520dbebab7 100644
--- a/Spigot-Server-Patches/0497-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/Spigot-Server-Patches/0496-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -1130,13 +1130,13 @@ index f0dc6efce2e0ff053f134993cce94afb9b5cd6f3..3292bdcd143995d52f8c983a8984af20
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2223210b6ba0c4a1484bc76aec588fd35251f823..4bc5dfa83aa86275e226514db2d7e880b66e6567 100644
+index 4e7319e0bad256ce3213a7e9f3d97e319fad3b1c..cace81e707245ba35be3c6d536b56618045e4c20 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1302,6 +1302,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1300,6 +1300,7 @@ 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/0498-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0497-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
index 0888e5d79b..0888e5d79b 100644
--- a/Spigot-Server-Patches/0498-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
+++ b/Spigot-Server-Patches/0497-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0498-Optimize-sending-packets-to-nearby-locations-sounds-.patch
index 21b6bd0475..21b6bd0475 100644
--- a/Spigot-Server-Patches/0499-Optimize-sending-packets-to-nearby-locations-sounds-.patch
+++ b/Spigot-Server-Patches/0498-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/Spigot-Server-Patches/0500-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0499-Improve-Chunk-Status-Transition-Speed.patch
index ec57249421..ec57249421 100644
--- a/Spigot-Server-Patches/0500-Improve-Chunk-Status-Transition-Speed.patch
+++ b/Spigot-Server-Patches/0499-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/Spigot-Server-Patches/0501-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0500-Fix-villager-trading-demand-MC-163962.patch
index 96152b810e..96152b810e 100644
--- a/Spigot-Server-Patches/0501-Fix-villager-trading-demand-MC-163962.patch
+++ b/Spigot-Server-Patches/0500-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0502-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0501-Maps-shouldn-t-load-chunks.patch
index 6dd34a1a75..6dd34a1a75 100644
--- a/Spigot-Server-Patches/0502-Maps-shouldn-t-load-chunks.patch
+++ b/Spigot-Server-Patches/0501-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0503-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0502-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index e4db6ce410..ed570b0067 100644
--- a/Spigot-Server-Patches/0503-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/Spigot-Server-Patches/0502-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
@@ -19,7 +19,7 @@ index 90be8c6091dc590a020721f45c7ff7b137cc806d..faa556d4358bc9890ae80c18ee10c38a
                  }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8f87e5121631dfa50f6cb95d036a700135d21b2c..2b04577c153fc4563e59b67afee12411a5de5314 100644
+index c920cfbfdf50bec3a64793bf1058a4c856c3ba7c..a54e3ed06a7a1757d3c4ce96b21bed0177e1fa86 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -302,8 +302,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0504-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0503-Optimize-Bit-Operations-by-inlining.patch
index cd3a9824d5..cd3a9824d5 100644
--- a/Spigot-Server-Patches/0504-Optimize-Bit-Operations-by-inlining.patch
+++ b/Spigot-Server-Patches/0503-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0505-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0504-Optimize-Light-Engine.patch
index 250eef1b8d..250eef1b8d 100644
--- a/Spigot-Server-Patches/0505-Optimize-Light-Engine.patch
+++ b/Spigot-Server-Patches/0504-Optimize-Light-Engine.patch
diff --git a/Spigot-Server-Patches/0506-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0505-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 32ee419044..eaddacca5f 100644
--- a/Spigot-Server-Patches/0506-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0505-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -35,7 +35,7 @@ index 5af7e5c815752f2fd2b13c02a905796971401813..6e6534ab25dbebbad5d2ee848edb88eb
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 4c4108705e9d25912e57a7b3c28b4f1abad58377..893c0085bca0a8d77a85dba1cc29f2dec96c56ec 100644
+index 705c6e3a47a76509268075078f95871d313f6b76..eaed04f786b3c1e1a136163b096bd6aeeb571023 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -176,6 +176,27 @@ public abstract class ChunkMapDistance {
diff --git a/Spigot-Server-Patches/0507-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0506-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index a945bdd477..8f47b0edce 100644
--- a/Spigot-Server-Patches/0507-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/Spigot-Server-Patches/0506-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -44,7 +44,7 @@ index 11c9b740b6b1ff30bd33c188c03f2b77b12faf7b..506e76eecd4be892bdc70367c0ee4d97
          printSaveWarning = false;
          console.autosavePeriod = configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4210aa793b497889ca732a51b2eadea08d88bfac..65b36a17418ae64b6166704b3d0ecf97df1e9445 100644
+index cc7c6204b6dcce766a0d3834f2963304b26107c6..06d8ab61f3636a2c76531356f3d7fd6f6be34225 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -402,9 +402,22 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0508-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0507-Fix-missing-chunks-due-to-integer-overflow.patch
index 7554af844d..7554af844d 100644
--- a/Spigot-Server-Patches/0508-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/Spigot-Server-Patches/0507-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0509-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0508-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index d34a476cfb..d34a476cfb 100644
--- a/Spigot-Server-Patches/0509-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/Spigot-Server-Patches/0508-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0510-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0509-Fix-piston-physics-inconsistency-MC-188840.patch
index ba9ffb6bd8..a11ff231eb 100644
--- a/Spigot-Server-Patches/0510-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/Spigot-Server-Patches/0509-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 353f453dba9603a45f7dd53d07f0da441331190a..741c06a27e664211a7023a6369f8e69cbb41a321 100644
+index f2f0b9f011bf5b5aa7d80c605cc885104bb934f8..56e4359ba32339e1bef58061585ff3e12e4215f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -429,4 +429,10 @@ public class PaperConfig {
diff --git a/Spigot-Server-Patches/0511-Fix-sand-duping.patch b/Spigot-Server-Patches/0510-Fix-sand-duping.patch
index 6cf9476b0e..6cf9476b0e 100644
--- a/Spigot-Server-Patches/0511-Fix-sand-duping.patch
+++ b/Spigot-Server-Patches/0510-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0512-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0511-Prevent-position-desync-in-playerconnection-causing-.patch
index 218aa2ba93..a9a8693e35 100644
--- a/Spigot-Server-Patches/0512-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/Spigot-Server-Patches/0511-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,10 +14,10 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6bb2b3520362d056d4d75c65764e4c8dbc1417f9..0ada31b7e5d509409d5d0fb9ac2949f79416ef73 100644
+index cace81e707245ba35be3c6d536b56618045e4c20..4050fa4b8ed060599fb3c14622737117fb2602df 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1098,6 +1098,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1097,6 +1097,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
                              this.player.c(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
diff --git a/Spigot-Server-Patches/0513-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0512-Fix-enderdragon-exp-dupe.patch
index 654d69e3c6..654d69e3c6 100644
--- a/Spigot-Server-Patches/0513-Fix-enderdragon-exp-dupe.patch
+++ b/Spigot-Server-Patches/0512-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0514-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0513-Inventory-getHolder-method-without-block-snapshot.patch
index 5ea9d7c297..5ea9d7c297 100644
--- a/Spigot-Server-Patches/0514-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/Spigot-Server-Patches/0513-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0515-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0514-Expose-Arrow-getItemStack.patch
index 6e89c259a7..6e89c259a7 100644
--- a/Spigot-Server-Patches/0515-Expose-Arrow-getItemStack.patch
+++ b/Spigot-Server-Patches/0514-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0516-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0515-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 5d59af97c1..3408f0cdc3 100644
--- a/Spigot-Server-Patches/0516-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/Spigot-Server-Patches/0515-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0ada31b7e5d509409d5d0fb9ac2949f79416ef73..a3a7ee9b69e926e0181301c2714cfe72c50a8599 100644
+index 4050fa4b8ed060599fb3c14622737117fb2602df..eb21aefa092d00e5ead2177282170fcf3617808c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2516,9 +2516,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2514,9 +2514,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinautorecipe, this, this.player.getWorldServer());
          this.player.resetIdleTimer();
          if (!this.player.isSpectator() && this.player.activeContainer.windowId == packetplayinautorecipe.b() && this.player.activeContainer.c(this.player) && this.player.activeContainer instanceof ContainerRecipeBook) {
diff --git a/Spigot-Server-Patches/0517-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0516-Hide-sync-chunk-writes-behind-flag.patch
index 143846f239..143846f239 100644
--- a/Spigot-Server-Patches/0517-Hide-sync-chunk-writes-behind-flag.patch
+++ b/Spigot-Server-Patches/0516-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0518-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0517-Limit-lightning-strike-effect-distance.patch
index 5735d85dd7..5735d85dd7 100644
--- a/Spigot-Server-Patches/0518-Limit-lightning-strike-effect-distance.patch
+++ b/Spigot-Server-Patches/0517-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0519-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0518-Add-permission-for-command-blocks.patch
index 27f5b2035a..aa9357900b 100644
--- a/Spigot-Server-Patches/0519-Add-permission-for-command-blocks.patch
+++ b/Spigot-Server-Patches/0518-Add-permission-for-command-blocks.patch
@@ -31,10 +31,10 @@ index 7e13b1cf6d92c3e0f2dab1ba1d42bd4f250e256c..3820acd65f3cd488dba964e6d9c45885
          } else {
              if (entityhuman.getWorld().isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a3a7ee9b69e926e0181301c2714cfe72c50a8599..4a99a05ef2d01383553e59833a8723f5364168ed 100644
+index eb21aefa092d00e5ead2177282170fcf3617808c..e4e001dbbe351b88c186856cbebfe7f3fcd9f0fb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -613,7 +613,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -612,7 +612,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinsetcommandblock, this, this.player.getWorldServer());
          if (!this.minecraftServer.getEnableCommandBlock()) {
              this.player.sendMessage(new ChatMessage("advMode.notEnabled"), SystemUtils.b);
@@ -43,7 +43,7 @@ index a3a7ee9b69e926e0181301c2714cfe72c50a8599..4a99a05ef2d01383553e59833a8723f5
              this.player.sendMessage(new ChatMessage("advMode.notAllowed"), SystemUtils.b);
          } else {
              CommandBlockListenerAbstract commandblocklistenerabstract = null;
-@@ -676,7 +676,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -675,7 +675,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinsetcommandminecart, this, this.player.getWorldServer());
          if (!this.minecraftServer.getEnableCommandBlock()) {
              this.player.sendMessage(new ChatMessage("advMode.notEnabled"), SystemUtils.b);
diff --git a/Spigot-Server-Patches/0520-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0519-Ensure-Entity-AABB-s-are-never-invalid.patch
index 0578d25614..4f2c87bfa7 100644
--- a/Spigot-Server-Patches/0520-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/Spigot-Server-Patches/0519-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3bbacebc3397f2c1d695f64bf3f4eb2b89b112b6..e5edd801c57e6f678c661193814ce9de07f83b95 100644
+index af9f906b4eb806c73f8ec98ea562393c2b48419e..759a91f43c9890602f4bb372eb241ebc0128b310 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1,53 +1,54 @@
diff --git a/Spigot-Server-Patches/0521-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0520-Optimize-WorldBorder-collision-checks-and-air.patch
index 58d0c56ce2..c6b9a9d8c0 100644
--- a/Spigot-Server-Patches/0521-Optimize-WorldBorder-collision-checks-and-air.patch
+++ b/Spigot-Server-Patches/0520-Optimize-WorldBorder-collision-checks-and-air.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e5edd801c57e6f678c661193814ce9de07f83b95..fcb3d3adae52fd70e856344a727a344cf78cfce3 100644
+index 759a91f43c9890602f4bb372eb241ebc0128b310..9b5cad1f1137cb6c73f423dada1ae027218086ca 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -854,7 +854,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0522-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0521-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 26aa3daa08..036b5d22c4 100644
--- a/Spigot-Server-Patches/0522-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/Spigot-Server-Patches/0521-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -39,7 +39,7 @@ index 4c561181a977fd0244325880bb6a8cd6a54dcacc..8b2755a3b95e472e884976195d1d3551
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aaea027a3c3f6797e2c763f0ae7159e2d431049e..67a6fc68c6611dab2a3617d5605d7a9e7d9bee2a 100644
+index 84cd55ae46bd09ba2470998155ba64877b2d4cda..3130c68e7318a41e763575b245ee1b5298c92a16 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1520,11 +1520,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -63,10 +63,10 @@ index aaea027a3c3f6797e2c763f0ae7159e2d431049e..67a6fc68c6611dab2a3617d5605d7a9e
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 999ab59d1efc095029baea4d4101eb9b2f80347f..1cc16c20ca03902c3e871a7ec19fab442253da27 100644
+index e4e001dbbe351b88c186856cbebfe7f3fcd9f0fb..8c02493bcdb6271870f8f1d558858ee3fb260014 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2780,7 +2780,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2778,7 +2778,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      public void a(PacketPlayInDifficultyChange packetplayindifficultychange) {
          PlayerConnectionUtils.ensureMainThread(packetplayindifficultychange, this, this.player.getWorldServer());
          if (this.player.k(2) || this.isExemptPlayer()) {
diff --git a/Spigot-Server-Patches/0523-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0522-Paper-dumpitem-command.patch
index 155582d568..179527e475 100644
--- a/Spigot-Server-Patches/0523-Paper-dumpitem-command.patch
+++ b/Spigot-Server-Patches/0522-Paper-dumpitem-command.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Paper dumpitem command
 Let's you quickly view the item in your hands NBT data
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index cc3fc5200f75f80a60b4cbc260e3a0bc4bb3a869..6bfcf86d44559849de66a24471e29d93217698bd 100644
+index a12bc81933c15606b7cde46937f504eafc4ff030..d798de637389cc5d5289a6c75304de307b01f493 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -21,7 +21,9 @@ import org.bukkit.command.CommandSender;
diff --git a/Spigot-Server-Patches/0524-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0523-Don-t-allow-null-UUID-s-for-chat.patch
index 306d2a56f2..306d2a56f2 100644
--- a/Spigot-Server-Patches/0524-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/Spigot-Server-Patches/0523-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0525-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0524-Improve-Legacy-Component-serialization-size.patch
index c4c00e14fb..c4c00e14fb 100644
--- a/Spigot-Server-Patches/0525-Improve-Legacy-Component-serialization-size.patch
+++ b/Spigot-Server-Patches/0524-Improve-Legacy-Component-serialization-size.patch
diff --git a/Spigot-Server-Patches/0526-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0525-Support-old-UUID-format-for-NBT.patch
index dd0cf39941..dd0cf39941 100644
--- a/Spigot-Server-Patches/0526-Support-old-UUID-format-for-NBT.patch
+++ b/Spigot-Server-Patches/0525-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0527-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0526-Clean-up-duplicated-GameProfile-Properties.patch
index 5d2c684b69..5d2c684b69 100644
--- a/Spigot-Server-Patches/0527-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/Spigot-Server-Patches/0526-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0528-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0527-Convert-legacy-attributes-in-Item-Meta.patch
index 8b4a253ec6..8b4a253ec6 100644
--- a/Spigot-Server-Patches/0528-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/Spigot-Server-Patches/0527-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0529-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0528-Remove-some-streams-from-structures.patch
index 765a385274..765a385274 100644
--- a/Spigot-Server-Patches/0529-Remove-some-streams-from-structures.patch
+++ b/Spigot-Server-Patches/0528-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0530-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0529-Remove-streams-from-classes-related-villager-gossip.patch
index 9655386da1..9655386da1 100644
--- a/Spigot-Server-Patches/0530-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/Spigot-Server-Patches/0529-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0531-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0530-Support-components-in-ItemMeta.patch
index e282bc8e11..e282bc8e11 100644
--- a/Spigot-Server-Patches/0531-Support-components-in-ItemMeta.patch
+++ b/Spigot-Server-Patches/0530-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0532-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0531-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index b7c5a49bd4..b7c5a49bd4 100644
--- a/Spigot-Server-Patches/0532-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/Spigot-Server-Patches/0531-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0533-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0532-Add-entity-liquid-API.patch
index 13ec6d1177..13ec6d1177 100644
--- a/Spigot-Server-Patches/0533-Add-entity-liquid-API.patch
+++ b/Spigot-Server-Patches/0532-Add-entity-liquid-API.patch
diff --git a/Spigot-Server-Patches/0534-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0533-Update-itemstack-legacy-name-and-lore.patch
index 934e8b519e..934e8b519e 100644
--- a/Spigot-Server-Patches/0534-Update-itemstack-legacy-name-and-lore.patch
+++ b/Spigot-Server-Patches/0533-Update-itemstack-legacy-name-and-lore.patch
diff --git a/Spigot-Server-Patches/0535-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0534-Spawn-player-in-correct-world-on-login.patch
index fa510ccd99..fa510ccd99 100644
--- a/Spigot-Server-Patches/0535-Spawn-player-in-correct-world-on-login.patch
+++ b/Spigot-Server-Patches/0534-Spawn-player-in-correct-world-on-login.patch
diff --git a/Spigot-Server-Patches/0536-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0535-Add-PrepareResultEvent.patch
index 358e7bb8f8..358e7bb8f8 100644
--- a/Spigot-Server-Patches/0536-Add-PrepareResultEvent.patch
+++ b/Spigot-Server-Patches/0535-Add-PrepareResultEvent.patch
diff --git a/Spigot-Server-Patches/0537-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0536-Allow-delegation-to-vanilla-chunk-gen.patch
index 5c9bb77f81..5c9bb77f81 100644
--- a/Spigot-Server-Patches/0537-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/Spigot-Server-Patches/0536-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-Server-Patches/0538-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0537-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 794f202126..3a8346c008 100644
--- a/Spigot-Server-Patches/0538-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/Spigot-Server-Patches/0537-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ad92d6d30f0e3280c2e4cab6d0c96280d40ae2ef..b5c595a4b5d74366f4cdc927673ac60923e46e90 100644
+index ce823833a0b308aeb11902652157575eabf09e3b..1a61bc7c8a532d11981e47cadfd57e92894bf4dd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2914,7 +2914,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0539-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0538-Optimize-NetworkManager-Exception-Handling.patch
index f33218d96b..f33218d96b 100644
--- a/Spigot-Server-Patches/0539-Optimize-NetworkManager-Exception-Handling.patch
+++ b/Spigot-Server-Patches/0538-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0540-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0539-Fix-Concurrency-issue-in-WeightedList.patch
index 2714f9eaeb..2714f9eaeb 100644
--- a/Spigot-Server-Patches/0540-Fix-Concurrency-issue-in-WeightedList.patch
+++ b/Spigot-Server-Patches/0539-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0541-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0540-Optimize-the-advancement-data-player-iteration-to-be.patch
index 61640b9c4e..61640b9c4e 100644
--- a/Spigot-Server-Patches/0541-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/Spigot-Server-Patches/0540-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0542-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0541-Fix-arrows-never-despawning-MC-125757.patch
index a65fde01f4..a65fde01f4 100644
--- a/Spigot-Server-Patches/0542-Fix-arrows-never-despawning-MC-125757.patch
+++ b/Spigot-Server-Patches/0541-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/Spigot-Server-Patches/0543-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0542-Thread-Safe-Vanilla-Command-permission-checking.patch
index 27c4d19077..27c4d19077 100644
--- a/Spigot-Server-Patches/0543-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/Spigot-Server-Patches/0542-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0544-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0543-Move-range-check-for-block-placing-up.patch
index 5b8d63da5b..1eec5e895f 100644
--- a/Spigot-Server-Patches/0544-Move-range-check-for-block-placing-up.patch
+++ b/Spigot-Server-Patches/0543-Move-range-check-for-block-placing-up.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cf83059fec9f11df992827f0c0249243caa9ac33..95d57c6de95eca580ca4e3183db851e5a15de342 100644
+index 8c02493bcdb6271870f8f1d558858ee3fb260014..6259ff4a571abb842b4a1b15a43b2b7c3fd5f0ab 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1435,15 +1435,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1433,15 +1433,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
          BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
          EnumDirection enumdirection = movingobjectpositionblock.getDirection();
  
diff --git a/Spigot-Server-Patches/0545-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0544-Fix-SPIGOT-5989.patch
index dc6cca3282..dc6cca3282 100644
--- a/Spigot-Server-Patches/0545-Fix-SPIGOT-5989.patch
+++ b/Spigot-Server-Patches/0544-Fix-SPIGOT-5989.patch
diff --git a/Spigot-Server-Patches/0546-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0545-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index a89982dd56..a89982dd56 100644
--- a/Spigot-Server-Patches/0546-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/Spigot-Server-Patches/0545-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/Spigot-Server-Patches/0547-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0546-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 3afadc516b..3afadc516b 100644
--- a/Spigot-Server-Patches/0547-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/Spigot-Server-Patches/0546-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/Spigot-Server-Patches/0548-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0547-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index e5620cb419..e5620cb419 100644
--- a/Spigot-Server-Patches/0548-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/Spigot-Server-Patches/0547-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0549-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0548-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 9f4205bce6..74b4304105 100644
--- a/Spigot-Server-Patches/0549-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/Spigot-Server-Patches/0548-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 65b36a17418ae64b6166704b3d0ecf97df1e9445..2e0a9e41400a2f11bdaee5053811871a936e922e 100644
+index 06d8ab61f3636a2c76531356f3d7fd6f6be34225..ca0ca5e407661c7f2d1aa3c70990abaeedd816df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2604,6 +2604,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0550-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0549-Fix-some-rails-connecting-improperly.patch
index 0a3ad634bc..0a3ad634bc 100644
--- a/Spigot-Server-Patches/0550-Fix-some-rails-connecting-improperly.patch
+++ b/Spigot-Server-Patches/0549-Fix-some-rails-connecting-improperly.patch