Fix local attribute setting

2023-09-23 09:42:59 +10:00 · 2023-09-23 09:42:59 +10:00 · d23c4a50e6
Commit d23c4a50e6
--- a/patches/unapplied/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/unapplied/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
--- a/patches/unapplied/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/unapplied/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
--- a/patches/unapplied/server/0682-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/unapplied/server/0682-Allow-controlled-flushing-for-network-manager.patch
--- a/patches/unapplied/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/unapplied/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
--- a/patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch
+++ b/patches/unapplied/server/0685-Optimise-chunk-tick-iteration.patch
--- a/patches/unapplied/server/0691-Remove-streams-for-villager-AI.patch
+++ b/patches/unapplied/server/0691-Remove-streams-for-villager-AI.patch
--- a/patches/unapplied/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/unapplied/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
--- a/patches/unapplied/server/0704-Optimise-non-flush-packet-sending.patch
+++ b/patches/unapplied/server/0704-Optimise-non-flush-packet-sending.patch
--- a/patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch
+++ b/patches/unapplied/server/0705-Optimise-nearby-player-lookups.patch
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@ -2249,7 +2249,7 @@ index 2a7c614df7b9c9405a5dd23e6a888ede7fc86683..794ab78d91cb54008679aecbc8f01eda
 
     public boolean logIPs() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 084339c7da80ce21ab8405e20b76af87dbbbe8ce..b944cda955c5660d3a9b84e9c92c2b19337a027a 100644
+index 084339c7da80ce21ab8405e20b76af87dbbbe8ce..f7674978f032f020887546f593024c1442719127 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -156,6 +156,7 @@ import net.minecraft.world.scores.Score;
@ -2342,14 +2342,11 @@ index 084339c7da80ce21ab8405e20b76af87dbbbe8ce..b944cda955c5660d3a9b84e9c92c2b19
         }
 
     }
-@@ -1819,6 +1823,10 @@ public class ServerPlayer extends Player {
+@@ -1819,6 +1823,7 @@ public class ServerPlayer extends Player {
         }
         // CraftBukkit end
         this.language = clientOptions.language();
-+        // Paper start
-+        this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language);
-+        this.connection.connection.channel.attr(PaperAdventure.LOCALE_ATTRIBUTE).set(this.adventure$locale);
-+        // Paper end
+        this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language); // Paper
         this.requestedViewDistance = clientOptions.viewDistance();
         this.chatVisibility = clientOptions.chatVisibility();
         this.canChatColor = clientOptions.chatColors();
@ -2418,8 +2415,20 @@ index e7a9dd7791a0dd200c4d74922c6e5adaa5013669..b9062fe651de34d5b3f9d5f146ae0b4f
         // CraftBukkit end
 
         this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), PacketSendListener.thenRun(() -> {
+diff --git a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
+index ea26375d6f23b14a8a1cd926fe410713551de99d..ed80d9551cd7cc1ec26a5d5fd7bc185b38fddd78 100644
+--- a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
+@@ -92,6 +92,7 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
+     @Override
+     public void handleClientInformation(ServerboundClientInformationPacket packet) {
+         this.clientInformation = packet.information();
+        this.connection.channel.attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).set(net.kyori.adventure.translation.Translator.parseLocale(packet.information().language())); // Paper
+     }
+ 
+     @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bbd256d088879f04762fcf628573f1348e4961a8..463d268c3e9450996f58f9820dbd8fc527c213ea 100644
+index bbd256d088879f04762fcf628573f1348e4961a8..ab30acb5bd76f31cab5052ce3d1edd3757a2cabf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -45,6 +45,7 @@ import net.minecraft.nbt.ListTag;
@ -2502,6 +2511,14 @@ index bbd256d088879f04762fcf628573f1348e4961a8..463d268c3e9450996f58f9820dbd8fc5
         } else {
             this.chat(s, message, true);
         }
+@@ -2907,6 +2916,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+     public void handleClientInformation(ServerboundClientInformationPacket packet) {
+         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
+         this.player.updateOptions(packet.information());
+        this.connection.channel.attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).set(net.kyori.adventure.translation.Translator.parseLocale(packet.information().language())); // Paper
+     }
+ 
+     @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 index 7d3a924a56f8a3f5756400e26e67581ebff27445..ef5d73a296982d8b9ac022c5ea755843c2da1c84 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/server/0014-Timings-v2.patch
@ -1275,7 +1275,7 @@ index e2eff46cae9771931b2e0dfee5e73fd4842e3ab5..988a17cd0b960a07795d999dd125eae3
                 this.entityManager.saveAll();
             } else {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 463d268c3e9450996f58f9820dbd8fc527c213ea..e85268e4c20371d4264effb70ae9fa8e435f8766 100644
+index ab30acb5bd76f31cab5052ce3d1edd3757a2cabf..3a7e510934f1d2058f12ba595ed4d986fc2c1c33 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -320,7 +320,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0018-Rewrite-chunk-system.patch
+++ b/patches/server/0018-Rewrite-chunk-system.patch
@ -20291,7 +20291,7 @@ index 988a17cd0b960a07795d999dd125eae3a63d4227..0261baddef54c47f7b32f4e2a31ba017
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b944cda955c5660d3a9b84e9c92c2b19337a027a..32d79663a30dbbf54b0edf0460193182008f003b 100644
+index f7674978f032f020887546f593024c1442719127..80105ed5ab45552d86b2302586de7511dbe729d2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -257,6 +257,50 @@ public class ServerPlayer extends Player {
@ -20660,7 +20660,7 @@ index c509a1318bcef38fd4927e38b6ee9846853e2d15..0f7ee2eea68a5c910bdf4d6263ed09cb
         this.desiredChunksPerTick = Double.isNaN((double)desiredBatchSize) ? 0.01F : Mth.clamp(desiredBatchSize, 0.01F, 64.0F);
         if (this.unacknowledgedBatches == 0) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e85268e4c20371d4264effb70ae9fa8e435f8766..3b11d395bd2c8ca8ec9a2ddb62b57c167a45ba2d 100644
+index 3a7e510934f1d2058f12ba595ed4d986fc2c1c33..7bcc8919d62f37ddc52a6c0ee2b91e6af2493d50 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -695,6 +695,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0038-Configurable-end-credits.patch
+++ b/patches/server/0038-Configurable-end-credits.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 32d79663a30dbbf54b0edf0460193182008f003b..d0cab48a8743a97c8be6bb84dd1c1a490cf5221c 100644
+index 80105ed5ab45552d86b2302586de7511dbe729d2..10a99aff9632db578d19683675ba12242ae6970b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1069,6 +1069,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d0cab48a8743a97c8be6bb84dd1c1a490cf5221c..263c1be59c62e2e5b6e40ecc7c36085e9e48827e 100644
+index 10a99aff9632db578d19683675ba12242ae6970b..77668e9534f6d68755020cbae09aae5d47d10fa1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -214,7 +214,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0047-Configurable-container-update-tick-rate.patch
+++ b/patches/server/0047-Configurable-container-update-tick-rate.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 263c1be59c62e2e5b6e40ecc7c36085e9e48827e..56566c9f74d1ba2539f9d35f61038489650b0792 100644
+index 77668e9534f6d68755020cbae09aae5d47d10fa1..5d95cc1f0f66cdad867265c38a06938c00b3a2ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -239,6 +239,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0052-Improve-Player-chat-API-handling.patch
+++ b/patches/server/0052-Improve-Player-chat-API-handling.patch
@ -17,7 +17,7 @@ Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 Co-authored-by: SoSeDiK <mrsosedik@gmail.com>

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3b11d395bd2c8ca8ec9a2ddb62b57c167a45ba2d..a3fb406ca9fda0ca6909e2e4f4f486c7de0e5ae3 100644
+index 7bcc8919d62f37ddc52a6c0ee2b91e6af2493d50..02ff355c94b3791b44e04d4744c0ed81d4813019 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1925,7 +1925,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch
@ -28,7 +28,7 @@ index 644a0fdea6576647539b96528717dbaeab498d93..221e64a66ff12a8de5c75992fc26a54a
 +    // Paper end - PlayerUseUnknownEntityEvent
 }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a3fb406ca9fda0ca6909e2e4f4f486c7de0e5ae3..d8a78412d2cfa6aff023ecc8e5cc2121767a9097 100644
+index 02ff355c94b3791b44e04d4744c0ed81d4813019..cbbde03b27ad2c820cee9a9cd6910f3ad17cf487 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2392,8 +2392,38 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0108-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0108-Configurable-packet-in-spam-threshold.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d8a78412d2cfa6aff023ecc8e5cc2121767a9097..24bb821dce6e70cf3e8f9c8f757f2967672a8896 100644
+index cbbde03b27ad2c820cee9a9cd6910f3ad17cf487..fbfdfa7505d319353ba5c77bb548d3bd384772c9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1505,13 +1505,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0109-Configurable-flying-kick-messages.patch
+++ b/patches/server/0109-Configurable-flying-kick-messages.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 24bb821dce6e70cf3e8f9c8f757f2967672a8896..75f454263d0933d2e5b3869c83ddc6eb43947c2c 100644
+index fbfdfa7505d319353ba5c77bb548d3bd384772c9..13c3fb6d201f5a995f1fc759b7ae83a53935118e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -336,7 +336,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0122-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0122-Properly-fix-item-duplication-bug.patch
@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 56566c9f74d1ba2539f9d35f61038489650b0792..aee79a46d8fce5e5e80010e0e34f04fc8495d602 100644
+index 5d95cc1f0f66cdad867265c38a06938c00b3a2ed..c6c046f3089759214739fc9c3b6f2936e41d1334 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2396,7 +2396,7 @@ public class ServerPlayer extends Player {
+@@ -2393,7 +2393,7 @@ public class ServerPlayer extends Player {
 
     @Override
     public boolean isImmobile() {
--- a/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@ -14,7 +14,7 @@ To be converted into a Paper-API event at some point in the future?
 public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75f454263d0933d2e5b3869c83ddc6eb43947c2c..bebe7cee0a0a94c1e11b7ac8c79c7496fb6b8edc 100644
+index 13c3fb6d201f5a995f1fc759b7ae83a53935118e..7544c7bd9f44eb2e6e1416aab2057b3260bf5c9b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2169,6 +2169,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0157-Add-PlayerJumpEvent.patch
+++ b/patches/server/0157-Add-PlayerJumpEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bebe7cee0a0a94c1e11b7ac8c79c7496fb6b8edc..592e7d24b27fab4af32d35d0f7c7786c582d9418 100644
+index 7544c7bd9f44eb2e6e1416aab2057b3260bf5c9b..5268b04ea82e82fe84441be1bf4a32af1a2f0aab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1199,7 +1199,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0167-AsyncTabCompleteEvent.patch
+++ b/patches/server/0167-AsyncTabCompleteEvent.patch
@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <aikar@aikar.co>

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 592e7d24b27fab4af32d35d0f7c7786c582d9418..c425780ba9867b4ccea9841a8a7dba43f98f5073 100644
+index 5268b04ea82e82fe84441be1bf4a32af1a2f0aab..2f61ce06befb5abf7878e1178accb2cf5f459818 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -687,12 +687,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch
@ -60,7 +60,7 @@ index 65d447df49d8c4a27de9ae7f9e298bf705c688bc..4649e597b86335b33d9e9227d966dd7a
 
             while (iterator1.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index aee79a46d8fce5e5e80010e0e34f04fc8495d602..74249488581e661dda4792348ca1407c1b1df6a9 100644
+index c6c046f3089759214739fc9c3b6f2936e41d1334..b756cf41f0f201824b055f3936ace7ded3bb6023 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1,5 +1,6 @@
--- a/patches/server/0182-Player.setPlayerProfile-API.patch
+++ b/patches/server/0182-Player.setPlayerProfile-API.patch
@ -9,7 +9,7 @@ This can be useful for changing name or skins after a player has logged in.
 public-f net.minecraft.world.entity.player.Player gameProfile

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c425780ba9867b4ccea9841a8a7dba43f98f5073..eff014f2a2d81cf52e36e92af9bf371c5a80fdff 100644
+index 2f61ce06befb5abf7878e1178accb2cf5f459818..b0ea4e32c2f39d635b6ef746c31e493f26069be2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1437,7 +1437,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0216-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0216-InventoryCloseEvent-Reason-API.patch
@ -29,7 +29,7 @@ index 4c1911140197568685524721e3140739bca039c7..1170b2fb6396fab0aa30a097bc8957e2
             }
             // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 74249488581e661dda4792348ca1407c1b1df6a9..73762977727f1cbeb52f6eb683b24217e034bc90 100644
+index b756cf41f0f201824b055f3936ace7ded3bb6023..63d0b6a241c9ef2e6f7b13e7354e59083a2ffb0a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -685,7 +685,7 @@ public class ServerPlayer extends Player {
@ -75,7 +75,7 @@ index 74249488581e661dda4792348ca1407c1b1df6a9..73762977727f1cbeb52f6eb683b24217
         this.doCloseContainer();
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eff014f2a2d81cf52e36e92af9bf371c5a80fdff..248390822d7d4fbff96b184e65affad953c14c8f 100644
+index b0ea4e32c2f39d635b6ef746c31e493f26069be2..dc06a38735b5e92ea18aa8f5f44f391d14b359e2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -215,6 +215,7 @@ import org.bukkit.event.inventory.ClickType;
--- a/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 248390822d7d4fbff96b184e65affad953c14c8f..108667fc42c8595d27d270e46a0e26fa3426450e 100644
+index dc06a38735b5e92ea18aa8f5f44f391d14b359e2..fab3316376df8ce6b06bdd51bc1c4d8a249063be 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2404,6 +2404,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 108667fc42c8595d27d270e46a0e26fa3426450e..36cc7b95613139b0ebc0b7b3525bc56814c11949 100644
+index fab3316376df8ce6b06bdd51bc1c4d8a249063be..41a3ab6236083198be0335e0fb20790256377933 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -253,6 +253,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0253-Improve-death-events.patch
+++ b/patches/server/0253-Improve-death-events.patch
@ -19,7 +19,7 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou
 public net.minecraft.world.entity.LivingEntity getSoundVolume()F

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 73762977727f1cbeb52f6eb683b24217e034bc90..4b67d13665b9c52cebd3d5c3a94617f09900726d 100644
+index 63d0b6a241c9ef2e6f7b13e7354e59083a2ffb0a..ba938eb9844157cccedb5f673a44720538912bc5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -241,6 +241,10 @@ public class ServerPlayer extends Player {
--- a/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch
@ -19,10 +19,10 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4b67d13665b9c52cebd3d5c3a94617f09900726d..740544bddc8a6013567cd25f0456f7c9b8c44c65 100644
+index ba938eb9844157cccedb5f673a44720538912bc5..be56cbfc2a7d966a8c5fc9c89f99f73c94e23ab6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1986,6 +1986,19 @@ public class ServerPlayer extends Player {
+@@ -1983,6 +1983,19 @@ public class ServerPlayer extends Player {
 
         this.camera = (Entity) (entity == null ? this : entity);
         if (entity1 != this.camera) {
@ -42,7 +42,7 @@ index 4b67d13665b9c52cebd3d5c3a94617f09900726d..740544bddc8a6013567cd25f0456f7c9
             Level world = this.camera.level();
 
             if (world instanceof ServerLevel) {
-@@ -2001,7 +2014,6 @@ public class ServerPlayer extends Player {
+@@ -1998,7 +2011,6 @@ public class ServerPlayer extends Player {
             this.connection.send(new ClientboundSetCameraPacket(this.camera));
             this.connection.resetPosition();
         }
--- a/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 36cc7b95613139b0ebc0b7b3525bc56814c11949..f1e730acceb8a539238857d7005406a515833a4f 100644
+index 41a3ab6236083198be0335e0fb20790256377933..cc47134877c9050366d24111e7188294b4c9898c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -466,9 +466,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0274-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0274-Reset-players-airTicks-on-respawn.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Reset players airTicks on respawn


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 740544bddc8a6013567cd25f0456f7c9b8c44c65..ca74bfbfe3863eb3b098252d39afa0d4b3398a5e 100644
+index be56cbfc2a7d966a8c5fc9c89f99f73c94e23ab6..ca3fe38fa443eb08408eca029a34afb58cd5a118 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2458,6 +2458,7 @@ public class ServerPlayer extends Player {
+@@ -2455,6 +2455,7 @@ public class ServerPlayer extends Player {
 
         this.setHealth(this.getMaxHealth());
         this.stopUsingItem(); // CraftBukkit - SPIGOT-6682: Clear active item on reset
--- a/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch
@ -59,7 +59,7 @@ index 7adf7d1248680e591638298f13f5ae88788f5e4c..bdf11a98614c9c12d3112f437651be81
 
                 this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f1e730acceb8a539238857d7005406a515833a4f..54105a484ce0ad074cb2183abff322fdf49478b7 100644
+index cc47134877c9050366d24111e7188294b4c9898c..b78d27e5ab3514c14555637607556684d0308eee 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1561,6 +1561,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0287-Book-Size-Limits.patch
+++ b/patches/server/0287-Book-Size-Limits.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 54105a484ce0ad074cb2183abff322fdf49478b7..42aec20c6ddfdbce688aa6a11e3b4ef99efcf15d 100644
+index b78d27e5ab3514c14555637607556684d0308eee..1dd55e648ec1c2de7bb445fbb2fc8b61f5b30601 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1023,6 +1023,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ca74bfbfe3863eb3b098252d39afa0d4b3398a5e..c3e238933436bd9b8705e8d23c499b0cadfdfab5 100644
+index ca3fe38fa443eb08408eca029a34afb58cd5a118..bc17ba1dc7b744a4325b30703cda73b501da5104 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -241,6 +241,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c3e238933436bd9b8705e8d23c499b0cadfdfab5..9f32eea06954a2d695e7ebdb9f180ecb15c44f63 100644
+index bc17ba1dc7b744a4325b30703cda73b501da5104..46827935fdd790b7e6e8516bc65f8e4985988501 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1647,6 +1647,13 @@ public class ServerPlayer extends Player {
--- a/patches/server/0295-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0295-Implement-Brigadier-Mojang-API.patch
@ -131,7 +131,7 @@ index bbf4db5faf4694e78e01f4e74e277b46a02f7afd..148cfe9eac43cafee016d58a1344a97a
 
             if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 42aec20c6ddfdbce688aa6a11e3b4ef99efcf15d..cb190a36c21a5a9002721e2951cc0dcbae44d496 100644
+index 1dd55e648ec1c2de7bb445fbb2fc8b61f5b30601..62b6c482bd91c94b152b4fb030500523794e4c44 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -739,8 +739,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0297-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0297-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/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cb190a36c21a5a9002721e2951cc0dcbae44d496..467ae1d550191f7ba17b7822daaf753cae9d6fda 100644
+index 62b6c482bd91c94b152b4fb030500523794e4c44..44ae0f89803d1d713dc1ce13a90ee57436cddb1e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -288,6 +288,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch
@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9f32eea06954a2d695e7ebdb9f180ecb15c44f63..678cfedf124c30ab34843995aa86a11a7d9b1aa1 100644
+index 46827935fdd790b7e6e8516bc65f8e4985988501..0e59ea13f1fd3abf684133b0e7f3df00c93b2061 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -850,6 +850,46 @@ public class ServerPlayer extends Player {
--- a/patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch
@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 678cfedf124c30ab34843995aa86a11a7d9b1aa1..19aa75cce58c3e3db350c416211d0f6d89549508 100644
+index 0e59ea13f1fd3abf684133b0e7f3df00c93b2061..dcb6a1bd3774e63dd14fbd8ddd6ff09c68741379 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -970,7 +970,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0340-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0340-implement-optional-per-player-mob-spawns.patch
@ -363,7 +363,7 @@ index 4649e597b86335b33d9e9227d966dd7ad8208096..e655cf837f7bd7d4271dca80b9c67643
 
             this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 19aa75cce58c3e3db350c416211d0f6d89549508..b37cde9c222aaedc440385a04bd7118b584dd3e4 100644
+index dcb6a1bd3774e63dd14fbd8ddd6ff09c68741379..ad34d1562131a5140c4cc83aa3ea94fab08d12da 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -246,6 +246,11 @@ public class ServerPlayer extends Player {
--- a/patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch
@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b37cde9c222aaedc440385a04bd7118b584dd3e4..53cbb238c00e212a549b540e4c14724777387491 100644
+index ad34d1562131a5140c4cc83aa3ea94fab08d12da..a6b9f246ed2d59122c31ff212d99adc0602ef35b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -242,6 +242,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0363-Don-t-tick-dead-players.patch
+++ b/patches/server/0363-Don-t-tick-dead-players.patch
@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 53cbb238c00e212a549b540e4c14724777387491..0b286ea0798845d86173fa81735f2dc1d4ff8737 100644
+index a6b9f246ed2d59122c31ff212d99adc0602ef35b..88152bb21f42f705f6d321f0f088e7f83ac66e62 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -727,7 +727,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch
@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0b286ea0798845d86173fa81735f2dc1d4ff8737..e3e0cd60ad735b895a57fd3b5f38087643a2809e 100644
+index 88152bb21f42f705f6d321f0f088e7f83ac66e62..99cabb83c54106ff39e89f9f138548aa734ccac3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -379,7 +379,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0372-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0372-Prevent-opening-inventories-when-frozen.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e3e0cd60ad735b895a57fd3b5f38087643a2809e..e84b71b457ee8e7ceedf621d755d2d304d4d6f8c 100644
+index 99cabb83c54106ff39e89f9f138548aa734ccac3..1ff911085da7d1a2a378c60c66f8e5364b9774b4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -696,7 +696,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0374-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0374-Implement-Player-Client-Options-API.patch
@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e84b71b457ee8e7ceedf621d755d2d304d4d6f8c..9c89106456ceae53dd87fe8ac6137eb86ccdcacd 100644
+index 1ff911085da7d1a2a378c60c66f8e5364b9774b4..c13f088a74448f80e111bdeeb712087a238ed2b8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1952,7 +1952,23 @@ public class ServerPlayer extends Player {
--- a/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@ -43,7 +43,7 @@ index 91373583904a22bc28c82cf3dfec9f60aebee9a3..463a82f08b7848a4b8a4eb89b201a6e8
         if (!(entity instanceof EnderDragonPart)) {
             EntityType<?> entitytypes = entity.getType();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9c89106456ceae53dd87fe8ac6137eb86ccdcacd..3523b35e629dc78343b891a495bbe310724595f8 100644
+index c13f088a74448f80e111bdeeb712087a238ed2b8..db722b6c6d6d7c5b973f56a2da624514a76b53cd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -265,6 +265,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 467ae1d550191f7ba17b7822daaf753cae9d6fda..b27e3ce52a900345556b2f6bd5985d8e368b7d0b 100644
+index 44ae0f89803d1d713dc1ce13a90ee57436cddb1e..02547349b615480bc800f0a130c9c32953629f07 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -866,7 +866,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0387-misc-debugging-dumps.patch
+++ b/patches/server/0387-misc-debugging-dumps.patch
@ -58,10 +58,10 @@ index 41106a10ca8148dae4129e2a46854d83605839b4..a107751a13ccef2729068e9b98225093
         this.running = false;
         if (waitForShutdown) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-index ea26375d6f23b14a8a1cd926fe410713551de99d..496ac1d2fd43c5ddfe7fa7a8b72a75860ec43443 100644
+index ed80d9551cd7cc1ec26a5d5fd7bc185b38fddd78..77e19f345bf68d12686a65e669cd597cd92af910 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-@@ -130,6 +130,11 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
+@@ -131,6 +131,11 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
             this.connection.resumeInboundAfterProtocolChange();
         } catch (Exception exception) {
             ServerConfigurationPacketListenerImpl.LOGGER.error("Couldn't place player in world", exception);
--- a/patches/server/0388-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0388-Prevent-teleporting-dead-entities.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b27e3ce52a900345556b2f6bd5985d8e368b7d0b..f4fc0edf454722b59ac89559fb3e5bb241dac5a2 100644
+index 02547349b615480bc800f0a130c9c32953629f07..5dd5b16a6c15672ade7d77c0c2e206533b07d08c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1514,6 +1514,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@ -560,10 +560,10 @@ index 282d94ab6da3cefa68a7caee88d726ffa2f73b83..5efd4d512f0a5ea90ff0f3131a912713
             }
             // Paper end
 diff --git a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-index 496ac1d2fd43c5ddfe7fa7a8b72a75860ec43443..6c2a5b2cb57fe799cc1c5002662894ad6e2b22aa 100644
+index 77e19f345bf68d12686a65e669cd597cd92af910..8dbcc1b3a70b6bbea3bd2d15b6d66cc4f9cd53f8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-@@ -132,7 +132,7 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
+@@ -133,7 +133,7 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
             ServerConfigurationPacketListenerImpl.LOGGER.error("Couldn't place player in world", exception);
             // Paper start
             if (MinecraftServer.getServer().isDebugging()) {
--- a/patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch
@ -14,7 +14,7 @@ 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/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f4fc0edf454722b59ac89559fb3e5bb241dac5a2..d2a46b11bcfc5232e725fa0f0a7b9eab175990b9 100644
+index 5dd5b16a6c15672ade7d77c0c2e206533b07d08c..7563a1f23622700afb8215064bfeb0fa24612d80 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1340,6 +1340,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d2a46b11bcfc5232e725fa0f0a7b9eab175990b9..2f06213e5f25953431ff0428693e275e2d781dba 100644
+index 7563a1f23622700afb8215064bfeb0fa24612d80..94383cdf063615bfbc3c5ecca082298c15116002 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2958,16 +2958,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0414-Add-permission-for-command-blocks.patch
+++ b/patches/server/0414-Add-permission-for-command-blocks.patch
@ -18,7 +18,7 @@ index bdf11a98614c9c12d3112f437651be81d0d9872a..3622708c453feb6da3d5be192291d63a
                 return false;
             } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2f06213e5f25953431ff0428693e275e2d781dba..b27363ca1a4f491150b1795fbbc12399a5c0d5ac 100644
+index 94383cdf063615bfbc3c5ecca082298c15116002..af4588c1c6fedc5f38bba6216f5e8a325e8e9754 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -777,7 +777,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@ -76,7 +76,7 @@ index 1f8dcc331505890ba72777b5d0cda2427e0ccfd1..a661f8a83d4e57ca48bbf28dc668f8ff
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3523b35e629dc78343b891a495bbe310724595f8..40964032baa7a94ee0330f36123eaee638c847c2 100644
+index db722b6c6d6d7c5b973f56a2da624514a76b53cd..7b5496d3a21316a7410dfbfbf9335a432b466560 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1206,7 +1206,7 @@ public class ServerPlayer extends Player {
@ -89,10 +89,10 @@ index 3523b35e629dc78343b891a495bbe310724595f8..40964032baa7a94ee0330f36123eaee6
 
                 playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b27363ca1a4f491150b1795fbbc12399a5c0d5ac..1cf17df6cad66c4b27e1636f365024c9e1e080f1 100644
+index af4588c1c6fedc5f38bba6216f5e8a325e8e9754..bf9ee449e33c6ef731c03d591736005868a6f30c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3160,7 +3160,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3161,7 +3161,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
     public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) {
         PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
         if (this.player.hasPermissions(2) || this.isSingleplayerOwner()) {
--- a/patches/server/0421-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0421-incremental-chunk-and-player-saving.patch
@ -115,7 +115,7 @@ index 5efd4d512f0a5ea90ff0f3131a91271310da8be0..6bb89597035894f9aedc52469a38f87f
         // Paper start - rewrite chunk system - add close param
         this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 40964032baa7a94ee0330f36123eaee638c847c2..b21a6f7624831d1ab152027a29bbdafa53cdda67 100644
+index 7b5496d3a21316a7410dfbfbf9335a432b466560..4d96b44533d39962b60ee43c232d5aa80b88e185 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -184,6 +184,7 @@ import org.bukkit.inventory.MainHand;
--- a/patches/server/0459-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0459-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/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1cf17df6cad66c4b27e1636f365024c9e1e080f1..e7d584a4a5618c8d70ed7b74bc94b6c259da2daa 100644
+index bf9ee449e33c6ef731c03d591736005868a6f30c..4b13b3c6422af6b135d622d0e9744430f3e653eb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -657,7 +657,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0469-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0469-Fix-for-large-move-vectors-crashing-server.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e7d584a4a5618c8d70ed7b74bc94b6c259da2daa..8293f8215382c32946f7df482e52a935573bbbdd 100644
+index 4b13b3c6422af6b135d622d0e9744430f3e653eb..b3a67e607b2e28ca3c1900acc3b20ba0ec8fcc8e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -464,9 +464,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0485-Add-API-for-quit-reason.patch
+++ b/patches/server/0485-Add-API-for-quit-reason.patch
@ -25,7 +25,7 @@ index 039c99078150d9732cfad7edc5baba11e1e3d010..2859f5bf5a00ff6841933dd83135d89a
                         Connection.LOGGER.debug("Failed to sent packet", throwable);
                         if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b21a6f7624831d1ab152027a29bbdafa53cdda67..fadfdb96ce9e0f449780c73a992c79691e4f8469 100644
+index 4d96b44533d39962b60ee43c232d5aa80b88e185..c70a7feab56fd63354ac2dd887a5d6157eaf8407 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -272,6 +272,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0498-Limit-recipe-packets.patch
+++ b/patches/server/0498-Limit-recipe-packets.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8293f8215382c32946f7df482e52a935573bbbdd..bc38e5f4fbb465a3cb733b48bf296ed719ad09a0 100644
+index b3a67e607b2e28ca3c1900acc3b20ba0ec8fcc8e..e499637851f3c099dd00a9659394f24ab47aeadd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch
@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <james.jenour@protonmail.com>

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bc38e5f4fbb465a3cb733b48bf296ed719ad09a0..a080b33b214f53c54143f6355e5fb549611ad0fd 100644
+index e499637851f3c099dd00a9659394f24ab47aeadd..de813e33e0c6f21d17dc54bc442e90489d72538c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1733,7 +1733,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fadfdb96ce9e0f449780c73a992c79691e4f8469..d76d7a9687df04b99b9116b2ec42263ec767b40f 100644
+index c70a7feab56fd63354ac2dd887a5d6157eaf8407..cb2f86e0ad0edc54711826215df4406c5725f29c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1243,6 +1243,11 @@ public class ServerPlayer extends Player {
--- a/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a080b33b214f53c54143f6355e5fb549611ad0fd..2cd930b022867e1ba8cadf18b47b796d728e4dfd 100644
+index de813e33e0c6f21d17dc54bc442e90489d72538c..4265e6de70ea9f3105f27fb51eb0d02fc5c1d95a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1725,7 +1725,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2cd930b022867e1ba8cadf18b47b796d728e4dfd..111a98eef2a6b5ba1800cfc82a8d001482012e6b 100644
+index 4265e6de70ea9f3105f27fb51eb0d02fc5c1d95a..4f8ba4ab86d36e75de46c75eba72aa8fd7c3be43 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1186,7 +1186,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch
@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 111a98eef2a6b5ba1800cfc82a8d001482012e6b..30bc43f728214c47d8b35cdbaa336390988b9290 100644
+index 4f8ba4ab86d36e75de46c75eba72aa8fd7c3be43..827804f25b776dd9cd38de8d643ebcdc9383a326 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1894,6 +1894,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 30bc43f728214c47d8b35cdbaa336390988b9290..409fe5a9c904edfeb617f9447dcb77b7883742fc 100644
+index 827804f25b776dd9cd38de8d643ebcdc9383a326..d8dcb3c7f81b946a866c43f808b2588a849e2d83 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2628,7 +2628,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
@ -45,7 +45,7 @@ index aee8618e27b893b72931e925724dd683d2e6d2aa..5cb15e2209d7b315904a1fc6d650ce1e
         }
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d76d7a9687df04b99b9116b2ec42263ec767b40f..f88898431b8f7cb33e25f9d591c581368e36773d 100644
+index cb2f86e0ad0edc54711826215df4406c5725f29c..0abc9dfd73b3cb16b29bdbcc40f0d0ea1c022f34 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1888,8 +1888,16 @@ public class ServerPlayer extends Player {
@ -76,7 +76,7 @@ index d76d7a9687df04b99b9116b2ec42263ec767b40f..f88898431b8f7cb33e25f9d591c58136
         }
     }
 
-@@ -2308,6 +2316,16 @@ public class ServerPlayer extends Player {
+@@ -2305,6 +2313,16 @@ public class ServerPlayer extends Player {
     }
 
     public void loadGameTypes(@Nullable CompoundTag nbt) {
@ -131,7 +131,7 @@ index 89f0c3d6e4dc9701f02fa7ed5331c3969de81ffc..0a15cda0919c0adf5009a023c17b3e25
     }
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 409fe5a9c904edfeb617f9447dcb77b7883742fc..82cf8b575c4622cbea8f9520b452391805b19d80 100644
+index d8dcb3c7f81b946a866c43f808b2588a849e2d83..d8a616fdf70179816b17d46ddeedeaadf353f065 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2637,7 +2637,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0600-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0600-Move-range-check-for-block-placing-up.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 82cf8b575c4622cbea8f9520b452391805b19d80..2909ec699b241840e6d1827af0436535f8c88d77 100644
+index d8a616fdf70179816b17d46ddeedeaadf353f065..c5b182e39691aecfde2c2a4c9c05de6f98f1c650 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1711,6 +1711,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0603-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0603-Add-Unix-domain-socket-support.patch
@ -93,7 +93,7 @@ index 2ea40a23539898b9c817440aafc91f4b5fd10977..2e7540b0e100347cd91624c9d61a5c46
     }
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2909ec699b241840e6d1827af0436535f8c88d77..75f47816336b6ad7568aa4abe7580e626f2838d5 100644
+index c5b182e39691aecfde2c2a4c9c05de6f98f1c650..117569229fc93ee0e756862485f0564a48ca7fef 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2460,6 +2460,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0609-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0609-Add-PlayerKickEvent-causes.patch
@ -188,7 +188,7 @@ index a38ad79aaf4ef5a928370152bdc5c0cc4c59d93e..877dd962a689c016668d1144ad2fef85
         if (this.cserver.getServer().isRunning()) {
             this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 75f47816336b6ad7568aa4abe7580e626f2838d5..5d5b796bc693b2c0f54ba4e6b279053b2180f0bf 100644
+index 117569229fc93ee0e756862485f0564a48ca7fef..9147ee3bf15b8445572375696ba90148df6ba72d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -340,7 +340,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@ -406,7 +406,7 @@ index 75f47816336b6ad7568aa4abe7580e626f2838d5..5d5b796bc693b2c0f54ba4e6b279053b
                 return;
             }
         }
-@@ -3232,7 +3232,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3233,7 +3233,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
         if (!Objects.equals(profilepublickey_a, profilepublickey_a1)) {
             if (profilepublickey_a != null && profilepublickey_a1.expiresAt().isBefore(profilepublickey_a.expiresAt())) {
@ -415,7 +415,7 @@ index 75f47816336b6ad7568aa4abe7580e626f2838d5..5d5b796bc693b2c0f54ba4e6b279053b
             } else {
                 try {
                     SignatureValidator signaturevalidator = this.server.getProfileKeySignatureValidator();
-@@ -3245,7 +3245,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3246,7 +3246,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                     this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
                 } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
                     ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
--- a/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f88898431b8f7cb33e25f9d591c581368e36773d..8e6dbca728143f92d6fc5f3ef22b0e33d4ba68a6 100644
+index 0abc9dfd73b3cb16b29bdbcc40f0d0ea1c022f34..2265259b24ae27a85beea1d47ec2c1bae6baa2a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2285,7 +2285,7 @@ public class ServerPlayer extends Player {
+@@ -2282,7 +2282,7 @@ public class ServerPlayer extends Player {
 
             if (retainOwnership) {
                 if (!itemstack1.isEmpty()) {
--- a/patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0626-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 5d5b796bc693b2c0f54ba4e6b279053b2180f0bf..c10ee6cf62f5f8c9ab92822d96f779e475f9cd79 100644
+index 9147ee3bf15b8445572375696ba90148df6ba72d..707650537187f9ed16c8c026555bfdcb5bccf11f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1095,7 +1095,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0630-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0630-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 c10ee6cf62f5f8c9ab92822d96f779e475f9cd79..c89bd05c60f2180895baaa73d2285df5adc0fbf5 100644
+index 707650537187f9ed16c8c026555bfdcb5bccf11f..19ca902e9adfb6f951e0b849a333bef3895e1a97 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2317,7 +2317,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8e6dbca728143f92d6fc5f3ef22b0e33d4ba68a6..f8d812b7cc47b5bebc71a14f5c69e3b650d07579 100644
+index 2265259b24ae27a85beea1d47ec2c1bae6baa2a7..552d64e47f17d916a4e374b877d12ff7a583a9e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -267,7 +267,6 @@ public class ServerPlayer extends Player {
@ -50,7 +50,7 @@ index 877dd962a689c016668d1144ad2fef850fdbc31e..2a1cf4ff3d0cc062b593f5c58ee80b00
         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 c89bd05c60f2180895baaa73d2285df5adc0fbf5..7118825a47f3cc99a86d01b578c86144713810ff 100644
+index 19ca902e9adfb6f951e0b849a333bef3895e1a97..681aa9bb7f54ea16c35bc07d69f2803f0cc09697 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
--- a/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f8d812b7cc47b5bebc71a14f5c69e3b650d07579..840e2f5c629a7d488cc367d17f80550610035994 100644
+index 552d64e47f17d916a4e374b877d12ff7a583a9e7..a59ac2011b85ff9b1185a14eca4d2796b2666df1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
--- a/patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0642-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 7118825a47f3cc99a86d01b578c86144713810ff..0b1030da1dc0a745f7a89d98636ff618dde4d5e4 100644
+index 681aa9bb7f54ea16c35bc07d69f2803f0cc09697..3174e196a30fcba07e783d005f80a69b9cda7a37 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
--- a/patches/server/0644-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0644-Add-PlayerSetSpawnEvent.patch
@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..d797637f61bdf8a424f56fbb48e28b7c
     }
 }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 840e2f5c629a7d488cc367d17f80550610035994..6bbf5d348764f2cb74065f2ea29ca9f1eebc7c54 100644
+index a59ac2011b85ff9b1185a14eca4d2796b2666df1..c2b535c5b1d05d70a16e15283ff5c9e45c59d8e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1352,7 +1352,7 @@ public class ServerPlayer extends Player {
@ -61,7 +61,7 @@ index 840e2f5c629a7d488cc367d17f80550610035994..6bbf5d348764f2cb74065f2ea29ca9f1
                 if (this.level().isDay()) {
                     return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                 } else {
-@@ -2205,44 +2205,50 @@ public class ServerPlayer extends Player {
+@@ -2202,44 +2202,50 @@ public class ServerPlayer extends Player {
         return this.respawnForced;
     }
 
@ -145,7 +145,7 @@ index 840e2f5c629a7d488cc367d17f80550610035994..6bbf5d348764f2cb74065f2ea29ca9f1
         } else {
             this.respawnPosition = null;
             this.respawnDimension = Level.OVERWORLD;
-@@ -2250,6 +2256,7 @@ public class ServerPlayer extends Player {
+@@ -2247,6 +2253,7 @@ public class ServerPlayer extends Player {
             this.respawnForced = false;
         }
 
--- a/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@ -28,7 +28,7 @@ index 257eedb5413521e1e3ce6a6a6376e0c8175c8c5e..f0f8d10140f0d06cba292f039d1e32ae
         }
         // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6bbf5d348764f2cb74065f2ea29ca9f1eebc7c54..3df5ecfdfae2f0d7714bfbf3d0f32fc6a10e4d38 100644
+index c2b535c5b1d05d70a16e15283ff5c9e45c59d8e3..de9248f622834dc6df4af7016f0ddab864ed0264 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1618,6 +1618,18 @@ public class ServerPlayer extends Player {
--- a/patches/server/0673-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0673-Improve-and-expand-AsyncCatcher.patch
@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0b1030da1dc0a745f7a89d98636ff618dde4d5e4..08c4e9037d54e14d0a80f75e05a91a128fdc1446 100644
+index 3174e196a30fcba07e783d005f80a69b9cda7a37..f38a16b1c337f7089bc545e58f3fca023b3d3e81 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
--- a/patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0698-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 08c4e9037d54e14d0a80f75e05a91a128fdc1446..da2d5681963b8d14056cee36c789dfb54633df42 100644
+index f38a16b1c337f7089bc545e58f3fca023b3d3e81..96b396dae158f57f71398f26412b705f9058511d 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
--- a/patches/server/0701-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0701-Ensure-valid-vehicle-status.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3df5ecfdfae2f0d7714bfbf3d0f32fc6a10e4d38..3931232e5ddc71c6bf595236763c2b39cc2ef742 100644
+index de9248f622834dc6df4af7016f0ddab864ed0264..e498d339830d8fa6dcf0eeee4a27b6295c84ee2e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -570,7 +570,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0719-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 da2d5681963b8d14056cee36c789dfb54633df42..a89915d288d517a1d3674d7d1eb28e8e3f3028a1 100644
+index 96b396dae158f57f71398f26412b705f9058511d..1dec7c18be79162ade2a634a2a7d6ef09c31fc54 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
--- a/patches/server/0725-Collision-optimisations.patch
+++ b/patches/server/0725-Collision-optimisations.patch
@ -2204,7 +2204,7 @@ index d0a8092bf57a29ab7c00ec0ddf52a9fdb2a33267..392406722b0a040c1d41fdc1154d75d3
     private Direction(int id, int idOpposite, int idHorizontal, String name, Direction.AxisDirection direction, Direction.Axis axis, Vec3i vector) {
         this.data3d = id;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3931232e5ddc71c6bf595236763c2b39cc2ef742..f6adb75984927e4254b98e4b6dc26ba4e5bc03d5 100644
+index e498d339830d8fa6dcf0eeee4a27b6295c84ee2e..6a33fbfb4f7dbe4a54044ccc408e196e537d96fa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -463,7 +463,7 @@ public class ServerPlayer extends Player {
--- a/patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0726-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 a89915d288d517a1d3674d7d1eb28e8e3f3028a1..129079ccc05d153c912565a4f348c0332ba8453a 100644
+index 1dec7c18be79162ade2a634a2a7d6ef09c31fc54..8da5cadc2f0012cde3574f7c2be59fbaccd18454 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
--- a/patches/server/0752-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0752-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 129079ccc05d153c912565a4f348c0332ba8453a..c92316910a1744fcb0cecd981df713be2eb7e4d4 100644
+index 8da5cadc2f0012cde3574f7c2be59fbaccd18454..dfc91570f2fa90f8407ab6d0a848cd416dd518e6 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
--- a/patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0779-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 c92316910a1744fcb0cecd981df713be2eb7e4d4..5874502ce611e985462ee4c2946ae2f34c9b0442 100644
+index dfc91570f2fa90f8407ab6d0a848cd416dd518e6..a6b88dcb7a2977207dec8630c5b98d1b3b77fde5 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
--- a/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f6adb75984927e4254b98e4b6dc26ba4e5bc03d5..8e06894ba02a9f68cbbb77a6316f927dd021da89 100644
+index 6a33fbfb4f7dbe4a54044ccc408e196e537d96fa..6a9e1b3fd1d7d1964835c78808f5c71ba8a82af7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -918,12 +918,14 @@ public class ServerPlayer extends Player {
--- a/patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0794-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 5874502ce611e985462ee4c2946ae2f34c9b0442..627d0f2bfc517aa36b87be26e82c5ca9e350bb75 100644
+index a6b88dcb7a2977207dec8630c5b98d1b3b77fde5..952b7295fe8d2410924da1ba5ee97df2187531a2 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
--- a/patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0797-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 627d0f2bfc517aa36b87be26e82c5ca9e350bb75..173bbf2fb19114df13e3c0209488e727cd58ab30 100644
+index 952b7295fe8d2410924da1ba5ee97df2187531a2..675c3112cba4bf651f3bc82798ee9c541ca50d4a 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
--- a/patches/server/0808-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0808-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 173bbf2fb19114df13e3c0209488e727cd58ab30..7cdbad2d295ade402536e0dc6f447996a49ea74b 100644
+index 675c3112cba4bf651f3bc82798ee9c541ca50d4a..ba8214f087c3737a14cb45a167a6dd9375ee7c67 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
@ -20,5 +20,5 @@ index 173bbf2fb19114df13e3c0209488e727cd58ab30..7cdbad2d295ade402536e0dc6f447996
 +        }
 +        // Paper end - do not accept invalid information
         this.player.updateOptions(packet.information());
+         this.connection.channel.attr(io.papermc.paper.adventure.PaperAdventure.LOCALE_ATTRIBUTE).set(net.kyori.adventure.translation.Translator.parseLocale(packet.information().language())); // Paper
     }
- 
--- a/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
@ -24,7 +24,7 @@ index d4a673a9fb604876c554f955ed13ad31a2adb217..e75b3df4db9cb618aef4837acb8cde92
         } else {
             BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8e06894ba02a9f68cbbb77a6316f927dd021da89..b3db504ccd063122348426f7422bab34fac74d7f 100644
+index 6a9e1b3fd1d7d1964835c78808f5c71ba8a82af7..b3fa0a7e75a7f367ab491ffad22facb985d8085a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1317,6 +1317,12 @@ public class ServerPlayer extends Player {
--- a/patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0828-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 7cdbad2d295ade402536e0dc6f447996a49ea74b..df8f49adf6b0d6c8334e1c8583e588278648022b 100644
+index ba8214f087c3737a14cb45a167a6dd9375ee7c67..a5b5664fccf16dad91e1b11c20ebdc45cb31c48d 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
--- a/patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0830-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 df8f49adf6b0d6c8334e1c8583e588278648022b..61840dbe2a8126fa247c745e6e27037a05f9b8e6 100644
+index a5b5664fccf16dad91e1b11c20ebdc45cb31c48d..6b6f90f4c4d762bc9ec208e2dff81e661153adba 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
--- a/patches/server/0831-More-Teleport-API.patch
+++ b/patches/server/0831-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 61840dbe2a8126fa247c745e6e27037a05f9b8e6..c28a45b2093b805812258047d06e8064c267fb7b 100644
+index 6b6f90f4c4d762bc9ec208e2dff81e661153adba..3c39df20e9c2b0c39b4c0875e5cb103a229b3882 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
--- a/patches/server/0834-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0834-Send-block-entities-after-destroy-prediction.patch
@ -57,7 +57,7 @@ index f968dee743f58fe71935097701866800c0f382a1..73e2948210139e40e234b5e2107f9008
             }
         }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c28a45b2093b805812258047d06e8064c267fb7b..ff65e2cc10a3197f09086ed5c4baa44305af158e 100644
+index 3c39df20e9c2b0c39b4c0875e5cb103a229b3882..1529bfe61b56297618482bd752339aad33dd2844 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
--- a/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b3db504ccd063122348426f7422bab34fac74d7f..0f4c93396257b95a348a2d2fc1c796c5e0b2ad5f 100644
+index b3fa0a7e75a7f367ab491ffad22facb985d8085a..3e37684e3fbbb01ad006f2ae7f1e38ed63acc2b8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -372,6 +372,25 @@ public class ServerPlayer extends Player {
--- a/patches/server/0889-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0889-Sync-offhand-slot-in-menus.patch
@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0f4c93396257b95a348a2d2fc1c796c5e0b2ad5f..6ad4afe60e97a79af0358a783be2b69dd2dcef35 100644
+index 3e37684e3fbbb01ad006f2ae7f1e38ed63acc2b8..215786e3991942ad5773306a68519946372e94d4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -341,6 +341,13 @@ public class ServerPlayer extends Player {
--- a/patches/server/0892-Properly-resend-entities.patch
+++ b/patches/server/0892-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 ff65e2cc10a3197f09086ed5c4baa44305af158e..964e2efa84f198a65d2f221b7ba3c155f855de32 100644
+index 1529bfe61b56297618482bd752339aad33dd2844..1c8f59da0487889f628f4fff7196464f17b29c52 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
--- a/patches/server/0899-Improve-logging-and-errors.patch
+++ b/patches/server/0899-Improve-logging-and-errors.patch
@ -5,10 +5,10 @@ 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 964e2efa84f198a65d2f221b7ba3c155f855de32..f44faa3b544c12145b7251446809013ae3283a93 100644
+index 1c8f59da0487889f628f4fff7196464f17b29c52..df22039d5c0bd5c0f117c0ec540b68404e3f5604 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3385,7 +3385,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3386,7 +3386,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
 
                     this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator));
                 } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
--- a/patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0902-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 f44faa3b544c12145b7251446809013ae3283a93..fca275842215dc0b4e413129afb45cc3cd30156a 100644
+index df22039d5c0bd5c0f117c0ec540b68404e3f5604..af042c0330236c778854d9cebd808e1bd99c11cd 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
--- a/Mehr anzeigen
+++ b/Mehr anzeigen