diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 6aeeb3bd24..1a3fdbae10 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1459,7 +1459,7 @@ index 127c03c321e1414e0d174c8d81a7851c9da03574..d98b6ef44e1836920956754dfcb6654f
  
      protected void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index afaa28520709bbed1fe37f79ebdf33cc0bf883a2..c9cc39a71eca13e9dcb9284cfd4419794bf9f18f 100644
+index b37b791cd66b2e88dd0ecf52beea1844c97cdb94..d34e91887cd73009bf852fb849e495a8affed7a9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -64,6 +64,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1486,7 +1486,7 @@ index afaa28520709bbed1fe37f79ebdf33cc0bf883a2..c9cc39a71eca13e9dcb9284cfd441979
  
      }
  
-@@ -1767,7 +1766,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1769,7 +1768,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -1495,7 +1495,7 @@ index afaa28520709bbed1fe37f79ebdf33cc0bf883a2..c9cc39a71eca13e9dcb9284cfd441979
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1778,7 +1777,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1780,7 +1779,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1504,7 +1504,7 @@ index afaa28520709bbed1fe37f79ebdf33cc0bf883a2..c9cc39a71eca13e9dcb9284cfd441979
              return;
          }
  
-@@ -1791,7 +1790,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1793,7 +1792,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
@@ -2012,10 +2012,10 @@ index 7f435847ac1d13756ce233e7d5ae13f9dc17c443..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a225e85c5ab04bac0249ae72d24094b10c72be81..f427185c84fe4c6cf5a0af89d030df9f3f9bfd74 100644
+index ddf385ec21cbfc163bb4fb8bb21b0e1ab1db2004..756e5d416e5a53eaf93f434ed27b3517f11bfef5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1811,6 +1811,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1821,6 +1821,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
index 9ff8ada225..6919f7f0b2 100644
--- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 20651905fd6566e856aeb7340469047b7eb8c2c8..adf64b482d78a8cfc9c3f57936440c4472dd4ba3 100644
+index d34e91887cd73009bf852fb849e495a8affed7a9..c70e290405c7c5ba247c1d3cce286579260cc76d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1698,6 +1698,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1700,6 +1700,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (!async && s.startsWith("/")) {
diff --git a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
index b68e6c4022..673dea8b50 100644
--- a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index adf64b482d78a8cfc9c3f57936440c4472dd4ba3..4796d4d807ad5aa9b78bdf36cec7f45c8bce2d76 100644
+index c70e290405c7c5ba247c1d3cce286579260cc76d..a6596d17a6c942061d98fed2cbb71045c7d3849f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1451,7 +1451,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1453,7 +1453,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
@@ -22,7 +22,7 @@ index adf64b482d78a8cfc9c3f57936440c4472dd4ba3..4796d4d807ad5aa9b78bdf36cec7f45c
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2cc50f8d91c4ea8632ad72fce6aa585916ca8dd7..65ba8b130328b681b67a01b06353ea382d004be6 100644
+index a1e00c468e77bfa995f117207ad3208bdc7ec028..e070e4e874bb5c08ab130a9ab6f5f7234df8c1f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -138,6 +138,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
index 5874923268..149fae3974 100644
--- a/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
@@ -18,10 +18,10 @@ index 49c911e54eb3b20d820f3e1895c057eead6d312b..09c757a3bb1d9a49343cf58e18f736e1
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4796d4d807ad5aa9b78bdf36cec7f45c8bce2d76..979cb35952b995dfe912e909f06b0e490fe855fc 100644
+index a6596d17a6c942061d98fed2cbb71045c7d3849f..12f521d96a47a39b7e8e5b0f95a47286ac7a5247 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2039,6 +2039,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2041,6 +2041,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
              }
          }
diff --git a/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 8e4ed4e670..a1576d20de 100644
--- a/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -26,10 +26,10 @@ index fe2c8001897dc6d66ce0d24ddb1a5d3b79810294..538e6751f3bda77ba32256158d2a6a25
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 979cb35952b995dfe912e909f06b0e490fe855fc..e3057d52e589c5f39279547181e91a9ea019113a 100644
+index 12f521d96a47a39b7e8e5b0f95a47286ac7a5247..638402acdaf841a59febc83d2c1f00fbbab7b646 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1776,7 +1776,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1778,7 +1778,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      return;
                  }
  
diff --git a/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch
index 7d2ca65fd5..228d869324 100644
--- a/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch
@@ -23,10 +23,10 @@ index 3592b8ecac38cabe9cacdd7d9071e4c179b6aed8..92244ab7d9b29689835c7f4e84221014
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e3057d52e589c5f39279547181e91a9ea019113a..3812ec96b668757f9527b5e942467694532e20a4 100644
+index 638402acdaf841a59febc83d2c1f00fbbab7b646..577ad4e5e29f85cd3460c5dcc355b55df96252c2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1311,13 +1311,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1313,13 +1313,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
diff --git a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
index 9849d6bf2e..f087fc5101 100644
--- a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ea275587cbe06f5624b4a5d05095e6d0964ea9b9..a4e93985d2db37d1f597878cfb5069fbc7233aa4 100644
+index 0c4a6ef28fd8cb04e7131b089ba392571e165ea6..d84b13e873d7f6c7e53f024c390105f19520eedd 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1913,7 +1913,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,10 +19,10 @@ index ea275587cbe06f5624b4a5d05095e6d0964ea9b9..a4e93985d2db37d1f597878cfb5069fb
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 406303f75b5bead76ab6b8c7f26614544f5236d8..0f1757a114278c461b149a8ec91ef3949ea2df16 100644
+index 372b47e539b9d696f5e0dfe8255b503daaa480df..bb99e1ed16deba5b39323c5a65bf68986ff816fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2658,7 +2658,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2660,7 +2660,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      }
  
      public final boolean isDisconnected() {
diff --git a/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 821af8e869..1d898ed951 100644
--- a/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -39,10 +39,10 @@ index 8e6059e0f6b800e0a141e0274c10b19beb4c58c2..980484baae997832dafa55a54e4a6585
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0f1757a114278c461b149a8ec91ef3949ea2df16..e9fa6aa6a2417cc017eb255fce02a37d6d2933e6 100644
+index bb99e1ed16deba5b39323c5a65bf68986ff816fe..e83f1bfe2b2c33b3bc6788de6998356430857855 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1901,6 +1901,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1903,6 +1903,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
          switch (packetplayinentityaction.c()) {
              case PRESS_SHIFT_KEY:
                  this.player.setSneaking(true);
diff --git a/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
index 584cb7211f..ac280dd2fc 100644
--- a/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e9fa6aa6a2417cc017eb255fce02a37d6d2933e6..3df76ca67dd372e968341e92c10b37b5e77925da 100644
+index e83f1bfe2b2c33b3bc6788de6998356430857855..240a50d0da11199a05292d803cf367e30a639331 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -64,6 +64,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index e9fa6aa6a2417cc017eb255fce02a37d6d2933e6..3df76ca67dd372e968341e92c10b37b5
  import co.aikar.timings.MinecraftTimings; // Paper
  // CraftBukkit end
  
-@@ -1015,7 +1017,34 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1017,7 +1019,34 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              boolean flag = d8 > 0.0D;
  
                              if (this.player.isOnGround() && !packetplayinflying.b() && flag) {
diff --git a/Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch
index 48744d1014..d6834f9b09 100644
--- a/Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch
@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3df76ca67dd372e968341e92c10b37b5e77925da..9eb5ec1b8b0299bf964ed1f0f1b30a4ce1a1ecd3 100644
+index 240a50d0da11199a05292d803cf367e30a639331..8d0b1405655ad38d4849d0972d69a3f9cf4988cf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2619,14 +2619,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2621,14 +2621,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index c1a13dd36e..3b936bfb74 100644
--- a/Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 453128ea031cea72d3fd57fb64938bd20aa1e7f3..32076076b39b6c408b0ee95afb7ef11b71e373dc 100644
+index 30bdf7dff8fc611677b95918574d4ad42ddf1c6c..7dd7289941253991d0a2aa22f9b058c116c14e82 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2631,7 +2631,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2633,7 +2633,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              String[] lines = new String[4];
  
              for (int i = 0; i < list.size(); ++i) {
diff --git a/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
index aeb9edf89d..320ceca9d6 100644
--- a/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
@@ -34,7 +34,7 @@ index cbffebfe323ff4ddec792c49ebc3391fc9ac35ac..73a33eff97d26e5b3542d787344013e1
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 36ac4fde147fb5c4d26f1bdbcf027fb0bf3edca7..dd3ae707776626d54894d19d5b0968256104c4dd 100644
+index 73479cf9e88567bf167dd5bffe4df75d2a424230..d4c907fb4914d3ffc3c361af08cfd709d3a88558 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -415,7 +415,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index 36ac4fde147fb5c4d26f1bdbcf027fb0bf3edca7..dd3ae707776626d54894d19d5b096825
          this.o();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e72a519645e9383c989fc3ad8059c1c88c1b6382..bad3923c0ec5b99d4e102d61ad88321aa854350e 100644
+index 7dd7289941253991d0a2aa22f9b058c116c14e82..577deb210f6d95b7502905f6af16e2e946edd8e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -43,6 +43,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -99,7 +99,7 @@ index e72a519645e9383c989fc3ad8059c1c88c1b6382..bad3923c0ec5b99d4e102d61ad88321a
  import org.bukkit.event.inventory.InventoryCreativeEvent;
  import org.bukkit.event.inventory.InventoryType.SlotType;
  import org.bukkit.event.player.AsyncPlayerChatEvent;
-@@ -2161,10 +2162,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2163,10 +2164,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInCloseWindow packetplayinclosewindow) {
@@ -180,7 +180,7 @@ index a1c318aa6501d9d0bdd53dc1fb8a99b7a782b4ce..ebcd2d043b3e6cf90b62eda1ea7a2d8c
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index df1896d447295123dbf7f8c8dea163be7849132f..18f0d23e38abb9c3e326a727cc4b4e040adb432d 100644
+index c24a0c6bd72b4b2cbc2432d5e1651c3c396e4baf..8092fba753f08b31edfd457960b8edc3578fb3ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -813,7 +813,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index d954210675..e3b04cc171 100644
--- a/Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,10 +16,10 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bad3923c0ec5b99d4e102d61ad88321aa854350e..e025360ffdb54f91b2215076f24f9abb08d6718f 100644
+index 577deb210f6d95b7502905f6af16e2e946edd8e2..a62fcd57be08cce2aa51de078aa86e2eeb6f11e5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2074,6 +2074,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2076,6 +2076,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
  
                      if (event.isCancelled()) {
diff --git a/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch
index 7c158edc29..bb2b76ebbd 100644
--- a/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,7 +19,7 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 08e2e911d726e9d306f5fcc7755ab89f94959aa3..0eb5d6a58a9794ed366d03b76f01abb673a6827c 100644
+index 8da30fd037a91309b09a1ba55cc085364d292c1f..7d2d7a909dba9e741605774081a6d4b589c428d9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1663,15 +1663,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,10 +88,10 @@ index 08e2e911d726e9d306f5fcc7755ab89f94959aa3..0eb5d6a58a9794ed366d03b76f01abb6
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6e3d66ab776146e2204539319412ea8bde17d58a..bb46e757b560d1bfec5c84d59971b51d9aa90bd8 100644
+index be2c94a8fb93ee024e035cc8557f230ee7c1c647..72ace986da7af07c4e765fc05399f898b869a119 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1204,6 +1204,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1206,6 +1206,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      }
  
      // CraftBukkit start - Delegate to teleport(Location)
diff --git a/Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 3f81d02aea..4c9823ba21 100644
--- a/Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -20,7 +20,7 @@ index 098c99793c68ac916b52776f9a1cc2c6510c0057..15e1f9f65280043853544d3bf796f991
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bb46e757b560d1bfec5c84d59971b51d9aa90bd8..b4270cab83e676ea9cd6975286f96e350a493962 100644
+index 72ace986da7af07c4e765fc05399f898b869a119..3a12052b805c84de8b3ed43cdc0f7fb81a4b1211 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -394,6 +394,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -37,7 +37,7 @@ index bb46e757b560d1bfec5c84d59971b51d9aa90bd8..b4270cab83e676ea9cd6975286f96e35
                  if (d10 - d9 > Math.max(100.0D, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isExemptPlayer()) {
                  // CraftBukkit end
                      PlayerConnection.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getDisplayName().getString(), this.player.getDisplayName().getString(), d6, d7, d8);
-@@ -990,9 +997,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -992,9 +999,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
                          double d1 = this.player.locY();
                          double d2 = this.player.locZ();
                          double d3 = this.player.locY();
@@ -49,7 +49,7 @@ index bb46e757b560d1bfec5c84d59971b51d9aa90bd8..b4270cab83e676ea9cd6975286f96e35
                          float f = packetplayinflying.a(this.player.yaw);
                          float f1 = packetplayinflying.b(this.player.pitch);
                          double d7 = d4 - this.l;
-@@ -1031,6 +1038,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1033,6 +1040,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              } else {
                                  speed = player.abilities.walkSpeed * 10f;
                              }
diff --git a/Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch
index 09feaf81a5..8169926680 100644
--- a/Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b4270cab83e676ea9cd6975286f96e350a493962..1adf90526360bd0cf2a46251dd767498ac44565c 100644
+index 3a12052b805c84de8b3ed43cdc0f7fb81a4b1211..1ea1066109814ae441f5ec3be2e72766bf6b67b7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1368,6 +1368,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1370,6 +1370,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
              case START_DESTROY_BLOCK:
              case ABORT_DESTROY_BLOCK:
              case STOP_DESTROY_BLOCK:
diff --git a/Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch
index 2b319f35ab..697d3c45b9 100644
--- a/Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 58102ee94907b9ab1bac93b4086d8aa4c6b06287..b1faac1e2465cdae624ca5d8d999db3cdedfe3de 100644
+index 07c42d062e6618f47afc9a35ae53277527ef7379..1705e223ec913b02793f2c329ff9401fbcf08178 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2682,7 +2682,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2684,7 +2684,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
              TileEntitySign tileentitysign = (TileEntitySign) tileentity;
  
diff --git a/Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch
index cf9c28cccc..a9e771142b 100644
--- a/Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index aca3aae216308544e527a6325b9a02a9a05c2551..040ed989dcfc59c8cb58d81070ea9c6cd493e47d 100644
+index 1705e223ec913b02793f2c329ff9401fbcf08178..192dc7d56769a8800ecfd150f68750ad89e1d08f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -110,6 +110,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -33,7 +33,7 @@ index aca3aae216308544e527a6325b9a02a9a05c2551..040ed989dcfc59c8cb58d81070ea9c6c
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
  
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
-@@ -2696,7 +2697,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2698,7 +2699,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
              String[] lines = new String[4];
  
              for (int i = 0; i < list.size(); ++i) {
diff --git a/Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch
index b77c2a2126..b2f3a2fe04 100644
--- a/Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch
@@ -22,10 +22,10 @@ index 216445778ce8432fe2506cd7ac4312f43f42ba33..e9bc1d22825850a1f1ef3267428c1984
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index fccde94e0ccd0964a051383bd1fc38d7b5967cd4..9eaa4e1caf297c26d49b0e4777cf75a81d6bc9c0 100644
+index 192dc7d56769a8800ecfd150f68750ad89e1d08f..bd84eb771f0c098bbdad1539fc23b6573522e8d8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2129,7 +2129,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2131,7 +2131,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                      if (event.isCancelled() || this.player.inventory.getItemInHand() == null || this.player.inventory.getItemInHand().getItem() != origItem) {
                          // Refresh the current entity metadata
diff --git a/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch
index 1af7f56f03..9e4ec36217 100644
--- a/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,10 +8,10 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dabeeb95011225963d26fead2a58b0cb3c3f91fc..6cc86e36d6a5795b90e40c90526c8c93844a0942 100644
+index 5e74436908c35bfbdba95a39119f115a9512786d..38cd2768374b44b82060b07924b17f35c466806c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1084,7 +1084,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1086,7 +1086,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                  speed = player.abilities.walkSpeed * 10f;
                              }
                              // Paper start - Prevent moving into unloaded chunks
diff --git a/Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 65ec64bbb1..e3fac1db0e 100644
--- a/Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -19,10 +19,10 @@ index 072fa0ba13bbad5a045cb7fd296fcca160718c8c..65187e7ce1e0ba32cc4a7547e570588c
          if (enumhand == EnumHand.MAIN_HAND) {
              return this.getEquipment(EnumItemSlot.MAINHAND);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6cc86e36d6a5795b90e40c90526c8c93844a0942..1d0345f904de6061e5cfee3ab7c2dbfd94e3fa9e 100644
+index 38cd2768374b44b82060b07924b17f35c466806c..9deee3cf802d43c806008b573219c69f1d62cc61 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1547,6 +1547,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1549,6 +1549,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524
                  return;
              }
diff --git a/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch
index 22db63d4f6..3e10ebf87b 100644
--- a/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch
+++ b/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1d0345f904de6061e5cfee3ab7c2dbfd94e3fa9e..93877b45f380e57f2dc9656463e333ef422a4b95 100644
+index 9deee3cf802d43c806008b573219c69f1d62cc61..9b58dd080f318a2d197a6f60d40a48b728867b91 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1309,6 +1309,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1311,6 +1311,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
      }
  
      private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<PacketPlayOutPosition.EnumPlayerTeleportFlags> set) {
diff --git a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index f98e410a15..e53ddf920c 100644
--- a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -569,7 +569,7 @@ index b4d8657d37b2a6c02e886ec6de243634d1c08d51..4b45a2bf926c26eddc7d81c233ab6187
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f6e04a116367010e23116161aca648c44535e2b7..de70bce8d33a8f4e92d0b65e37cb1a624cb071e6 100644
+index 563b5f10649a165180f7f39ff8bce4c79508ae97..b5aed60f7e5a8a74033700e40a4ccc3d99a9ad3e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -56,6 +56,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1146,10 +1146,10 @@ index fba7c9b5724114eab35a3d24febdee3cd3e30aa0..b6ae589548bdc75052f4986069b3374c
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 033578cb5f2be7db6c03c37dcdf1e353a0441d68..8c3a5b11d32d6ccf4f76387db629943935234973 100644
+index 37b7925b0c6dea0920d67cacf3b1982e8034e202..99b9da1f8f214082fb30070f7e853447e8ab0ccc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1369,6 +1369,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1371,6 +1371,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
          this.A = this.e;
          this.player.setLocation(d0, d1, d2, f, f1);
@@ -1237,7 +1237,7 @@ index f35dda50fd9015a793708d214c648d75f9f87e2b..ae1f9dde6887988ca682f53cba316ce5
              net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);
              return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3c24c1cc5045fbf794e605a5dd5473d8bf8e6542..453cae339656a52a6d42bc712de546b340a5e91c 100644
+index a4c112844ce99e770d8ad2df5a096be39897c4ce..1fb88aefa052bc61a7421378a48bb7f0846d7fa9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -766,6 +766,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch
index 2915f0aa80..be38ea79c6 100644
--- a/Spigot-Server-Patches/0501-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/Spigot-Server-Patches/0501-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 8c3a5b11d32d6ccf4f76387db629943935234973..1a3aba5754bcbdd0400d3a090e5a754fcecb4406 100644
+index 99b9da1f8f214082fb30070f7e853447e8ab0ccc..1a321d4857b5ae426b7e2bcfca8d0bc064559426 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1166,6 +1166,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1168,6 +1168,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
                              this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
diff --git a/Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch
index bf84be501d..bf2476015c 100644
--- a/Spigot-Server-Patches/0505-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/Spigot-Server-Patches/0505-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 1a3aba5754bcbdd0400d3a090e5a754fcecb4406..d391ca12bc3de506cc4485e4d207f04033ca0b94 100644
+index 1a321d4857b5ae426b7e2bcfca8d0bc064559426..623ec94e5d3cdd67313510b41cbcbd609d067426 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2602,9 +2602,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2604,9 +2604,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/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 91c366b18c..774be850e6 100644
--- a/Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/Spigot-Server-Patches/0511-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -63,10 +63,10 @@ index 1175f23558fe694bfb77dd478b0a3ec15109dd9b..1439b874b9a825ea605c15aaacaecaed
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d224bdc5bf05e3688467dab1dd22f722445ebc6a..3c989cdbbdf95f4629445a6b4d22a8ad8dcc958a 100644
+index d01950720cb769ad13713812abee32d05edfa46d..8a07a7de26308ceb01aaeb54f1dddfe0a3565564 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2872,7 +2872,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2874,7 +2874,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/0533-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch
index a8c8476b2e..1376ea18c9 100644
--- a/Spigot-Server-Patches/0533-Move-range-check-for-block-placing-up.patch
+++ b/Spigot-Server-Patches/0533-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 0c1b4932f14e58bc6d418cf20f23e7915525430b..1f919dde69c8d8db0b0a7e857e5f10878f3aac52 100644
+index 8a07a7de26308ceb01aaeb54f1dddfe0a3565564..eae8ba055b0cd595a31ce4d99622366ce2cc9bb0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1502,15 +1502,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1504,15 +1504,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
          BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
          EnumDirection enumdirection = movingobjectpositionblock.getDirection();
  
diff --git a/Spigot-Server-Patches/0549-Brand-support.patch b/Spigot-Server-Patches/0549-Brand-support.patch
index 5c19e97bd0..a18e346c30 100644
--- a/Spigot-Server-Patches/0549-Brand-support.patch
+++ b/Spigot-Server-Patches/0549-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 789a41b900640add7adbc216c65a4133e54e88b0..72a3f0219c5c29229d75357db37d569615e8e43d 100644
+index eae8ba055b0cd595a31ce4d99622366ce2cc9bb0..6cb6a6d2cdf25c7db0e3d2c79af2c1002a04d14b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -5,6 +5,7 @@ import com.google.common.primitives.Doubles;
@@ -25,7 +25,7 @@ index 789a41b900640add7adbc216c65a4133e54e88b0..72a3f0219c5c29229d75357db37d5696
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
          this.minecraftServer = minecraftserver;
          this.networkManager = networkmanager;
-@@ -2831,6 +2834,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2833,6 +2836,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
      private static final MinecraftKey CUSTOM_REGISTER = new MinecraftKey("register");
      private static final MinecraftKey CUSTOM_UNREGISTER = new MinecraftKey("unregister");
  
@@ -34,7 +34,7 @@ index 789a41b900640add7adbc216c65a4133e54e88b0..72a3f0219c5c29229d75357db37d5696
      @Override
      public void a(PacketPlayInCustomPayload packetplayincustompayload) {
          PlayerConnectionUtils.ensureMainThread(packetplayincustompayload, this, this.player.getWorldServer());
-@@ -2858,6 +2863,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2860,6 +2865,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
              try {
                  byte[] data = new byte[packetplayincustompayload.data.readableBytes()];
                  packetplayincustompayload.data.readBytes(data);
@@ -51,7 +51,7 @@ index 789a41b900640add7adbc216c65a4133e54e88b0..72a3f0219c5c29229d75357db37d5696
                  server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packetplayincustompayload.tag.toString(), data);
              } catch (Exception ex) {
                  PlayerConnection.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-@@ -2867,6 +2882,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2869,6 +2884,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      }
  
@@ -65,10 +65,10 @@ index 789a41b900640add7adbc216c65a4133e54e88b0..72a3f0219c5c29229d75357db37d5696
          return (!this.player.joining && !this.networkManager.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9141f1c214944672899a64bd760f7db0c53a8e94..d40ff328c4c29038c43a5e66f788a11515abb8e2 100644
+index 1fb88aefa052bc61a7421378a48bb7f0846d7fa9..01b554c3caf4322cfc403db24433e3db70b9c579 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2180,6 +2180,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2190,6 +2190,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/Spigot-Server-Patches/0559-Brand-support.patch b/Spigot-Server-Patches/0559-Brand-support.patch
index e8a842c71c..5faa477b9e 100644
--- a/Spigot-Server-Patches/0559-Brand-support.patch
+++ b/Spigot-Server-Patches/0559-Brand-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d40ff328c4c29038c43a5e66f788a11515abb8e2..eb928f66d9ba8f4bd58bc683353f675b3774eb0f 100644
+index 01b554c3caf4322cfc403db24433e3db70b9c579..7f3275b89a6ab745091a42175be916d8997163df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2183,7 +2183,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2193,7 +2193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start - brand support
      @Override
      public String getClientBrandName() {
diff --git a/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index bf3e7725d5..778a174e47 100644
--- a/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/Spigot-Server-Patches/0571-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -35,7 +35,7 @@ index 6aeea48d4cf4732f6a5a5dba12af873c2aee493b..fa0256a99c833e6035b8d3e873a93af2
          this.yaw = f;
          this.pitch = f1;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f6c04946aa752b9db4e0c81dbb74334618c955ad..6e68b91bf8e36e12dfadab5b1bccdc2b7dd94fbf 100644
+index 6cb6a6d2cdf25c7db0e3d2c79af2c1002a04d14b..d622abf1013d500532cc6072e5cbb12248e983c2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -544,7 +544,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -47,7 +47,7 @@ index f6c04946aa752b9db4e0c81dbb74334618c955ad..6e68b91bf8e36e12dfadab5b1bccdc2b
              this.o = this.teleportPos.x;
              this.p = this.teleportPos.y;
              this.q = this.teleportPos.z;
-@@ -1376,7 +1376,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1378,7 +1378,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          // CraftBukkit end
  
          this.A = this.e;
diff --git a/Spigot-Server-Patches/0584-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0584-Fix-for-large-move-vectors-crashing-server.patch
index 4b467c71ae..71e77d953e 100644
--- a/Spigot-Server-Patches/0584-Fix-for-large-move-vectors-crashing-server.patch
+++ b/Spigot-Server-Patches/0584-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bb429358c558171134ba2aa188722f69f15858c8..7abf55f5326502dfcc6af5fe853d03e0ae380c32 100644
+index d622abf1013d500532cc6072e5cbb12248e983c2..563ae7355f4f4645d21f2fbd494a5b5656c5e664 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -369,19 +369,24 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -41,7 +41,7 @@ index bb429358c558171134ba2aa188722f69f15858c8..7abf55f5326502dfcc6af5fe853d03e0
  
  
                  // CraftBukkit start - handle custom speeds and skipped ticks
-@@ -1071,7 +1076,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1073,7 +1078,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                          double d2 = this.player.locZ();
                          double d3 = this.player.locY();
                          double d4 = packetplayinflying.a(this.player.locX());double toX = d4; // Paper - OBFHELPER
@@ -50,7 +50,7 @@ index bb429358c558171134ba2aa188722f69f15858c8..7abf55f5326502dfcc6af5fe853d03e0
                          double d6 = packetplayinflying.c(this.player.locZ());double toZ = d6; // Paper - OBFHELPER
                          float f = packetplayinflying.a(this.player.yaw);
                          float f1 = packetplayinflying.b(this.player.pitch);
-@@ -1079,7 +1084,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1081,7 +1086,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
                          double d8 = d5 - this.m;
                          double d9 = d6 - this.n;
                          double d10 = this.player.getMot().g();
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6fd677caf2..3eb7236e44 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6fd677caf2dfa6212b11122e9b41b584e1ef314c
+Subproject commit 3eb7236e443d84d0cb8acb68c9bc6b324e4fbf62
diff --git a/work/Spigot b/work/Spigot
index aa477927d3..37d799b230 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit aa477927d347496adbacfea2617fe244ee1fb47b
+Subproject commit 37d799b230195de166af55b0a746310ddcf92bc0