Remove bad server.scheduleOnMain disconnect calls from old patches

The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point

478 files changed, 55 insertions, 74 deletions

diff --git a/patches/server/0271-Book-Size-Limits.patch b/patches/server/0271-Book-Size-Limits.patch
index b7ea9e7370..872f2d8903 100644
--- a/patches/server/0271-Book-Size-Limits.patch
+++ b/patches/server/0271-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 9b255f9551fa66efa21944e284a40a03aefc3040..23f033e16e2210970e6b01672873670578f426f4 100644
+index 9b255f9551fa66efa21944e284a40a03aefc3040..519ba39c5ff2c7782a88adc4212a7aca6788e09d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1043,6 +1043,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -24,7 +24,7 @@ index 9b255f9551fa66efa21944e284a40a03aefc3040..23f033e16e2210970e6b016728736705
 +                int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
 +                if (byteLength > 256 * 4) {
 +                    ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send a book with with a page too large!");
-+                    server.scheduleOnMain(() -> this.disconnect(Component.literal("Book too large!")));
++                    this.disconnect(Component.literal("Book too large!"));
 +                    return;
 +                }
 +                byteTotal += byteLength;
@@ -47,7 +47,7 @@ index 9b255f9551fa66efa21944e284a40a03aefc3040..23f033e16e2210970e6b016728736705
 +
 +            if (byteTotal > byteAllowed) {
 +                ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
-+                server.scheduleOnMain(() -> this.disconnect(Component.literal("Book too large!")));
++                this.disconnect(Component.literal("Book too large!"));
 +                return;
 +            }
 +        }
diff --git a/patches/server/0278-Brigadier-Mojang-API.patch b/patches/server/0278-Brigadier-Mojang-API.patch
index 8b333ef51e..4015e42587 100644
--- a/patches/server/0278-Brigadier-Mojang-API.patch
+++ b/patches/server/0278-Brigadier-Mojang-API.patch
@@ -119,7 +119,7 @@ index a05aea8561ac102476ee1b3068942b095950a86a..2b5235aea933462ca711abb5b59b6715
  
              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 23f033e16e2210970e6b01672873670578f426f4..cb6c447899d7080f14abecdb0cc84dc256a5bceb 100644
+index 519ba39c5ff2c7782a88adc4212a7aca6788e09d..f0fb981c46229c2498061ab6b3adff2db886f7f6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -769,19 +769,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0280-Limit-Client-Sign-length-more.patch b/patches/server/0280-Limit-Client-Sign-length-more.patch
index 31dcd1fbb0..ce0baeff49 100644
--- a/patches/server/0280-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0280-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 cb6c447899d7080f14abecdb0cc84dc256a5bceb..39e273ada6225a4a5deb4830185a957e4ae9ab0d 100644
+index f0fb981c46229c2498061ab6b3adff2db886f7f6..5db66f34c8010331765f2a75af6f8f19c6855e51 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -299,6 +299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch
index d07183ae92..231569604f 100644
--- a/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0352-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 39e273ada6225a4a5deb4830185a957e4ae9ab0d..9ca934b6f24d6a8d5e32f6c4cf728bee4b3f3e36 100644
+index 5db66f34c8010331765f2a75af6f8f19c6855e51..451f443a11e93b1d4a00490fd3459156289ff614 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -895,7 +895,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0355-Prevent-teleporting-dead-entities.patch b/patches/server/0355-Prevent-teleporting-dead-entities.patch
index 569c4dde7e..e133cff17c 100644
--- a/patches/server/0355-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0355-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 9ca934b6f24d6a8d5e32f6c4cf728bee4b3f3e36..ebeada0d62a71123e70fbafe3cb3232866e915f1 100644
+index 451f443a11e93b1d4a00490fd3459156289ff614..0cdb3af5e89b9934257fc26e619b5086711c3486 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1553,6 +1553,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch
index ecf670b677..439f44b599 100644
--- a/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch
@@ -13,7 +13,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 ebeada0d62a71123e70fbafe3cb3232866e915f1..97059c8199bc80f3982556a4094f02b03138dc6c 100644
+index 0cdb3af5e89b9934257fc26e619b5086711c3486..49f3cc0cf7ee20f754442fc1cbccb66132fbe794 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1350,6 +1350,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch
index 8a7facd949..61efb3a952 100644
--- a/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 97059c8199bc80f3982556a4094f02b03138dc6c..c210c7632efd40a81432faa51bedabeac095e5c6 100644
+index 49f3cc0cf7ee20f754442fc1cbccb66132fbe794..0fa1cf3694424b81fe40fbaa701a29da73eca8ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3058,16 +3058,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0374-Add-permission-for-command-blocks.patch b/patches/server/0374-Add-permission-for-command-blocks.patch
index 5b2d948df0..b9b154e252 100644
--- a/patches/server/0374-Add-permission-for-command-blocks.patch
+++ b/patches/server/0374-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index da9e864520150acd8027545672aa476be414bb4d..d4bd44210d58b30696feeea48e190947
                  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 c210c7632efd40a81432faa51bedabeac095e5c6..d823d32285b84c3775361d28f39b2c321b6b2f66 100644
+index 0fa1cf3694424b81fe40fbaa701a29da73eca8ea..e7e12f6b7b9c34b9ab4bb934a9a45ad58269981d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -806,7 +806,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 9efd6dc19f..3f8fdb89ba 100644
--- a/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -76,7 +76,7 @@ index d6dc8c983d26ce89f17a990be4284fdc78ad164b..2b1d7a2360a9ee7bca9d93a2dc8c61d1
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d823d32285b84c3775361d28f39b2c321b6b2f66..ad8b76b4b39442500de82653fe736bec32330ca0 100644
+index e7e12f6b7b9c34b9ab4bb934a9a45ad58269981d..9b597e3840260c5fad3682bb5e1e135ce81235d3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3261,7 +3261,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0382-Do-not-accept-invalid-client-settings.patch b/patches/server/0382-Do-not-accept-invalid-client-settings.patch
index 44c3888851..34c085dca2 100644
--- a/patches/server/0382-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0382-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 ad8b76b4b39442500de82653fe736bec32330ca0..602991cc2a2fbbca990a6c35137bdd01f1027d6c 100644
+index 9b597e3840260c5fad3682bb5e1e135ce81235d3..cf77e704a1f7b27cae0b5f1a930c9fca045793e0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3253,6 +3253,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 8cec90b208..f4d6f72db3 100644
--- a/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0411-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 602991cc2a2fbbca990a6c35137bdd01f1027d6c..28a210e76ba9f61ca88dea345e6d89f73e2a1ceb 100644
+index cf77e704a1f7b27cae0b5f1a930c9fca045793e0..1f11efcef80f9915006cc68b5e8938b393d115ee 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -679,7 +679,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch
index 910593a782..add9c0ed45 100644
--- a/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0421-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 28a210e76ba9f61ca88dea345e6d89f73e2a1ceb..e03d49f10f624cf09b65f5c43afcc70c4ccb4900 100644
+index 1f11efcef80f9915006cc68b5e8938b393d115ee..d8cd5bcc8d8c07eb4582030ca2703f9171743bd8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -492,9 +492,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0445-Limit-recipe-packets.patch b/patches/server/0445-Limit-recipe-packets.patch
index 07d4663966..1738c2e123 100644
--- a/patches/server/0445-Limit-recipe-packets.patch
+++ b/patches/server/0445-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 e03d49f10f624cf09b65f5c43afcc70c4ccb4900..caf21de44bf2a39e28080f9cb9a9f2c658964633 100644
+index d8cd5bcc8d8c07eb4582030ca2703f9171743bd8..291c85c823a24b86235bf7581761c1686f609b82 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 extends ServerCommonPacketListenerImpl
@@ -31,7 +31,7 @@ index e03d49f10f624cf09b65f5c43afcc70c4ccb4900..caf21de44bf2a39e28080f9cb9a9f2c6
 +        // Paper start - auto recipe limit
 +        if (!org.bukkit.Bukkit.isPrimaryThread()) {
 +            if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
-+                this.server.scheduleOnMain(() -> this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam")));
++                this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam"));
 +                return;
 +            }
 +        }
diff --git a/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch
index e534eb6443..c80cc0c64b 100644
--- a/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0460-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 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index caf21de44bf2a39e28080f9cb9a9f2c658964633..c0e42aafb33df84275938eccf9dd40c01cdf5404 100644
+index 291c85c823a24b86235bf7581761c1686f609b82..48ebf9e606079fc091f1c4eed37001bbd0100e55 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1771,7 +1771,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch
index 745076e6ce..df5205a027 100644
--- a/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0504-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 c0e42aafb33df84275938eccf9dd40c01cdf5404..21544ad90171e3705ee23174a6fbff173a3ef23c 100644
+index 48ebf9e606079fc091f1c4eed37001bbd0100e55..91f19079cefe3ff5d3defec3991b32225c283d8b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1759,8 +1759,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index eb2493e8e3..292034ce60 100644
--- a/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0509-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 21544ad90171e3705ee23174a6fbff173a3ef23c..e89a87500c81da73a8a8b698303c4300c49fd95a 100644
+index 91f19079cefe3ff5d3defec3991b32225c283d8b..0f6f1b47f88f46f4d51704304b0504826cef3565 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1155,7 +1155,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch
index b896158e96..3ffd81552b 100644
--- a/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0519-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 e89a87500c81da73a8a8b698303c4300c49fd95a..98798ede3297312ca2bb164a6320f26f8169f4a5 100644
+index 0f6f1b47f88f46f4d51704304b0504826cef3565..a31f15acc53ab63b601b8de340beeeba92d5ed64 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1934,6 +1934,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch
index 27ddc44a4a..0834c59e06 100644
--- a/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch
@@ -134,7 +134,7 @@ index 5de472df78940d1b8320f73d18b2edf3a796227e..073cf184a0e7af41048ae67a9b17b4cd
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 98798ede3297312ca2bb164a6320f26f8169f4a5..9acceb918c8e390d8b132a2ffb181f1cede34667 100644
+index a31f15acc53ab63b601b8de340beeeba92d5ed64..17ba9988b6d7fbed2675291781ae28643cd0e6f5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2732,7 +2732,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0539-Move-range-check-for-block-placing-up.patch b/patches/server/0539-Move-range-check-for-block-placing-up.patch
index 5f6bc9c449..7f257f6eac 100644
--- a/patches/server/0539-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0539-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 9acceb918c8e390d8b132a2ffb181f1cede34667..0ca2cb7b3daacc55308e12604344214cc83a4084 100644
+index 17ba9988b6d7fbed2675291781ae28643cd0e6f5..f1eea721a2ab664c1b52384313941e46cb8f1a11 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1746,6 +1746,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0542-Add-Unix-domain-socket-support.patch b/patches/server/0542-Add-Unix-domain-socket-support.patch
index c31eb1bd29..80f6dfdfd5 100644
--- a/patches/server/0542-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0542-Add-Unix-domain-socket-support.patch
@@ -87,7 +87,7 @@ index d6d7f1c446ba5507f67038ff27775ba75156f4a7..c63c194c44646e6bc1a5942655278701
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0ca2cb7b3daacc55308e12604344214cc83a4084..1b9d530de9e69935eafe86c56e07b80e1128d680 100644
+index f1eea721a2ab664c1b52384313941e46cb8f1a11..9fb437fe46741edb4ffb7c3d1f0c1bf791ba2283 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2551,6 +2551,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0548-Add-PlayerKickEvent-causes.patch b/patches/server/0548-Add-PlayerKickEvent-causes.patch
index 097bf055a4..022d813508 100644
--- a/patches/server/0548-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0548-Add-PlayerKickEvent-causes.patch
@@ -218,7 +218,7 @@ index 24bf661e76fb421a8be565d9ea68edf7205254d2..feb529adf2168025c785ab92d95a3246
          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 1b9d530de9e69935eafe86c56e07b80e1128d680..6feee492addc939015c6c16c2aaa2c1c4a42bde3 100644
+index 9fb437fe46741edb4ffb7c3d1f0c1bf791ba2283..1c76c6f8b60c65f73efdb30f695c2387a7e6fe1b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -349,7 +349,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -288,8 +288,8 @@ index 1b9d530de9e69935eafe86c56e07b80e1128d680..6feee492addc939015c6c16c2aaa2c1c
                  int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  if (byteLength > 256 * 4) {
                      ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send a book with with a page too large!");
--                    server.scheduleOnMain(() -> this.disconnect(Component.literal("Book too large!")));
-+                    server.scheduleOnMain(() -> this.disconnect(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause
+-                    this.disconnect(Component.literal("Book too large!"));
++                    this.disconnect(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
                      return;
                  }
                  byteTotal += byteLength;
@@ -297,8 +297,8 @@ index 1b9d530de9e69935eafe86c56e07b80e1128d680..6feee492addc939015c6c16c2aaa2c1c
  
              if (byteTotal > byteAllowed) {
                  ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
--                server.scheduleOnMain(() -> this.disconnect(Component.literal("Book too large!")));
-+                server.scheduleOnMain(() -> this.disconnect(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause
+-                this.disconnect(Component.literal("Book too large!"));
++                this.disconnect(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
                  return;
              }
          }
@@ -404,8 +404,8 @@ index 1b9d530de9e69935eafe86c56e07b80e1128d680..6feee492addc939015c6c16c2aaa2c1c
          // Paper start - auto recipe limit
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
--                this.server.scheduleOnMain(() -> this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam")));
-+                this.server.scheduleOnMain(() -> this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause
+-                this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam"));
++                this.disconnect(net.minecraft.network.chat.Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); // Paper - kick event cause
                  return;
              }
          }
diff --git a/patches/server/0563-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0563-Ensure-disconnect-for-book-edit-is-called-on-main.patch
deleted file mode 100644
index baea885801..0000000000
--- a/patches/server/0563-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <[email protected]>
-Date: Tue, 22 Jun 2021 19:58:53 +0100
-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 6feee492addc939015c6c16c2aaa2c1c4a42bde3..014b8357f430309bc0d32c7f4e1a5d689305a917 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1118,7 +1118,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
-         // Paper end - Book size limits
-         // CraftBukkit start
-         if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
--            this.disconnect(Component.literal("Book edited too quickly!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause
-+            server.scheduleOnMain(() -> this.disconnect(Component.literal("Book edited too quickly!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause // Paper - Also ensure this is called on main
-             return;
-         }
-         this.lastBookTick = MinecraftServer.currentTick;
diff --git a/patches/server/0564-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0563-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0564-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0563-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0565-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0564-Use-getChunkIfLoadedImmediately-in-places.patch
index 0cfa5936f9..0cfa5936f9 100644
--- a/patches/server/0565-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0564-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0566-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0565-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0566-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0565-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0567-Add-PlayerArmSwingEvent.patch b/patches/server/0566-Add-PlayerArmSwingEvent.patch
index 3812bcc970..78c4ed80d1 100644
--- a/patches/server/0567-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0566-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 014b8357f430309bc0d32c7f4e1a5d689305a917..6da81426bf358ccc80ab3cff4b96dc0ed6e068c9 100644
+index 1c76c6f8b60c65f73efdb30f695c2387a7e6fe1b..4e96a2a41f3e467e1595cc99ed6a4ce88a98672c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2413,7 +2413,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0568-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0567-Fix-kick-event-leave-message-not-being-sent.patch
index c4ff8571e9..62346afa75 100644
--- a/patches/server/0568-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0567-Fix-kick-event-leave-message-not-being-sent.patch
@@ -55,7 +55,7 @@ index feb529adf2168025c785ab92d95a3246e73c0236..b43f87ff4b9853b5d4bbea5ff9686d64
          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 6da81426bf358ccc80ab3cff4b96dc0ed6e068c9..444584160d0d0fdbe359b31851028a65cbd09a8c 100644
+index 4e96a2a41f3e467e1595cc99ed6a4ce88a98672c..e55b783ea9fcdf300346409f19c6973fb1d40a48 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1895,6 +1895,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0569-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0568-Don-t-apply-cramming-damage-to-players.patch
index 5176f24655..5176f24655 100644
--- a/patches/server/0569-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0568-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0570-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0569-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0570-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0569-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0571-Add-missing-forceDrop-toggles.patch b/patches/server/0570-Add-missing-forceDrop-toggles.patch
index d7c261ea7c..d7c261ea7c 100644
--- a/patches/server/0571-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0570-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0572-Stinger-API.patch b/patches/server/0571-Stinger-API.patch
index 2690191442..2690191442 100644
--- a/patches/server/0572-Stinger-API.patch
+++ b/patches/server/0571-Stinger-API.patch
diff --git a/patches/server/0573-Add-System.out-err-catcher.patch b/patches/server/0572-Add-System.out-err-catcher.patch
index 1a4bfc12d1..1a4bfc12d1 100644
--- a/patches/server/0573-Add-System.out-err-catcher.patch
+++ b/patches/server/0572-Add-System.out-err-catcher.patch
diff --git a/patches/server/0574-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0573-Prevent-AFK-kick-while-watching-end-credits.patch
index c0178fb452..02fd619640 100644
--- a/patches/server/0574-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0573-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 444584160d0d0fdbe359b31851028a65cbd09a8c..dc84854a94d4ba83645aa03e81b9b07a4a4ebc0d 100644
+index e55b783ea9fcdf300346409f19c6973fb1d40a48..045f510cf6ee120e00a13b2306d0c0ae9086b7fa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -397,7 +397,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0575-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0574-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0575-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0574-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0576-Add-PlayerSetSpawnEvent.patch b/patches/server/0575-Add-PlayerSetSpawnEvent.patch
index b54fcfb9d0..b54fcfb9d0 100644
--- a/patches/server/0576-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0575-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0577-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0576-Make-hoppers-respect-inventory-max-stack-size.patch
index c5f669b979..c5f669b979 100644
--- a/patches/server/0577-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0576-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0578-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0577-Optimize-entity-tracker-passenger-checks.patch
index 0dd7d25ba3..0dd7d25ba3 100644
--- a/patches/server/0578-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0577-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0579-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0578-Config-option-for-Piglins-guarding-chests.patch
index 8e2094a53d..8e2094a53d 100644
--- a/patches/server/0579-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0578-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0580-Add-EntityDamageItemEvent.patch b/patches/server/0579-Add-EntityDamageItemEvent.patch
index 6026e41afa..6026e41afa 100644
--- a/patches/server/0580-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0579-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0581-Optimize-indirect-passenger-iteration.patch b/patches/server/0580-Optimize-indirect-passenger-iteration.patch
index 5f05159ded..5f05159ded 100644
--- a/patches/server/0581-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0580-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0582-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0581-Configurable-item-frame-map-cursor-update-interval.patch
index a6389cdcbb..a6389cdcbb 100644
--- a/patches/server/0582-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0581-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0583-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0582-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0583-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0582-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0584-Add-BlockBreakBlockEvent.patch b/patches/server/0583-Add-BlockBreakBlockEvent.patch
index 4bc0c5116f..4bc0c5116f 100644
--- a/patches/server/0584-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0583-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0585-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0584-Option-to-prevent-data-components-copy-in-smithing-r.patch
index 7246d24edd..7246d24edd 100644
--- a/patches/server/0585-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0584-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0586-More-CommandBlock-API.patch b/patches/server/0585-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0586-More-CommandBlock-API.patch
+++ b/patches/server/0585-More-CommandBlock-API.patch
diff --git a/patches/server/0587-Add-missing-team-sidebar-display-slots.patch b/patches/server/0586-Add-missing-team-sidebar-display-slots.patch
index 641de83a40..641de83a40 100644
--- a/patches/server/0587-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0586-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0588-Add-back-EntityPortalExitEvent.patch b/patches/server/0587-Add-back-EntityPortalExitEvent.patch
index ccbe08c67a..ccbe08c67a 100644
--- a/patches/server/0588-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0587-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0589-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0588-Add-methods-to-find-targets-for-lightning-strikes.patch
index fac79b2807..fac79b2807 100644
--- a/patches/server/0589-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0588-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0590-Get-entity-default-attributes.patch b/patches/server/0589-Get-entity-default-attributes.patch
index 6f99af1f3a..6f99af1f3a 100644
--- a/patches/server/0590-Get-entity-default-attributes.patch
+++ b/patches/server/0589-Get-entity-default-attributes.patch
diff --git a/patches/server/0591-Left-handed-API.patch b/patches/server/0590-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0591-Left-handed-API.patch
+++ b/patches/server/0590-Left-handed-API.patch
diff --git a/patches/server/0592-Add-more-advancement-API.patch b/patches/server/0591-Add-more-advancement-API.patch
index 772c00ba58..772c00ba58 100644
--- a/patches/server/0592-Add-more-advancement-API.patch
+++ b/patches/server/0591-Add-more-advancement-API.patch
diff --git a/patches/server/0593-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0592-Add-ItemFactory-getSpawnEgg-API.patch
index 12ea03ddb7..12ea03ddb7 100644
--- a/patches/server/0593-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0592-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0594-Add-critical-damage-API.patch b/patches/server/0593-Add-critical-damage-API.patch
index 8310fc11a1..8310fc11a1 100644
--- a/patches/server/0594-Add-critical-damage-API.patch
+++ b/patches/server/0593-Add-critical-damage-API.patch
diff --git a/patches/server/0595-Fix-issues-with-mob-conversion.patch b/patches/server/0594-Fix-issues-with-mob-conversion.patch
index 1b4597fe00..1b4597fe00 100644
--- a/patches/server/0595-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0594-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0596-Add-hasCollision-methods-to-various-places.patch b/patches/server/0595-Add-hasCollision-methods-to-various-places.patch
index a6045ddd1b..a6045ddd1b 100644
--- a/patches/server/0596-Add-hasCollision-methods-to-various-places.patch
+++ b/patches/server/0595-Add-hasCollision-methods-to-various-places.patch
diff --git a/patches/server/0597-Goat-ram-API.patch b/patches/server/0596-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0597-Goat-ram-API.patch
+++ b/patches/server/0596-Goat-ram-API.patch
diff --git a/patches/server/0598-Add-API-for-resetting-a-single-score.patch b/patches/server/0597-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0598-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0597-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0599-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0598-Add-Raw-Byte-Entity-Serialization.patch
index 1c6a7c7472..1c6a7c7472 100644
--- a/patches/server/0599-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0598-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0600-Vanilla-command-permission-fixes.patch b/patches/server/0599-Vanilla-command-permission-fixes.patch
index 53fa2975d6..53fa2975d6 100644
--- a/patches/server/0600-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0599-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0601-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index c1d628caf8..c1d628caf8 100644
--- a/patches/server/0601-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0600-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0602-Fix-GameProfileCache-concurrency.patch b/patches/server/0601-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0602-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0601-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0603-Improve-and-expand-AsyncCatcher.patch b/patches/server/0602-Improve-and-expand-AsyncCatcher.patch
index 09db2442ff..ec5a6e526c 100644
--- a/patches/server/0603-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0602-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dc84854a94d4ba83645aa03e81b9b07a4a4ebc0d..5757e26cad9d53ab80865bb0d113555c6aa158c2 100644
+index 045f510cf6ee120e00a13b2306d0c0ae9086b7fa..147f2faac16e9dcaa6c63ff660978638567109ca 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1578,6 +1578,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0604-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0603-Add-paper-mobcaps-and-paper-playermobcaps.patch
index e945bbb794..e945bbb794 100644
--- a/patches/server/0604-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0603-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0605-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0604-Sanitize-ResourceLocation-error-logging.patch
index 602f0d3b27..602f0d3b27 100644
--- a/patches/server/0605-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0604-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0606-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0605-Manually-inline-methods-in-BlockPosition.patch
index 77b9a47ac1..77b9a47ac1 100644
--- a/patches/server/0606-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0605-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0607-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0606-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0607-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0606-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0608-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0607-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 976f278b20..976f278b20 100644
--- a/patches/server/0608-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0607-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0609-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0608-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 48449be461..48449be461 100644
--- a/patches/server/0609-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0608-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0610-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0609-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0610-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0609-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0611-Time-scoreboard-search.patch b/patches/server/0610-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0611-Time-scoreboard-search.patch
+++ b/patches/server/0610-Time-scoreboard-search.patch
diff --git a/patches/server/0612-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0611-Oprimise-map-impl-for-tracked-players.patch
index 2cadeeb2a0..2cadeeb2a0 100644
--- a/patches/server/0612-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0611-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0613-Add-missing-InventoryType.patch b/patches/server/0612-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0613-Add-missing-InventoryType.patch
+++ b/patches/server/0612-Add-missing-InventoryType.patch
diff --git a/patches/server/0614-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0613-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0614-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0613-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0615-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0614-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index e15a3485c3..e15a3485c3 100644
--- a/patches/server/0615-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0614-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0616-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0615-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0616-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0615-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0617-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0616-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 177e43f073..7f0fd29a50 100644
--- a/patches/server/0617-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0616-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 5757e26cad9d53ab80865bb0d113555c6aa158c2..c72153d59c5c444706173dcd8daf85dd57bc56dd 100644
+index 147f2faac16e9dcaa6c63ff660978638567109ca..c645dae6ba4fe15c1548300854a73e2ef9dca353 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -748,6 +748,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0618-Add-packet-limiter-config.patch b/patches/server/0617-Add-packet-limiter-config.patch
index a6bd6521f4..a6bd6521f4 100644
--- a/patches/server/0618-Add-packet-limiter-config.patch
+++ b/patches/server/0617-Add-packet-limiter-config.patch
diff --git a/patches/server/0619-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0618-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 0b139a1e02..0b139a1e02 100644
--- a/patches/server/0619-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0618-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0620-Ensure-valid-vehicle-status.patch b/patches/server/0619-Ensure-valid-vehicle-status.patch
index 70f49165db..70f49165db 100644
--- a/patches/server/0620-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0619-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0621-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0620-Prevent-softlocked-end-exit-portal-generation.patch
index e2698e961b..e2698e961b 100644
--- a/patches/server/0621-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0620-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0622-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0621-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0622-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0621-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0623-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0622-Don-t-log-debug-logging-being-disabled.patch
index d62e56bfc1..d62e56bfc1 100644
--- a/patches/server/0623-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0622-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0624-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0623-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0624-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0623-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0625-Preserve-overstacked-loot.patch b/patches/server/0624-Preserve-overstacked-loot.patch
index bd657ec906..bd657ec906 100644
--- a/patches/server/0625-Preserve-overstacked-loot.patch
+++ b/patches/server/0624-Preserve-overstacked-loot.patch
diff --git a/patches/server/0626-Update-head-rotation-in-missing-places.patch b/patches/server/0625-Update-head-rotation-in-missing-places.patch
index ab7ede0fd7..ab7ede0fd7 100644
--- a/patches/server/0626-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0625-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0627-prevent-unintended-light-block-manipulation.patch b/patches/server/0626-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0627-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0626-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0628-Fix-CraftCriteria-defaults-map.patch b/patches/server/0627-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0628-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0627-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0629-Fix-upstreams-block-state-factories.patch b/patches/server/0628-Fix-upstreams-block-state-factories.patch
index a48a6b0d09..a48a6b0d09 100644
--- a/patches/server/0629-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0628-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0630-Configurable-feature-seeds.patch b/patches/server/0629-Configurable-feature-seeds.patch
index 27997ba7c0..27997ba7c0 100644
--- a/patches/server/0630-Configurable-feature-seeds.patch
+++ b/patches/server/0629-Configurable-feature-seeds.patch
diff --git a/patches/server/0631-Add-root-admin-user-detection.patch b/patches/server/0630-Add-root-admin-user-detection.patch
index abe2f3b5ae..abe2f3b5ae 100644
--- a/patches/server/0631-Add-root-admin-user-detection.patch
+++ b/patches/server/0630-Add-root-admin-user-detection.patch
diff --git a/patches/server/0632-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0631-don-t-attempt-to-teleport-dead-entities.patch
index c207194634..c207194634 100644
--- a/patches/server/0632-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0631-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0633-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0632-Prevent-excessive-velocity-through-repeated-crits.patch
index d6ec443589..d6ec443589 100644
--- a/patches/server/0633-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0632-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0634-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0633-Remove-client-side-code-using-deprecated-for-removal.patch
index 4aed4f1f3a..4aed4f1f3a 100644
--- a/patches/server/0634-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0633-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0635-Fix-Spigot-growth-modifiers.patch b/patches/server/0634-Fix-Spigot-growth-modifiers.patch
index dbaed5a331..dbaed5a331 100644
--- a/patches/server/0635-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0634-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0636-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0635-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0636-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0635-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0637-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0636-Add-PlayerItemFrameChangeEvent.patch
index e047726740..e047726740 100644
--- a/patches/server/0637-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0636-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0638-Optimize-HashMapPalette.patch b/patches/server/0637-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0638-Optimize-HashMapPalette.patch
+++ b/patches/server/0637-Optimize-HashMapPalette.patch
diff --git a/patches/server/0639-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0638-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 8f7f6be080..8f7f6be080 100644
--- a/patches/server/0639-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0638-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0640-Add-more-Campfire-API.patch b/patches/server/0639-Add-more-Campfire-API.patch
index 012ca1cc7d..012ca1cc7d 100644
--- a/patches/server/0640-Add-more-Campfire-API.patch
+++ b/patches/server/0639-Add-more-Campfire-API.patch
diff --git a/patches/server/0641-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0640-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 80c053acc6..80c053acc6 100644
--- a/patches/server/0641-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0640-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0642-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0641-Forward-CraftEntity-in-teleport-command.patch
index 0471bae893..0471bae893 100644
--- a/patches/server/0642-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0641-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0643-Improve-scoreboard-entries.patch b/patches/server/0642-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0643-Improve-scoreboard-entries.patch
+++ b/patches/server/0642-Improve-scoreboard-entries.patch
diff --git a/patches/server/0644-Entity-powdered-snow-API.patch b/patches/server/0643-Entity-powdered-snow-API.patch
index adef89850e..adef89850e 100644
--- a/patches/server/0644-Entity-powdered-snow-API.patch
+++ b/patches/server/0643-Entity-powdered-snow-API.patch
diff --git a/patches/server/0645-Add-API-for-item-entity-health.patch b/patches/server/0644-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0645-Add-API-for-item-entity-health.patch
+++ b/patches/server/0644-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0646-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0645-Configurable-max-block-light-for-monster-spawning.patch
index 421d176050..421d176050 100644
--- a/patches/server/0646-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0645-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0647-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0646-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0647-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0646-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0648-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0647-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 026f793541..026f793541 100644
--- a/patches/server/0648-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0647-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0649-Bucketable-API.patch b/patches/server/0648-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0649-Bucketable-API.patch
+++ b/patches/server/0648-Bucketable-API.patch
diff --git a/patches/server/0650-Validate-usernames.patch b/patches/server/0649-Validate-usernames.patch
index 08d6e377eb..08d6e377eb 100644
--- a/patches/server/0650-Validate-usernames.patch
+++ b/patches/server/0649-Validate-usernames.patch
diff --git a/patches/server/0651-Make-water-animal-spawn-height-configurable.patch b/patches/server/0650-Make-water-animal-spawn-height-configurable.patch
index 14f75d9b89..14f75d9b89 100644
--- a/patches/server/0651-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0650-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0652-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0651-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 8306fb57e8..8306fb57e8 100644
--- a/patches/server/0652-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0651-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0653-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0652-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0653-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0652-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0654-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0653-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0654-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0653-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0655-Multiple-Entries-with-Scoreboards.patch b/patches/server/0654-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0655-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0654-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0656-Reset-placed-block-on-exception.patch b/patches/server/0655-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0656-Reset-placed-block-on-exception.patch
+++ b/patches/server/0655-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0657-Add-configurable-height-for-slime-spawn.patch b/patches/server/0656-Add-configurable-height-for-slime-spawn.patch
index 5ed7f1549d..5ed7f1549d 100644
--- a/patches/server/0657-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0656-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0658-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0657-Fix-xp-reward-for-baby-zombies.patch
index a4fec4e0f2..a4fec4e0f2 100644
--- a/patches/server/0658-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0657-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0659-Multi-Block-Change-API-Implementation.patch b/patches/server/0658-Multi-Block-Change-API-Implementation.patch
index 52d9d21721..52d9d21721 100644
--- a/patches/server/0659-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0658-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0660-Fix-NotePlayEvent.patch b/patches/server/0659-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0660-Fix-NotePlayEvent.patch
+++ b/patches/server/0659-Fix-NotePlayEvent.patch
diff --git a/patches/server/0661-Freeze-Tick-Lock-API.patch b/patches/server/0660-Freeze-Tick-Lock-API.patch
index fe59902cdc..fe59902cdc 100644
--- a/patches/server/0661-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0660-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0662-More-PotionEffectType-API.patch b/patches/server/0661-More-PotionEffectType-API.patch
index 1bbb96d291..1bbb96d291 100644
--- a/patches/server/0662-More-PotionEffectType-API.patch
+++ b/patches/server/0661-More-PotionEffectType-API.patch
diff --git a/patches/server/0663-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0662-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 82d25835a6..82d25835a6 100644
--- a/patches/server/0663-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0662-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0664-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0663-API-for-creating-command-sender-which-forwards-feedb.patch
index 0bd41db0fa..0bd41db0fa 100644
--- a/patches/server/0664-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0663-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0665-Add-missing-structure-set-seed-configs.patch b/patches/server/0664-Add-missing-structure-set-seed-configs.patch
index d97d88a95d..d97d88a95d 100644
--- a/patches/server/0665-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0664-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0666-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0665-Fix-cancelled-powdered-snow-bucket-placement.patch
index d4169a6e7a..d4169a6e7a 100644
--- a/patches/server/0666-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0665-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0667-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0666-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index d797848359..d797848359 100644
--- a/patches/server/0667-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0666-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0668-Add-GameEvent-tags.patch b/patches/server/0667-Add-GameEvent-tags.patch
index 7bd38c77bb..7bd38c77bb 100644
--- a/patches/server/0668-Add-GameEvent-tags.patch
+++ b/patches/server/0667-Add-GameEvent-tags.patch
diff --git a/patches/server/0669-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0668-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 351cec2218..351cec2218 100644
--- a/patches/server/0669-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0668-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0670-Furnace-RecipesUsed-API.patch b/patches/server/0669-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0670-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0669-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0671-Configurable-sculk-sensor-listener-range.patch b/patches/server/0670-Configurable-sculk-sensor-listener-range.patch
index 99ff902efa..99ff902efa 100644
--- a/patches/server/0671-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0670-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0672-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0671-Add-missing-block-data-mins-and-maxes.patch
index fe8170196d..fe8170196d 100644
--- a/patches/server/0672-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0671-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0673-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0672-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index eed2fe11bf..eed2fe11bf 100644
--- a/patches/server/0673-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0672-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0674-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0673-Put-world-into-worldlist-before-initing-the-world.patch
index 28d59a5fbf..28d59a5fbf 100644
--- a/patches/server/0674-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0673-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0675-Custom-Potion-Mixes.patch b/patches/server/0674-Custom-Potion-Mixes.patch
index 62f7870ba8..62f7870ba8 100644
--- a/patches/server/0675-Custom-Potion-Mixes.patch
+++ b/patches/server/0674-Custom-Potion-Mixes.patch
diff --git a/patches/server/0676-Force-close-world-loading-screen.patch b/patches/server/0675-Force-close-world-loading-screen.patch
index 83d9e2f203..83d9e2f203 100644
--- a/patches/server/0676-Force-close-world-loading-screen.patch
+++ b/patches/server/0675-Force-close-world-loading-screen.patch
diff --git a/patches/server/0677-Fix-falling-block-spawn-methods.patch b/patches/server/0676-Fix-falling-block-spawn-methods.patch
index 22cab6121b..22cab6121b 100644
--- a/patches/server/0677-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0676-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0678-Expose-furnace-minecart-push-values.patch b/patches/server/0677-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0678-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0677-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0679-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0678-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 4698298019..4698298019 100644
--- a/patches/server/0679-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0678-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0680-More-Projectile-API.patch b/patches/server/0679-More-Projectile-API.patch
index eb2ea1dbc5..eb2ea1dbc5 100644
--- a/patches/server/0680-More-Projectile-API.patch
+++ b/patches/server/0679-More-Projectile-API.patch
diff --git a/patches/server/0681-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0680-Fix-swamp-hut-cat-generation-deadlock.patch
index 6aa68bdd5c..6aa68bdd5c 100644
--- a/patches/server/0681-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0680-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0682-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0681-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index ceb39c1064..8a08304bd7 100644
--- a/patches/server/0682-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0681-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 c72153d59c5c444706173dcd8daf85dd57bc56dd..3b1ca4e17360599ff22408a79c813f95318861ab 100644
+index c645dae6ba4fe15c1548300854a73e2ef9dca353..c4ce2f6a2737891337a4369deee5d98f990edeab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -484,6 +484,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0683-Implement-getComputedBiome-API.patch b/patches/server/0682-Implement-getComputedBiome-API.patch
index 41624673a7..41624673a7 100644
--- a/patches/server/0683-Implement-getComputedBiome-API.patch
+++ b/patches/server/0682-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0684-Make-some-itemstacks-nonnull.patch b/patches/server/0683-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0684-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0683-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0685-Implement-enchantWithLevels-API.patch b/patches/server/0684-Implement-enchantWithLevels-API.patch
index 7bf61f04ba..7bf61f04ba 100644
--- a/patches/server/0685-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0684-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0686-Fix-saving-in-unloadWorld.patch b/patches/server/0685-Fix-saving-in-unloadWorld.patch
index 6148bbda3c..6148bbda3c 100644
--- a/patches/server/0686-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0685-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0687-Buffer-OOB-setBlock-calls.patch b/patches/server/0686-Buffer-OOB-setBlock-calls.patch
index 7bc7bd4823..7bc7bd4823 100644
--- a/patches/server/0687-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0686-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0688-Add-TameableDeathMessageEvent.patch b/patches/server/0687-Add-TameableDeathMessageEvent.patch
index e683289da1..e683289da1 100644
--- a/patches/server/0688-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0687-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0689-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0688-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 924b330ad8..924b330ad8 100644
--- a/patches/server/0689-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0688-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0690-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0689-fix-player-loottables-running-when-mob-loot-gamerule.patch
index a4490f06fd..a4490f06fd 100644
--- a/patches/server/0690-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0689-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0691-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0690-Ensure-entity-passenger-world-matches-ridden-entity.patch
index ec690057bb..ec690057bb 100644
--- a/patches/server/0691-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0690-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0692-cache-resource-keys.patch b/patches/server/0691-cache-resource-keys.patch
index 7f3b6ce992..7f3b6ce992 100644
--- a/patches/server/0692-cache-resource-keys.patch
+++ b/patches/server/0691-cache-resource-keys.patch
diff --git a/patches/server/0693-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0692-Allow-changing-the-EnderDragon-podium.patch
index 7c00628ca0..7c00628ca0 100644
--- a/patches/server/0693-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0692-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0694-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0693-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 265f2bbdbb..265f2bbdbb 100644
--- a/patches/server/0694-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0693-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0695-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0694-Prevent-tile-entity-copies-loading-chunks.patch
index cd9b866ad6..aaf851bff7 100644
--- a/patches/server/0695-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0694-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 3b1ca4e17360599ff22408a79c813f95318861ab..d46fbc276bf4e751988384f876260264b91b13c5 100644
+index c4ce2f6a2737891337a4369deee5d98f990edeab..d2eb455eb527ca819565e6538f97d1972afc8a7f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3202,7 +3202,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0696-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0695-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 59639c77c4..59639c77c4 100644
--- a/patches/server/0696-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0695-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0697-Expand-PlayerItemDamageEvent.patch b/patches/server/0696-Expand-PlayerItemDamageEvent.patch
index bf458d8c9b..bf458d8c9b 100644
--- a/patches/server/0697-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0696-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0698-WorldCreator-keepSpawnLoaded.patch b/patches/server/0697-WorldCreator-keepSpawnLoaded.patch
index ce6b29605a..ce6b29605a 100644
--- a/patches/server/0698-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0697-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0699-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0698-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0699-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0698-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0700-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0699-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index ed6f344427..ed6f344427 100644
--- a/patches/server/0700-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0699-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0701-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0700-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 16f87ae350..16f87ae350 100644
--- a/patches/server/0701-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0700-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0702-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0701-Fire-CauldronLevelChange-on-initial-fill.patch
index 07f836b363..07f836b363 100644
--- a/patches/server/0702-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0701-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0703-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0702-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0703-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0702-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0704-Add-PlayerStopUsingItemEvent.patch b/patches/server/0703-Add-PlayerStopUsingItemEvent.patch
index a2453612cc..a2453612cc 100644
--- a/patches/server/0704-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0703-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0705-Don-t-tick-markers.patch b/patches/server/0704-Don-t-tick-markers.patch
index c8a214b154..c8a214b154 100644
--- a/patches/server/0705-Don-t-tick-markers.patch
+++ b/patches/server/0704-Don-t-tick-markers.patch
diff --git a/patches/server/0706-Expand-FallingBlock-API.patch b/patches/server/0705-Expand-FallingBlock-API.patch
index 84c7821142..84c7821142 100644
--- a/patches/server/0706-Expand-FallingBlock-API.patch
+++ b/patches/server/0705-Expand-FallingBlock-API.patch
diff --git a/patches/server/0707-Add-support-for-Proxy-Protocol.patch b/patches/server/0706-Add-support-for-Proxy-Protocol.patch
index 9fb1a82dd2..9fb1a82dd2 100644
--- a/patches/server/0707-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0706-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0708-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0707-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..61c9b7dd07 100644
--- a/patches/server/0708-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0707-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0709-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0708-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0709-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0708-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0710-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0709-Sanitize-sent-BlockEntity-NBT.patch
index 0f97b535cc..0f97b535cc 100644
--- a/patches/server/0710-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0709-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0711-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0710-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0711-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0710-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0712-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0711-Prevent-entity-loading-causing-async-lookups.patch
index 107aabb196..107aabb196 100644
--- a/patches/server/0712-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0711-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0713-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0712-Throw-exception-on-world-create-while-being-ticked.patch
index 5d2cb89f00..5d2cb89f00 100644
--- a/patches/server/0713-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0712-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0714-Dont-resent-entity-on-art-update.patch b/patches/server/0713-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0714-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0713-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0715-Add-WardenAngerChangeEvent.patch b/patches/server/0714-Add-WardenAngerChangeEvent.patch
index 41f4251548..41f4251548 100644
--- a/patches/server/0715-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0714-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0716-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0715-Add-option-for-strict-advancement-dimension-checks.patch
index 236729352e..236729352e 100644
--- a/patches/server/0716-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0715-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0717-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0716-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0717-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0716-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0718-Nameable-Banner-API.patch b/patches/server/0717-Nameable-Banner-API.patch
index 21ca7151b4..21ca7151b4 100644
--- a/patches/server/0718-Nameable-Banner-API.patch
+++ b/patches/server/0717-Nameable-Banner-API.patch
diff --git a/patches/server/0719-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0718-Don-t-broadcast-messages-to-command-blocks.patch
index 5a89b4427f..5a89b4427f 100644
--- a/patches/server/0719-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0718-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0720-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0719-Prevent-empty-items-from-being-added-to-world.patch
index 5659cfbcab..5659cfbcab 100644
--- a/patches/server/0720-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0719-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0721-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0720-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index c2e21a749e..c2e21a749e 100644
--- a/patches/server/0721-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0720-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0722-Add-Player-getFishHook.patch b/patches/server/0721-Add-Player-getFishHook.patch
index d87fa21619..d87fa21619 100644
--- a/patches/server/0722-Add-Player-getFishHook.patch
+++ b/patches/server/0721-Add-Player-getFishHook.patch
diff --git a/patches/server/0723-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0722-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0723-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0722-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0724-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0723-Add-various-missing-EntityDropItemEvent-calls.patch
index d3b522d0fb..d3b522d0fb 100644
--- a/patches/server/0724-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0723-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0725-Fix-Bee-flower-NPE.patch b/patches/server/0724-Fix-Bee-flower-NPE.patch
index db6e1b0ad9..db6e1b0ad9 100644
--- a/patches/server/0725-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0724-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0726-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0725-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index cb793fb08e..7b9fd5728a 100644
--- a/patches/server/0726-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0725-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 d46fbc276bf4e751988384f876260264b91b13c5..ce466ccf573f69738813e947f6c6c6d0db6d82b7 100644
+index d2eb455eb527ca819565e6538f97d1972afc8a7f..559a683e22bfeb981a7a84beeeb08b7aac994687 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2384,7 +2384,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0727-More-Teleport-API.patch b/patches/server/0726-More-Teleport-API.patch
index 732ed40fc2..0d14091d47 100644
--- a/patches/server/0727-More-Teleport-API.patch
+++ b/patches/server/0726-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ce466ccf573f69738813e947f6c6c6d0db6d82b7..6044a84fd9a3b07e418b8e308b3d6faeb152170c 100644
+index 559a683e22bfeb981a7a84beeeb08b7aac994687..7dafab02db55fbba49e59a6b2a8c03f8a22cb982 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1566,11 +1566,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0728-Add-EntityPortalReadyEvent.patch b/patches/server/0727-Add-EntityPortalReadyEvent.patch
index 72e8f57726..72e8f57726 100644
--- a/patches/server/0728-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0727-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0729-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0728-Don-t-use-level-random-in-entity-constructors.patch
index cb41bd38c5..cb41bd38c5 100644
--- a/patches/server/0729-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0728-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0730-Send-block-entities-after-destroy-prediction.patch b/patches/server/0729-Send-block-entities-after-destroy-prediction.patch
index a7c1fdde0f..c5c44aed4b 100644
--- a/patches/server/0730-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0729-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 4d024956156aefde7df308642dfd0a40779e0633..6abecaac8407b992d208a9108e11fd49
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6044a84fd9a3b07e418b8e308b3d6faeb152170c..bebbf173d846337fb2a0887c1a0f9a4afca570f8 100644
+index 7dafab02db55fbba49e59a6b2a8c03f8a22cb982..6f53025766666adfa2354a7ae9cbffc5baccdfa5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1712,8 +1712,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0731-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0730-Warn-on-plugins-accessing-faraway-chunks.patch
index e97023798f..e97023798f 100644
--- a/patches/server/0731-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0730-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0732-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0731-Custom-Chat-Completion-Suggestions-API.patch
index 839ee2255a..839ee2255a 100644
--- a/patches/server/0732-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0731-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0733-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0732-Add-and-fix-missing-BlockFadeEvents.patch
index 055406ea3e..055406ea3e 100644
--- a/patches/server/0733-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0732-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0734-Collision-API.patch b/patches/server/0733-Collision-API.patch
index 6bd05181ad..6bd05181ad 100644
--- a/patches/server/0734-Collision-API.patch
+++ b/patches/server/0733-Collision-API.patch
diff --git a/patches/server/0735-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0734-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index 1a84359dae..1a84359dae 100644
--- a/patches/server/0735-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0734-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0736-Block-Ticking-API.patch b/patches/server/0735-Block-Ticking-API.patch
index 9e5247f35f..9e5247f35f 100644
--- a/patches/server/0736-Block-Ticking-API.patch
+++ b/patches/server/0735-Block-Ticking-API.patch
diff --git a/patches/server/0737-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0736-Add-Velocity-IP-Forwarding-Support.patch
index 99b0cc4d6a..99b0cc4d6a 100644
--- a/patches/server/0737-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0736-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0738-Add-NamespacedKey-biome-methods.patch b/patches/server/0737-Add-NamespacedKey-biome-methods.patch
index d981229c6f..d981229c6f 100644
--- a/patches/server/0738-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0737-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0739-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0738-Fix-plugin-loggers-on-server-shutdown.patch
index 6914ddec62..6914ddec62 100644
--- a/patches/server/0739-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0738-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0740-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch
index 63adf0fc72..63adf0fc72 100644
--- a/patches/server/0740-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0739-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0741-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0740-Fire-EntityChangeBlockEvent-in-more-places.patch
index d281ac226e..d281ac226e 100644
--- a/patches/server/0741-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0740-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0742-Missing-eating-regain-reason.patch b/patches/server/0741-Missing-eating-regain-reason.patch
index ac2e750c71..ac2e750c71 100644
--- a/patches/server/0742-Missing-eating-regain-reason.patch
+++ b/patches/server/0741-Missing-eating-regain-reason.patch
diff --git a/patches/server/0743-Missing-effect-cause.patch b/patches/server/0742-Missing-effect-cause.patch
index a56cd781d5..a56cd781d5 100644
--- a/patches/server/0743-Missing-effect-cause.patch
+++ b/patches/server/0742-Missing-effect-cause.patch
diff --git a/patches/server/0744-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0743-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0744-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0743-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0745-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0744-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index c20eb336eb..c20eb336eb 100644
--- a/patches/server/0745-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0744-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0746-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0745-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0746-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0745-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0747-Configurable-chat-thread-limit.patch b/patches/server/0746-Configurable-chat-thread-limit.patch
index 62a41e3361..62a41e3361 100644
--- a/patches/server/0747-Configurable-chat-thread-limit.patch
+++ b/patches/server/0746-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0748-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0747-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 4d07ca9402..4d07ca9402 100644
--- a/patches/server/0748-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0747-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0749-fix-Jigsaw-block-kicking-user.patch b/patches/server/0748-fix-Jigsaw-block-kicking-user.patch
index 6e1aef94c8..6e1aef94c8 100644
--- a/patches/server/0749-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0748-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0750-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0749-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0750-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0749-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0751-Add-getDrops-to-BlockState.patch b/patches/server/0750-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0751-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0750-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0752-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0751-Fix-a-bunch-of-vanilla-bugs.patch
index eba9c58e8b..eba9c58e8b 100644
--- a/patches/server/0752-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0751-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0753-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0752-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 382d4cc3a7..382d4cc3a7 100644
--- a/patches/server/0753-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0752-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0754-Fix-custom-piglin-loved-items.patch b/patches/server/0753-Fix-custom-piglin-loved-items.patch
index a09a51f7ea..a09a51f7ea 100644
--- a/patches/server/0754-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0753-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0755-EntityPickupItemEvent-fixes.patch b/patches/server/0754-EntityPickupItemEvent-fixes.patch
index 375a09d01d..375a09d01d 100644
--- a/patches/server/0755-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0754-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0755-Correctly-handle-interactions-with-items-on-cooldown.patch
index 5b61753747..5b61753747 100644
--- a/patches/server/0756-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0755-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0757-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0756-Add-PlayerInventorySlotChangeEvent.patch
index ddeaac02da..ddeaac02da 100644
--- a/patches/server/0757-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0756-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0758-Elder-Guardian-appearance-API.patch b/patches/server/0757-Elder-Guardian-appearance-API.patch
index 05ac7bf793..05ac7bf793 100644
--- a/patches/server/0758-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0757-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0759-Allow-changing-bed-s-occupied-property.patch b/patches/server/0758-Allow-changing-bed-s-occupied-property.patch
index d8b51d7f0b..d8b51d7f0b 100644
--- a/patches/server/0759-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0758-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0760-Add-entity-knockback-API.patch b/patches/server/0759-Add-entity-knockback-API.patch
index f18cd45c36..f18cd45c36 100644
--- a/patches/server/0760-Add-entity-knockback-API.patch
+++ b/patches/server/0759-Add-entity-knockback-API.patch
diff --git a/patches/server/0761-Detect-headless-JREs.patch b/patches/server/0760-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0761-Detect-headless-JREs.patch
+++ b/patches/server/0760-Detect-headless-JREs.patch
diff --git a/patches/server/0762-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0761-fix-entity-vehicle-collision-event-not-called.patch
index e39b0eaf22..e39b0eaf22 100644
--- a/patches/server/0762-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0761-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0763-Add-EntityToggleSitEvent.patch b/patches/server/0762-Add-EntityToggleSitEvent.patch
index 66349ee5a3..66349ee5a3 100644
--- a/patches/server/0763-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0762-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0764-Add-fire-tick-delay-option.patch b/patches/server/0763-Add-fire-tick-delay-option.patch
index 848f831f0e..848f831f0e 100644
--- a/patches/server/0764-Add-fire-tick-delay-option.patch
+++ b/patches/server/0763-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0765-Add-Moving-Piston-API.patch b/patches/server/0764-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0765-Add-Moving-Piston-API.patch
+++ b/patches/server/0764-Add-Moving-Piston-API.patch
diff --git a/patches/server/0766-Ignore-impossible-spawn-tick.patch b/patches/server/0765-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0766-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0765-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0767-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0766-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index c42422ceca..c42422ceca 100644
--- a/patches/server/0767-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0766-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0768-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0767-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index aeff32467f..aeff32467f 100644
--- a/patches/server/0768-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0767-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0769-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0768-Add-PrePlayerAttackEntityEvent.patch
index da2cbed41e..da2cbed41e 100644
--- a/patches/server/0769-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0768-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0770-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0769-ensure-reset-EnderDragon-boss-event-name.patch
index 854c391fc5..854c391fc5 100644
--- a/patches/server/0770-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0769-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0771-Add-Player-Warden-Warning-API.patch b/patches/server/0770-Add-Player-Warden-Warning-API.patch
index 48110ad056..48110ad056 100644
--- a/patches/server/0771-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0770-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0772-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0771-More-vanilla-friendly-methods-to-update-trades.patch
index 79a6b155bd..79a6b155bd 100644
--- a/patches/server/0772-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0771-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0773-Add-paper-dumplisteners-command.patch b/patches/server/0772-Add-paper-dumplisteners-command.patch
index aabb60033d..aabb60033d 100644
--- a/patches/server/0773-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0772-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0774-check-global-player-list-where-appropriate.patch b/patches/server/0773-check-global-player-list-where-appropriate.patch
index 63bb71842c..63bb71842c 100644
--- a/patches/server/0774-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0773-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0775-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0774-Fix-async-entity-add-due-to-fungus-trees.patch
index 2a7830d952..2a7830d952 100644
--- a/patches/server/0775-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0774-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0776-ItemStack-damage-API.patch b/patches/server/0775-ItemStack-damage-API.patch
index 4dd87b1f24..4dd87b1f24 100644
--- a/patches/server/0776-ItemStack-damage-API.patch
+++ b/patches/server/0775-ItemStack-damage-API.patch
diff --git a/patches/server/0777-Friction-API.patch b/patches/server/0776-Friction-API.patch
index f5dba5cb62..f5dba5cb62 100644
--- a/patches/server/0777-Friction-API.patch
+++ b/patches/server/0776-Friction-API.patch
diff --git a/patches/server/0778-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0777-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..5bc45a7af4 100644
--- a/patches/server/0778-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0777-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0779-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0778-Fix-premature-player-kicks-on-shutdown.patch
index 7f465faed2..7f465faed2 100644
--- a/patches/server/0779-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0778-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0780-Sync-offhand-slot-in-menus.patch b/patches/server/0779-Sync-offhand-slot-in-menus.patch
index 0cac839445..0cac839445 100644
--- a/patches/server/0780-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0779-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0781-Player-Entity-Tracking-Events.patch b/patches/server/0780-Player-Entity-Tracking-Events.patch
index bdc7e8779e..bdc7e8779e 100644
--- a/patches/server/0781-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0780-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0782-Limit-pet-look-distance.patch b/patches/server/0781-Limit-pet-look-distance.patch
index 983f861539..983f861539 100644
--- a/patches/server/0782-Limit-pet-look-distance.patch
+++ b/patches/server/0781-Limit-pet-look-distance.patch
diff --git a/patches/server/0783-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch
index e66bfd2b7d..e66bfd2b7d 100644
--- a/patches/server/0783-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0784-fix-Instruments.patch b/patches/server/0783-fix-Instruments.patch
index a77e5ed5f6..a77e5ed5f6 100644
--- a/patches/server/0784-fix-Instruments.patch
+++ b/patches/server/0783-fix-Instruments.patch
diff --git a/patches/server/0785-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0784-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 3a64891f6a..3a64891f6a 100644
--- a/patches/server/0785-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0784-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0786-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0785-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 8b797606ed..8b797606ed 100644
--- a/patches/server/0786-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0785-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0787-Add-BlockLockCheckEvent.patch b/patches/server/0786-Add-BlockLockCheckEvent.patch
index deeeae6839..deeeae6839 100644
--- a/patches/server/0787-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0786-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0788-Add-Sneaking-API-for-Entities.patch b/patches/server/0787-Add-Sneaking-API-for-Entities.patch
index a8db30ee3c..a8db30ee3c 100644
--- a/patches/server/0788-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0787-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0789-Improve-logging-and-errors.patch b/patches/server/0788-Improve-logging-and-errors.patch
index e4489ef6a7..0537254752 100644
--- a/patches/server/0789-Improve-logging-and-errors.patch
+++ b/patches/server/0788-Improve-logging-and-errors.patch
@@ -52,7 +52,7 @@ index aa39bdb0a4ba8fedf5052ea9700afa7d4d2a4300..b4af03c4bdd1ce0861f36c3b75fc7e89
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bebbf173d846337fb2a0887c1a0f9a4afca570f8..0e2d8a4bd05dc8bf7b79e268a6985b025f3296fa 100644
+index 6f53025766666adfa2354a7ae9cbffc5baccdfa5..8429d78be110b7d296284d99089a37d9f1573ba8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3400,7 +3400,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0790-Improve-PortalEvents.patch b/patches/server/0789-Improve-PortalEvents.patch
index 99cd6ef169..99cd6ef169 100644
--- a/patches/server/0790-Improve-PortalEvents.patch
+++ b/patches/server/0789-Improve-PortalEvents.patch
diff --git a/patches/server/0791-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0790-Add-config-option-for-spider-worldborder-climbing.patch
index b10bcacd3c..b10bcacd3c 100644
--- a/patches/server/0791-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0790-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0792-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0791-Add-missing-SpigotConfig-logCommands-check.patch
index c3885506e8..6deb542ce8 100644
--- a/patches/server/0792-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0791-Add-missing-SpigotConfig-logCommands-check.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 Co-authored-by: david <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0e2d8a4bd05dc8bf7b79e268a6985b025f3296fa..f525e120fa1e36d756e5e8bd96bf2d0bdce51a65 100644
+index 8429d78be110b7d296284d99089a37d9f1573ba8..810a9580034b2049220655b9863bf589097f82b3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2058,7 +2058,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0793-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0792-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0793-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0792-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0794-Flying-Fall-Damage.patch b/patches/server/0793-Flying-Fall-Damage.patch
index 021a59a960..021a59a960 100644
--- a/patches/server/0794-Flying-Fall-Damage.patch
+++ b/patches/server/0793-Flying-Fall-Damage.patch
diff --git a/patches/server/0795-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0794-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index d2369905d5..d2369905d5 100644
--- a/patches/server/0795-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0794-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0796-config-for-disabling-entity-tag-tags.patch b/patches/server/0795-config-for-disabling-entity-tag-tags.patch
index aabc1e1a31..aabc1e1a31 100644
--- a/patches/server/0796-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0795-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0797-Use-single-player-info-update-packet-on-join.patch b/patches/server/0796-Use-single-player-info-update-packet-on-join.patch
index e88e6c54b9..2c8409d959 100644
--- a/patches/server/0797-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0796-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 f525e120fa1e36d756e5e8bd96bf2d0bdce51a65..249b94b75fd1007e491fd1de4377e06880175a7f 100644
+index 810a9580034b2049220655b9863bf589097f82b3..554f32f562ce4d841f50183a011fc09fd170f741 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3438,7 +3438,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0798-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0797-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 58b1a31cc8..58b1a31cc8 100644
--- a/patches/server/0798-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0797-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0799-Win-Screen-API.patch b/patches/server/0798-Win-Screen-API.patch
index 6fb9c91a90..6fb9c91a90 100644
--- a/patches/server/0799-Win-Screen-API.patch
+++ b/patches/server/0798-Win-Screen-API.patch
diff --git a/patches/server/0800-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0799-Remove-CraftItemStack-setAmount-null-assignment.patch
index 80397182f2..80397182f2 100644
--- a/patches/server/0800-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0799-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0801-Fix-force-opening-enchantment-tables.patch b/patches/server/0800-Fix-force-opening-enchantment-tables.patch
index eac3ab63ee..eac3ab63ee 100644
--- a/patches/server/0801-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0800-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0802-Add-Entity-Body-Yaw-API.patch b/patches/server/0801-Add-Entity-Body-Yaw-API.patch
index 4b118801d5..4b118801d5 100644
--- a/patches/server/0802-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0801-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0803-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0802-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0803-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0802-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0804-Add-EntityFertilizeEggEvent.patch b/patches/server/0803-Add-EntityFertilizeEggEvent.patch
index a077b2cfc0..a077b2cfc0 100644
--- a/patches/server/0804-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0803-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0805-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0804-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index a3e0925b49..a3e0925b49 100644
--- a/patches/server/0805-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0804-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0806-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0805-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0806-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0805-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0807-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0806-Correctly-handle-ArmorStand-invisibility.patch
index 34b66d686a..34b66d686a 100644
--- a/patches/server/0807-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0806-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0808-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch
index e4afda05dd..e4afda05dd 100644
--- a/patches/server/0808-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0807-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0809-Fix-text-display-error-on-spawn.patch b/patches/server/0808-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0809-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0808-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0810-Fix-inventories-returning-null-Locations.patch b/patches/server/0809-Fix-inventories-returning-null-Locations.patch
index eabfae28c5..eabfae28c5 100644
--- a/patches/server/0810-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0809-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0811-Add-Shearable-API.patch b/patches/server/0810-Add-Shearable-API.patch
index 675a1bf358..675a1bf358 100644
--- a/patches/server/0811-Add-Shearable-API.patch
+++ b/patches/server/0810-Add-Shearable-API.patch
diff --git a/patches/server/0812-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0811-Fix-SpawnEggMeta-get-setSpawnedType.patch
index f3afed07e4..f3afed07e4 100644
--- a/patches/server/0812-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0811-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0813-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0812-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index d90e599897..d90e599897 100644
--- a/patches/server/0813-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0812-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0814-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0813-Treat-sequence-violations-like-they-should-be.patch
index 0c1ccc268b..3f1ebdd9fa 100644
--- a/patches/server/0814-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0813-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 249b94b75fd1007e491fd1de4377e06880175a7f..6485780c3fe2ad866c7c93419fde1e96f6f0bddc 100644
+index 554f32f562ce4d841f50183a011fc09fd170f741..941d45f0a4a50a8ad1d085cb04221c7a77370408 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1977,6 +1977,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0815-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0814-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 11aa4b82b7..7aea15e9ac 100644
--- a/patches/server/0815-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0814-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -26,7 +26,7 @@ index 68c062cbaa030d62d97c9c003651f8fc17a00a6b..6247a21c9c391abf1f6db3482c659593
          UPDATE_GAME_MODE((serialized, buf) -> serialized.gameMode = GameType.byId(buf.readVarInt()), (buf, entry) -> buf.writeVarInt(entry.gameMode().getId())),
          UPDATE_LISTED((serialized, buf) -> serialized.listed = buf.readBoolean(), (buf, entry) -> buf.writeBoolean(entry.listed())),
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6485780c3fe2ad866c7c93419fde1e96f6f0bddc..3ec08f9206274a857f6999faa4e5db0ac46b6a5f 100644
+index 941d45f0a4a50a8ad1d085cb04221c7a77370408..5f20090c35cfd83e54ce139bfe49ae70ddd16582 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -295,6 +295,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0816-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0815-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 9f9f6c26b3..9f9f6c26b3 100644
--- a/patches/server/0816-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0815-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0817-Use-array-for-gamerule-storage.patch b/patches/server/0816-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0817-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0816-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0818-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0817-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0818-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0817-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0819-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0818-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0819-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0818-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0820-Add-Mob-Experience-reward-API.patch b/patches/server/0819-Add-Mob-Experience-reward-API.patch
index f82f765beb..f82f765beb 100644
--- a/patches/server/0820-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0819-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0821-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0820-Break-redstone-on-top-of-trap-doors-early.patch
index 11c427e808..11c427e808 100644
--- a/patches/server/0821-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0820-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0822-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0821-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0822-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0821-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0823-More-accurate-isInOpenWater-impl.patch b/patches/server/0822-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0823-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0822-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0824-Expand-PlayerItemMendEvent.patch b/patches/server/0823-Expand-PlayerItemMendEvent.patch
index 73068bdf5a..73068bdf5a 100644
--- a/patches/server/0824-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0823-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0825-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0824-Refresh-ProjectileSource-for-projectiles.patch
index 4762f3cc7b..4762f3cc7b 100644
--- a/patches/server/0825-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0824-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0826-Add-transient-modifier-API.patch b/patches/server/0825-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0826-Add-transient-modifier-API.patch
+++ b/patches/server/0825-Add-transient-modifier-API.patch
diff --git a/patches/server/0827-Fix-block-place-logic.patch b/patches/server/0826-Fix-block-place-logic.patch
index de31264ab7..de31264ab7 100644
--- a/patches/server/0827-Fix-block-place-logic.patch
+++ b/patches/server/0826-Fix-block-place-logic.patch
diff --git a/patches/server/0828-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0827-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index ba85bd867f..ba85bd867f 100644
--- a/patches/server/0828-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0827-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0829-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0828-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0829-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0828-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0830-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0829-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 5c55e8560a..5c55e8560a 100644
--- a/patches/server/0830-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0829-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0831-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0830-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0831-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0830-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0832-Fix-sniffer-removeExploredLocation.patch b/patches/server/0831-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0832-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0831-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0833-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0832-Add-method-to-remove-all-active-potion-effects.patch
index 0acdf4ee22..0acdf4ee22 100644
--- a/patches/server/0833-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0832-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0834-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0833-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index ed5525cfda..ed5525cfda 100644
--- a/patches/server/0834-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0833-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0835-Add-event-for-player-editing-sign.patch b/patches/server/0834-Add-event-for-player-editing-sign.patch
index a7fbf6addc..a7fbf6addc 100644
--- a/patches/server/0835-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0834-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0836-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0835-Only-tick-item-frames-if-players-can-see-it.patch
index bf73ba4a5c..bf73ba4a5c 100644
--- a/patches/server/0836-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0835-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0837-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0836-Fix-cmd-permission-levels-for-command-blocks.patch
index 0c24048293..0c24048293 100644
--- a/patches/server/0837-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0836-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0838-Add-option-to-disable-block-updates.patch b/patches/server/0837-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0838-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0837-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0839-Call-missing-BlockDispenseEvent.patch b/patches/server/0838-Call-missing-BlockDispenseEvent.patch
index 97050595b8..97050595b8 100644
--- a/patches/server/0839-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0838-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0840-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch
index f674b02e68..f674b02e68 100644
--- a/patches/server/0840-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0841-Optimize-player-lookups-for-beacons.patch b/patches/server/0840-Optimize-player-lookups-for-beacons.patch
index 1c203c23a6..1c203c23a6 100644
--- a/patches/server/0841-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0840-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0842-Add-Sign-getInteractableSideFor.patch b/patches/server/0841-Add-Sign-getInteractableSideFor.patch
index 2833829ce4..2833829ce4 100644
--- a/patches/server/0842-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0841-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0843-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0842-fix-item-meta-for-tadpole-buckets.patch
index 0fc39b3ea1..0fc39b3ea1 100644
--- a/patches/server/0843-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0842-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0844-Fix-BanList-API.patch b/patches/server/0843-Fix-BanList-API.patch
index dcc17ccb44..dcc17ccb44 100644
--- a/patches/server/0844-Fix-BanList-API.patch
+++ b/patches/server/0843-Fix-BanList-API.patch
diff --git a/patches/server/0845-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0844-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0845-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0844-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0846-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0845-Fix-possible-NPE-on-painting-creation.patch
index dc3838be94..dc3838be94 100644
--- a/patches/server/0846-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0845-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0847-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0846-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 6785f755ab..6785f755ab 100644
--- a/patches/server/0847-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0846-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0848-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0847-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 542bede5c4..542bede5c4 100644
--- a/patches/server/0848-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0847-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0849-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0848-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0849-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0848-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0850-Add-whitelist-events.patch b/patches/server/0849-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0850-Add-whitelist-events.patch
+++ b/patches/server/0849-Add-whitelist-events.patch
diff --git a/patches/server/0851-Implement-PlayerFailMoveEvent.patch b/patches/server/0850-Implement-PlayerFailMoveEvent.patch
index 8cda03ce44..673107a946 100644
--- a/patches/server/0851-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0850-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ec08f9206274a857f6999faa4e5db0ac46b6a5f..2ee205375250456c89aae7a472014f9598c2359e 100644
+index 5f20090c35cfd83e54ce139bfe49ae70ddd16582..e1cae30864f033d32c8e7c3e6e4e4af92d74f2b0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1261,8 +1261,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0852-Folia-scheduler-and-owned-region-API.patch b/patches/server/0851-Folia-scheduler-and-owned-region-API.patch
index 9fcb2209e9..9fcb2209e9 100644
--- a/patches/server/0852-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0851-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0853-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0852-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0853-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0852-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0854-API-for-updating-recipes-on-clients.patch b/patches/server/0853-API-for-updating-recipes-on-clients.patch
index 5c29dfb157..5c29dfb157 100644
--- a/patches/server/0854-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0853-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0855-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0854-Fix-rotation-when-spawning-display-entities.patch
index 7491ff60fe..7491ff60fe 100644
--- a/patches/server/0855-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0854-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0856-Only-capture-actual-tree-growth.patch b/patches/server/0855-Only-capture-actual-tree-growth.patch
index 1cba6ddee8..1cba6ddee8 100644
--- a/patches/server/0856-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0855-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0857-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0856-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0857-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0856-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0858-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0857-Respect-randomizeData-on-more-entities-when-spawning.patch
index d04e8bf4f6..d04e8bf4f6 100644
--- a/patches/server/0858-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0857-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0859-Use-correct-seed-on-api-world-load.patch b/patches/server/0858-Use-correct-seed-on-api-world-load.patch
index f29dbe4467..f29dbe4467 100644
--- a/patches/server/0859-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0858-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0860-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0859-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0860-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0859-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0861-Cache-map-ids-on-item-frames.patch b/patches/server/0860-Cache-map-ids-on-item-frames.patch
index 65e3e3499f..65e3e3499f 100644
--- a/patches/server/0861-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0860-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0862-Fix-custom-statistic-criteria-creation.patch b/patches/server/0861-Fix-custom-statistic-criteria-creation.patch
index f399187f50..f399187f50 100644
--- a/patches/server/0862-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0861-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0863-Bandaid-fix-for-Effect.patch b/patches/server/0862-Bandaid-fix-for-Effect.patch
index 2a382dcc25..2a382dcc25 100644
--- a/patches/server/0863-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0862-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0864-SculkCatalyst-bloom-API.patch b/patches/server/0863-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0864-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0863-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0865-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0864-API-for-an-entity-s-scoreboard-name.patch
index a7d3664dd4..a7d3664dd4 100644
--- a/patches/server/0865-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0864-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0866-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0865-Deprecate-and-replace-methods-with-old-StructureType.patch
index 7eeb4db8f2..7eeb4db8f2 100644
--- a/patches/server/0866-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0865-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0867-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0866-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index b082ac2c42..c5d8030053 100644
--- a/patches/server/0867-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0866-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2ee205375250456c89aae7a472014f9598c2359e..61f379d456f2774f9b95435db4467a9835d9c2f6 100644
+index e1cae30864f033d32c8e7c3e6e4e4af92d74f2b0..48c1327d7226fdbb34ef0cc9e6516aaf94e6781c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -820,6 +820,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0868-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0867-Properly-handle-BlockBreakEvent-isDropItems.patch
index 75a746ca81..75a746ca81 100644
--- a/patches/server/0868-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0867-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0869-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0868-Fire-entity-death-event-for-ender-dragon.patch
index 7f6054281d..7f6054281d 100644
--- a/patches/server/0869-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0868-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0870-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0869-Configurable-entity-tracking-range-by-Y-coordinate.patch
index a437b50f0f..a437b50f0f 100644
--- a/patches/server/0870-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0869-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0871-Add-Listing-API-for-Player.patch b/patches/server/0870-Add-Listing-API-for-Player.patch
index 45d76a9d22..45d76a9d22 100644
--- a/patches/server/0871-Add-Listing-API-for-Player.patch
+++ b/patches/server/0870-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0872-Configurable-Region-Compression-Format.patch b/patches/server/0871-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0872-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0871-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0873-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0872-Add-BlockFace-to-BlockDamageEvent.patch
index 7ad1e7c9e4..7ad1e7c9e4 100644
--- a/patches/server/0873-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0872-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0874-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0873-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0874-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0873-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0875-Expand-Pose-API.patch b/patches/server/0874-Expand-Pose-API.patch
index 59a2bc1a09..59a2bc1a09 100644
--- a/patches/server/0875-Expand-Pose-API.patch
+++ b/patches/server/0874-Expand-Pose-API.patch
diff --git a/patches/server/0876-More-DragonBattle-API.patch b/patches/server/0875-More-DragonBattle-API.patch
index a6e0c111c0..a6e0c111c0 100644
--- a/patches/server/0876-More-DragonBattle-API.patch
+++ b/patches/server/0875-More-DragonBattle-API.patch
diff --git a/patches/server/0877-Add-PlayerPickItemEvent.patch b/patches/server/0876-Add-PlayerPickItemEvent.patch
index 909407b450..e97cdf35c3 100644
--- a/patches/server/0877-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0876-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 61f379d456f2774f9b95435db4467a9835d9c2f6..7cfbcd661488b45e07b3869f2bb55dcd3b671285 100644
+index 48c1327d7226fdbb34ef0cc9e6516aaf94e6781c..5694afb14889187a4cfc342ccf497dd6ca867f0e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -935,8 +935,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0878-Allow-trident-custom-damage.patch b/patches/server/0877-Allow-trident-custom-damage.patch
index 75570ca360..75570ca360 100644
--- a/patches/server/0878-Allow-trident-custom-damage.patch
+++ b/patches/server/0877-Allow-trident-custom-damage.patch
diff --git a/patches/server/0879-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0878-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0879-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0878-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0880-Optimize-nearest-structure-border-iteration.patch b/patches/server/0879-Optimize-nearest-structure-border-iteration.patch
index df5f60c52c..df5f60c52c 100644
--- a/patches/server/0880-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0879-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0881-Implement-OfflinePlayer-isConnected.patch b/patches/server/0880-Implement-OfflinePlayer-isConnected.patch
index f0ac88e8c8..f0ac88e8c8 100644
--- a/patches/server/0881-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0880-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0882-Fix-inventory-desync.patch b/patches/server/0881-Fix-inventory-desync.patch
index 25475a237b..25475a237b 100644
--- a/patches/server/0882-Fix-inventory-desync.patch
+++ b/patches/server/0881-Fix-inventory-desync.patch
diff --git a/patches/server/0883-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0882-Add-titleOverride-to-InventoryOpenEvent.patch
index 3bb0db6ef2..3bb0db6ef2 100644
--- a/patches/server/0883-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0882-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0884-Configure-sniffer-egg-hatch-time.patch b/patches/server/0883-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0884-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0883-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0885-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0884-Do-crystal-portal-proximity-check-before-entity-look.patch
index 67d506a715..67d506a715 100644
--- a/patches/server/0885-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0884-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0886-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0885-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0886-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0885-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0887-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0886-Add-slot-sanity-checks-in-container-clicks.patch
index 3e89e648da..7356593a1f 100644
--- a/patches/server/0887-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0886-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7cfbcd661488b45e07b3869f2bb55dcd3b671285..2e96486ddd9eca0e26fa645628f2ec00992dc020 100644
+index 5694afb14889187a4cfc342ccf497dd6ca867f0e..7e25d42a6ce16b5e8e17d03592a674734b85f540 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2987,6 +2987,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0888-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0887-Call-BlockRedstoneEvents-for-lecterns.patch
index b2cf0ce209..b2cf0ce209 100644
--- a/patches/server/0888-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0887-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0889-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch
index 4e10b7651f..4e10b7651f 100644
--- a/patches/server/0889-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0888-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0890-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0889-Fix-silent-equipment-change-for-mobs.patch
index edc3ea39f0..edc3ea39f0 100644
--- a/patches/server/0890-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0889-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0891-Fix-spigot-s-Forced-Stats.patch b/patches/server/0890-Fix-spigot-s-Forced-Stats.patch
index 554f1f8844..554f1f8844 100644
--- a/patches/server/0891-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0890-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0892-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0891-Add-missing-InventoryHolders-to-inventories.patch
index ae956d4693..ae956d4693 100644
--- a/patches/server/0892-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0891-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0893-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0892-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index ab4d61b97a..ab4d61b97a 100644
--- a/patches/server/0893-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0892-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0894-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0893-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0894-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0893-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0895-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0894-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0895-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0894-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0896-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0895-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0896-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0895-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0897-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0896-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0897-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0896-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0898-Fix-missing-map-initialize-event-call.patch b/patches/server/0897-Fix-missing-map-initialize-event-call.patch
index 214c9bce18..214c9bce18 100644
--- a/patches/server/0898-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0897-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0899-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0898-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0899-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0898-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0900-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0899-Fix-UnsafeValues-loadAdvancement.patch
index 205c42df23..205c42df23 100644
--- a/patches/server/0900-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0899-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0901-Add-player-idle-duration-API.patch b/patches/server/0900-Add-player-idle-duration-API.patch
index e9d6bf10c6..e9d6bf10c6 100644
--- a/patches/server/0901-Add-player-idle-duration-API.patch
+++ b/patches/server/0900-Add-player-idle-duration-API.patch
diff --git a/patches/server/0902-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0901-Don-t-check-if-we-can-see-non-visible-entities.patch
index 109e1a443b..109e1a443b 100644
--- a/patches/server/0902-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0901-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0903-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0902-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 5abf7cda2c..5abf7cda2c 100644
--- a/patches/server/0903-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0902-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0904-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0903-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 10e1013d26..10e1013d26 100644
--- a/patches/server/0904-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0903-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0905-Optimize-VarInts.patch b/patches/server/0904-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0905-Optimize-VarInts.patch
+++ b/patches/server/0904-Optimize-VarInts.patch
diff --git a/patches/server/0906-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0905-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index f0fcc8b9eb..f0fcc8b9eb 100644
--- a/patches/server/0906-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0905-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0907-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0906-Add-predicate-for-blocks-when-raytracing.patch
index 96bceb6bfa..96bceb6bfa 100644
--- a/patches/server/0907-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0906-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0908-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0907-Broadcast-take-item-packets-with-collector-as-source.patch
index f114e5e960..f114e5e960 100644
--- a/patches/server/0908-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0907-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0909-Expand-LingeringPotion-API.patch b/patches/server/0908-Expand-LingeringPotion-API.patch
index fdd0abf668..fdd0abf668 100644
--- a/patches/server/0909-Expand-LingeringPotion-API.patch
+++ b/patches/server/0908-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0910-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0909-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 00e51b071b..00e51b071b 100644
--- a/patches/server/0910-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0909-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0911-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0910-Add-hand-to-fish-event-for-all-player-interactions.patch
index dd3e5bba44..dd3e5bba44 100644
--- a/patches/server/0911-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0910-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0912-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0911-Fix-several-issues-with-EntityBreedEvent.patch
index 9e82a901a0..9e82a901a0 100644
--- a/patches/server/0912-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0911-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0913-Add-UUID-attribute-modifier-API.patch b/patches/server/0912-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0913-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0912-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0914-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0913-Fix-missing-event-call-for-entity-teleport-API.patch
index 79cebb8989..79cebb8989 100644
--- a/patches/server/0914-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0913-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0915-Lazily-create-LootContext-for-criterions.patch b/patches/server/0914-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0915-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0914-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0916-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0915-Don-t-fire-sync-events-during-worldgen.patch
index db1332ce1b..db1332ce1b 100644
--- a/patches/server/0916-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0915-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0917-Add-Structure-check-API.patch b/patches/server/0916-Add-Structure-check-API.patch
index 93eeb5ef48..93eeb5ef48 100644
--- a/patches/server/0917-Add-Structure-check-API.patch
+++ b/patches/server/0916-Add-Structure-check-API.patch
diff --git a/patches/server/0918-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0917-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index d7613db46b..d7613db46b 100644
--- a/patches/server/0918-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0917-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0919-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0918-Restore-vanilla-entity-drops-behavior.patch
index 6594619e44..6594619e44 100644
--- a/patches/server/0919-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0918-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0920-Dont-resend-blocks-on-interactions.patch b/patches/server/0919-Dont-resend-blocks-on-interactions.patch
index f522a08097..f522a08097 100644
--- a/patches/server/0920-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0919-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0921-add-more-scoreboard-API.patch b/patches/server/0920-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0921-add-more-scoreboard-API.patch
+++ b/patches/server/0920-add-more-scoreboard-API.patch
diff --git a/patches/server/0922-Improve-Registry.patch b/patches/server/0921-Improve-Registry.patch
index 14131191a6..14131191a6 100644
--- a/patches/server/0922-Improve-Registry.patch
+++ b/patches/server/0921-Improve-Registry.patch
diff --git a/patches/server/0923-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0922-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 4c7c476e6d..4c7c476e6d 100644
--- a/patches/server/0923-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0922-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0924-Add-experience-points-API.patch b/patches/server/0923-Add-experience-points-API.patch
index 9844f2f32a..9844f2f32a 100644
--- a/patches/server/0924-Add-experience-points-API.patch
+++ b/patches/server/0923-Add-experience-points-API.patch
diff --git a/patches/server/0925-Add-drops-to-shear-events.patch b/patches/server/0924-Add-drops-to-shear-events.patch
index 31dda33340..31dda33340 100644
--- a/patches/server/0925-Add-drops-to-shear-events.patch
+++ b/patches/server/0924-Add-drops-to-shear-events.patch
diff --git a/patches/server/0926-Add-PlayerShieldDisableEvent.patch b/patches/server/0925-Add-PlayerShieldDisableEvent.patch
index f9d5404f63..f9d5404f63 100644
--- a/patches/server/0926-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0925-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0927-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0926-Validate-ResourceLocation-in-NBT-reading.patch
index 58ef6fe154..58ef6fe154 100644
--- a/patches/server/0927-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0926-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0928-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0927-Properly-handle-experience-dropping-on-block-break.patch
index 471a743c29..471a743c29 100644
--- a/patches/server/0928-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0927-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0929-Fixup-NamespacedKey-handling.patch b/patches/server/0928-Fixup-NamespacedKey-handling.patch
index 42c433ad7f..42c433ad7f 100644
--- a/patches/server/0929-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0928-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0930-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0929-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0930-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0929-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0931-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0930-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 86bd3e7f29..86bd3e7f29 100644
--- a/patches/server/0931-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0930-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0932-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0931-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index a58beffec5..a58beffec5 100644
--- a/patches/server/0932-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0931-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0933-Add-ShulkerDuplicateEvent.patch b/patches/server/0932-Add-ShulkerDuplicateEvent.patch
index de864137e2..de864137e2 100644
--- a/patches/server/0933-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0932-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0934-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0933-Add-api-for-spawn-egg-texture-colors.patch
index 2462562bb0..2462562bb0 100644
--- a/patches/server/0934-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0933-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0935-Add-Lifecycle-Event-system.patch b/patches/server/0934-Add-Lifecycle-Event-system.patch
index 89149b0c71..89149b0c71 100644
--- a/patches/server/0935-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0934-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0936-ItemStack-Tooltip-API.patch b/patches/server/0935-ItemStack-Tooltip-API.patch
index 6b01a6f311..6b01a6f311 100644
--- a/patches/server/0936-ItemStack-Tooltip-API.patch
+++ b/patches/server/0935-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0937-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0936-Add-getChunkSnapshot-includeLightData-parameter.patch
index 54aa35539f..54aa35539f 100644
--- a/patches/server/0937-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0936-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0938-Add-FluidState-API.patch b/patches/server/0937-Add-FluidState-API.patch
index aac0912819..aac0912819 100644
--- a/patches/server/0938-Add-FluidState-API.patch
+++ b/patches/server/0937-Add-FluidState-API.patch
diff --git a/patches/server/0939-add-number-format-api.patch b/patches/server/0938-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0939-add-number-format-api.patch
+++ b/patches/server/0938-add-number-format-api.patch
diff --git a/patches/server/0940-improve-BanList-types.patch b/patches/server/0939-improve-BanList-types.patch
index c63e72309a..c63e72309a 100644
--- a/patches/server/0940-improve-BanList-types.patch
+++ b/patches/server/0939-improve-BanList-types.patch
diff --git a/patches/server/0941-Expanded-Hopper-API.patch b/patches/server/0940-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0941-Expanded-Hopper-API.patch
+++ b/patches/server/0940-Expanded-Hopper-API.patch
diff --git a/patches/server/0942-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0941-Add-BlockBreakProgressUpdateEvent.patch
index 125844c5b6..125844c5b6 100644
--- a/patches/server/0942-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0941-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0943-Deprecate-ItemStack-setType.patch b/patches/server/0942-Deprecate-ItemStack-setType.patch
index cb0f3585a3..cb0f3585a3 100644
--- a/patches/server/0943-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0942-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0944-Add-CartographyItemEvent.patch b/patches/server/0943-Add-CartographyItemEvent.patch
index 3ca5095c48..b6ae62ffa8 100644
--- a/patches/server/0944-Add-CartographyItemEvent.patch
+++ b/patches/server/0943-Add-CartographyItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add CartographyItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2e96486ddd9eca0e26fa645628f2ec00992dc020..6231e2fee613562b7ea991be19760f82edee84a8 100644
+index 7e25d42a6ce16b5e8e17d03592a674734b85f540..ae66fb6ad96bc322d3a0690026bfd5accf30cc67 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3109,6 +3109,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0945-More-Raid-API.patch b/patches/server/0944-More-Raid-API.patch
index c98e63a452..c98e63a452 100644
--- a/patches/server/0945-More-Raid-API.patch
+++ b/patches/server/0944-More-Raid-API.patch
diff --git a/patches/server/0946-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0945-Add-onboarding-message-for-initial-server-start.patch
index 89e4195a68..89e4195a68 100644
--- a/patches/server/0946-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0945-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0947-Configurable-max-block-fluid-ticks.patch b/patches/server/0946-Configurable-max-block-fluid-ticks.patch
index 02e6a701ce..02e6a701ce 100644
--- a/patches/server/0947-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0946-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0948-Fix-bees-aging-inside-hives.patch b/patches/server/0947-Fix-bees-aging-inside-hives.patch
index ae6a0ff63d..ae6a0ff63d 100644
--- a/patches/server/0948-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0947-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0949-Disable-memory-reserve-allocating.patch b/patches/server/0948-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0949-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0948-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0950-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0949-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index d98b3aeccc..d98b3aeccc 100644
--- a/patches/server/0950-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0949-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0951-Fix-DamageSource-API.patch b/patches/server/0950-Fix-DamageSource-API.patch
index b6a6d334d0..b6a6d334d0 100644
--- a/patches/server/0951-Fix-DamageSource-API.patch
+++ b/patches/server/0950-Fix-DamageSource-API.patch
diff --git a/patches/server/0952-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0951-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index 8769e0adaf..8769e0adaf 100644
--- a/patches/server/0952-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0951-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0953-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0952-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 5a6627392e..5a6627392e 100644
--- a/patches/server/0953-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0952-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0954-Improve-tag-parser-handling.patch b/patches/server/0953-Improve-tag-parser-handling.patch
index 011715a67c..3fd32ea7bf 100644
--- a/patches/server/0954-Improve-tag-parser-handling.patch
+++ b/patches/server/0953-Improve-tag-parser-handling.patch
@@ -169,7 +169,7 @@ index 898b19887ed34c87003fc63cb5905df2ba6234a5..b47eeb23055b135d5567552ba983bfbc
  
      private void write(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6231e2fee613562b7ea991be19760f82edee84a8..146d42ba446c2f7aaa728bcb73679c07e8c4a65a 100644
+index ae66fb6ad96bc322d3a0690026bfd5accf30cc67..92a281429ba583212dc7ab2caf3135d94e39017c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -766,6 +766,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0955-Item-Mutation-Fixes.patch b/patches/server/0954-Item-Mutation-Fixes.patch
index 0e20a90a87..0e20a90a87 100644
--- a/patches/server/0955-Item-Mutation-Fixes.patch
+++ b/patches/server/0954-Item-Mutation-Fixes.patch
diff --git a/patches/server/0956-Per-world-ticks-per-spawn-settings.patch b/patches/server/0955-Per-world-ticks-per-spawn-settings.patch
index bfd6fd26af..bfd6fd26af 100644
--- a/patches/server/0956-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0955-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0957-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0956-Properly-track-the-changed-item-from-dispense-events.patch
index 656111c06e..656111c06e 100644
--- a/patches/server/0957-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0956-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0958-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0957-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 0fd49bd9ed..0fd49bd9ed 100644
--- a/patches/server/0958-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0957-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0959-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0958-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/0959-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/0958-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/0960-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0959-Add-config-for-mobs-immune-to-default-effects.patch
index 5989f9bd5f..5989f9bd5f 100644
--- a/patches/server/0960-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0959-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0961-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0960-Deep-clone-nbt-tags-in-PDC.patch
index bc3f0b3278..bc3f0b3278 100644
--- a/patches/server/0961-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0960-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0962-Support-old-UUID-format-for-NBT.patch b/patches/server/0961-Support-old-UUID-format-for-NBT.patch
index a38c2a7f7b..a38c2a7f7b 100644
--- a/patches/server/0962-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0961-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0963-Fix-shield-disable-inconsistency.patch b/patches/server/0962-Fix-shield-disable-inconsistency.patch
index 69826053ae..69826053ae 100644
--- a/patches/server/0963-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0962-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0964-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/0963-Don-t-lose-removed-data-components-in-ItemMeta.patch
index 7f6bc352fa..7f6bc352fa 100644
--- a/patches/server/0964-Don-t-lose-removed-data-components-in-ItemMeta.patch
+++ b/patches/server/0963-Don-t-lose-removed-data-components-in-ItemMeta.patch
diff --git a/patches/server/0965-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0964-Handle-Large-Packets-disconnecting-client.patch
index ea20a101a7..ea20a101a7 100644
--- a/patches/server/0965-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0964-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0966-Fix-ItemFlags.patch b/patches/server/0965-Fix-ItemFlags.patch
index 7be17295bf..7be17295bf 100644
--- a/patches/server/0966-Fix-ItemFlags.patch
+++ b/patches/server/0965-Fix-ItemFlags.patch
diff --git a/patches/server/0967-Fix-Player-setBlockUpdate.patch b/patches/server/0966-Fix-Player-setBlockUpdate.patch
index fd8ab6bd92..fd8ab6bd92 100644
--- a/patches/server/0967-Fix-Player-setBlockUpdate.patch
+++ b/patches/server/0966-Fix-Player-setBlockUpdate.patch
diff --git a/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0967-Fix-helmet-damage-reduction-inconsistencies.patch
index bbce375f3f..bbce375f3f 100644
--- a/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0967-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0969-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0968-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 58c69c8939..58c69c8939 100644
--- a/patches/server/0969-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0968-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0970-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0969-improve-checking-handled-tags-in-itemmeta.patch
index ac37f066e2..ac37f066e2 100644
--- a/patches/server/0970-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0969-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0971-General-ItemMeta-fixes.patch b/patches/server/0970-General-ItemMeta-fixes.patch
index 776e90997b..776e90997b 100644
--- a/patches/server/0971-General-ItemMeta-fixes.patch
+++ b/patches/server/0970-General-ItemMeta-fixes.patch
diff --git a/patches/server/0972-Expose-hasColor-to-leather-armor.patch b/patches/server/0971-Expose-hasColor-to-leather-armor.patch
index fb4dc944de..fb4dc944de 100644
--- a/patches/server/0972-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0971-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0973-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch
index 6ab913db18..6ab913db18 100644
--- a/patches/server/0973-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/0974-More-Chest-Block-API.patch b/patches/server/0973-More-Chest-Block-API.patch
index 020d97d086..020d97d086 100644
--- a/patches/server/0974-More-Chest-Block-API.patch
+++ b/patches/server/0973-More-Chest-Block-API.patch
diff --git a/patches/server/0975-Print-data-component-type-on-encoding-error.patch b/patches/server/0974-Print-data-component-type-on-encoding-error.patch
index a60bdfee87..a60bdfee87 100644
--- a/patches/server/0975-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0974-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0976-Brigadier-based-command-API.patch b/patches/server/0975-Brigadier-based-command-API.patch
index 3ae23da312..395602eca3 100644
--- a/patches/server/0976-Brigadier-based-command-API.patch
+++ b/patches/server/0975-Brigadier-based-command-API.patch
@@ -2327,7 +2327,7 @@ index b4af03c4bdd1ce0861f36c3b75fc7e89d701c46a..0761d5bc5f2813bb4a9f664ac7a05b97
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 146d42ba446c2f7aaa728bcb73679c07e8c4a65a..08e6f49b1c3401225c59ff030551080f0bcaf99e 100644
+index 92a281429ba583212dc7ab2caf3135d94e39017c..1ff2a20fd9e08faa5155fc156851e4a8d9742a1d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2408,33 +2408,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0977-Fix-issues-with-Recipe-API.patch b/patches/server/0976-Fix-issues-with-Recipe-API.patch
index bb85dca687..bb85dca687 100644
--- a/patches/server/0977-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0976-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0978-Fix-equipment-slot-and-group-API.patch b/patches/server/0977-Fix-equipment-slot-and-group-API.patch
index 0369dbaa73..0369dbaa73 100644
--- a/patches/server/0978-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0977-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0979-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0978-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 980c3dc8a0..980c3dc8a0 100644
--- a/patches/server/0979-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0978-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0980-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 037bfd2e95..4f061e6e5e 100644
--- a/patches/server/0980-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -201,7 +201,7 @@ index 0e7ace92522fbd4cef7b2c2b8a0f8b86c2cce192..1d849ce4e2c85f149af25318b8ffb6dc
              ((LivingEntity) this.entity).detectEquipmentUpdatesPublic(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 08e6f49b1c3401225c59ff030551080f0bcaf99e..8900abed5147284f433efe45bb09f7d45c5b89bf 100644
+index 1ff2a20fd9e08faa5155fc156851e4a8d9742a1d..f04ff7b0c3d30c83931cba2dd6c70e458f08999c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2732,7 +2732,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0981-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0980-Prevent-NPE-if-hooked-entity-was-cleared.patch
index 8d3547db93..8d3547db93 100644
--- a/patches/server/0981-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0980-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0982-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0981-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index 7c3afdd7bb..7c3afdd7bb 100644
--- a/patches/server/0982-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0981-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
diff --git a/patches/server/0983-Add-missing-fishing-event-state.patch b/patches/server/0982-Add-missing-fishing-event-state.patch
index 6ad1a92dd0..6ad1a92dd0 100644
--- a/patches/server/0983-Add-missing-fishing-event-state.patch
+++ b/patches/server/0982-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0984-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 749ee86186..ba49c9f65d 100644
--- a/patches/server/0984-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate InvAction#HOTBAR_MOVE_AND_READD
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8900abed5147284f433efe45bb09f7d45c5b89bf..be2e97e4de911ad9570a9b4e9f3c5fafa93f6203 100644
+index f04ff7b0c3d30c83931cba2dd6c70e458f08999c..d80d490722dddb9255eb1abdf838bc7f4edcc229 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2998,14 +2998,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0985-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0984-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0985-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0984-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0986-Adopt-MaterialRerouting.patch b/patches/server/0985-Adopt-MaterialRerouting.patch
index c1057b6bc1..c1057b6bc1 100644
--- a/patches/server/0986-Adopt-MaterialRerouting.patch
+++ b/patches/server/0985-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0987-Suspicious-Effect-Entry-API.patch b/patches/server/0986-Suspicious-Effect-Entry-API.patch
index bc26031199..bc26031199 100644
--- a/patches/server/0987-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0986-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0988-check-if-itemstack-is-stackable-first.patch b/patches/server/0987-check-if-itemstack-is-stackable-first.patch
index 8e11960bdd..8e11960bdd 100644
--- a/patches/server/0988-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0987-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0989-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0988-Fix-removing-recipes-from-RecipeIterator.patch
index 461c3eb854..461c3eb854 100644
--- a/patches/server/0989-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0988-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0990-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0989-Configurable-damage-tick-when-blocking-with-shield.patch
index 8c0e7e79e6..8c0e7e79e6 100644
--- a/patches/server/0990-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0989-Configurable-damage-tick-when-blocking-with-shield.patch
diff --git a/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch b/patches/server/0990-Chunk-System-Starlight-from-Moonrise.patch
index 3e7b994bed..3e7b994bed 100644
--- a/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch
+++ b/patches/server/0990-Chunk-System-Starlight-from-Moonrise.patch
diff --git a/patches/server/0992-Rewrite-dataconverter-system.patch b/patches/server/0991-Rewrite-dataconverter-system.patch
index b03980be16..b03980be16 100644
--- a/patches/server/0992-Rewrite-dataconverter-system.patch
+++ b/patches/server/0991-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0993-disable-forced-empty-world-ticks.patch b/patches/server/0992-disable-forced-empty-world-ticks.patch
index e33cae412e..e33cae412e 100644
--- a/patches/server/0993-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0992-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0994-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0993-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 2cdcbebb6f..2cdcbebb6f 100644
--- a/patches/server/0994-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0993-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 655f635c6c..655f635c6c 100644
--- a/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0996-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 52c1df5a4d..52c1df5a4d 100644
--- a/patches/server/0996-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0997-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index f51a3d8642..f51a3d8642 100644
--- a/patches/server/0997-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0998-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch
index 4eef25929e..4eef25929e 100644
--- a/patches/server/0998-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0999-Flat-bedrock-generator-settings.patch b/patches/server/0998-Flat-bedrock-generator-settings.patch
index da68e7d65b..da68e7d65b 100644
--- a/patches/server/0999-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0998-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/1000-Entity-Activation-Range-2.0.patch b/patches/server/0999-Entity-Activation-Range-2.0.patch
index 6ac2fde9e8..6ac2fde9e8 100644
--- a/patches/server/1000-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0999-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/1001-Optional-per-player-mob-spawns.patch b/patches/server/1000-Optional-per-player-mob-spawns.patch
index 2e43136e37..2e43136e37 100644
--- a/patches/server/1001-Optional-per-player-mob-spawns.patch
+++ b/patches/server/1000-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/1002-Anti-Xray.patch b/patches/server/1001-Anti-Xray.patch
index d60a304b4a..d60a304b4a 100644
--- a/patches/server/1002-Anti-Xray.patch
+++ b/patches/server/1001-Anti-Xray.patch
diff --git a/patches/server/1003-Eigencraft-redstone-implementation.patch b/patches/server/1002-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/1003-Eigencraft-redstone-implementation.patch
+++ b/patches/server/1002-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1004-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1003-Add-Alternate-Current-redstone-implementation.patch
index 63c2b14dfc..63c2b14dfc 100644
--- a/patches/server/1004-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1003-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1005-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1004-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 410b44641b..410b44641b 100644
--- a/patches/server/1005-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/1004-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1005-Use-Velocity-compression-and-cipher-natives.patch
index fd68f70524..fd68f70524 100644
--- a/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/1005-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1006-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 1f46712639..1f46712639 100644
--- a/patches/server/1007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/1006-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1008-Optimize-Hoppers.patch b/patches/server/1007-Optimize-Hoppers.patch
index 2a71db2bec..2a71db2bec 100644
--- a/patches/server/1008-Optimize-Hoppers.patch
+++ b/patches/server/1007-Optimize-Hoppers.patch
diff --git a/patches/server/1009-Entity-load-save-limit-per-chunk.patch b/patches/server/1008-Entity-load-save-limit-per-chunk.patch
index cf71d8747d..cf71d8747d 100644
--- a/patches/server/1009-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1008-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1010-Optimize-Voxel-Shape-Merging.patch b/patches/server/1009-Optimize-Voxel-Shape-Merging.patch
index 4ec779560c..4ec779560c 100644
--- a/patches/server/1010-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1009-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1011-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1010-Optimize-Bit-Operations-by-inlining.patch
index b7d93a56b9..b7d93a56b9 100644
--- a/patches/server/1011-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1010-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1012-Remove-streams-from-hot-code.patch b/patches/server/1011-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1012-Remove-streams-from-hot-code.patch
+++ b/patches/server/1011-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1013-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1012-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1013-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1012-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1014-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1014-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1014-Fix-entity-type-tags-suggestions-in-selectors.patch
index 47e6c56f5b..47e6c56f5b 100644
--- a/patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1014-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1016-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1015-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/1016-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1015-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1017-API-for-checking-sent-chunks.patch b/patches/server/1016-API-for-checking-sent-chunks.patch
index a0c0a6363e..a0c0a6363e 100644
--- a/patches/server/1017-API-for-checking-sent-chunks.patch
+++ b/patches/server/1016-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1018-Configurable-Sand-Duping.patch b/patches/server/1017-Configurable-Sand-Duping.patch
index cbc52697db..cbc52697db 100644
--- a/patches/server/1018-Configurable-Sand-Duping.patch
+++ b/patches/server/1017-Configurable-Sand-Duping.patch
diff --git a/patches/server/1019-Properly-resend-entities.patch b/patches/server/1018-Properly-resend-entities.patch
index 104ad37efe..221fe50a8a 100644
--- a/patches/server/1019-Properly-resend-entities.patch
+++ b/patches/server/1018-Properly-resend-entities.patch
@@ -81,7 +81,7 @@ index e9dcdb1e09e84a9b451034ff4bdfa6eae2dd1c04..24b1715397ba8e6f5e9841a030d0e3d9
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index be2e97e4de911ad9570a9b4e9f3c5fafa93f6203..199e2f447ddb319387a15c934da71c27aab6da1e 100644
+index d80d490722dddb9255eb1abdf838bc7f4edcc229..e460578e2f2f82da05bcf867529ccf9c09ecc1e6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1949,6 +1949,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl