Properly call overloaded super onDisconnect

Since the method is overloaded, the call to super (which is changed
to call the overloaded method) without the additional parameters
will result in recursion.

25 files changed, 27 insertions, 26 deletions

diff --git a/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch
index 4526e2677b..231099a165 100644
--- a/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -50,7 +50,7 @@ index 7b57657b204204e2a1971c0e1c63812fea14c496..231150bac0ae61e9722c2cdfd70d6f7d
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 07670c7223665237b3a537a7905250321ebb7468..3faf891ec688659dba58fe4be567ee126ee954d5 100644
+index 07670c7223665237b3a537a7905250321ebb7468..4e9e08c3f59de9eac87f244939dc0a19b85b9802 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1855,6 +1855,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -71,8 +71,9 @@ index 07670c7223665237b3a537a7905250321ebb7468..3faf891ec688659dba58fe4be567ee12
          // CraftBukkit end
          ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
 -        this.removePlayerFromWorld();
+-        super.onDisconnect(reason);
 +        this.removePlayerFromWorld(quitMessage); // Paper
-         super.onDisconnect(reason);
++        super.onDisconnect(reason, quitMessage); // Paper
      }
  
 +    // Paper start
diff --git a/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch
index ced5b11e3f..403f8edd6d 100644
--- a/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3faf891ec688659dba58fe4be567ee126ee954d5..3ef7882029f38329f797f77dd64b8ffeeb84dc6b 100644
+index 4e9e08c3f59de9eac87f244939dc0a19b85b9802..ca60102128cd798572a39b3c2eb6c86eba465e90 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -388,7 +388,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0675-Improve-and-expand-AsyncCatcher.patch b/patches/server/0675-Improve-and-expand-AsyncCatcher.patch
index 6a6fe71235..7e587655e1 100644
--- a/patches/server/0675-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0675-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ef7882029f38329f797f77dd64b8ffeeb84dc6b..a53d67a601fc04f18f673742743a4e3b238d0365 100644
+index ca60102128cd798572a39b3c2eb6c86eba465e90..7119c6377a86cf33e4bddbaf5db1594414b5032c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1543,6 +1543,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 853e50ad34..6ef712fd7a 100644
--- a/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a53d67a601fc04f18f673742743a4e3b238d0365..dfe057ccd536f52bd9eed8b13899aed4fce57c1b 100644
+index 7119c6377a86cf33e4bddbaf5db1594414b5032c..e8ca93305e8baaee3e72932b630a2d6907444593 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -734,6 +734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch
index a83342b88a..cf6202185d 100644
--- a/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index dcf412aa557cdc7464893264b86b916e0ffbb0b8..1f71e11ec2bd617595de788f42562a43
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dfe057ccd536f52bd9eed8b13899aed4fce57c1b..c571766b52f4b6b1d5dabceeb5e4a32590626b5c 100644
+index e8ca93305e8baaee3e72932b630a2d6907444593..65f36454b08d7527aca0d3e667979fd58f3dcf6f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2550,8 +2550,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch
index db7c54e214..07f462e68e 100644
--- a/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c571766b52f4b6b1d5dabceeb5e4a32590626b5c..8e0aba32a7dbd8915899779d1fa4b1dc36051b06 100644
+index 65f36454b08d7527aca0d3e667979fd58f3dcf6f..b0987c149917513fd00c39da2560277df4e0549b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -534,7 +534,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0754-Kick-on-main-for-illegal-chat.patch b/patches/server/0754-Kick-on-main-for-illegal-chat.patch
index ac14e4d73b..d4075b2273 100644
--- a/patches/server/0754-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0754-Kick-on-main-for-illegal-chat.patch
@@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8e0aba32a7dbd8915899779d1fa4b1dc36051b06..4359f05f6c45393e491d5a0d588c9fe8aa1f1dfb 100644
+index b0987c149917513fd00c39da2560277df4e0549b..e8302e9be8fda770e1396da40107ed22338de31b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2021,7 +2021,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 639d0cea98..af0968bf69 100644
--- a/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4359f05f6c45393e491d5a0d588c9fe8aa1f1dfb..1affbdc7141cc48fa878f4e8f7364e4cc7f5d1a1 100644
+index e8302e9be8fda770e1396da40107ed22338de31b..42860936789e66128615d3d2dc7a2a7bf139240b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -463,6 +463,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch
index bac9abd76c..68f5cebe43 100644
--- a/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1affbdc7141cc48fa878f4e8f7364e4cc7f5d1a1..686049046869b6d9a558a1f28b204b2cf83196cf 100644
+index 42860936789e66128615d3d2dc7a2a7bf139240b..7f96ba2095bee348cb6bb7796471aa7cdd1999d3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3188,7 +3188,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch
index f1f2e81c5c..a80fb4d3b4 100644
--- a/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index c7894892afe97eb3cb453c37a2d9a23d811d70b8..2d06a8f85c5e29688aa0fd4726fd5767
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 686049046869b6d9a558a1f28b204b2cf83196cf..6e90f40dd58f935c7b067cd4eea57704e0a231da 100644
+index 7f96ba2095bee348cb6bb7796471aa7cdd1999d3..aa3926339c698038560f3eb2671917c9d5882fee 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2751,7 +2751,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0810-Do-not-accept-invalid-client-settings.patch b/patches/server/0810-Do-not-accept-invalid-client-settings.patch
index d53bd7982c..fa8d84dc35 100644
--- a/patches/server/0810-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0810-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6e90f40dd58f935c7b067cd4eea57704e0a231da..6580a437734fad134f1a72aeae300f340caffdf3 100644
+index aa3926339c698038560f3eb2671917c9d5882fee..ba86bc53af2e9574a4fbaaf052df4f4cc5d752bd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3312,6 +3312,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 3f6d83434f..f79a1a6a1e 100644
--- a/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6580a437734fad134f1a72aeae300f340caffdf3..85c149e7bab7250e5fd731dfec7bedc39380a30a 100644
+index ba86bc53af2e9574a4fbaaf052df4f4cc5d752bd..6ae39de0ac64e6a5757972c6cee85c37f641d9fd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2148,7 +2148,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 9793b6dd50..6b2b48140b 100644
--- a/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 85c149e7bab7250e5fd731dfec7bedc39380a30a..85651f43ef7c979d3024f168cb9f42956e544a7d 100644
+index 6ae39de0ac64e6a5757972c6cee85c37f641d9fd..b1be147250d3850930e103a2fa2823a6c992f0dd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2368,7 +2368,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0833-More-Teleport-API.patch b/patches/server/0833-More-Teleport-API.patch
index 213f919b8f..99f281278b 100644
--- a/patches/server/0833-More-Teleport-API.patch
+++ b/patches/server/0833-More-Teleport-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API
 public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 85651f43ef7c979d3024f168cb9f42956e544a7d..8014c067396dc595ec456847e05615f8aa794f1e 100644
+index b1be147250d3850930e103a2fa2823a6c992f0dd..675467a6552cfc1f951e7c81a9be0d423cae8c44 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1605,11 +1605,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0836-Send-block-entities-after-destroy-prediction.patch b/patches/server/0836-Send-block-entities-after-destroy-prediction.patch
index 6014c369d6..509dc02f75 100644
--- a/patches/server/0836-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0836-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8014c067396dc595ec456847e05615f8aa794f1e..7ffd1d56ec88ffc8e3d6d0124260c3f76f3554ee 100644
+index 675467a6552cfc1f951e7c81a9be0d423cae8c44..db5368bf4970c63f21ef1e5fc7428787c90de4dd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1751,8 +1751,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0894-Properly-resend-entities.patch b/patches/server/0894-Properly-resend-entities.patch
index bfaa0894c7..766b75ba5e 100644
--- a/patches/server/0894-Properly-resend-entities.patch
+++ b/patches/server/0894-Properly-resend-entities.patch
@@ -82,7 +82,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..15add3f4dfd718ec09bb1db4f2222346
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7ffd1d56ec88ffc8e3d6d0124260c3f76f3554ee..9e8f224a6d2986caaacea75eeea64d84a8674868 100644
+index db5368bf4970c63f21ef1e5fc7428787c90de4dd..9372f2363b13dca1b5ae77a509daaec7fbbf5e4f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2648,7 +2648,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0901-Improve-logging-and-errors.patch b/patches/server/0901-Improve-logging-and-errors.patch
index ab4e900826..e5f0dc8f80 100644
--- a/patches/server/0901-Improve-logging-and-errors.patch
+++ b/patches/server/0901-Improve-logging-and-errors.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve logging and errors
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9e8f224a6d2986caaacea75eeea64d84a8674868..6de98d320dc640ada9ef3fd364f1750502208174 100644
+index 9372f2363b13dca1b5ae77a509daaec7fbbf5e4f..647069b24b16aaa5f9b77a32932d8b072343331c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3386,7 +3386,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch
index 5cddf89663..128115cbc3 100644
--- a/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6de98d320dc640ada9ef3fd364f1750502208174..ebcb7a1e09c63c83819e0831d0db23a8a9b17a94 100644
+index 647069b24b16aaa5f9b77a32932d8b072343331c..cb12c626db3bdc021895cbfb3fab749a0ef5079f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2112,7 +2112,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0910-Use-single-player-info-update-packet-on-join.patch b/patches/server/0910-Use-single-player-info-update-packet-on-join.patch
index 64fa22a769..3df8f607ee 100644
--- a/patches/server/0910-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0910-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ebcb7a1e09c63c83819e0831d0db23a8a9b17a94..24c8f5d859b7084cf838d5c6ef4be7a74171c8f7 100644
+index cb12c626db3bdc021895cbfb3fab749a0ef5079f..a352011eff0d7c29a349345ce7426ef4f22f404b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3416,7 +3416,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
index c6e2f9c0ac..73867d90b5 100644
--- a/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 24c8f5d859b7084cf838d5c6ef4be7a74171c8f7..7e5669fbe9bfeff422099210562853ec70ce3c86 100644
+index a352011eff0d7c29a349345ce7426ef4f22f404b..acc717c59ccab1102f3e12be67438998fcda6457 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2011,6 +2011,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
index dde9182a62..8de436fbe0 100644
--- a/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 40ac5cf19934207f06755fbea02d4626d7aa0511..32e3f347e2e025e2675e9410116386e4
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7e5669fbe9bfeff422099210562853ec70ce3c86..a0860af6f11214cc58db49dcce027b4e157e978b 100644
+index acc717c59ccab1102f3e12be67438998fcda6457..afbc246a2dc55f0f1576c0468118ef80671a034e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -284,6 +284,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0957-Properly-Cancel-Usable-Items.patch b/patches/server/0957-Properly-Cancel-Usable-Items.patch
index 08a0696c6d..5948fdb2d1 100644
--- a/patches/server/0957-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0957-Properly-Cancel-Usable-Items.patch
@@ -34,7 +34,7 @@ index 34ecfb89372f459117db99d57a7edd6f681bbe8a..baf3e79489e310f443788bc917c553ae
          return enuminteractionresult;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a0860af6f11214cc58db49dcce027b4e157e978b..034bfe82c1910f2c3399c11072052cbeff216aec 100644
+index afbc246a2dc55f0f1576c0468118ef80671a034e..1c86eaf44e6c797a51e69f14e08bb9a3f91b4c20 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1923,6 +1923,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0977-Implement-PlayerFailMoveEvent.patch b/patches/server/0977-Implement-PlayerFailMoveEvent.patch
index c679467e26..994712cea1 100644
--- a/patches/server/0977-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0977-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 034bfe82c1910f2c3399c11072052cbeff216aec..757cde17437021a2afbd47253f034e364d237bf9 100644
+index 1c86eaf44e6c797a51e69f14e08bb9a3f91b4c20..18a3546b829c8c696b6d38d2325a09d34c1da3a5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1291,8 +1291,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 371c486aac..d69eb30401 100644
--- a/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 757cde17437021a2afbd47253f034e364d237bf9..5d3adb8ce13e3185a160e1aef4338231d95cd8c9 100644
+index 18a3546b829c8c696b6d38d2325a09d34c1da3a5..ec4add38ebf0329cdc8e8bbdb3bd76cac9948ffc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -805,6 +805,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/1005-Add-PlayerPickItemEvent.patch b/patches/server/1005-Add-PlayerPickItemEvent.patch
index 7e30426fda..d7cd5f972f 100644
--- a/patches/server/1005-Add-PlayerPickItemEvent.patch
+++ b/patches/server/1005-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5d3adb8ce13e3185a160e1aef4338231d95cd8c9..b5fe3786b337fb99920aac72b865e6a25bcb9649 100644
+index ec4add38ebf0329cdc8e8bbdb3bd76cac9948ffc..8bd243a8d5a4be54f907af2b02e96ea833cee62f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -942,7 +942,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl