Fix boot errors

Thanks kennytv
2024-11-28 21:47:55 +01:00 · 2023-06-08 16:44:17 -07:00 · 2023-06-08 16:44:17 -07:00 · 57a592466d
commit 57a592466d
parent efb4197a1b
65 changed files with 73 additions and 72 deletions
--- a/patches/server/0013-Paper-Plugins.patch
+++ b/patches/server/0013-Paper-Plugins.patch
@ -6944,13 +6944,14 @@ index baa88201c4d08fb4f32f1198e187d7ca138b0f0e..7d09adf27da249851cfc87b7916b9152
         validate(REGISTRY);
     }
 diff --git a/src/main/java/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
-index 1eabd8b5a99850298838b11ba97e3d220f444378..89343863d0cf58ff65c66230855e1e83df078e26 100644
+index 1eabd8b5a99850298838b11ba97e3d220f444378..8ff786c366332588a2df053438f23cc9fb7e2b84 100644
 --- a/src/main/java/net/minecraft/server/Bootstrap.java
 +++ b/src/main/java/net/minecraft/server/Bootstrap.java
-@@ -77,6 +77,11 @@ public class Bootstrap {
+@@ -76,7 +76,11 @@ public class Bootstrap {
+                     EntitySelectorOptions.bootStrap();
                     DispenseItemBehavior.bootStrap();
                     CauldronInteraction.bootStrap();
-                     BuiltInRegistries.bootStrap();
+-                    BuiltInRegistries.bootStrap();
 +                    // Paper start
 +                    BuiltInRegistries.bootStrap(() -> {
 +                        io.papermc.paper.plugin.entrypoint.LaunchEntryPointHandler.enterBootstrappers(); // Paper - Entrypoint for bootstrapping
--- a/patches/server/0107-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0107-Configurable-packet-in-spam-threshold.patch
@ -5,23 +5,23 @@ 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 2b1311185bb08592038e256d860a722fbd4d9ffc..28ec3530a5c3df8e0c629228f80c0130cb65cc27 100644
+index 2b1311185bb08592038e256d860a722fbd4d9ffc..3ac549815895e6cbb43cbfc04377337f8b7ebd43 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1595,13 +1595,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
     // Spigot start - limit place/interactions
     private int limitedPackets;
     private long lastLimitedPacket = -1;
-+    private static final int THRESHOLD = io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.incomingPacketThreshold; // Paper - Configurable threshold
+    private static int getSpamThreshold() { return io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.incomingPacketThreshold; } // Paper - Configurable threshold
 
     private boolean checkLimit(long timestamp) {
 -        if (this.lastLimitedPacket != -1 && timestamp - this.lastLimitedPacket < 30 && this.limitedPackets++ >= 4) {
-+        if (this.lastLimitedPacket != -1 && timestamp - this.lastLimitedPacket < THRESHOLD && this.limitedPackets++ >= 8) { // Paper - Use threshold, raise packet limit to 8
+        if (this.lastLimitedPacket != -1 && timestamp - this.lastLimitedPacket < getSpamThreshold() && this.limitedPackets++ >= 8) { // Paper - Use threshold, raise packet limit to 8
             return false;
         }
 
 -        if (this.lastLimitedPacket == -1 || timestamp - this.lastLimitedPacket >= 30) {
-+        if (this.lastLimitedPacket == -1 || timestamp - this.lastLimitedPacket >= THRESHOLD) { // Paper
+        if (this.lastLimitedPacket == -1 || timestamp - this.lastLimitedPacket >= getSpamThreshold()) { // Paper
             this.lastLimitedPacket = timestamp;
             this.limitedPackets = 0;
             return true;
--- a/patches/server/0108-Configurable-flying-kick-messages.patch
+++ b/patches/server/0108-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 28ec3530a5c3df8e0c629228f80c0130cb65cc27..6017d2d5378f1d6c2a258469cc24c51e7a4ab4b6 100644
+index 3ac549815895e6cbb43cbfc04377337f8b7ebd43..c33b94701a8c4f3198671405d32467d9645bf87f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -355,7 +355,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0121-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0121-Properly-fix-item-duplication-bug.patch
@ -19,7 +19,7 @@ index 321d14f241df1246061ba73b2488f5ab5326a734..0cb86afa3732eaf04dd6369d7499bd62
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6017d2d5378f1d6c2a258469cc24c51e7a4ab4b6..cf5972518023dabd9cf7110d93643886d1ad047e 100644
+index c33b94701a8c4f3198671405d32467d9645bf87f..188c1506fe219e778da273478b0c581f48ca9ef2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3149,7 +3149,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 cf5972518023dabd9cf7110d93643886d1ad047e..72a9216a509c8e7be6257ceec0569bc0a7e41675 100644
+index 188c1506fe219e778da273478b0c581f48ca9ef2..054776624f6df25b69d1e3c480e8b7effbb592a7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2329,6 +2329,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0150-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0150-Fix-this-stupid-bullshit.patch
@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.

 diff --git a/src/main/java/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
-index 89343863d0cf58ff65c66230855e1e83df078e26..e6e2c63b19d010569fb70b629188be3eec28025d 100644
+index 8ff786c366332588a2df053438f23cc9fb7e2b84..c887d34171f89c731d76c4ca92c70be2b1edc1e6 100644
 --- a/src/main/java/net/minecraft/server/Bootstrap.java
 +++ b/src/main/java/net/minecraft/server/Bootstrap.java
@@ -45,7 +45,7 @@ public class Bootstrap {
--- 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 72a9216a509c8e7be6257ceec0569bc0a7e41675..35e7f877a7d188767660c97418f9194cc50ac464 100644
+index 054776624f6df25b69d1e3c480e8b7effbb592a7..6928d2fb7493206ab84bedc39434285f45d9dc38 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1292,7 +1292,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
+++ b/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch
@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 35e7f877a7d188767660c97418f9194cc50ac464..248bedc4ce26f3d848f336c995fb27672affbf22 100644
+index 6928d2fb7493206ab84bedc39434285f45d9dc38..95256c095626f429315b80df86876b18112989bc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3108,14 +3108,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0160-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0160-revert-serverside-behavior-of-keepalives.patch
@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
 at the cost of dead connections being kept open for longer.

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 248bedc4ce26f3d848f336c995fb27672affbf22..57ed1d99846f147258b33c6bad2ef7386981462e 100644
+index 95256c095626f429315b80df86876b18112989bc..575ecae47633e7a30c8bca57d686dcfc0b31a0df 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -259,7 +259,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 57ed1d99846f147258b33c6bad2ef7386981462e..c43f50f884b6c9c0eb6eb8e11ac892c8986529b8 100644
+index 575ecae47633e7a30c8bca57d686dcfc0b31a0df..5d1875b11d4768afc184416e38a0bd3e3334a9ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -788,12 +788,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 c43f50f884b6c9c0eb6eb8e11ac892c8986529b8..3669e467607517b9c488d4f804c5a8e129fe39c7 100644
+index 5d1875b11d4768afc184416e38a0bd3e3334a9ce..e7d2bd1b2ee80c5cc68048f2d90dcf21e50f04d2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1535,7 +1535,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0216-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0216-InventoryCloseEvent-Reason-API.patch
@ -75,7 +75,7 @@ index 8b5b66c8f55660085ff3af824b8bf0c455be79bc..0578d72681a0d45b6c8d1d6d04208eb1
         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 3669e467607517b9c488d4f804c5a8e129fe39c7..cba6277e2b6e76051dfb7081107a786069e24382 100644
+index e7d2bd1b2ee80c5cc68048f2d90dcf21e50f04d2..3a3c21132b2a843de642490c7a256e53e2e90453 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -220,6 +220,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 cba6277e2b6e76051dfb7081107a786069e24382..890aad5e5fad00d36167f213622ec62b342b5e26 100644
+index 3a3c21132b2a843de642490c7a256e53e2e90453..8a2f8b48b23ddfc86746696021e62b96016afa2f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2561,6 +2561,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 890aad5e5fad00d36167f213622ec62b342b5e26..c215fc66099f2391ce0db50b0e6c84b9d28bd3a3 100644
+index 8a2f8b48b23ddfc86746696021e62b96016afa2f..c1558f261e80d1fbb5dc66e6db741c140c5e99b8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -265,6 +265,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 c215fc66099f2391ce0db50b0e6c84b9d28bd3a3..b21b1a05eae9a8069c0a5bb8e6ddcf6742e5e1cd 100644
+index c1558f261e80d1fbb5dc66e6db741c140c5e99b8..d05d088a5294f092f921961ec38053c8ccd6b6bd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -567,9 +567,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 0d72be376615f84934b031243ef283b6efc0bd13..562534d15f6f70ff286be90fb512b807
 
                 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 b21b1a05eae9a8069c0a5bb8e6ddcf6742e5e1cd..cd729528ff05cf8798a9319bbf8ff4509f80ec48 100644
+index d05d088a5294f092f921961ec38053c8ccd6b6bd..024b5fe3eb90c447522141454d3f733e5381bb24 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1659,6 +1659,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 cd729528ff05cf8798a9319bbf8ff4509f80ec48..fe96b64c945f1141c3c8b21aed0f90b3bfe2fd6d 100644
+index 024b5fe3eb90c447522141454d3f733e5381bb24..ee150e432cb8ca69749dc20c8d2140c2b49bcdc2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1124,6 +1124,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0295-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0295-Implement-Brigadier-Mojang-API.patch
@ -131,7 +131,7 @@ index b7f1569c662df13f278fc704cabec0400ba7c382..87ce129e1d592bcf68169feb559f44d5
 
             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 fe96b64c945f1141c3c8b21aed0f90b3bfe2fd6d..1519f15d70f5851916cfb6b205411f262ad5b1f2 100644
+index ee150e432cb8ca69749dc20c8d2140c2b49bcdc2..0222181b0dddffc3b0e91dc53b5424317bb191c7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -840,8 +840,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 1519f15d70f5851916cfb6b205411f262ad5b1f2..f3f75fb24f4ddf145a08988848ad97c12a20445d 100644
+index 0222181b0dddffc3b0e91dc53b5424317bb191c7..ebd48880cd7256c8f26b9a2565a756efd0188746 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -300,6 +300,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f3f75fb24f4ddf145a08988848ad97c12a20445d..5df917c81bab831f8bc5a63c201be4150922d5ae 100644
+index ebd48880cd7256c8f26b9a2565a756efd0188746..4a92305dd0ac5db459f0a716b4ac8d6a0aa2c437 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -515,7 +515,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0325-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0325-Flat-bedrock-generator-settings.patch
@ -114,11 +114,11 @@ index 06e1774dfbb667aca69bc30c9675ed472cb5728c..1d5bc86516df3781aea894c3afd34042
 
     public static SurfaceRules.RuleSource end() {
 diff --git a/src/main/java/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
-index e6e2c63b19d010569fb70b629188be3eec28025d..e2393e31a008c78e7a593c1e36fc7fd40a443c73 100644
+index c887d34171f89c731d76c4ca92c70be2b1edc1e6..df6752b5c77bc88a4fcf1ffe918b24d41cd30ad4 100644
 --- a/src/main/java/net/minecraft/server/Bootstrap.java
 +++ b/src/main/java/net/minecraft/server/Bootstrap.java
-@@ -79,6 +79,7 @@ public class Bootstrap {
-                     BuiltInRegistries.bootStrap();
+@@ -78,6 +78,7 @@ public class Bootstrap {
+                     CauldronInteraction.bootStrap();
                     // Paper start
                     BuiltInRegistries.bootStrap(() -> {
 +                        net.minecraft.core.Registry.register(net.minecraft.core.registries.BuiltInRegistries.MATERIAL_CONDITION, new net.minecraft.resources.ResourceLocation("paper", "bedrock_condition_source"), net.minecraft.data.worldgen.SurfaceRuleData.PaperBedrockConditionSource.CODEC.codec());
--- a/patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0385-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 5df917c81bab831f8bc5a63c201be4150922d5ae..5b36746b8a5502cb26b7871179768b5baa2e96b8 100644
+index 4a92305dd0ac5db459f0a716b4ac8d6a0aa2c437..1bf4ed4878f900730f66e2245106e66bd1927a5f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -967,7 +967,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0390-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0390-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 5b36746b8a5502cb26b7871179768b5baa2e96b8..c4b8244ba8d6c12cabf3feea01f2bd0fa8955869 100644
+index 1bf4ed4878f900730f66e2245106e66bd1927a5f..817db930347b0a83f3cea8cbcbd823622c1be7c0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1612,6 +1612,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0412-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 c4b8244ba8d6c12cabf3feea01f2bd0fa8955869..e597eb175d0ff2e330f5735d94fbff56aa65a2e5 100644
+index 817db930347b0a83f3cea8cbcbd823622c1be7c0..23d576cebf10bc0f35b9fb99df7b323a744dd111 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1441,6 +1441,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0416-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 e597eb175d0ff2e330f5735d94fbff56aa65a2e5..0f97634df91a52ac30f12f1344979d70ea28b2a0 100644
+index 23d576cebf10bc0f35b9fb99df7b323a744dd111..4f43f6ff06ab3b68631b8e9c8dd1e9d4a5e76880 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3114,9 +3114,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0418-Add-permission-for-command-blocks.patch
+++ b/patches/server/0418-Add-permission-for-command-blocks.patch
@ -18,7 +18,7 @@ index 562534d15f6f70ff286be90fb512b807e00ad807..c185083abf2b4527a7fe046d83c64cd2
                 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 0f97634df91a52ac30f12f1344979d70ea28b2a0..713ffd4e415e796420a60a616ebdda561326e96a 100644
+index 4f43f6ff06ab3b68631b8e9c8dd1e9d4a5e76880..04a9cef0a80aaa401ce0ed560a16f3ada6e6a953 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -878,7 +878,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@ -89,7 +89,7 @@ index af6b92056d924f7cb9a7a583fd089025c95f88ad..6fe74d96659029efb6fe798fb3b3b02b
 
                 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 713ffd4e415e796420a60a616ebdda561326e96a..e9ddcc6b1c30c4f6663c926821d7e8f58b46d3bd 100644
+index 04a9cef0a80aaa401ce0ed560a16f3ada6e6a953..391eed0b5631732d799c858d35f0c31b88f05123 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3352,7 +3352,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0448-Brand-support.patch
+++ b/patches/server/0448-Brand-support.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Brand support


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e9ddcc6b1c30c4f6663c926821d7e8f58b46d3bd..600758b91ed8197ef615368e1ef5315dfa9666c6 100644
+index 391eed0b5631732d799c858d35f0c31b88f05123..3376cf61fdb06292ed02735990f84b00647dfc66 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -302,6 +302,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0466-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0466-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 600758b91ed8197ef615368e1ef5315dfa9666c6..e178effe00488139a250937a17144f77890c3468 100644
+index 3376cf61fdb06292ed02735990f84b00647dfc66..b0d43cda858373d1e15f795d0b216cbdc7936db1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -760,7 +760,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0476-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0476-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 e178effe00488139a250937a17144f77890c3468..08d409b0485e7a2a8ff05b02058781ffbc720803 100644
+index b0d43cda858373d1e15f795d0b216cbdc7936db1..a4233fa223bdf9b29a3d75b84ef38640331d7fb8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -567,9 +567,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0492-Add-API-for-quit-reason.patch
+++ b/patches/server/0492-Add-API-for-quit-reason.patch
@ -37,7 +37,7 @@ index bdc7b67b4302a217071c2087732bbd789309fea3..a5901bedc5f74f76fa9be2668cb2b698
     private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
     public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 08d409b0485e7a2a8ff05b02058781ffbc720803..953e492011f1a68bfc93bbcbb254fa76599eb876 100644
+index a4233fa223bdf9b29a3d75b84ef38640331d7fb8..2f0cb4d692631f6485b3a70c6e15e7d9ed0c3ac7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -507,6 +507,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0505-Limit-recipe-packets.patch
+++ b/patches/server/0505-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 953e492011f1a68bfc93bbcbb254fa76599eb876..3ae085ec1ed9b39c86ae5edeb628ab9118d24cbd 100644
+index 2f0cb4d692631f6485b3a70c6e15e7d9ed0c3ac7..904a442e28077da74d4de994d21347a50faa6ba2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -266,6 +266,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0522-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0522-Fix-interact-event-not-being-called-in-adventure.patch
@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ae085ec1ed9b39c86ae5edeb628ab9118d24cbd..16bc796a138d7dd7220591e59fc1118f05217872 100644
+index 904a442e28077da74d4de994d21347a50faa6ba2..df9d65167346152d9c589e3072e3d3d6882db5c6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1834,7 +1834,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0571-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0571-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 16bc796a138d7dd7220591e59fc1118f05217872..36a0fe0f7a820be3afa77523d3704ec3700ba087 100644
+index df9d65167346152d9c589e3072e3d3d6882db5c6..6c695a80b1e175a6207a89c3f38e6c5faa3742e6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1826,7 +1826,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0577-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0577-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 36a0fe0f7a820be3afa77523d3704ec3700ba087..846a3c7212d8c68ded7ba094be0d0e16368bafd8 100644
+index 6c695a80b1e175a6207a89c3f38e6c5faa3742e6..7eb9ddbdb1c2a57674f4ca91e0bda88e42f364ed 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1290,7 +1290,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0587-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0587-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 846a3c7212d8c68ded7ba094be0d0e16368bafd8..1cf0394a57383cd79340de36d2a720022600b114 100644
+index 7eb9ddbdb1c2a57674f4ca91e0bda88e42f364ed..4f4b6348da714854fc87ed992d16ff567a5690aa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2040,6 +2040,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0595-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0595-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 1cf0394a57383cd79340de36d2a720022600b114..8c98b01b3bf1e53ae849f19e7cec9f8f42af6883 100644
+index 4f4b6348da714854fc87ed992d16ff567a5690aa..d27eeef0cfeda8de66710f7b3ca1b9056270fea4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2780,7 +2780,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch
@ -131,7 +131,7 @@ index 95173754148848bf1772a0426173dcea89e6b9b8..34def52e9380a4587c5008f1d133a07e
     }
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8c98b01b3bf1e53ae849f19e7cec9f8f42af6883..e51527e1ecf49160130434ffdf97a9a0563be353 100644
+index d27eeef0cfeda8de66710f7b3ca1b9056270fea4..a4baf4e5cba66e0e5d9418ddf7ca8d612854f22e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2789,7 +2789,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0610-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0610-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 e51527e1ecf49160130434ffdf97a9a0563be353..842df6735485e9a809f397b32c14500523ec4ae8 100644
+index a4baf4e5cba66e0e5d9418ddf7ca8d612854f22e..2060f20a4da4c4005b8de03f82f497626f83d9b0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1812,6 +1812,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0613-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0613-Add-Unix-domain-socket-support.patch
@ -91,7 +91,7 @@ index 29a0a720f22f56ca3d844efef1ecde3980fb1c12..838244e3680ea6020701e10bafbde7f5
     }
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 842df6735485e9a809f397b32c14500523ec4ae8..8c4f82c4c24f2d415f7008b0864fba4fc53f2990 100644
+index 2060f20a4da4c4005b8de03f82f497626f83d9b0..707f0e0bdd3617fac987dacea36df6c363ca71ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2624,6 +2624,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- 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 8c4f82c4c24f2d415f7008b0864fba4fc53f2990..0dd80f46bb2e984278e88b5c753c89108449a112 100644
+index 707f0e0bdd3617fac987dacea36df6c363ca71ca..18bdc328dd80e637c3e8cb8a12bd7bfead163191 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
--- 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 0dd80f46bb2e984278e88b5c753c89108449a112..07cf783ffc81cdef61a1356bb85ecb72a43f0462 100644
+index 18bdc328dd80e637c3e8cb8a12bd7bfead163191..b4df48db8b329c258abd25d48463a0317028de90 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
--- 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 07cf783ffc81cdef61a1356bb85ecb72a43f0462..721f67922c4a9720f523aa577e9b4d40af5d6808 100644
+index b4df48db8b329c258abd25d48463a0317028de90..30e732d8d5c8944baf6080707568926500c6061d 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
--- 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 721f67922c4a9720f523aa577e9b4d40af5d6808..88d141d2dd6a2b7190a4032d3b24d24d3c26765a 100644
+index 30e732d8d5c8944baf6080707568926500c6061d..46ded046ec267aadc6366ff726974f549dfcb0e9 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
--- 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 88d141d2dd6a2b7190a4032d3b24d24d3c26765a..ca8ceca79ee191b7366c5c84fffa47852de61ec0 100644
+index 46ded046ec267aadc6366ff726974f549dfcb0e9..92d447b938592cabad2e09d0893165b9f043d5b4 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
--- 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 <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 ca8ceca79ee191b7366c5c84fffa47852de61ec0..ee5f58ae4c276b4529d7dd35aa5cfa515e058d77 100644
+index 92d447b938592cabad2e09d0893165b9f043d5b4..f6d42ce7b0c058424e88c89dc1d0d0977c55c893 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
--- 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 ee5f58ae4c276b4529d7dd35aa5cfa515e058d77..2b6e315d275cf5e303663c175745a5fe2e35969f 100644
+index f6d42ce7b0c058424e88c89dc1d0d0977c55c893..6a6f83ab60c2bf4b47e31952cedad7d06226e2c4 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
--- 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 2b6e315d275cf5e303663c175745a5fe2e35969f..13e73042653909f194cfc909a96370656cbcf1ca 100644
+index 6a6f83ab60c2bf4b47e31952cedad7d06226e2c4..adfc5010a5160adf1cd32bf38ba68f2d6ca63e27 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
--- 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 13e73042653909f194cfc909a96370656cbcf1ca..0dc3cfb53a34cb7ecfa0a31c4c0faa247dda66e6 100644
+index adfc5010a5160adf1cd32bf38ba68f2d6ca63e27..4bf9a1b7437f3593e329a42621a53baa40ccb248 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
--- 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 0dc3cfb53a34cb7ecfa0a31c4c0faa247dda66e6..52885e9a9b761465a6f65026b19b2757bce38c82 100644
+index 4bf9a1b7437f3593e329a42621a53baa40ccb248..34af6c33bd8c6bc70b506d68de40aff6b40b9221 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
--- 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 52885e9a9b761465a6f65026b19b2757bce38c82..8527025729614a2828e5c39e40747b3fc0cc0c61 100644
+index 34af6c33bd8c6bc70b506d68de40aff6b40b9221..0e7886df1a1904f99d98601235af7c267835245b 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
--- 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 8527025729614a2828e5c39e40747b3fc0cc0c61..e9fc80f4d934bb485781b3213708e37792b50be1 100644
+index 0e7886df1a1904f99d98601235af7c267835245b..ec8b809f0ce619d948088625e7b06b66e1d778ad 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
--- 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 e9fc80f4d934bb485781b3213708e37792b50be1..079fc18274102dea52b14bf39e2f72f89a014fed 100644
+index ec8b809f0ce619d948088625e7b06b66e1d778ad..9503c6a15836ac99a011fd9277f4cc5233b0f943 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
--- 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 079fc18274102dea52b14bf39e2f72f89a014fed..af9e34f5f07626121f7df16d077360940bda7e43 100644
+index 9503c6a15836ac99a011fd9277f4cc5233b0f943..fad1a7d6fbf016aad7edb8457776f95787e942a2 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
--- 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 af9e34f5f07626121f7df16d077360940bda7e43..c10aba1a414eaa0349ab0b325b6673eb2142bb05 100644
+index fad1a7d6fbf016aad7edb8457776f95787e942a2..91c7a81aab590540706d546d78dfdd6992f3a8ea 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
--- 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 c10aba1a414eaa0349ab0b325b6673eb2142bb05..e348a3da6f743b211aaef8af738f31bb4d196370 100644
+index 91c7a81aab590540706d546d78dfdd6992f3a8ea..a1124b201379a31723cc815f7bd2d50b05cf785a 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
--- 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 e348a3da6f743b211aaef8af738f31bb4d196370..2c8e77df54167ac6b3ae3b17f86a9e147aa27a05 100644
+index a1124b201379a31723cc815f7bd2d50b05cf785a..8292ec001d9be4507d4ae880d38ab9fc36ceabed 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
--- 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 2c8e77df54167ac6b3ae3b17f86a9e147aa27a05..45f28f27304373733128b4e686d0b1b21876d5c1 100644
+index 8292ec001d9be4507d4ae880d38ab9fc36ceabed..7a464f836fd196ada5be42679f4dd15381a76fda 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
--- 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 45f28f27304373733128b4e686d0b1b21876d5c1..4d89165216883e58f6bfc732f6a47eb607ef569c 100644
+index 7a464f836fd196ada5be42679f4dd15381a76fda..6acee52f59290bcc8f6d61c9b616cdc7f30504ec 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
--- 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 4d89165216883e58f6bfc732f6a47eb607ef569c..4e0397b59e3c11dc8362610bbc90a841a624394d 100644
+index 6acee52f59290bcc8f6d61c9b616cdc7f30504ec..1b58accf9d00940617d60024ef196c55b10cce7c 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
--- 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 4e0397b59e3c11dc8362610bbc90a841a624394d..61aa5fec06b2c9a0986596790fc735caec1cc564 100644
+index 1b58accf9d00940617d60024ef196c55b10cce7c..7281e1cf6e41a222657c3deaf13e1f09080ef597 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
--- 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 61aa5fec06b2c9a0986596790fc735caec1cc564..06ea0185c7eb6bbb2ece220db4c0795ddabc465b 100644
+index 7281e1cf6e41a222657c3deaf13e1f09080ef597..3c4e3c1f161dc14b2341a7847e872584c52c719f 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
--- 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 06ea0185c7eb6bbb2ece220db4c0795ddabc465b..47e61033ccebe5cd2a850207aaed6235cc14b599 100644
+index 3c4e3c1f161dc14b2341a7847e872584c52c719f..3ed87a3a00bb7da4106f3430ffa6afaa31336059 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
--- 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 47e61033ccebe5cd2a850207aaed6235cc14b599..307d5eed074df91ed4746881ffeae22041ecde0d 100644
+index 3ed87a3a00bb7da4106f3430ffa6afaa31336059..0cb7a7d8152796b216bb97543122da7b13749f21 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
--- 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 307d5eed074df91ed4746881ffeae22041ecde0d..10c387c813d5af1c9522d361f2c843c096fcbe6e 100644
+index 0cb7a7d8152796b216bb97543122da7b13749f21..1288f651fa83d5ab99a88858f52a6d3212284df0 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