diff --git a/Spigot-Server-Patches/0010-Adventure.patch b/Spigot-Server-Patches/0010-Adventure.patch
index 4c0cd37dc6..ff2bdd9b11 100644
--- a/Spigot-Server-Patches/0010-Adventure.patch
+++ b/Spigot-Server-Patches/0010-Adventure.patch
@@ -186,10 +186,10 @@ index 0000000000000000000000000000000000000000..64fcc77eb2ce8979ae756696d98f1d3a
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7beb93a96b9eca4558131c339678cc31e9972c96
+index 0000000000000000000000000000000000000000..09b1b569893111f4a02811a5ba9d4a176ea8f6bc
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-@@ -0,0 +1,284 @@
+@@ -0,0 +1,286 @@
 +package io.papermc.paper.adventure;
 +
 +import com.mojang.brigadier.exceptions.CommandSyntaxException;
@@ -206,6 +206,7 @@ index 0000000000000000000000000000000000000000..7beb93a96b9eca4558131c339678cc31
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.format.TextColor;
 +import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
++import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 +import net.kyori.adventure.translation.GlobalTranslator;
 +import net.kyori.adventure.util.Codec;
 +import net.minecraft.server.BossBattle;
@@ -223,6 +224,7 @@ index 0000000000000000000000000000000000000000..7beb93a96b9eca4558131c339678cc31
 +
 +public final class PaperAdventure {
 +    public static final AttributeKey<Locale> LOCALE_ATTRIBUTE = AttributeKey.valueOf("adventure:locale");
++    public static final LegacyComponentSerializer LEGACY_SECTION_UXRC = LegacyComponentSerializer.builder().useUnusualXRepeatedCharacterHexFormat().build();
 +    static final GsonComponentSerializer GSON = GsonComponentSerializer.builder()
 +        .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.INSTANCE)
 +        .build();
@@ -1096,7 +1098,7 @@ index 055555cb5ce63d41cb9a7f4114341b0685879b9e..7875d4c08969b3adc6f95504686cc9fe
  
                  @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d34e91887cd73009bf852fb849e495a8affed7a9..6c759b295d1bdac25cd40713d7020fffa9d0fdb3 100644
+index d34e91887cd73009bf852fb849e495a8affed7a9..5fa4afb75d46a32d91402c5ca850d17d11990b8d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -25,6 +25,8 @@ import org.apache.logging.log4j.LogManager;
@@ -1108,7 +1110,7 @@ index d34e91887cd73009bf852fb849e495a8affed7a9..6c759b295d1bdac25cd40713d7020fff
  import java.util.concurrent.ExecutionException;
  import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
  import org.bukkit.Location;
-@@ -243,21 +245,20 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -243,21 +245,24 @@ public class PlayerConnection implements PacketListenerPlayIn {
          return this.minecraftServer.a(this.player.getProfile());
      }
  
@@ -1117,13 +1119,17 @@ index d34e91887cd73009bf852fb849e495a8affed7a9..6c759b295d1bdac25cd40713d7020fff
 -    public void disconnect(IChatBaseComponent ichatbasecomponent) {
 -        disconnect(CraftChatMessage.fromComponent(ichatbasecomponent));
 +    public void disconnect(String s) {
-+        // Paper start - Adventure
-+        this.disconnect(CraftChatMessage.fromStringOrNull(s));
++        // Paper start
++        this.disconnect(PaperAdventure.LEGACY_SECTION_UXRC.deserialize(s));
      }
 -    // CraftBukkit end
  
 -    public void disconnect(String s) {
-+    public void disconnect(IChatBaseComponent reason) {
++    public void disconnect(final IChatBaseComponent reason) {
++        this.disconnect(PaperAdventure.asAdventure(reason));
++    }
++
++    public void disconnect(net.kyori.adventure.text.Component reason) {
 +        // Paper end
          // CraftBukkit start - fire PlayerKickEvent
          if (this.processedDisconnect) {
@@ -1133,11 +1139,11 @@ index d34e91887cd73009bf852fb849e495a8affed7a9..6c759b295d1bdac25cd40713d7020fff
 +        net.kyori.adventure.text.Component leaveMessage = net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, this.player.getBukkitEntity().displayName()); // Paper - Adventure
  
 -        PlayerKickEvent event = new PlayerKickEvent(this.server.getPlayer(this.player), s, leaveMessage);
-+        PlayerKickEvent event = new PlayerKickEvent(this.server.getPlayer(this.player), PaperAdventure.asAdventure(reason), leaveMessage); // Paper - Adventure
++        PlayerKickEvent event = new PlayerKickEvent(this.server.getPlayer(this.player), reason, leaveMessage); // Paper - Adventure
  
          if (this.server.getServer().isRunning()) {
              this.server.getPluginManager().callEvent(event);
-@@ -268,8 +269,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -268,8 +273,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              return;
          }
          // Send the possibly modified leave message
@@ -1147,7 +1153,7 @@ index d34e91887cd73009bf852fb849e495a8affed7a9..6c759b295d1bdac25cd40713d7020fff
          // CraftBukkit end
  
          this.networkManager.sendPacket(new PacketPlayOutKickDisconnect(ichatbasecomponent), (future) -> {
-@@ -1485,9 +1485,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1485,9 +1489,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
          */
  
          this.player.p();
@@ -1162,7 +1168,7 @@ index d34e91887cd73009bf852fb849e495a8affed7a9..6c759b295d1bdac25cd40713d7020fff
          }
          // CraftBukkit end
          ITextFilter itextfilter = this.player.Q();
-@@ -1721,15 +1723,20 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1721,15 +1727,20 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              return null;
                          }
  
@@ -1187,7 +1193,7 @@ index d34e91887cd73009bf852fb849e495a8affed7a9..6c759b295d1bdac25cd40713d7020fff
                              }
                          }
                          return null;
-@@ -1751,15 +1758,20 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1751,15 +1762,20 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      return;
                  }
  
@@ -1212,7 +1218,7 @@ index d34e91887cd73009bf852fb849e495a8affed7a9..6c759b295d1bdac25cd40713d7020fff
                      }
                  }
              }
-@@ -2511,21 +2523,20 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2511,21 +2527,20 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  return;
              }
  
diff --git a/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
index 7d2003668f..2a1bd393da 100644
--- a/Spigot-Server-Patches/0045-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0045-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 287d1c6abd407dc8f1e5b29a95579ff9875bdaec..cfacd979d75fd612937586cbc9f55570b1b04e6f 100644
+index 5fa4afb75d46a32d91402c5ca850d17d11990b8d..0dec3e50fcaf4505dcd7800c8ec985ae302c1da2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1702,6 +1702,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1706,6 +1706,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
          }
  
          if (!async && s.startsWith("/")) {
diff --git a/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch
index 84b328d888..2ca902584a 100644
--- a/Spigot-Server-Patches/0059-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0059-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 cfacd979d75fd612937586cbc9f55570b1b04e6f..3f482b20c4486fce2b1324a9c58d0af1bd357444 100644
+index 0dec3e50fcaf4505dcd7800c8ec985ae302c1da2..c1d0aa8248af19124b1c94313602cd4dadcc95df 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1453,7 +1453,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1457,7 +1457,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
diff --git a/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
index d555a7a405..6f04da4428 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 3f482b20c4486fce2b1324a9c58d0af1bd357444..9430ddad295fb6cc49656d79041df2f9410a7505 100644
+index c1d0aa8248af19124b1c94313602cd4dadcc95df..3aa6cae8b7f27264ee5f910d13df876b568968e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2053,6 +2053,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2057,6 +2057,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 215ae5a596..cb8123af3b 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
@@ -52,10 +52,10 @@ index 39c1e750ae1270ca780a5d8624f8daa45bd27637..215123a2162841fbbced5e070c1bef19
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9430ddad295fb6cc49656d79041df2f9410a7505..3d81636634fdc4cd0fb51e7e19df3620f7dc64b7 100644
+index 3aa6cae8b7f27264ee5f910d13df876b568968e4..5d6214b00633b64a769384e6e01eba58cc7d0e6a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1733,7 +1733,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1737,7 +1737,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
          } else {
@@ -64,7 +64,7 @@ index 9430ddad295fb6cc49656d79041df2f9410a7505..3d81636634fdc4cd0fb51e7e19df3620
              AsyncPlayerChatEvent event = new AsyncPlayerChatEvent(async, player, s, new LazyPlayerSet(minecraftServer));
              this.server.getPluginManager().callEvent(event);
  
-@@ -1750,7 +1750,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1754,7 +1754,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                              return null;
                          }
  
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 47d831b7e0..688f5b87e7 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 91f8d4e2f747f980a597bca533af631bbff6d6bd..5452e0f0e9b468ea3b1f832f1a2494d9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3d81636634fdc4cd0fb51e7e19df3620f7dc64b7..fdf1d57670bf62dba7038f91df9dc589247b57ad 100644
+index 5d6214b00633b64a769384e6e01eba58cc7d0e6a..29aa35877549abaef40a88c23f4fc44622e31842 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1313,13 +1313,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1317,13 +1317,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 c312a8ddec..d67d41ab95 100644
--- a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
@@ -19,10 +19,10 @@ index f8c9515f3ee922b6b96d97676ca740bba617721a..fd7513008dde790107647f7f5b967003
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3bee1397a00cd5879504c77a761a3112cc73b5c3..a6de594acd00697d0ca55d2caea9cdbf505d6752 100644
+index 52d28a0ce408a58f0068920d2286409e5124b7f6..e48d896974b6839e496deda320e5c470188b2754 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2662,7 +2662,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2666,7 +2666,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 253a615a23..f103b79ccd 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 bc930015082ad6b2c5d744f823d9ad28a07fa5d4..63f3743bbf3632badf4e66a5ee4239cc
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a6de594acd00697d0ca55d2caea9cdbf505d6752..331282ed36989c3b29e2a0ad5c3704bd869d1893 100644
+index e48d896974b6839e496deda320e5c470188b2754..833095238b2e08058573b777fc226278f187c103 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1906,6 +1906,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1910,6 +1910,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 70bbcf292e..e797e0e5cd 100644
--- a/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
@@ -5,10 +5,10 @@ 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 331282ed36989c3b29e2a0ad5c3704bd869d1893..2bde97c695cc6cdc097b43db1267ed73ac4e5117 100644
+index 833095238b2e08058573b777fc226278f187c103..8d04e3ab27229fcd0756ec4ed82064d65cf58f07 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1017,7 +1017,34 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1021,7 +1021,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 9575ef322c..afe5f88cab 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 2bde97c695cc6cdc097b43db1267ed73ac4e5117..f61471e726928c18b9e181c98d69717384b130f4 100644
+index 8d04e3ab27229fcd0756ec4ed82064d65cf58f07..4c20d092c029383737f2e78acdb38c977f35252b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2621,14 +2621,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2625,14 +2625,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch
index 2a5d6ae217..49950c9e36 100644
--- a/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch
@@ -14,10 +14,10 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bbf89a81489bc6ec5741448b246ce9926b87b4e1..fa4ae84f7ed03da24d89268c4c5664430d9e332b 100644
+index afedfbbeaaefc3f301b1f2f15a72298d244455ad..ab6d99493b6284b5ae1d7255446ea27f1db5a834 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -562,10 +562,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -566,10 +566,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
@@ -30,7 +30,7 @@ index bbf89a81489bc6ec5741448b246ce9926b87b4e1..fa4ae84f7ed03da24d89268c4c566443
              return;
          }
          // CraftBukkit end
-@@ -575,12 +575,35 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -579,12 +579,35 @@ public class PlayerConnection implements PacketListenerPlayIn {
              stringreader.skip();
          }
  
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 695523bd68..a303c3c78f 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 fa4ae84f7ed03da24d89268c4c5664430d9e332b..a6a9ee8f34a61fbabfb1643b41cfb5e3a72cdf78 100644
+index ab6d99493b6284b5ae1d7255446ea27f1db5a834..cb9257d66a28ddd30c5e54808c044cd1e10b8a4a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2630,7 +2630,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2634,7 +2634,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
              List<net.kyori.adventure.text.Component> lines = new java.util.ArrayList<>();
  
              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 29ac805845..3c79ce1e67 100644
--- a/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
@@ -88,7 +88,7 @@ index 3f559918e85b6d5c2ab8ff593b69d40c1db8bb16..d606e3faaf7c58d89539b6bd997978c0
          this.o();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5c8e8a6c8e8e132240e38433e81698c4bc06e2a4..d7ab51834cbf4a1ea81c3ea610dcb23a8933d66a 100644
+index cb9257d66a28ddd30c5e54808c044cd1e10b8a4a..fb121524f0505baf65d0ed3cb6db7cbdf24bbf96 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -45,6 +45,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -99,7 +99,7 @@ index 5c8e8a6c8e8e132240e38433e81698c4bc06e2a4..d7ab51834cbf4a1ea81c3ea610dcb23a
  import org.bukkit.event.inventory.InventoryCreativeEvent;
  import org.bukkit.event.inventory.InventoryType.SlotType;
  import org.bukkit.event.player.AsyncPlayerChatEvent;
-@@ -2164,10 +2165,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2168,10 +2169,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInCloseWindow packetplayinclosewindow) {
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 399e320386..76adbaca1a 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 77e0d5dde4f3a7c808df545fd8d3870d24c42a38..359892d3b4df1dcf67ba01794bcd7be46933e4d7 100644
+index fb121524f0505baf65d0ed3cb6db7cbdf24bbf96..eeefbf2d81e73226e1ba84be6fd54c330b60f240 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2077,6 +2077,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2081,6 +2081,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
  
                      if (event.isCancelled()) {
diff --git a/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch
index aa16af5d05..f1ce2515d7 100644
--- a/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -45,7 +45,7 @@ index fddc8e25347b2a14ff7e0636ec341fd9c0fa5581..89f1eb215a585eccd8498cb337e58943
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 359892d3b4df1dcf67ba01794bcd7be46933e4d7..ffc0d54ef7aa717d539d9de8af39637b5676dba7 100644
+index eeefbf2d81e73226e1ba84be6fd54c330b60f240..e27d5b1e89b6e6f511e99e104b166503b267c5bc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -83,6 +83,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -64,7 +64,7 @@ index 359892d3b4df1dcf67ba01794bcd7be46933e4d7..ffc0d54ef7aa717d539d9de8af39637b
          /* Use thread-safe field access instead
          if (this.chatThrottle > 0) {
              --this.chatThrottle;
-@@ -565,7 +567,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -569,7 +571,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
          // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
          // CraftBukkit start
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 956293caa1..5b34ad7e44 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
@@ -88,10 +88,10 @@ index 273fd5a83790f76f089c2b1308a1e02ac6828683..d92cb1aca385ea15c181ba0dc8f19f31
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ffc0d54ef7aa717d539d9de8af39637b5676dba7..f6bd6a3977678891e7c900fc7b3696e922675dde 100644
+index e27d5b1e89b6e6f511e99e104b166503b267c5bc..49f8ceb913fe58c68cc6141ca49b0926785cd2f5 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 {
+@@ -1208,6 +1208,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 cc8d786568..ad07e5e858 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,10 +20,10 @@ index f280dbff4a09bc611a9ca565c6d697d08801f53b..fbf3ccfb347a5ba6e895339e9576629d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f6bd6a3977678891e7c900fc7b3696e922675dde..36f2bf45ca443c12abb2ef79ea815466e5fa4843 100644
+index 49f8ceb913fe58c68cc6141ca49b0926785cd2f5..0b1350c78a5d268237c983fd45214efe861c3560 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -392,6 +392,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -396,6 +396,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
                  }
                  speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
  
@@ -37,7 +37,7 @@ index f6bd6a3977678891e7c900fc7b3696e922675dde..36f2bf45ca443c12abb2ef79ea815466
                  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 {
+@@ -994,9 +1001,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 f6bd6a3977678891e7c900fc7b3696e922675dde..36f2bf45ca443c12abb2ef79ea815466
                          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 {
+@@ -1035,6 +1042,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 0aed0fd13b..f2b4317726 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 36f2bf45ca443c12abb2ef79ea815466e5fa4843..25e5c0ca0c8895a060d1fa00bee373ca624595bf 100644
+index 0b1350c78a5d268237c983fd45214efe861c3560..32856a1e19bf31a7650bf9a4e662d5a49c3248d2 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 {
+@@ -1372,6 +1372,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
              case START_DESTROY_BLOCK:
              case ABORT_DESTROY_BLOCK:
              case STOP_DESTROY_BLOCK:
diff --git a/Spigot-Server-Patches/0312-Book-Size-Limits.patch b/Spigot-Server-Patches/0312-Book-Size-Limits.patch
index ea7480e6c4..03eca326a6 100644
--- a/Spigot-Server-Patches/0312-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0312-Book-Size-Limits.patch
@@ -22,7 +22,7 @@ index 1697687405392198d2df653220465671675362c2..e8bade581ed391b25c592dbafb3fb3cc
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 25e5c0ca0c8895a060d1fa00bee373ca624595bf..604aa80fe8d8efd171b9db691bba77b6090194b5 100644
+index 32856a1e19bf31a7650bf9a4e662d5a49c3248d2..2e3a4f2630ce6601772f05a186e5f4a3541640b9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -20,6 +20,7 @@ import java.util.function.Consumer;
@@ -33,7 +33,7 @@ index 25e5c0ca0c8895a060d1fa00bee373ca624595bf..604aa80fe8d8efd171b9db691bba77b6
  import org.apache.commons.lang3.StringUtils;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
-@@ -850,6 +851,52 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -854,6 +855,52 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInBEdit packetplayinbedit) {
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 b37b85c694..123cbe672f 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 604aa80fe8d8efd171b9db691bba77b6090194b5..cd9818d33bf3206366838446779053b29c9750a3 100644
+index 2e3a4f2630ce6601772f05a186e5f4a3541640b9..9188101eaebab33f18145f3c93e90c27a1aa8562 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2695,7 +2695,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2699,7 +2699,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 75b8cbbe27..7c5323b204 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 cd9818d33bf3206366838446779053b29c9750a3..90618fa896fbcbfe6559f38aeddf2f9592670f00 100644
+index 9188101eaebab33f18145f3c93e90c27a1aa8562..454587fc85aecad21f4f042dd87c35a4232338e9 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 cd9818d33bf3206366838446779053b29c9750a3..90618fa896fbcbfe6559f38aeddf2f95
      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) {
-@@ -2705,7 +2706,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2709,7 +2710,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
              List<net.kyori.adventure.text.Component> lines = new java.util.ArrayList<>();
  
              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 569d9d126f..8c8ff0355c 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 c346ca8ba30da401ea1a421e8ce6ed1d5b6e4c13..d89d53e9990918fb9863a7eed3111ef0
          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 90618fa896fbcbfe6559f38aeddf2f9592670f00..3f50cebdb57dd5029a457c593ae17e2d2d56053a 100644
+index 454587fc85aecad21f4f042dd87c35a4232338e9..fa6ae287036992bc91c56c96fadb331050ebfbc3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2142,7 +2142,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2146,7 +2146,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/0347-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch
index 911354cca4..2bf2700bbf 100644
--- a/Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3f50cebdb57dd5029a457c593ae17e2d2d56053a..38d81c42a82bf1208ec727d7c6c0cfac7ae5cd2e 100644
+index fa6ae287036992bc91c56c96fadb331050ebfbc3..af464019f8ef8236c2c2d605471aa35bf1bcd25c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -295,7 +295,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -299,7 +299,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
          this.networkManager.getClass();
          // CraftBukkit - Don't wait
diff --git a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
index 9ed1b3447c..3ceecb3fda 100644
--- a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
@@ -3505,10 +3505,10 @@ index 325532e1585beefe1cb341580e0bb3e95020b6fe..7f72d13bb39182666a741d4376921530
          return this.m;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 38d81c42a82bf1208ec727d7c6c0cfac7ae5cd2e..ba1046999ec48ed49de52be4d7b6d9893033a8d5 100644
+index af464019f8ef8236c2c2d605471aa35bf1bcd25c..44ac06b2b733336ed27a58e6d2725424dc2b134d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -580,6 +580,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -584,6 +584,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
              minecraftServer.scheduleOnMain(() -> this.disconnect(new ChatMessage("disconnect.spam", new Object[0]))); // Paper
              return;
          }
diff --git a/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch
index e054871c33..609b081a49 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 ba1046999ec48ed49de52be4d7b6d9893033a8d5..71b92f99f0148849acc733005aa90234e739f717 100644
+index 44ac06b2b733336ed27a58e6d2725424dc2b134d..5be06182f2987f16c96c3b54fa7314f403ca69bd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1094,7 +1094,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1098,7 +1098,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 6e2e9cd01e..cfc3b3040f 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 4567b0fe175765748bb787049e10fbe0af0a61d9..11a1fad5450ec94aeb4b135d7efc7271
          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 71b92f99f0148849acc733005aa90234e739f717..a90b0caeaa2340ce78dbad773b257db0f108a4ed 100644
+index 5be06182f2987f16c96c3b54fa7314f403ca69bd..60046183e610f406020c9835c295e2732812b37b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1557,6 +1557,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1561,6 +1561,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 df3638c0b8..f2dad3d79b 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 a90b0caeaa2340ce78dbad773b257db0f108a4ed..5b42d6ff29dfd7415a8b89b36e8522ab4f5494ca 100644
+index 60046183e610f406020c9835c295e2732812b37b..b6d31a9e64377de0f9ecfc5f5f24d92b8fe11caf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1319,6 +1319,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1323,6 +1323,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/0460-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
index 38197d1dda..4b9d0ffa91 100644
--- a/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
+++ b/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
@@ -69,10 +69,10 @@ index 54a1988341a4a6e80ab40624280b7c92532d5db6..7073d697a5d35b9b72ea05d5608438ac
      public boolean hasPermission(int i) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bce167086d12b8b9b955a885ce86b33efa064a3c..fea5583126144287cfb2abd05208166bc7eeecdd 100644
+index ce25ed932bc2f49c78c4693806b7f405bc0d6e9d..3ba41cea005aa809c7ea1fdf5fe70e594f869bc9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -620,8 +620,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -624,8 +624,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      ParseResults<CommandListenerWrapper> parseresults = this.minecraftServer.getCommandDispatcher().a().parse(stringreader, this.player.getCommandListener());
  
                      this.minecraftServer.getCommandDispatcher().a().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
@@ -87,7 +87,7 @@ index bce167086d12b8b9b955a885ce86b33efa064a3c..fea5583126144287cfb2abd05208166b
                      });
                  });
              }
-@@ -630,7 +634,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -634,7 +638,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
              builder = builder.createOffset(builder.getInput().lastIndexOf(' ') + 1);
              completions.forEach(builder::suggest);
diff --git a/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 20d8c6b754..7dc2cfe08c 100644
--- a/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index fea5583126144287cfb2abd05208166bc7eeecdd..1570fc9490bfb776cfdfdf594d5b666563a3b342 100644
+index 3ba41cea005aa809c7ea1fdf5fe70e594f869bc9..b877fd6b5d47069bba0ee70a6d4aa50f24770dd7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -733,7 +733,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -737,7 +737,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
      @Override
      public void a(PacketPlayInPickItem packetplayinpickitem) {
          PlayerConnectionUtils.ensureMainThread(packetplayinpickitem, this, this.player.getWorldServer());
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 8656c7738f..6e9eba0a2b 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
@@ -1146,10 +1146,10 @@ index e38c9a8f4bf017db9f296bffcd029f9603ee82f6..19a31536d40289cba25120d4cc4788e9
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6a3cd67816ee3cb79d00a2ea9e71af3d840b87c2..8e21c1d9bc47f5fc451bb0ff51480ca4cd1fff6e 100644
+index b877fd6b5d47069bba0ee70a6d4aa50f24770dd7..cab29e756cd0f04c8c97e29ee2affaa39b425b9a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1379,6 +1379,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1383,6 +1383,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
          this.A = this.e;
          this.player.setLocation(d0, d1, d2, f, f1);
@@ -1158,7 +1158,7 @@ index 6a3cd67816ee3cb79d00a2ea9e71af3d840b87c2..8e21c1d9bc47f5fc451bb0ff51480ca4
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1dfd884d9b2dfb3b8c44afb8363019681ae49d84..4bf086ab2ee2514515ab8238a30b766e5c9d3ea9 100644
+index 1d9d954540a0567c1103dbdb1b9cea986e61c46c..c11623e8b15b4da0b1e199d0e0c92e5338971041 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -198,8 +198,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch
index 1b8a612743..7a98714e2f 100644
--- a/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/Spigot-Server-Patches/0500-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 9fe5c5109775f5d11bce47f88b78c20da971336e..cbcfafd0a48e0041340924931e57133cb6380622 100644
+index cab29e756cd0f04c8c97e29ee2affaa39b425b9a..ab9714c0ed5eed66b6c6d44b686fe39dd1719d97 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1176,6 +1176,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1180,6 +1180,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/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch
index c2a7364543..b1df5d3efe 100644
--- a/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/Spigot-Server-Patches/0504-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 cbcfafd0a48e0041340924931e57133cb6380622..c655fa9840feefdc6bf7156899eadceaa3a6cf21 100644
+index ab9714c0ed5eed66b6c6d44b686fe39dd1719d97..d26d4041afe806f7d2b07ad4404610ffd6c316e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2615,9 +2615,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2619,9 +2619,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/0507-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch
index 648b243044..3a7817e054 100644
--- a/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch
+++ b/Spigot-Server-Patches/0507-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 c655fa9840feefdc6bf7156899eadceaa3a6cf21..7c3e5340d403fb2a1c055dd0ea40d7a7ec335e27 100644
+index d26d4041afe806f7d2b07ad4404610ffd6c316e4..dc11d45dbcb8c0c300e4ef407bf94df30310adf8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -648,7 +648,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -652,7 +652,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 c655fa9840feefdc6bf7156899eadceaa3a6cf21..7c3e5340d403fb2a1c055dd0ea40d7a7
              this.player.sendMessage(new ChatMessage("advMode.notAllowed"), SystemUtils.b);
          } else {
              CommandBlockListenerAbstract commandblocklistenerabstract = null;
-@@ -711,7 +711,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -715,7 +715,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/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 0cf3325f0c..8502b32034 100644
--- a/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -61,10 +61,10 @@ index d0ce4b96174f85c545a457fe864c7ebadc727ade..ca417825eb0827caad817f65b5132f1d
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7c3e5340d403fb2a1c055dd0ea40d7a7ec335e27..bbfd4db220a4f95c473093ad4fb6cc2072af0082 100644
+index dc11d45dbcb8c0c300e4ef407bf94df30310adf8..d6e41934ae86d83ed3c81b499dd81f584c07b90d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2884,7 +2884,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2888,7 +2888,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/0532-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch
index ce2e4b0b17..99ff7974e7 100644
--- a/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch
+++ b/Spigot-Server-Patches/0532-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 bbfd4db220a4f95c473093ad4fb6cc2072af0082..c7543b0f4172384210dde152b56908414e68ddda 100644
+index d6e41934ae86d83ed3c81b499dd81f584c07b90d..b444567722c5884b10dc99e96f985f981aa76a3c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1512,15 +1512,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1516,15 +1516,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
          BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
          EnumDirection enumdirection = movingobjectpositionblock.getDirection();
  
diff --git a/Spigot-Server-Patches/0547-Brand-support.patch b/Spigot-Server-Patches/0547-Brand-support.patch
index 3281d5b048..7c6e87c824 100644
--- a/Spigot-Server-Patches/0547-Brand-support.patch
+++ b/Spigot-Server-Patches/0547-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 c7543b0f4172384210dde152b56908414e68ddda..d140832157bb502c0792993a2d9415c50e78a05b 100644
+index b444567722c5884b10dc99e96f985f981aa76a3c..5b7457d9186b9ea66b986603e5e2c629c9e245cb 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 c7543b0f4172384210dde152b56908414e68ddda..d140832157bb502c0792993a2d9415c5
      public PlayerConnection(MinecraftServer minecraftserver, NetworkManager networkmanager, EntityPlayer entityplayer) {
          this.minecraftServer = minecraftserver;
          this.networkManager = networkmanager;
-@@ -2843,6 +2846,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2847,6 +2850,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 c7543b0f4172384210dde152b56908414e68ddda..d140832157bb502c0792993a2d9415c5
      @Override
      public void a(PacketPlayInCustomPayload packetplayincustompayload) {
          PlayerConnectionUtils.ensureMainThread(packetplayincustompayload, this, this.player.getWorldServer());
-@@ -2870,6 +2875,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2874,6 +2879,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
              try {
                  byte[] data = new byte[packetplayincustompayload.data.readableBytes()];
                  packetplayincustompayload.data.readBytes(data);
@@ -51,7 +51,7 @@ index c7543b0f4172384210dde152b56908414e68ddda..d140832157bb502c0792993a2d9415c5
                  server.getMessenger().dispatchIncomingMessage(player.getBukkitEntity(), packetplayincustompayload.tag.toString(), data);
              } catch (Exception ex) {
                  PlayerConnection.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-@@ -2879,6 +2894,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2883,6 +2898,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      }
  
diff --git a/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index a1c20429d1..ab85f4a4ac 100644
--- a/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 83a469447e39b801442769fcb5979e987e2adae9..e65cb9c72e46d50b871d1c7b5789a1855622d934 100644
+index 5c52a2988b8830e4e5597f8a5b3718d242023cb7..a7b225249f7ffafa2c6e1fc60657067229e02960 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -54,6 +54,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,10 +35,10 @@ index 83a469447e39b801442769fcb5979e987e2adae9..e65cb9c72e46d50b871d1c7b5789a185
          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 d140832157bb502c0792993a2d9415c50e78a05b..c98287032082923f9c733b949cf4d76185e3001d 100644
+index 5b7457d9186b9ea66b986603e5e2c629c9e245cb..9f836c5f6b9cbe83f537ebd25b54d7fd42693bd5 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -542,7 +542,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -546,7 +546,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
      public void a(PacketPlayInTeleportAccept packetplayinteleportaccept) {
          PlayerConnectionUtils.ensureMainThread(packetplayinteleportaccept, this, this.player.getWorldServer());
          if (packetplayinteleportaccept.b() == this.teleportAwait && this.teleportPos != null) { // CraftBukkit
@@ -47,7 +47,7 @@ index d140832157bb502c0792993a2d9415c50e78a05b..c98287032082923f9c733b949cf4d761
              this.o = this.teleportPos.x;
              this.p = this.teleportPos.y;
              this.q = this.teleportPos.z;
-@@ -1386,7 +1386,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1390,7 +1390,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          // CraftBukkit end
  
          this.A = this.e;
diff --git a/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch
index 2885e0f856..f62a67dfb2 100644
--- a/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch
+++ b/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,10 +6,10 @@ 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 c98287032082923f9c733b949cf4d76185e3001d..0f27428757b1827a625a25ea8f6435882f7b5f8a 100644
+index 9f836c5f6b9cbe83f537ebd25b54d7fd42693bd5..2ca65ad26155ee168b51db52568d207c92a5d137 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -367,19 +367,24 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -371,19 +371,24 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
              if (entity != this.player && entity.getRidingPassenger() == this.player && entity == this.r) {
                  WorldServer worldserver = this.player.getWorldServer();
@@ -41,7 +41,7 @@ index c98287032082923f9c733b949cf4d76185e3001d..0f27428757b1827a625a25ea8f643588
  
  
                  // CraftBukkit start - handle custom speeds and skipped ticks
-@@ -1081,7 +1086,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1085,7 +1090,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 c98287032082923f9c733b949cf4d76185e3001d..0f27428757b1827a625a25ea8f643588
                          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);
-@@ -1089,7 +1094,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1093,7 +1098,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/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch b/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
index f369248f22..cae6277770 100644
--- a/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
+++ b/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch
@@ -37,10 +37,10 @@ index fc4ad72ffaed5e747cfecc71e9ac8ee2b556ce31..fb1e3c705b8abee13695762cdfd0e9f1
                          NetworkManager.LOGGER.debug("Failed to sent packet", throwable);
                          this.sendPacket(new PacketPlayOutKickDisconnect(chatmessage), (future) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dea7787f755013fb06c1e9b999f4b6d167cb5697..9b36afad0974ad6f8a31f940bdbbf920c7859bb3 100644
+index 2ca65ad26155ee168b51db52568d207c92a5d137..8591cd6636f6c1f9cb4fd66618afe63592cec482 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -298,6 +298,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -302,6 +302,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          final IChatBaseComponent ichatbasecomponent = PaperAdventure.asVanilla(event.reason()); // Paper - Adventure
          // CraftBukkit end
  
diff --git a/Spigot-Server-Patches/0615-Limit-recipe-packets.patch b/Spigot-Server-Patches/0615-Limit-recipe-packets.patch
index eab66b49a7..db3d7d1ab7 100644
--- a/Spigot-Server-Patches/0615-Limit-recipe-packets.patch
+++ b/Spigot-Server-Patches/0615-Limit-recipe-packets.patch
@@ -23,7 +23,7 @@ index da48ad0e4725d9a9fcb2d60f82249be97be29033..6a9f41eafcd48ff029f027eeebfc0dc9
      public static boolean velocityOnlineMode;
      public static byte[] velocitySecretKey;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 54b109777c4383cfb4bef8f8ea8e4a9f1cbc9c7c..8b69cdf0619e4b76e98e4170db58198e89faf0f3 100644
+index 8591cd6636f6c1f9cb4fd66618afe63592cec482..b484af7308200133eba42dcc9918566ff3c4fb0d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1,5 +1,6 @@
@@ -67,7 +67,7 @@ index 54b109777c4383cfb4bef8f8ea8e4a9f1cbc9c7c..8b69cdf0619e4b76e98e4170db58198e
          /* Use thread-safe field access instead
          if (this.chatThrottle > 0) {
              --this.chatThrottle;
-@@ -2630,6 +2635,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2634,6 +2639,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInAutoRecipe packetplayinautorecipe) {
diff --git a/Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch b/Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch
index b0d97a705d..191d882e2b 100644
--- a/Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8b69cdf0619e4b76e98e4170db58198e89faf0f3..4e3aa45856015d55bd87d43738533e8d7b01beda 100644
+index b484af7308200133eba42dcc9918566ff3c4fb0d..ad33505bb7896dce6c4381b4652316ef734e9e48 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2058,7 +2058,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2062,7 +2062,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          Vec3D vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
          MovingObjectPosition movingobjectposition = this.player.world.rayTrace(new RayTrace(vec3d, vec3d1, RayTrace.BlockCollisionOption.OUTLINE, RayTrace.FluidCollisionOption.NONE, player));