Finish tests & bad calls

26 files changed, 40 insertions, 32 deletions

diff --git a/patches/server/0502-Added-missing-default-perms-for-commands.patch b/patches/server/0502-Added-missing-default-perms-for-commands.patch
index b28e56519d..ad38e917ee 100644
--- a/patches/server/0502-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0502-Added-missing-default-perms-for-commands.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added missing default perms for commands
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-index ca30f9c590f792caa8f1b76d7219e9121d932673..ec771c480156db393c326fa2fbdc2d432fb76f53 100644
+index ca30f9c590f792caa8f1b76d7219e9121d932673..55695044da8363c8da040d922fa033c917f341d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-@@ -25,12 +25,70 @@ public final class CommandPermissions {
+@@ -25,12 +25,71 @@ public final class CommandPermissions {
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "list", "Allows the user to list all online players", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "gamemode", "Allows the user to change the gamemode of another player", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "xp", "Allows the user to give themselves or others arbitrary values of experience", PermissionDefault.OP, commands);
@@ -76,6 +76,7 @@ index ca30f9c590f792caa8f1b76d7219e9121d932673..ec771c480156db393c326fa2fbdc2d43
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "whitelist", "Allows the user to manage the server whitelist", PermissionDefault.OP, commands);
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "worldborder", "Allows the user to manage the world border", PermissionDefault.OP, commands);
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "place", "Allows the user to place features and structures", PermissionDefault.OP, commands);
++        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "return", "Allows the user to use the /return command", PermissionDefault.OP, commands);
 +        // Paper end
  
          DefaultPermissions.registerPermission("minecraft.admin.command_feedback", "Receive command broadcasts when sendCommandFeedback is true", PermissionDefault.OP, commands);
diff --git a/patches/server/0619-Add-PlayerKickEvent-causes.patch b/patches/server/0619-Add-PlayerKickEvent-causes.patch
index 105be42256..0089d0d1da 100644
--- a/patches/server/0619-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0619-Add-PlayerKickEvent-causes.patch
@@ -88,7 +88,7 @@ index c68bac4727f6b2ca95fc8c438303097af14286f2..bb629ec263959c8268de88ca807bddb6
                  return Component.translatable("commands.kick.success", serverPlayer.getDisplayName(), reason);
              }, true);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 707f0e0bdd3617fac987dacea36df6c363ca71ca..18bdc328dd80e637c3e8cb8a12bd7bfead163191 100644
+index 707f0e0bdd3617fac987dacea36df6c363ca71ca..2f04823ef4143223ae1e1d108f9ff5721c575039 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -362,7 +362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -146,13 +146,13 @@ index 707f0e0bdd3617fac987dacea36df6c363ca71ca..18bdc328dd80e637c3e8cb8a12bd7bfe
      public void disconnect(final Component reason) {
 -        this.disconnect(PaperAdventure.asAdventure(reason));
 +        this.disconnect(PaperAdventure.asAdventure(reason), org.bukkit.event.player.PlayerKickEvent.Cause.UNKNOWN);
++    }
++
++    public void disconnect(final Component reason, PlayerKickEvent.Cause cause) {
++        this.disconnect(PaperAdventure.asAdventure(reason), cause);
      }
  
 -    public void disconnect(net.kyori.adventure.text.Component reason) {
-+    public void disconnect(final Component reason, PlayerKickEvent.Cause cause) {
-+        this.disconnect(PaperAdventure.asAdventure(reason), cause);
-+    }
-+
 +    public void disconnect(net.kyori.adventure.text.Component reason, org.bukkit.event.player.PlayerKickEvent.Cause cause) {
          // Paper end
          // CraftBukkit start - fire PlayerKickEvent
@@ -193,7 +193,7 @@ index 707f0e0bdd3617fac987dacea36df6c363ca71ca..18bdc328dd80e637c3e8cb8a12bd7bfe
                  return;
              }
  
-@@ -827,7 +837,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -827,13 +837,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async
          // CraftBukkit start
          if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -202,6 +202,13 @@ index 707f0e0bdd3617fac987dacea36df6c363ca71ca..18bdc328dd80e637c3e8cb8a12bd7bfe
              return;
          }
          // Paper start
+         String str = packet.getCommand(); int index = -1;
+         if (str.length() > 64 && ((index = str.indexOf(' ')) == -1 || index >= 64)) {
+-            server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]))); // Paper
++            server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper
+             return;
+         }
+         // Paper end
 @@ -986,7 +996,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start - validate pick item position
          if (!(packet.getSlot() >= 0 && packet.getSlot() < this.player.getInventory().items.size())) {
diff --git a/patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 7fc4614548..4b9116113b 100644
--- a/patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 18bdc328dd80e637c3e8cb8a12bd7bfead163191..b4df48db8b329c258abd25d48463a0317028de90 100644
+index 2f04823ef4143223ae1e1d108f9ff5721c575039..febb8df46cd2d82e9109366c78f8fc3452121cd3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1209,7 +1209,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0640-Adds-PlayerArmSwingEvent.patch b/patches/server/0640-Adds-PlayerArmSwingEvent.patch
index 6fe74a39d2..d49bf72168 100644
--- a/patches/server/0640-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0640-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b4df48db8b329c258abd25d48463a0317028de90..30e732d8d5c8944baf6080707568926500c6061d 100644
+index febb8df46cd2d82e9109366c78f8fc3452121cd3..54bbe187860c8aecd4da8bd3eb1c25c18b29dddf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2491,7 +2491,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch
index 8a8a702087..785a8e335e 100644
--- a/patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index dc134bfac4fb2bef6d99c7c88cb680d87808a5f7..62906422a96995ca4eac5a4d8ad2af30
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 30e732d8d5c8944baf6080707568926500c6061d..46ded046ec267aadc6366ff726974f549dfcb0e9 100644
+index 54bbe187860c8aecd4da8bd3eb1c25c18b29dddf..f0aa3519f90d00e5f1d3bcc3cd431f3c57744412 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -514,7 +514,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch
index 43b98f07f0..f982d9439c 100644
--- a/patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0653-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 46ded046ec267aadc6366ff726974f549dfcb0e9..92d447b938592cabad2e09d0893165b9f043d5b4 100644
+index f0aa3519f90d00e5f1d3bcc3cd431f3c57744412..ee3325c1035a0427e608ce22c462085c3c677e48 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -431,7 +431,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0684-Improve-and-expand-AsyncCatcher.patch b/patches/server/0684-Improve-and-expand-AsyncCatcher.patch
index 0b47531e00..7ebc09e231 100644
--- a/patches/server/0684-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0684-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 92d447b938592cabad2e09d0893165b9f043d5b4..f6d42ce7b0c058424e88c89dc1d0d0977c55c893 100644
+index ee3325c1035a0427e608ce22c462085c3c677e48..cbf76edc482c51a0b0f0633f65186e0933dee599 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1653,6 +1653,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 31e8f1c67e..a47e1da159 100644
--- a/patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0717-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 f6d42ce7b0c058424e88c89dc1d0d0977c55c893..6a6f83ab60c2bf4b47e31952cedad7d06226e2c4 100644
+index cbf76edc482c51a0b0f0633f65186e0933dee599..674b57f31b15a47054c4b07093ab43294a289171 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -847,6 +847,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch
index c6538b6e16..b8d245796b 100644
--- a/patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index 71a8812365503d840f6702a21d504a37d67c7194..63561c0044375465fa0023b2b563a651
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6a6f83ab60c2bf4b47e31952cedad7d06226e2c4..adfc5010a5160adf1cd32bf38ba68f2d6ca63e27 100644
+index 674b57f31b15a47054c4b07093ab43294a289171..6297f05bdaaa53cfab2ef019e2d30622f34c076c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2705,8 +2705,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch
index 307b158e8b..1bb232a446 100644
--- a/patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0747-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 adfc5010a5160adf1cd32bf38ba68f2d6ca63e27..4bf9a1b7437f3593e329a42621a53baa40ccb248 100644
+index 6297f05bdaaa53cfab2ef019e2d30622f34c076c..f211eb2b56fc758512862c0b1e5a049bc7c76685 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -647,7 +647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0773-Kick-on-main-for-illegal-chat.patch b/patches/server/0773-Kick-on-main-for-illegal-chat.patch
index b375f83a96..16fddd4fdd 100644
--- a/patches/server/0773-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0773-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 4bf9a1b7437f3593e329a42621a53baa40ccb248..34af6c33bd8c6bc70b506d68de40aff6b40b9221 100644
+index f211eb2b56fc758512862c0b1e5a049bc7c76685..f8e808819409d1d9caf4347d042de19ac64722c6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2162,7 +2162,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index f3661fda0b..11c5c9c385 100644
--- a/patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0800-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 34af6c33bd8c6bc70b506d68de40aff6b40b9221..0e7886df1a1904f99d98601235af7c267835245b 100644
+index f8e808819409d1d9caf4347d042de19ac64722c6..6a8e97cda413762d1b5d02c2d23be71fa36db657 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -576,6 +576,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch
index a720885319..870f708ef5 100644
--- a/patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0815-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 0e7886df1a1904f99d98601235af7c267835245b..ec8b809f0ce619d948088625e7b06b66e1d778ad 100644
+index 6a8e97cda413762d1b5d02c2d23be71fa36db657..fafe71b267d514840cb6c9337817c30f3e466d35 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3308,7 +3308,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
index 75bf9cef18..90e9ee9720 100644
--- a/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index 9951e999b1440ef623f14bdd46b5e42a90387f1e..91e6161449dc5625331e467d9e837575
  
              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 ec8b809f0ce619d948088625e7b06b66e1d778ad..9503c6a15836ac99a011fd9277f4cc5233b0f943 100644
+index fafe71b267d514840cb6c9337817c30f3e466d35..2c93b0657a21a48d70941e4eee26df4c61fc3fe2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2898,7 +2898,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0828-Do-not-accept-invalid-client-settings.patch b/patches/server/0828-Do-not-accept-invalid-client-settings.patch
index 306616803d..01917c8ec7 100644
--- a/patches/server/0828-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0828-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 9503c6a15836ac99a011fd9277f4cc5233b0f943..fad1a7d6fbf016aad7edb8457776f95787e942a2 100644
+index 2c93b0657a21a48d70941e4eee26df4c61fc3fe2..79708158c748eb877dbd3c225da45938e51781bf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3450,6 +3450,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch
index e036bc46b2..4dc45be5c8 100644
--- a/patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fad1a7d6fbf016aad7edb8457776f95787e942a2..91c7a81aab590540706d546d78dfdd6992f3a8ea 100644
+index 79708158c748eb877dbd3c225da45938e51781bf..82007c6527ac932a22f68b7c7051e3bf6f204117 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2032,7 +2032,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 5786019c13..505585a567 100644
--- a/patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0849-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 91c7a81aab590540706d546d78dfdd6992f3a8ea..a1124b201379a31723cc815f7bd2d50b05cf785a 100644
+index 82007c6527ac932a22f68b7c7051e3bf6f204117..b504ecc5e98c74b3eee2b0e7552156a46815adf3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2290,7 +2290,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index c06816c50c..455e7e8795 100644
--- a/patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0851-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 a1124b201379a31723cc815f7bd2d50b05cf785a..8292ec001d9be4507d4ae880d38ab9fc36ceabed 100644
+index b504ecc5e98c74b3eee2b0e7552156a46815adf3..3bad487618a096c4970b5e99bd588001a3cd6716 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2537,7 +2537,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0852-More-Teleport-API.patch b/patches/server/0852-More-Teleport-API.patch
index 639e455400..b1da07e3f2 100644
--- a/patches/server/0852-More-Teleport-API.patch
+++ b/patches/server/0852-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 8292ec001d9be4507d4ae880d38ab9fc36ceabed..7a464f836fd196ada5be42679f4dd15381a76fda 100644
+index 3bad487618a096c4970b5e99bd588001a3cd6716..e596cb762e038325ffc7979f9dc0276b812388f7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1708,11 +1708,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0855-Send-block-entities-after-destroy-prediction.patch b/patches/server/0855-Send-block-entities-after-destroy-prediction.patch
index 4c3a32c04d..8112369925 100644
--- a/patches/server/0855-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0855-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 0f0cf4fdfcbf8537696f15f98f3fb7e68baeb27c..c38268b11dd5a76d5b3c2013c241063c
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7a464f836fd196ada5be42679f4dd15381a76fda..6acee52f59290bcc8f6d61c9b616cdc7f30504ec 100644
+index e596cb762e038325ffc7979f9dc0276b812388f7..b198e6d9b78d9d76bf0571c15a691e638e7bf1b7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1854,8 +1854,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0861-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0861-Remove-invalid-signature-login-stacktrace.patch
index 80be53f207..85de582081 100644
--- a/patches/server/0861-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0861-Remove-invalid-signature-login-stacktrace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6acee52f59290bcc8f6d61c9b616cdc7f30504ec..1b58accf9d00940617d60024ef196c55b10cce7c 100644
+index b198e6d9b78d9d76bf0571c15a691e638e7bf1b7..f525320635dc428610c0ff5259c9ea9a0115ac9e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3585,7 +3585,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0914-Properly-resend-entities.patch b/patches/server/0914-Properly-resend-entities.patch
index 9c1e04c6ae..932a46a1d2 100644
--- a/patches/server/0914-Properly-resend-entities.patch
+++ b/patches/server/0914-Properly-resend-entities.patch
@@ -66,7 +66,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..bf6a70a69bb695ec1a202cd1e863c468
      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 1b58accf9d00940617d60024ef196c55b10cce7c..7281e1cf6e41a222657c3deaf13e1f09080ef597 100644
+index f525320635dc428610c0ff5259c9ea9a0115ac9e..6c850f8a39f20f30ad744ef946420de453f8ce45 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2796,7 +2796,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch
index 4b648ef509..5de7e7c74a 100644
--- a/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0924-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 7281e1cf6e41a222657c3deaf13e1f09080ef597..3c4e3c1f161dc14b2341a7847e872584c52c719f 100644
+index 6c850f8a39f20f30ad744ef946420de453f8ce45..b9d86e030aafe526f07e4335e772bcd9c0d8fe2a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2254,7 +2254,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0930-Use-single-player-info-update-packet-on-join.patch b/patches/server/0930-Use-single-player-info-update-packet-on-join.patch
index 8098422c33..9eae4ab946 100644
--- a/patches/server/0930-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0930-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 3c4e3c1f161dc14b2341a7847e872584c52c719f..3ed87a3a00bb7da4106f3430ffa6afaa31336059 100644
+index b9d86e030aafe526f07e4335e772bcd9c0d8fe2a..b94def027095f4decc00d5f415a220df9408bad6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3600,7 +3600,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0952-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0952-Treat-sequence-violations-like-they-should-be.patch
index 69a22f4983..8cac9bfc29 100644
--- a/patches/server/0952-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0952-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 3ed87a3a00bb7da4106f3430ffa6afaa31336059..0cb7a7d8152796b216bb97543122da7b13749f21 100644
+index b94def027095f4decc00d5f415a220df9408bad6..e7af33c702fcfe187c549b795c65029c727c6517 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2124,6 +2124,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 377847e75e..3053f7c554 100644
--- a/patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 23e0e6937e28f09271a4ec7c35e0076a576cf3d3..4aa8b483841028fbcc43f9ed47730881
          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 0cb7a7d8152796b216bb97543122da7b13749f21..1288f651fa83d5ab99a88858f52a6d3212284df0 100644
+index e7af33c702fcfe187c549b795c65029c727c6517..ae82ab0e3d8e99f87ca8465fbcbb44b5ce18bf96 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic