Remove Patches (#7541)

857 files changed, 274 insertions, 268 deletions

diff --git a/patches/server/0025-Remove-invalid-mob-spawner-tile-entities.patch b/patches/removed/1.18.2/0025-Remove-invalid-mob-spawner-tile-entities.patch
index 017e6dda31..7a4832a901 100644
--- a/patches/server/0025-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/patches/removed/1.18.2/0025-Remove-invalid-mob-spawner-tile-entities.patch
@@ -3,6 +3,8 @@ From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 15:08:03 -0600
 Subject: [PATCH] Remove invalid mob spawner tile entities
 
+Minecraft checks if the block is able to hold a tile entity higher up, preventing them from ever
+being added to the world.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 index 5496c9ae4af9658164098356532da47351808b51..2ca41f90b6b50c254a6e34da00f287197c81d65e 100644
diff --git a/patches/server/0085-Workaround-for-setting-passengers-on-players.patch b/patches/removed/1.18.2/0085-Workaround-for-setting-passengers-on-players.patch
index 369fbe153a..369fbe153a 100644
--- a/patches/server/0085-Workaround-for-setting-passengers-on-players.patch
+++ b/patches/removed/1.18.2/0085-Workaround-for-setting-passengers-on-players.patch
diff --git a/patches/server/0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/patches/removed/1.18.2/0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
index 26fc5942ba..f9a25cfce3 100644
--- a/patches/server/0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/patches/removed/1.18.2/0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@@ -4,6 +4,7 @@ Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
 
 TODO 1.17 isn't this supposed to be applied to when the fish hook is removed _in general_? Not just in Bukkit api calls?
+No longer needed, fishing is set to null when FishingHook is removed.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
 index 6bfa984781a483d048ef4318761203c701d8a632..3c18712040da8d6ece24fd817b7846836b8353c1 100644
diff --git a/patches/server/0109-Option-to-remove-corrupt-tile-entities.patch b/patches/removed/1.18.2/0109-Option-to-remove-corrupt-tile-entities.patch
index f250660200..6de0fe1b52 100644
--- a/patches/server/0109-Option-to-remove-corrupt-tile-entities.patch
+++ b/patches/removed/1.18.2/0109-Option-to-remove-corrupt-tile-entities.patch
@@ -3,6 +3,7 @@ From: Zach Brown <[email protected]>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
+Corrupt tile entities are never added to the world in the first place anymore.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 index d7734fbc6b684b14bc32c94e65947fb41aae126a..80345730b8ccc11d3d0833485d25b03f614aeee2 100644
diff --git a/patches/server/0115-Don-t-let-fishinghooks-use-portals.patch b/patches/removed/1.18.2/0115-Don-t-let-fishinghooks-use-portals.patch
index dfedf4f2ed..c2ccabc19a 100644
--- a/patches/server/0115-Don-t-let-fishinghooks-use-portals.patch
+++ b/patches/removed/1.18.2/0115-Don-t-let-fishinghooks-use-portals.patch
@@ -3,6 +3,8 @@ From: Zach Brown <[email protected]>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
+Fishing hooks have canChangeDimensions to false, preventing them from being able to switch dimensions
+via portals.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 index 24192a91d9f5c890a316ec150d4aec84073cb61a..3b23279ce994b9684dbc10157839f5fc47edfabd 100644
diff --git a/patches/server/0026-Further-improve-server-tick-loop.patch b/patches/server/0025-Further-improve-server-tick-loop.patch
index ea92cfe634..ea92cfe634 100644
--- a/patches/server/0026-Further-improve-server-tick-loop.patch
+++ b/patches/server/0025-Further-improve-server-tick-loop.patch
diff --git a/patches/server/0027-Only-refresh-abilities-if-needed.patch b/patches/server/0026-Only-refresh-abilities-if-needed.patch
index f6c9cf0a88..f6c9cf0a88 100644
--- a/patches/server/0027-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0026-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0028-Entity-Origin-API.patch b/patches/server/0027-Entity-Origin-API.patch
index eea14e718a..affd5c5e38 100644
--- a/patches/server/0028-Entity-Origin-API.patch
+++ b/patches/server/0027-Entity-Origin-API.patch
@@ -94,7 +94,7 @@ index 8a4f4582a6bd69016a36d611f9c4ac2262f7f3ec..a4cd7088113b60fd10e79359e5749fd1
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
              CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 8e7479afd3579e6b732feca059c1e4df1160e450..2bc46e02779d22adedc1fd9e5c9130c209bd58f7 100644
+index de98cbe9e863a19f71783980417fb32646102c9e..16b029f08d5c9dfd3bc4ad304ab9d339ad20b232 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -330,6 +330,14 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0029-Prevent-tile-entity-and-entity-crashes.patch b/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
index dac12b6365..53317d541f 100644
--- a/patches/server/0029-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
@@ -44,10 +44,10 @@ index a35e3f54cbec83e8c691b6f61d4e1ac1ece6156d..5c2ac7a1de96d9b4830955c2ff108c08
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 2ca41f90b6b50c254a6e34da00f287197c81d65e..98fe6a1d2866d029383a5a5d60a2635d2d421f1e 100644
+index 5496c9ae4af9658164098356532da47351808b51..ed6203119fe2e4ee47a2d51c84df5b7c236f32da 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1029,11 +1029,11 @@ public class LevelChunk extends ChunkAccess {
+@@ -1024,11 +1024,11 @@ public class LevelChunk extends ChunkAccess {
  
                          gameprofilerfiller.pop();
                      } catch (Throwable throwable) {
diff --git a/patches/server/0030-Configurable-top-of-nether-void-damage.patch b/patches/server/0029-Configurable-top-of-nether-void-damage.patch
index 75fbf7ca7c..75fbf7ca7c 100644
--- a/patches/server/0030-Configurable-top-of-nether-void-damage.patch
+++ b/patches/server/0029-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0031-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
index 64f713e616..64f713e616 100644
--- a/patches/server/0031-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0032-Always-tick-falling-blocks.patch b/patches/server/0031-Always-tick-falling-blocks.patch
index c52ac50408..c52ac50408 100644
--- a/patches/server/0032-Always-tick-falling-blocks.patch
+++ b/patches/server/0031-Always-tick-falling-blocks.patch
diff --git a/patches/server/0033-Configurable-end-credits.patch b/patches/server/0032-Configurable-end-credits.patch
index 7090170d66..7090170d66 100644
--- a/patches/server/0033-Configurable-end-credits.patch
+++ b/patches/server/0032-Configurable-end-credits.patch
diff --git a/patches/server/0034-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
index 1e41454268..1e41454268 100644
--- a/patches/server/0034-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0035-Optimize-explosions.patch b/patches/server/0034-Optimize-explosions.patch
index 62c851563b..62c851563b 100644
--- a/patches/server/0035-Optimize-explosions.patch
+++ b/patches/server/0034-Optimize-explosions.patch
diff --git a/patches/server/0036-Disable-explosion-knockback.patch b/patches/server/0035-Disable-explosion-knockback.patch
index 8a4aeab17b..8a4aeab17b 100644
--- a/patches/server/0036-Disable-explosion-knockback.patch
+++ b/patches/server/0035-Disable-explosion-knockback.patch
diff --git a/patches/server/0037-Disable-thunder.patch b/patches/server/0036-Disable-thunder.patch
index 59050743e6..59050743e6 100644
--- a/patches/server/0037-Disable-thunder.patch
+++ b/patches/server/0036-Disable-thunder.patch
diff --git a/patches/server/0038-Disable-ice-and-snow.patch b/patches/server/0037-Disable-ice-and-snow.patch
index 5a6d654b24..5a6d654b24 100644
--- a/patches/server/0038-Disable-ice-and-snow.patch
+++ b/patches/server/0037-Disable-ice-and-snow.patch
diff --git a/patches/server/0039-Configurable-mob-spawner-tick-rate.patch b/patches/server/0038-Configurable-mob-spawner-tick-rate.patch
index dfef31d530..dfef31d530 100644
--- a/patches/server/0039-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/server/0038-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0040-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
index 511a5fe002..511a5fe002 100644
--- a/patches/server/0040-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0041-Per-Player-View-Distance-API-placeholders.patch b/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch
index 66fa41284d..66fa41284d 100644
--- a/patches/server/0041-Per-Player-View-Distance-API-placeholders.patch
+++ b/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch
diff --git a/patches/server/0042-Add-BeaconEffectEvent.patch b/patches/server/0041-Add-BeaconEffectEvent.patch
index 8eb9548fe5..8eb9548fe5 100644
--- a/patches/server/0042-Add-BeaconEffectEvent.patch
+++ b/patches/server/0041-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0043-Configurable-container-update-tick-rate.patch b/patches/server/0042-Configurable-container-update-tick-rate.patch
index 564fd6f9cc..564fd6f9cc 100644
--- a/patches/server/0043-Configurable-container-update-tick-rate.patch
+++ b/patches/server/0042-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0044-Use-UserCache-for-player-heads.patch b/patches/server/0043-Use-UserCache-for-player-heads.patch
index 2381324116..2381324116 100644
--- a/patches/server/0044-Use-UserCache-for-player-heads.patch
+++ b/patches/server/0043-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0045-Disable-spigot-tick-limiters.patch b/patches/server/0044-Disable-spigot-tick-limiters.patch
index e562468965..e562468965 100644
--- a/patches/server/0045-Disable-spigot-tick-limiters.patch
+++ b/patches/server/0044-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0046-Add-PlayerInitialSpawnEvent.patch b/patches/server/0045-Add-PlayerInitialSpawnEvent.patch
index d685e6d5c0..d685e6d5c0 100644
--- a/patches/server/0046-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/server/0045-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0047-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
index f340deebe8..f340deebe8 100644
--- a/patches/server/0047-Configurable-Disabling-Cat-Chest-Detection.patch
+++ b/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0048-Ensure-commands-are-not-ran-async.patch b/patches/server/0047-Ensure-commands-are-not-ran-async.patch
index 2b9b710747..242409c33e 100644
--- a/patches/server/0048-Ensure-commands-are-not-ran-async.patch
+++ b/patches/server/0047-Ensure-commands-are-not-ran-async.patch
@@ -48,7 +48,7 @@ index 9b47d8ab57c3b290173247ba25ad7668f3529903..6f99b1b54fe893240143282563cb59e6
          } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9251a33715c271e17cad8b9d0de5da444ad25100..ee053cc0fd2fedd1d8c2212bac1b81ea3e140884 100644
+index 3636921da74f5271a15d79d431c8a33a2c83cd96..8df959195e8d516d7f6d90d79c151e8ff5d8bff5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -856,6 +856,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0049-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
index 36066b8123..36066b8123 100644
--- a/patches/server/0049-All-chunks-are-slime-spawn-chunks-toggle.patch
+++ b/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0050-Expose-server-CommandMap.patch b/patches/server/0049-Expose-server-CommandMap.patch
index 84a35e22bf..f346c727cf 100644
--- a/patches/server/0050-Expose-server-CommandMap.patch
+++ b/patches/server/0049-Expose-server-CommandMap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ee053cc0fd2fedd1d8c2212bac1b81ea3e140884..3fa2d14c67c211a7e145b02b84db84706e971761 100644
+index 8df959195e8d516d7f6d90d79c151e8ff5d8bff5..cf42b5e3f3353606410e7dea174927ea18cd2681 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1969,6 +1969,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0051-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
index edd16859a7..edd16859a7 100644
--- a/patches/server/0051-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0052-Ensure-inv-drag-is-in-bounds.patch b/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
index 942b4ab775..942b4ab775 100644
--- a/patches/server/0052-Ensure-inv-drag-is-in-bounds.patch
+++ b/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
diff --git a/patches/server/0053-Player-Tab-List-and-Title-APIs.patch b/patches/server/0052-Player-Tab-List-and-Title-APIs.patch
index b58b05d23e..b58b05d23e 100644
--- a/patches/server/0053-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0052-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/0054-Add-configurable-portal-search-radius.patch b/patches/server/0053-Add-configurable-portal-search-radius.patch
index 4c53f428df..4c53f428df 100644
--- a/patches/server/0054-Add-configurable-portal-search-radius.patch
+++ b/patches/server/0053-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0055-Add-velocity-warnings.patch b/patches/server/0054-Add-velocity-warnings.patch
index 944dc1e9f1..bf5f88935b 100644
--- a/patches/server/0055-Add-velocity-warnings.patch
+++ b/patches/server/0054-Add-velocity-warnings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3fa2d14c67c211a7e145b02b84db84706e971761..02674288c62493c22e5e21b42a2d4386b5a42a1d 100644
+index cf42b5e3f3353606410e7dea174927ea18cd2681..a73d2ec4db6aff8a92c7d0322eaf999609d5ed33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -278,6 +278,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0056-Configurable-inter-world-teleportation-safety.patch b/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
index 2323934be3..2323934be3 100644
--- a/patches/server/0056-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0055-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0057-Add-exception-reporting-event.patch b/patches/server/0056-Add-exception-reporting-event.patch
index 43d56e2539..525aa3dc9d 100644
--- a/patches/server/0057-Add-exception-reporting-event.patch
+++ b/patches/server/0056-Add-exception-reporting-event.patch
@@ -143,7 +143,7 @@ index 8d4efe65baf28760ee68cecd7ef7c8e65a2912ba..b8666d46e85bc7e9e3a05b4ebd65f591
                                  }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 98fe6a1d2866d029383a5a5d60a2635d2d421f1e..1ddc917772d701ac7b8800df44da890b9b6a6113 100644
+index ed6203119fe2e4ee47a2d51c84df5b7c236f32da..108c7ec010f826f9b9bb2db0987d2bcc18266482 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1,6 +1,7 @@
@@ -154,9 +154,9 @@ index 98fe6a1d2866d029383a5a5d60a2635d2d421f1e..1ddc917772d701ac7b8800df44da890b
  import com.google.common.collect.Maps;
  import com.google.common.collect.UnmodifiableIterator;
  import com.mojang.logging.LogUtils;
-@@ -549,10 +550,15 @@ public class LevelChunk extends ChunkAccess {
-             this.removeBlockEntity(blockEntity.getBlockPos());
-             // Paper end
+@@ -544,10 +545,15 @@ public class LevelChunk extends ChunkAccess {
+ 
+             // CraftBukkit start
          } else {
 -            System.out.println("Attempted to place a tile entity (" + blockEntity + ") at " + blockEntity.getBlockPos().getX() + "," + blockEntity.getBlockPos().getY() + "," + blockEntity.getBlockPos().getZ()
 -                + " (" + this.getBlockState(blockposition) + ") where there was no entity tile!");
@@ -174,7 +174,7 @@ index 98fe6a1d2866d029383a5a5d60a2635d2d421f1e..1ddc917772d701ac7b8800df44da890b
              // CraftBukkit end
          }
      }
-@@ -1032,6 +1038,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -1027,6 +1033,7 @@ public class LevelChunk extends ChunkAccess {
                          // Paper start - Prevent tile entity and entity crashes
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
diff --git a/patches/server/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index c569f0e66c..c569f0e66c 100644
--- a/patches/server/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
diff --git a/patches/server/0059-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
index 06d4465661..06d4465661 100644
--- a/patches/server/0059-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index b73f1a823f..b73f1a823f 100644
--- a/patches/server/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0061-Chunk-Save-Reattempt.patch b/patches/server/0060-Chunk-Save-Reattempt.patch
index 82a269b220..82a269b220 100644
--- a/patches/server/0061-Chunk-Save-Reattempt.patch
+++ b/patches/server/0060-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0062-Complete-resource-pack-API.patch b/patches/server/0061-Complete-resource-pack-API.patch
index 085ba458a6..085ba458a6 100644
--- a/patches/server/0062-Complete-resource-pack-API.patch
+++ b/patches/server/0061-Complete-resource-pack-API.patch
diff --git a/patches/server/0063-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
index 2fb116daf5..12d156a8bc 100644
--- a/patches/server/0063-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a0f55d6e1096af6f59e7e7ffdc27cdd29cbac9a6..52ff230d3fc5fb27178a657a5a9d244c6a2f43da 100644
+index 11e703e8e78fb49a5f53bdbc20d62422b573ae55..364f9196fb89a6e1bb9cd892971b486205b0c631 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -234,4 +234,9 @@ public class PaperConfig {
@@ -30,7 +30,7 @@ index a0f55d6e1096af6f59e7e7ffdc27cdd29cbac9a6..52ff230d3fc5fb27178a657a5a9d244c
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b5cc9698a1f7723ac9b3032286f2d90e2030f379..9c618bd3543862eed434d4f23bb1c5425ed7647d 100644
+index a73d2ec4db6aff8a92c7d0322eaf999609d5ed33..b89ca165b7103b8a0d6a8e49e62657c70329890a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -455,6 +455,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0064-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
index a2a7daf095..a2a7daf095 100644
--- a/patches/server/0064-Allow-Reloading-of-Custom-Permissions.patch
+++ b/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0065-Remove-Metadata-on-reload.patch b/patches/server/0064-Remove-Metadata-on-reload.patch
index 8272286495..38b992edfe 100644
--- a/patches/server/0065-Remove-Metadata-on-reload.patch
+++ b/patches/server/0064-Remove-Metadata-on-reload.patch
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 39c847d68b9195d082d324485fee83332e07f59a..ad851aa3a29b6aabfcfe7f95df15303437c48eaa 100644
+index 17fe7e47d9e11ca7c82bde34dc478c590328fb00..971652c0a9d5cc1dce05a97629c2ae30682d9cfc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -944,8 +944,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0066-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
index 91d8e83c36..91d8e83c36 100644
--- a/patches/server/0066-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0067-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
index 9566e5a378..9566e5a378 100644
--- a/patches/server/0067-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0068-Add-World-Util-Methods.patch b/patches/server/0067-Add-World-Util-Methods.patch
index 01e0d5c51d..01e0d5c51d 100644
--- a/patches/server/0068-Add-World-Util-Methods.patch
+++ b/patches/server/0067-Add-World-Util-Methods.patch
diff --git a/patches/server/0069-Custom-replacement-for-eaten-items.patch b/patches/server/0068-Custom-replacement-for-eaten-items.patch
index 1bd6dd4cf5..1bd6dd4cf5 100644
--- a/patches/server/0069-Custom-replacement-for-eaten-items.patch
+++ b/patches/server/0068-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0070-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index fd9126bedf..fd9126bedf 100644
--- a/patches/server/0070-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0071-Use-a-Shared-Random-for-Entities.patch b/patches/server/0070-Use-a-Shared-Random-for-Entities.patch
index 3d805466e8..3d805466e8 100644
--- a/patches/server/0071-Use-a-Shared-Random-for-Entities.patch
+++ b/patches/server/0070-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0072-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
index 6fd7e8e734..6fd7e8e734 100644
--- a/patches/server/0072-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0073-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index bc12e77534..b930154132 100644
--- a/patches/server/0073-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -88,7 +88,7 @@ index 82a4f5fb84884d229d258134fbfe62d34ad30d80..37e7f766e0de7b47c7240c9365bb134f
      @Override
      public FluidState getFluidState(BlockPos pos) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 1ddc917772d701ac7b8800df44da890b9b6a6113..aff826fb06a16adac8173efcaad0da1724db95c4 100644
+index 108c7ec010f826f9b9bb2db0987d2bcc18266482..aa8524af06132096cf593614301cde6a814ff41f 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -288,12 +288,29 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index b9b524fca0..b9b524fca0 100644
--- a/patches/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
diff --git a/patches/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
index 5950957dd2..5950957dd2 100644
--- a/patches/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0076-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
index d50f3875c6..bf6d556f43 100644
--- a/patches/server/0076-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
@@ -30,7 +30,7 @@ index aa8cd5965632626e4cbd4952acf9b349f79b2b1c..e7534ed3f995be64c99399ab76e98086
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index aff826fb06a16adac8173efcaad0da1724db95c4..3ecb007cf0ae781a2a68ca0a190616daf3e4aa88 100644
+index aa8524af06132096cf593614301cde6a814ff41f..7b964beaaa66ac1c8b20dd7bda665ee30ca61b98 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -281,6 +281,13 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0077-EntityPathfindEvent.patch b/patches/server/0076-EntityPathfindEvent.patch
index 44aaa32494..44aaa32494 100644
--- a/patches/server/0077-EntityPathfindEvent.patch
+++ b/patches/server/0076-EntityPathfindEvent.patch
diff --git a/patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
index 3cd51d8e26..0ee9a6d085 100644
--- a/patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 768581056d228303937814af2421ecad732d3132..2c43db4094f0a5a450eadcf342c8e5107ff053da 100644
+index 364f9196fb89a6e1bb9cd892971b486205b0c631..30abe81164347134c7fa1f16e9e1f2537377a079 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -239,4 +239,9 @@ public class PaperConfig {
diff --git a/patches/server/0079-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch
index 0a002dd1f7..0a002dd1f7 100644
--- a/patches/server/0079-Do-not-load-chunks-for-Pathfinding.patch
+++ b/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0080-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
index da2c587acd..da2c587acd 100644
--- a/patches/server/0080-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0081-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
index cc11565d1c..cc11565d1c 100644
--- a/patches/server/0081-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 9e15d02785..9e15d02785 100644
--- a/patches/server/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0083-Optimize-DataBits.patch b/patches/server/0082-Optimize-DataBits.patch
index e95ff4c431..e95ff4c431 100644
--- a/patches/server/0083-Optimize-DataBits.patch
+++ b/patches/server/0082-Optimize-DataBits.patch
diff --git a/patches/server/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index f38c57fac2..f38c57fac2 100644
--- a/patches/server/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0086-Configurable-Player-Collision.patch b/patches/server/0084-Configurable-Player-Collision.patch
index d21c24db19..0c2e3d317d 100644
--- a/patches/server/0086-Configurable-Player-Collision.patch
+++ b/patches/server/0084-Configurable-Player-Collision.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2c43db4094f0a5a450eadcf342c8e5107ff053da..13debcbff95b26f17677db876a23cff33825c881 100644
+index 30abe81164347134c7fa1f16e9e1f2537377a079..77a8c86103bc91c696cb4f74e8cfcf4d57ca6c10 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -244,4 +244,9 @@ public class PaperConfig {
@@ -32,7 +32,7 @@ index 8993d8809c109212ab278e15c09cebab9e89342f..005a3058c51a41a39f050b1817e2079b
              buf.writeComponent(this.playerPrefix);
              buf.writeComponent(this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 99478fe8f16783e7d2ae128f32199fa4b465dc83..0f743a46195ce83bb3d96a5a65067cfab3a369e8 100644
+index ba2b8c886d6c4d68b669186724e8049531987979..199401eb1a0722d84700681a0a5cba67953c6bec 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -162,6 +162,7 @@ import net.minecraft.world.level.storage.loot.LootTables;
diff --git a/patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
index b501dca4d5..b501dca4d5 100644
--- a/patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0088-Configurable-RCON-IP-address.patch b/patches/server/0086-Configurable-RCON-IP-address.patch
index 1dc723e8a3..1dc723e8a3 100644
--- a/patches/server/0088-Configurable-RCON-IP-address.patch
+++ b/patches/server/0086-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch
index c698f66703..c698f66703 100644
--- a/patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch
index 1d79f6db2a..1d79f6db2a 100644
--- a/patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0091-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch
index c0f8aa3bb4..c0f8aa3bb4 100644
--- a/patches/server/0091-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index a79e71b55b..a79e71b55b 100644
--- a/patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch
index 897d43d9c2..897d43d9c2 100644
--- a/patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch
diff --git a/patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index dceeebf8fc..baec7cdb36 100644
--- a/patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 13debcbff95b26f17677db876a23cff33825c881..a037c09a7616874d26b2a8eda9ebc795b8266431 100644
+index 77a8c86103bc91c696cb4f74e8cfcf4d57ca6c10..fc1933160f0bc70438c40fd3c0adb5675093af07 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -249,4 +249,9 @@ public class PaperConfig {
diff --git a/patches/server/0095-System-property-for-disabling-watchdoge.patch b/patches/server/0093-System-property-for-disabling-watchdoge.patch
index 8d880e6928..8d880e6928 100644
--- a/patches/server/0095-System-property-for-disabling-watchdoge.patch
+++ b/patches/server/0093-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0096-Optimize-UserCache-Thread-Safe.patch b/patches/server/0094-Optimize-UserCache-Thread-Safe.patch
index fcfc1b35d7..fcfc1b35d7 100644
--- a/patches/server/0096-Optimize-UserCache-Thread-Safe.patch
+++ b/patches/server/0094-Optimize-UserCache-Thread-Safe.patch
diff --git a/patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch
index 64982119f2..64982119f2 100644
--- a/patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
index 2e7cf46f46..2e7cf46f46 100644
--- a/patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0099-Add-server-name-parameter.patch b/patches/server/0097-Add-server-name-parameter.patch
index b7f8d47734..b7f8d47734 100644
--- a/patches/server/0099-Add-server-name-parameter.patch
+++ b/patches/server/0097-Add-server-name-parameter.patch
diff --git a/patches/server/0100-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
index e7dc00e609..e7dc00e609 100644
--- a/patches/server/0100-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/patches/server/0101-Fix-Old-Sign-Conversion.patch b/patches/server/0099-Fix-Old-Sign-Conversion.patch
index eb04571684..eb04571684 100644
--- a/patches/server/0101-Fix-Old-Sign-Conversion.patch
+++ b/patches/server/0099-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
index 56a2d048af..56a2d048af 100644
--- a/patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index fc115189d5..fc115189d5 100644
--- a/patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0104-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
index 1216d49789..19bba5f03d 100644
--- a/patches/server/0104-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add setting for proxy online mode status
 TODO: Add isProxyOnlineMode check to Metrics
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a037c09a7616874d26b2a8eda9ebc795b8266431..2ec11634242ada8cbcf3bc2a15a56e59d219039a 100644
+index fc1933160f0bc70438c40fd3c0adb5675093af07..96fbac179e6970f4eeeed9fdc07c1ac1d8e8be0a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -23,6 +23,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
@@ -67,7 +67,7 @@ index b7b98832be6178a2bca534bf974519ede977b282..aa3caccc58f1cec8d5f396813d7fc40b
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ad851aa3a29b6aabfcfe7f95df15303437c48eaa..2b6df52d586acf28aaf531c39073cf9448c589f9 100644
+index 971652c0a9d5cc1dce05a97629c2ae30682d9cfc..630ff9daa7bbe55e0e52f6127c496fdd10876c6e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1697,7 +1697,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0105-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
index 9a9dcd4259..9a9dcd4259 100644
--- a/patches/server/0105-Optimise-BlockState-s-hashCode-equals.patch
+++ b/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0106-Configurable-packet-in-spam-threshold.patch b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
index 3c2a821fff..4fdeaab552 100644
--- a/patches/server/0106-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2ec11634242ada8cbcf3bc2a15a56e59d219039a..06894c03b1d584c533355b3c4174b7fb05d67bc2 100644
+index 96fbac179e6970f4eeeed9fdc07c1ac1d8e8be0a..081761cd2177bd3cea5a489a85e7088c46d12725 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -264,4 +264,13 @@ public class PaperConfig {
diff --git a/patches/server/0107-Configurable-flying-kick-messages.patch b/patches/server/0105-Configurable-flying-kick-messages.patch
index 668ae68266..f39db8c39e 100644
--- a/patches/server/0107-Configurable-flying-kick-messages.patch
+++ b/patches/server/0105-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 06894c03b1d584c533355b3c4174b7fb05d67bc2..7612ee9bb6877dea0ff83d03f393180048ff960c 100644
+index 081761cd2177bd3cea5a489a85e7088c46d12725..6f36c7a233ec0335d713523e87a28ba9b5e46d88 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -273,4 +273,11 @@ public class PaperConfig {
diff --git a/patches/server/0110-Add-EntityZapEvent.patch b/patches/server/0106-Add-EntityZapEvent.patch
index d3e5095d8a..d3e5095d8a 100644
--- a/patches/server/0110-Add-EntityZapEvent.patch
+++ b/patches/server/0106-Add-EntityZapEvent.patch
diff --git a/patches/server/0111-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
index 6b19770c9d..0eb4dfb833 100644
--- a/patches/server/0111-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 80345730b8ccc11d3d0833485d25b03f614aeee2..6eb3678177834a4b34b78ba8e359528de7c0d2f0 100644
+index d7734fbc6b684b14bc32c94e65947fb41aae126a..7320f07beffee60fe3c49016daf7a98658879a27 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -352,4 +352,12 @@ public class PaperWorldConfig {
-     private void removeCorruptTEs() {
-         removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
+@@ -347,4 +347,12 @@ public class PaperWorldConfig {
+         preventTntFromMovingInWater = getBoolean("prevent-tnt-from-moving-in-water", false);
+         log("Prevent TNT from moving in water: " + preventTntFromMovingInWater);
      }
 +
 +    public boolean filterNBTFromSpawnEgg = true;
@@ -22,7 +22,7 @@ index 80345730b8ccc11d3d0833485d25b03f614aeee2..6eb3678177834a4b34b78ba8e359528d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 2bc46e02779d22adedc1fd9e5c9130c209bd58f7..c1de9740d199dc862f8e85251a5de021499e0031 100644
+index 16b029f08d5c9dfd3bc4ad304ab9d339ad20b232..2723816204ee61ea3fda9279369df030b8d70a13 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -309,6 +309,18 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0112-Cache-user-authenticator-threads.patch b/patches/server/0108-Cache-user-authenticator-threads.patch
index a2659f2b46..a2659f2b46 100644
--- a/patches/server/0112-Cache-user-authenticator-threads.patch
+++ b/patches/server/0108-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch
index 618217cda2..618217cda2 100644
--- a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch
index 55ccd362c3..55ccd362c3 100644
--- a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0116-Add-ProjectileCollideEvent.patch b/patches/server/0111-Add-ProjectileCollideEvent.patch
index 4aba55165d..4aba55165d 100644
--- a/patches/server/0116-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0111-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0117-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
index df13150cc1..df13150cc1 100644
--- a/patches/server/0117-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0118-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch
index c6fb2bcab4..c6fb2bcab4 100644
--- a/patches/server/0118-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0119-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch
index 3985c7f8aa..3985c7f8aa 100644
--- a/patches/server/0119-Bound-Treasure-Maps-to-World-Border.patch
+++ b/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0120-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch
index 2e6f72a1a7..08c18d59bd 100644
--- a/patches/server/0120-Configurable-Cartographer-Treasure-Maps.patch
+++ b/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch
@@ -9,10 +9,10 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6eb3678177834a4b34b78ba8e359528de7c0d2f0..f383f30b9dd1a7c6cf69d342f99118beec70b206 100644
+index 7320f07beffee60fe3c49016daf7a98658879a27..5183c756289db3600d04d473c20d08768af91ea9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -360,4 +360,14 @@ public class PaperWorldConfig {
+@@ -355,4 +355,14 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
          }
      }
diff --git a/patches/server/0121-Optimize-ItemStack.isEmpty.patch b/patches/server/0116-Optimize-ItemStack.isEmpty.patch
index d850c3dd8e..d850c3dd8e 100644
--- a/patches/server/0121-Optimize-ItemStack.isEmpty.patch
+++ b/patches/server/0116-Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/0122-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch
index c641c7f9fa..c641c7f9fa 100644
--- a/patches/server/0122-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0123-String-based-Action-Bar-API.patch b/patches/server/0118-String-based-Action-Bar-API.patch
index 0a5ec8d756..cc951dabf0 100644
--- a/patches/server/0123-String-based-Action-Bar-API.patch
+++ b/patches/server/0118-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 796060044c0b8e479e93a35de886b31aab24e1b4..f1c8202428cd8b13c9f7a17365c701ac0e6c7ccf 100644
+index af277ce2e2d2baff298dffd4b0f9d2ee146b3c9a..6f912d77d8da7cb71de9cdb3dc42f61caa5272b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -267,6 +267,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0124-Properly-fix-item-duplication-bug.patch b/patches/server/0119-Properly-fix-item-duplication-bug.patch
index 14109ddfd2..14109ddfd2 100644
--- a/patches/server/0124-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0119-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0125-Firework-API-s.patch b/patches/server/0120-Firework-API-s.patch
index 326eaa7490..a574505f2d 100644
--- a/patches/server/0125-Firework-API-s.patch
+++ b/patches/server/0120-Firework-API-s.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Firework API's
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
-index 231d5923a2df7f1e7428555a3f28b83f95fc4b44..9930f7a0681899017329bd2c599db7308310b395 100644
+index c424c33fb708aa563e98c7c3dcd3f59b5a3f9607..5a062a19bb2fc427c9391bb4731f071719b72c52 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
 @@ -39,6 +39,7 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
diff --git a/patches/server/0126-PlayerTeleportEndGatewayEvent.patch b/patches/server/0121-PlayerTeleportEndGatewayEvent.patch
index 16c800730a..16c800730a 100644
--- a/patches/server/0126-PlayerTeleportEndGatewayEvent.patch
+++ b/patches/server/0121-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
index 676ea3eba3..676ea3eba3 100644
--- a/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0128-Enforce-Sync-Player-Saves.patch b/patches/server/0123-Enforce-Sync-Player-Saves.patch
index 99d1138169..99d1138169 100644
--- a/patches/server/0128-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0123-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0129-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch
index fc09d5c627..fc09d5c627 100644
--- a/patches/server/0129-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch
diff --git a/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index f75549faf4..d4b310eadf 100644
--- a/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -230,10 +230,10 @@ index b9a0fc52460ce0c50deea25112dee20c977e99c5..d7cb3d8b37f225ee4796246aa907da10
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 3b23279ce994b9684dbc10157839f5fc47edfabd..90a5a5ede2c65d74dec4ac247e8411636fc20f78 100644
+index 24192a91d9f5c890a316ec150d4aec84073cb61a..8162ead7ca524f80b8b4a846273266a837db5924 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-@@ -518,7 +518,7 @@ public class FishingHook extends Projectile {
+@@ -513,7 +513,7 @@ public class FishingHook extends Projectile {
                      this.level.addFreshEntity(entityitem);
                      // CraftBukkit start - this.random.nextInt(6) + 1 -> playerFishEvent.getExpToDrop()
                      if (playerFishEvent.getExpToDrop() > 0) {
diff --git a/patches/server/0131-Cap-Entity-Collisions.patch b/patches/server/0126-Cap-Entity-Collisions.patch
index 0a0dccc30b..ca4502f8c7 100644
--- a/patches/server/0131-Cap-Entity-Collisions.patch
+++ b/patches/server/0126-Cap-Entity-Collisions.patch
@@ -12,10 +12,10 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f383f30b9dd1a7c6cf69d342f99118beec70b206..47b717e8741bb2b8f3aa776dcdc73a3e7dbb5960 100644
+index 5183c756289db3600d04d473c20d08768af91ea9..72501b05d1d5d9304e4ac31bbf694f5ca1637c0f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -370,4 +370,10 @@ public class PaperWorldConfig {
+@@ -365,4 +365,10 @@ public class PaperWorldConfig {
              log("Treasure Maps will return already discovered locations");
          }
      }
diff --git a/patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch
index eacad1fb97..eacad1fb97 100644
--- a/patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0133-Do-not-let-armorstands-drown.patch b/patches/server/0128-Do-not-let-armorstands-drown.patch
index 3c8b3ef332..3c8b3ef332 100644
--- a/patches/server/0133-Do-not-let-armorstands-drown.patch
+++ b/patches/server/0128-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0134-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
index a1b0e025ae..a1b0e025ae 100644
--- a/patches/server/0134-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/patches/server/0135-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
index 933e7082a4..933e7082a4 100644
--- a/patches/server/0135-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 5d03b7cafd..01472b7e40 100644
--- a/patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -11,10 +11,10 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 47b717e8741bb2b8f3aa776dcdc73a3e7dbb5960..9dad1efab44b8a23f274aa89c85944d98e9a6c51 100644
+index 72501b05d1d5d9304e4ac31bbf694f5ca1637c0f..f459b23282e5353f0f57bd228af7e8d53050eda9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -376,4 +376,10 @@ public class PaperWorldConfig {
+@@ -371,4 +371,10 @@ public class PaperWorldConfig {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", this.maxCollisionsPerEntity, false) );
          log( "Max Entity Collisions: " + maxCollisionsPerEntity );
      }
diff --git a/patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
index b1d88993dc..fa031bddd0 100644
--- a/patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 785660014a4a489decdf5e9febd3f6e4f82735fa..90b1803c111b26f299953eec15745bc4f180d4bd 100644
+index 6f36c7a233ec0335d713523e87a28ba9b5e46d88..bbf5dae44b52941452c65ce4d0820172f0f03f3d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -280,4 +280,9 @@ public class PaperConfig {
diff --git a/patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
index a0787dd22a..b83942e31a 100644
--- a/patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -236,7 +236,7 @@ index 5b1dcf148d24bbd61728d8c2af611b7c4f8dd166..03fc0bca0c1a11db43d315236ca05dfe
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fb46d2cf6caf033e4edd1e8f8145f90f408abdad..dba46a37d30baaaec830503aa5bb7d56a315658c 100644
+index 57999f25a820cc9b395f6c3037e0fcce9bc4a80c..044609ec67ea3fc6240437807a329e136c8e6633 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -45,7 +45,6 @@ import java.util.logging.Level;
diff --git a/patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
index 2a9095c87f..94e912f456 100644
--- a/patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9dad1efab44b8a23f274aa89c85944d98e9a6c51..99d09ff7e9eea776f8c78eda3e89a9613a722172 100644
+index f459b23282e5353f0f57bd228af7e8d53050eda9..2c92d3d924fa132937576c24da26e2a8f72f601e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -382,4 +382,10 @@ public class PaperWorldConfig {
+@@ -377,4 +377,10 @@ public class PaperWorldConfig {
          parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
          log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
      }
diff --git a/patches/server/0140-Item-canEntityPickup.patch b/patches/server/0135-Item-canEntityPickup.patch
index 8256bd986b..8256bd986b 100644
--- a/patches/server/0140-Item-canEntityPickup.patch
+++ b/patches/server/0135-Item-canEntityPickup.patch
diff --git a/patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
index dcfbc30eef..dcfbc30eef 100644
--- a/patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0142-PlayerAttemptPickupItemEvent.patch b/patches/server/0137-PlayerAttemptPickupItemEvent.patch
index 63863ce126..63863ce126 100644
--- a/patches/server/0142-PlayerAttemptPickupItemEvent.patch
+++ b/patches/server/0137-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0143-Add-UnknownCommandEvent.patch b/patches/server/0138-Add-UnknownCommandEvent.patch
index a0d430345e..22193ce524 100644
--- a/patches/server/0143-Add-UnknownCommandEvent.patch
+++ b/patches/server/0138-Add-UnknownCommandEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 89d9ac790b28fedc7d30b54f30cc6235f9b12a64..40d9766bbf53f858a3debd83319152cbd11ef7ed 100644
+index 044609ec67ea3fc6240437807a329e136c8e6633..179ba5ae2406d8babfdec386fc8125960043d586 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -885,7 +885,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0144-Basic-PlayerProfile-API.patch b/patches/server/0139-Basic-PlayerProfile-API.patch
index 625ffbc575..625ffbc575 100644
--- a/patches/server/0144-Basic-PlayerProfile-API.patch
+++ b/patches/server/0139-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0145-Shoulder-Entities-Release-API.patch b/patches/server/0140-Shoulder-Entities-Release-API.patch
index 146b442789..146b442789 100644
--- a/patches/server/0145-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0140-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0146-Profile-Lookup-Events.patch b/patches/server/0141-Profile-Lookup-Events.patch
index a9a4210f19..a9a4210f19 100644
--- a/patches/server/0146-Profile-Lookup-Events.patch
+++ b/patches/server/0141-Profile-Lookup-Events.patch
diff --git a/patches/server/0147-Block-player-logins-during-server-shutdown.patch b/patches/server/0142-Block-player-logins-during-server-shutdown.patch
index b22e55320c..b22e55320c 100644
--- a/patches/server/0147-Block-player-logins-during-server-shutdown.patch
+++ b/patches/server/0142-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0148-Entity-fromMobSpawner.patch b/patches/server/0143-Entity-fromMobSpawner.patch
index 012ca3be7c..012ca3be7c 100644
--- a/patches/server/0148-Entity-fromMobSpawner.patch
+++ b/patches/server/0143-Entity-fromMobSpawner.patch
diff --git a/patches/server/0149-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch
index ccd3b7baf4..ccd3b7baf4 100644
--- a/patches/server/0149-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0150-Implement-ensureServerConversions-API.patch b/patches/server/0145-Implement-ensureServerConversions-API.patch
index 94b99fef75..94b99fef75 100644
--- a/patches/server/0150-Implement-ensureServerConversions-API.patch
+++ b/patches/server/0145-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0151-Implement-getI18NDisplayName.patch b/patches/server/0146-Implement-getI18NDisplayName.patch
index d9dee100a5..d9dee100a5 100644
--- a/patches/server/0151-Implement-getI18NDisplayName.patch
+++ b/patches/server/0146-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0152-ProfileWhitelistVerifyEvent.patch b/patches/server/0147-ProfileWhitelistVerifyEvent.patch
index 02967097cc..02967097cc 100644
--- a/patches/server/0152-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0147-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0153-Fix-this-stupid-bullshit.patch b/patches/server/0148-Fix-this-stupid-bullshit.patch
index 0e67ea0838..0e67ea0838 100644
--- a/patches/server/0153-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0148-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0154-LivingEntity-setKiller.patch b/patches/server/0149-LivingEntity-setKiller.patch
index c8eb4f6720..c8eb4f6720 100644
--- a/patches/server/0154-LivingEntity-setKiller.patch
+++ b/patches/server/0149-LivingEntity-setKiller.patch
diff --git a/patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch
index 1e82429fcb..1e82429fcb 100644
--- a/patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index 9b68ceeb8c..9b68ceeb8c 100644
--- a/patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
index 1f8cc40cfa..d856e67015 100644
--- a/patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 352cec8559923189dcea5c97066ef2f90cc4023b..71288ac78dc0adb4fdb692d3f69debbff84ffa74 100644
+index bbf5dae44b52941452c65ce4d0820172f0f03f3d..13cd1da1277615a695f5bf92e2f7005dd99a534e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 61939161b7..8168b7544b 100644
--- a/patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e7eca424ffa81f60a08a2ab655e085bd3e49983c..541357dff44a3ce86b6adf807c0e43df11b012ef 100644
+index 6c86bb7ff8c7bfcfc29fe79ea8c6f79656a3d7ae..5b009dc1b35e551ed78baf86b49d6470c4598a12 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -21,7 +21,7 @@ dependencies {
diff --git a/patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch
index 5afb9562c0..5afb9562c0 100644
--- a/patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch
+++ b/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0160-Add-PlayerJumpEvent.patch b/patches/server/0155-Add-PlayerJumpEvent.patch
index f0cf6a0226..f0cf6a0226 100644
--- a/patches/server/0160-Add-PlayerJumpEvent.patch
+++ b/patches/server/0155-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0156-handle-PacketPlayInKeepAlive-async.patch
index 3c93d62b38..3c93d62b38 100644
--- a/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch
+++ b/patches/server/0156-handle-PacketPlayInKeepAlive-async.patch
diff --git a/patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
index 1040586e1a..e3869466cc 100644
--- a/patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
@@ -75,7 +75,7 @@ index dac5ab91fca602cdc2dbc308b24e15ce411659a2..1a2184e23f1e1b8e39141689ebc5f1d1
      public Connection(PacketFlow side) {
          this.receiving = side;
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 27d304316bec097fea4b950cb4e0ac80cb219f70..85fea9b0bf84a8b40098f35eac503070914c98d8 100644
+index 63cc89c7769bfcc9d663a1827ad525e3ddd82fe5..a95b2ee0e80832f786bdb8f3d0bc00cbfae26fd4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -155,6 +155,10 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
@@ -90,7 +90,7 @@ index 27d304316bec097fea4b950cb4e0ac80cb219f70..85fea9b0bf84a8b40098f35eac503070
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f1c8202428cd8b13c9f7a17365c701ac0e6c7ccf..8d439a7e901eb18e6e9b606ad71d9fd487743217 100644
+index 6f912d77d8da7cb71de9cdb3dc42f61caa5272b5..750a436950d43ffc10761984faad246ebe01b06c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -211,6 +211,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0163-revert-serverside-behavior-of-keepalives.patch b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
index fa656de035..fa656de035 100644
--- a/patches/server/0163-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 2034d8b6c7..2034d8b6c7 100644
--- a/patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0165-Add-PlayerArmorChangeEvent.patch b/patches/server/0160-Add-PlayerArmorChangeEvent.patch
index 0154d914e6..0154d914e6 100644
--- a/patches/server/0165-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0160-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
index 9be38dd147..9be38dd147 100644
--- a/patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index bfd6705b79..bfd6705b79 100644
--- a/patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
index b448867fdd..b448867fdd 100644
--- a/patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
index 6805a47f52..6805a47f52 100644
--- a/patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0170-AsyncTabCompleteEvent.patch b/patches/server/0165-AsyncTabCompleteEvent.patch
index e380d580e6..803a02d978 100644
--- a/patches/server/0170-AsyncTabCompleteEvent.patch
+++ b/patches/server/0165-AsyncTabCompleteEvent.patch
@@ -72,7 +72,7 @@ index 44e4cd2a3039be132ca5f03759801456b3290f72..4c89828089ddb8fbee78643df7d3b82d
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a380f59ea01cec492f2d2bef6bb6509a07998d07..f57050098a49757927fbb4609b7f97c19f5747d1 100644
+index 24f361820f195e948f617cd134352e098b298b5d..d9dce9ada23473af6920bedd6d28739cf62e4744 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2072,7 +2072,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0171-PlayerPickupExperienceEvent.patch b/patches/server/0166-PlayerPickupExperienceEvent.patch
index 6b3e21f677..6b3e21f677 100644
--- a/patches/server/0171-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0166-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0172-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
index 3d094336bf..f1b17376b3 100644
--- a/patches/server/0172-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
@@ -10,10 +10,10 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8d439a7e901eb18e6e9b606ad71d9fd487743217..3ecdbf91807f915529e608699c80057012d2e8fe 100644
+index 750a436950d43ffc10761984faad246ebe01b06c..0cbfda7cb17580622d8f953ccd4dc0fe36fa05be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1266,7 +1266,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1255,7 +1255,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
index 3fb8ab5bf8..3fb8ab5bf8 100644
--- a/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0174-PreCreatureSpawnEvent.patch b/patches/server/0169-PreCreatureSpawnEvent.patch
index 06cb11ed0a..06cb11ed0a 100644
--- a/patches/server/0174-PreCreatureSpawnEvent.patch
+++ b/patches/server/0169-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
index a87a829f5b..a87a829f5b 100644
--- a/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0176-Fill-Profile-Property-Events.patch b/patches/server/0171-Fill-Profile-Property-Events.patch
index 30643d081c..30643d081c 100644
--- a/patches/server/0176-Fill-Profile-Property-Events.patch
+++ b/patches/server/0171-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch
index 24c1ee0c73..24c1ee0c73 100644
--- a/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0178-Add-ArmorStand-Item-Meta.patch b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
index e468d79145..e468d79145 100644
--- a/patches/server/0178-Add-ArmorStand-Item-Meta.patch
+++ b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0179-Extend-Player-Interact-cancellation.patch b/patches/server/0174-Extend-Player-Interact-cancellation.patch
index f775b34e77..f775b34e77 100644
--- a/patches/server/0179-Extend-Player-Interact-cancellation.patch
+++ b/patches/server/0174-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0180-Tameable-getOwnerUniqueId-API.patch b/patches/server/0175-Tameable-getOwnerUniqueId-API.patch
index 7fca628e8a..7fca628e8a 100644
--- a/patches/server/0180-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/server/0175-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 6854965082..e0f1b8355f 100644
--- a/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 99d09ff7e9eea776f8c78eda3e89a9613a722172..3bb339658d3253b1cbdcfb789ef234f37f8e0888 100644
+index 2c92d3d924fa132937576c24da26e2a8f72f601e..207bef30c34e368066f4058dd28dd12fdbac5d34 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -238,6 +238,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
index 1ccb5ac583..1ccb5ac583 100644
--- a/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
+++ b/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
index 5011f668c0..5011f668c0 100644
--- a/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index ea12180ec7..ea12180ec7 100644
--- a/patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0185-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch
index 8567df8df6..0341183857 100644
--- a/patches/server/0185-Player.setPlayerProfile-API.patch
+++ b/patches/server/0180-Player.setPlayerProfile-API.patch
@@ -24,7 +24,7 @@ index d3462cdc5eee37cedbff80f35d5b9c51e8dcd1da..5ebc450432805d52457b9f8ff1e2b198
                          playerName = gameProfile.getName();
                          uniqueId = gameProfile.getId();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3ecdbf91807f915529e608699c80057012d2e8fe..212ad1986c5c2bdcac48cc53463834f6fea32f1e 100644
+index 0cbfda7cb17580622d8f953ccd4dc0fe36fa05be..c732d7c20fcce1e3a80fc23c266a147953dd3018 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -72,6 +72,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
@@ -47,7 +47,7 @@ index 3ecdbf91807f915529e608699c80057012d2e8fe..212ad1986c5c2bdcac48cc53463834f6
      @Override
      public InetSocketAddress getAddress() {
          if (this.getHandle().connection == null) return null;
-@@ -1399,8 +1395,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1388,8 +1384,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.hiddenEntities.put(entity.getUniqueId(), hidingPlugins);
  
          // Remove this entity from the hidden player's EntityTrackerEntry
@@ -64,7 +64,7 @@ index 3ecdbf91807f915529e608699c80057012d2e8fe..212ad1986c5c2bdcac48cc53463834f6
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
-@@ -1413,8 +1416,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1402,8 +1405,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.getHandle().connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, otherPlayer));
              }
          }
@@ -73,7 +73,7 @@ index 3ecdbf91807f915529e608699c80057012d2e8fe..212ad1986c5c2bdcac48cc53463834f6
      }
  
      @Override
-@@ -1451,8 +1452,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1440,8 +1441,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          this.hiddenEntities.remove(entity.getUniqueId());
  
@@ -90,7 +90,7 @@ index 3ecdbf91807f915529e608699c80057012d2e8fe..212ad1986c5c2bdcac48cc53463834f6
  
          if (other instanceof ServerPlayer) {
              ServerPlayer otherPlayer = (ServerPlayer) other;
-@@ -1463,9 +1471,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1452,9 +1460,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
              entry.updatePlayer(this.getHandle());
          }
diff --git a/patches/server/0186-getPlayerUniqueId-API.patch b/patches/server/0181-getPlayerUniqueId-API.patch
index c0f6fe98b9..251356f545 100644
--- a/patches/server/0186-getPlayerUniqueId-API.patch
+++ b/patches/server/0181-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f57050098a49757927fbb4609b7f97c19f5747d1..23e33857b5cc888f4cbac273939fad81e3081103 100644
+index d9dce9ada23473af6920bedd6d28739cf62e4744..eb5a7b302b027ab19d42326683f93671a40c64d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1699,6 +1699,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0187-Improved-Async-Task-Scheduler.patch b/patches/server/0182-Improved-Async-Task-Scheduler.patch
index b62fddc7b9..b62fddc7b9 100644
--- a/patches/server/0187-Improved-Async-Task-Scheduler.patch
+++ b/patches/server/0182-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0188-Upstream-config-migrations.patch b/patches/server/0183-Upstream-config-migrations.patch
index 3862808878..041a89afbf 100644
--- a/patches/server/0188-Upstream-config-migrations.patch
+++ b/patches/server/0183-Upstream-config-migrations.patch
@@ -7,7 +7,7 @@ This patch contains config migrations for when upstream adds options
 which Paper already had.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 71288ac78dc0adb4fdb692d3f69debbff84ffa74..61d6c4ed39fb7d3ebdeafd8f84fa2f40f3714201 100644
+index 13cd1da1277615a695f5bf92e2f7005dd99a534e..fddc40fc7b6bfbdab3ab54dae273a0d99198da5f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -291,4 +291,23 @@ public class PaperConfig {
diff --git a/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
index fa9de2b263..fa9de2b263 100644
--- a/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
index 6b87008391..6b87008391 100644
--- a/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
+++ b/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0191-Flag-to-disable-the-channel-limit.patch b/patches/server/0186-Flag-to-disable-the-channel-limit.patch
index ab39753565..bfabd5a348 100644
--- a/patches/server/0191-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0186-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 212ad1986c5c2bdcac48cc53463834f6fea32f1e..f5ac3bcc24e9719b02d6b4150daf6e2fed178ead 100644
+index c732d7c20fcce1e3a80fc23c266a147953dd3018..072de6ba71462eaca878a7c9cfdb683f93993382 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -160,6 +160,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -20,7 +20,7 @@ index 212ad1986c5c2bdcac48cc53463834f6fea32f1e..f5ac3bcc24e9719b02d6b4150daf6e2f
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -1715,7 +1716,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1704,7 +1705,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper end
  
      public void addChannel(String channel) {
diff --git a/patches/server/0192-Add-openSign-method-to-HumanEntity.patch b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
index b96d95ac06..b96d95ac06 100644
--- a/patches/server/0192-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0193-Configurable-sprint-interruption-on-attack.patch b/patches/server/0188-Configurable-sprint-interruption-on-attack.patch
index db3d57ea0e..8a66457998 100644
--- a/patches/server/0193-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0188-Configurable-sprint-interruption-on-attack.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3bb339658d3253b1cbdcfb789ef234f37f8e0888..a9706dcb41a05fa69b5f7fa939d9fe02f6bfacd8 100644
+index 207bef30c34e368066f4058dd28dd12fdbac5d34..ef9f6712046a22a8d0dfcf95d8e2d12403345532 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -393,4 +393,9 @@ public class PaperWorldConfig {
+@@ -388,4 +388,9 @@ public class PaperWorldConfig {
          disableCreeperLingeringEffect = getBoolean("disable-creeper-lingering-effect", false);
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
diff --git a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 3ae32a1206..3ae32a1206 100644
--- a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0195-EndermanEscapeEvent.patch b/patches/server/0190-EndermanEscapeEvent.patch
index e9d52a5b2d..e9d52a5b2d 100644
--- a/patches/server/0195-EndermanEscapeEvent.patch
+++ b/patches/server/0190-EndermanEscapeEvent.patch
diff --git a/patches/server/0196-Enderman.teleportRandomly.patch b/patches/server/0191-Enderman.teleportRandomly.patch
index 86bca4b671..86bca4b671 100644
--- a/patches/server/0196-Enderman.teleportRandomly.patch
+++ b/patches/server/0191-Enderman.teleportRandomly.patch
diff --git a/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
index 44f44d156a..dc85e7e419 100644
--- a/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
@@ -12,10 +12,10 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a9706dcb41a05fa69b5f7fa939d9fe02f6bfacd8..8fc56818a2ba1aed73b8dda4da04ecac748c6ae6 100644
+index ef9f6712046a22a8d0dfcf95d8e2d12403345532..ea426792b751fd7591bf09f2256dd6bdd31fac06 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -398,4 +398,10 @@ public class PaperWorldConfig {
+@@ -393,4 +393,10 @@ public class PaperWorldConfig {
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
      }
@@ -27,7 +27,7 @@ index a9706dcb41a05fa69b5f7fa939d9fe02f6bfacd8..8fc56818a2ba1aed73b8dda4da04ecac
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index d4aa7e6dd54ed896187db96d19490ae9d55355f1..3b2322e359ea0fa8cf6c256054c4d0dcd3f43d73 100644
+index 1c3ae7c61c06f486e50e57f434b9f360c6cf55be..bdefda914a7f93b8393a06f112ea9239d9685d51 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -88,6 +88,7 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
index e3f03cae84..e3f03cae84 100644
--- a/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
index 616f34fdc9..616f34fdc9 100644
--- a/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0200-EndermanAttackPlayerEvent.patch b/patches/server/0195-EndermanAttackPlayerEvent.patch
index be33ff581c..be33ff581c 100644
--- a/patches/server/0200-EndermanAttackPlayerEvent.patch
+++ b/patches/server/0195-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0201-WitchConsumePotionEvent.patch b/patches/server/0196-WitchConsumePotionEvent.patch
index f054a8dd3c..f054a8dd3c 100644
--- a/patches/server/0201-WitchConsumePotionEvent.patch
+++ b/patches/server/0196-WitchConsumePotionEvent.patch
diff --git a/patches/server/0202-WitchThrowPotionEvent.patch b/patches/server/0197-WitchThrowPotionEvent.patch
index 86ba404bc1..86ba404bc1 100644
--- a/patches/server/0202-WitchThrowPotionEvent.patch
+++ b/patches/server/0197-WitchThrowPotionEvent.patch
diff --git a/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index 5cab56c188..5cab56c188 100644
--- a/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0204-WitchReadyPotionEvent.patch b/patches/server/0199-WitchReadyPotionEvent.patch
index 99ac9dce10..99ac9dce10 100644
--- a/patches/server/0204-WitchReadyPotionEvent.patch
+++ b/patches/server/0199-WitchReadyPotionEvent.patch
diff --git a/patches/server/0205-ItemStack-getMaxItemUseDuration.patch b/patches/server/0200-ItemStack-getMaxItemUseDuration.patch
index a54b637d4c..a54b637d4c 100644
--- a/patches/server/0205-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/server/0200-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
index 541316c571..541316c571 100644
--- a/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 462155cf04..462155cf04 100644
--- a/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0208-Fix-CraftEntity-hashCode.patch b/patches/server/0203-Fix-CraftEntity-hashCode.patch
index ae135df932..ae135df932 100644
--- a/patches/server/0208-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0203-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
index ec29fc37b1..ba08f35691 100644
--- a/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 61d6c4ed39fb7d3ebdeafd8f84fa2f40f3714201..e933d54c309da046554029d1f232daa31659e537 100644
+index fddc40fc7b6bfbdab3ab54dae273a0d99198da5f..114a65963b65597ff915ec3a0d75bb78f33bd774 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -310,4 +310,12 @@ public class PaperConfig {
diff --git a/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
index 1fa6aa9aac..1fa6aa9aac 100644
--- a/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0211-Make-shield-blocking-delay-configurable.patch b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
index c1a7abb9ea..8dcd253d10 100644
--- a/patches/server/0211-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8fc56818a2ba1aed73b8dda4da04ecac748c6ae6..1e9ffb5bc5c9d74c07be14435eb29ef998943814 100644
+index ea426792b751fd7591bf09f2256dd6bdd31fac06..50ad52d33de2eb977e1fec50c0e9ca5448900c4b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -404,4 +404,9 @@ public class PaperWorldConfig {
+@@ -399,4 +399,9 @@ public class PaperWorldConfig {
          disableEnderpearlExploit = getBoolean("game-mechanics.disable-unloaded-chunk-enderpearl-exploit", disableEnderpearlExploit);
          log("Disable Unloaded Chunk Enderpearl Exploit: " + (disableEnderpearlExploit ? "enabled" : "disabled"));
      }
diff --git a/patches/server/0212-Improve-EntityShootBowEvent.patch b/patches/server/0207-Improve-EntityShootBowEvent.patch
index d2b406c4ad..d2b406c4ad 100644
--- a/patches/server/0212-Improve-EntityShootBowEvent.patch
+++ b/patches/server/0207-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0213-PlayerReadyArrowEvent.patch b/patches/server/0208-PlayerReadyArrowEvent.patch
index 2d3e016e1a..2d3e016e1a 100644
--- a/patches/server/0213-PlayerReadyArrowEvent.patch
+++ b/patches/server/0208-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch
index fb2d62ff7e..fb2d62ff7e 100644
--- a/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch
diff --git a/patches/server/0215-Expand-Explosions-API.patch b/patches/server/0210-Expand-Explosions-API.patch
index ad6eb3d960..ad6eb3d960 100644
--- a/patches/server/0215-Expand-Explosions-API.patch
+++ b/patches/server/0210-Expand-Explosions-API.patch
diff --git a/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
index b8c1582431..b8c1582431 100644
--- a/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0217-RangedEntity-API.patch b/patches/server/0212-RangedEntity-API.patch
index 2770c2a756..2770c2a756 100644
--- a/patches/server/0217-RangedEntity-API.patch
+++ b/patches/server/0212-RangedEntity-API.patch
diff --git a/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
index 7f54e199ca..2e506a8d7c 100644
--- a/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1e9ffb5bc5c9d74c07be14435eb29ef998943814..e203647884c20a8512a0aebdbad3488939226a8c 100644
+index 50ad52d33de2eb977e1fec50c0e9ca5448900c4b..4b73a3ff72db0135273365b95a2d097d3c34c7c4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -409,4 +409,9 @@ public class PaperWorldConfig {
+@@ -404,4 +404,9 @@ public class PaperWorldConfig {
      private void shieldBlockingDelay() {
          shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
      }
diff --git a/patches/server/0219-Implement-World.getEntity-UUID-API.patch b/patches/server/0214-Implement-World.getEntity-UUID-API.patch
index 23976b68fb..23976b68fb 100644
--- a/patches/server/0219-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0214-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0220-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
index 07e4f74d4e..33bcecc69c 100644
--- a/patches/server/0220-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
@@ -174,7 +174,7 @@ index c0ed3dd9ebcaf710d202ae8b38007e6a1f20b57e..adfbc156b4c4a8591609f385adaa6b04
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f5ac3bcc24e9719b02d6b4150daf6e2fed178ead..5897b067797af48a6c643c3a3db7d4b12ec6822f 100644
+index 072de6ba71462eaca878a7c9cfdb683f93993382..1366dc333449dd6fe2607152db47d1a45028aeb0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -969,7 +969,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0221-Vex-get-setSummoner-API.patch b/patches/server/0216-Vex-get-setSummoner-API.patch
index ec419aa9d5..ec419aa9d5 100644
--- a/patches/server/0221-Vex-get-setSummoner-API.patch
+++ b/patches/server/0216-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index d75952d217..d75952d217 100644
--- a/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index c0afe840a5..c0afe840a5 100644
--- a/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/patches/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 7c24570379..56f4597665 100644
--- a/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 541357dff44a3ce86b6adf807c0e43df11b012ef..80c533bc8966e4f9d7b19ef98faf04146d14be7d 100644
+index 5b009dc1b35e551ed78baf86b49d6470c4598a12..ccaef92ae87bd1723957e98b3b632fb79b8eeb3d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -28,6 +28,7 @@ dependencies {
diff --git a/patches/server/0225-add-more-information-to-Entity.toString.patch b/patches/server/0220-add-more-information-to-Entity.toString.patch
index fba5a02350..fba5a02350 100644
--- a/patches/server/0225-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0220-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index e916b52e10..e916b52e10 100644
--- a/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0227-EnderDragon-Events.patch b/patches/server/0222-EnderDragon-Events.patch
index 6368f8e07f..6368f8e07f 100644
--- a/patches/server/0227-EnderDragon-Events.patch
+++ b/patches/server/0222-EnderDragon-Events.patch
diff --git a/patches/server/0228-PlayerElytraBoostEvent.patch b/patches/server/0223-PlayerElytraBoostEvent.patch
index 00826b935f..00826b935f 100644
--- a/patches/server/0228-PlayerElytraBoostEvent.patch
+++ b/patches/server/0223-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0229-PlayerLaunchProjectileEvent.patch b/patches/server/0224-PlayerLaunchProjectileEvent.patch
index c01b74cbc8..c01b74cbc8 100644
--- a/patches/server/0229-PlayerLaunchProjectileEvent.patch
+++ b/patches/server/0224-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0230-Improve-BlockPosition-inlining.patch b/patches/server/0225-Improve-BlockPosition-inlining.patch
index c8ba260207..c8ba260207 100644
--- a/patches/server/0230-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0225-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 03f12b9757..e685b949d8 100644
--- a/patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e203647884c20a8512a0aebdbad3488939226a8c..5993ea31ebdf1b37f85cee27f11234b7981f77fe 100644
+index 4b73a3ff72db0135273365b95a2d097d3c34c7c4..1cf6eb1b578561dfd9e734843fb87e477c7bde9e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -414,4 +414,9 @@ public class PaperWorldConfig {
+@@ -409,4 +409,9 @@ public class PaperWorldConfig {
      private void scanForLegacyEnderDragon() {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
diff --git a/patches/server/0232-Vanished-players-don-t-have-rights.patch b/patches/server/0227-Vanished-players-don-t-have-rights.patch
index 2b61bed882..7b4d98a647 100644
--- a/patches/server/0232-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0227-Vanished-players-don-t-have-rights.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 3b2322e359ea0fa8cf6c256054c4d0dcd3f43d73..1382a16d21133b368158914509eb9ef3e0694ffd 100644
+index bdefda914a7f93b8393a06f112ea9239d9685d51..54dfc45f9b350a9d4c2872ded5199ad13c797c80 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -209,7 +209,14 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0233-Allow-disabling-armour-stand-ticking.patch b/patches/server/0228-Allow-disabling-armour-stand-ticking.patch
index 4b9030fdc9..ac3d013f29 100644
--- a/patches/server/0233-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/server/0228-Allow-disabling-armour-stand-ticking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5993ea31ebdf1b37f85cee27f11234b7981f77fe..831e874f01d8edcff12a094dbf918d2533939c60 100644
+index 1cf6eb1b578561dfd9e734843fb87e477c7bde9e..d1b2b8c339449d57890fda5a8ff43786bbdd227d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -419,4 +419,10 @@ public class PaperWorldConfig {
+@@ -414,4 +414,10 @@ public class PaperWorldConfig {
      private void armorStandEntityLookups() {
          armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true);
      }
diff --git a/patches/server/0234-SkeletonHorse-Additions.patch b/patches/server/0229-SkeletonHorse-Additions.patch
index 3fa78942e4..3fa78942e4 100644
--- a/patches/server/0234-SkeletonHorse-Additions.patch
+++ b/patches/server/0229-SkeletonHorse-Additions.patch
diff --git a/patches/server/0235-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch
index 6327eec23e..6327eec23e 100644
--- a/patches/server/0235-Don-t-call-getItemMeta-on-hasItemMeta.patch
+++ b/patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0236-Implement-Expanded-ArmorStand-API.patch b/patches/server/0231-Implement-Expanded-ArmorStand-API.patch
index ace889510d..ace889510d 100644
--- a/patches/server/0236-Implement-Expanded-ArmorStand-API.patch
+++ b/patches/server/0231-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0237-AnvilDamageEvent.patch b/patches/server/0232-AnvilDamageEvent.patch
index f2443baeff..f2443baeff 100644
--- a/patches/server/0237-AnvilDamageEvent.patch
+++ b/patches/server/0232-AnvilDamageEvent.patch
diff --git a/patches/server/0238-Add-hand-to-bucket-events.patch b/patches/server/0233-Add-hand-to-bucket-events.patch
index 9720caf629..9720caf629 100644
--- a/patches/server/0238-Add-hand-to-bucket-events.patch
+++ b/patches/server/0233-Add-hand-to-bucket-events.patch
diff --git a/patches/server/0239-Add-TNTPrimeEvent.patch b/patches/server/0234-Add-TNTPrimeEvent.patch
index 63784ce3b7..63784ce3b7 100644
--- a/patches/server/0239-Add-TNTPrimeEvent.patch
+++ b/patches/server/0234-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
index 38514face6..ce1508b012 100644
--- a/patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index e933d54c309da046554029d1f232daa31659e537..9dba4eb0e9c4e4d974edaeaf41c370d3996dd94e 100644
+index 114a65963b65597ff915ec3a0d75bb78f33bd774..d654affc5565622cfabde9b838aa2b40e4e122bb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -318,4 +318,18 @@ public class PaperConfig {
diff --git a/patches/server/0241-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch
index c0c7c171ff..c0c7c171ff 100644
--- a/patches/server/0241-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0242-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0237-Fix-client-rendering-skulls-from-same-user.patch
index 4e0e6f3b86..4e0e6f3b86 100644
--- a/patches/server/0242-Fix-client-rendering-skulls-from-same-user.patch
+++ b/patches/server/0237-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 156e358d93..156e358d93 100644
--- a/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
index 54016bd330..7a3c2108b2 100644
--- a/patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9dba4eb0e9c4e4d974edaeaf41c370d3996dd94e..62671d6c04f973594a6ca95446774c4b5a78a575 100644
+index d654affc5565622cfabde9b838aa2b40e4e122bb..23ddaffadfafc3b23a09fcba2bf708f570415006 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -48,7 +48,7 @@ index 61edb76381a83f36d0ade1c35e9999eaad58abd2..432f1d6e5989f861e762a8b919a0048b
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 104162d1641499af3559e51fe9ad32b91785416a..8d429d2ebe63a429912bafe20eb24688aae939a1 100644
+index eb5a7b302b027ab19d42326683f93671a40c64d6..57533be63ac4bb70be6e94598565211d4fce6da2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -904,6 +904,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
index d11cc073c4..d11cc073c4 100644
--- a/patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
index 742b00ee96..742b00ee96 100644
--- a/patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index a583e1baff..a583e1baff 100644
--- a/patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0248-Optimize-BlockPosition-helper-methods.patch b/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
index b69dfaf75d..b69dfaf75d 100644
--- a/patches/server/0248-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0243-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0249-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 891e5bf4db..891e5bf4db 100644
--- a/patches/server/0249-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0250-Slime-Pathfinder-Events.patch b/patches/server/0245-Slime-Pathfinder-Events.patch
index 40c543b870..40c543b870 100644
--- a/patches/server/0250-Slime-Pathfinder-Events.patch
+++ b/patches/server/0245-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
index d9b466d628..abb7ec8937 100644
--- a/patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 831e874f01d8edcff12a094dbf918d2533939c60..e57ab8a3e6efd78e12385042b7d91dcd27fef11d 100644
+index d1b2b8c339449d57890fda5a8ff43786bbdd227d..8c50036896602ab6b00979351918878d08c9c75e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -425,4 +425,10 @@ public class PaperWorldConfig {
+@@ -420,4 +420,10 @@ public class PaperWorldConfig {
          this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
          log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
      }
diff --git a/patches/server/0252-Optimize-CraftBlockData-Creation.patch b/patches/server/0247-Optimize-CraftBlockData-Creation.patch
index 998ef1e21b..998ef1e21b 100644
--- a/patches/server/0252-Optimize-CraftBlockData-Creation.patch
+++ b/patches/server/0247-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0253-Optimize-MappedRegistry.patch b/patches/server/0248-Optimize-MappedRegistry.patch
index bb17dbc545..bb17dbc545 100644
--- a/patches/server/0253-Optimize-MappedRegistry.patch
+++ b/patches/server/0248-Optimize-MappedRegistry.patch
diff --git a/patches/server/0254-Add-PhantomPreSpawnEvent.patch b/patches/server/0249-Add-PhantomPreSpawnEvent.patch
index e3026cd52d..e3026cd52d 100644
--- a/patches/server/0254-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0249-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0255-Add-More-Creeper-API.patch b/patches/server/0250-Add-More-Creeper-API.patch
index b92aff3e3f..b92aff3e3f 100644
--- a/patches/server/0255-Add-More-Creeper-API.patch
+++ b/patches/server/0250-Add-More-Creeper-API.patch
diff --git a/patches/server/0256-Inventory-removeItemAnySlot.patch b/patches/server/0251-Inventory-removeItemAnySlot.patch
index 533e72fb45..533e72fb45 100644
--- a/patches/server/0256-Inventory-removeItemAnySlot.patch
+++ b/patches/server/0251-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 592f2eccb1..592f2eccb1 100644
--- a/patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch
index 62af0ac1fb..d1864752c5 100644
--- a/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch
@@ -161,7 +161,7 @@ index 0fda52841b5e1643efeda92106124998abc4e0aa..fe79c0add4f7cb18d487c5bb9415c40c
  
      public static Timing getTickList(ServerLevel worldserver, String timingsType) {
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 62671d6c04f973594a6ca95446774c4b5a78a575..7682300eec0d097798c1bd68de519513c438fd17 100644
+index 23ddaffadfafc3b23a09fcba2bf708f570415006..0e4cb05e78ff78bce6ca42fd30b6f9ff42f87f7d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch
index a639c0f642..a639c0f642 100644
--- a/patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch
index 0527da3234..18c72bb460 100644
--- a/patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5897b067797af48a6c643c3a3db7d4b12ec6822f..f2fcfc12f4efd3317f3d6540f3b73f028b66d5ee 100644
+index 1366dc333449dd6fe2607152db47d1a45028aeb0..fe64837ce62277b24eba9dcb83c02f2c9d4cad0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2412,6 +2412,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2401,6 +2401,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          return this.adventure$pointers;
      }
diff --git a/patches/server/0261-Improve-death-events.patch b/patches/server/0256-Improve-death-events.patch
index 191ce68cfd..6afa0fecf0 100644
--- a/patches/server/0261-Improve-death-events.patch
+++ b/patches/server/0256-Improve-death-events.patch
@@ -308,10 +308,10 @@ index 91cf7728aee475cb36f2c02bbfb7e3d2e0d00576..a3a900d10440ed5ebe24370a77ccb6ca
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f2fcfc12f4efd3317f3d6540f3b73f028b66d5ee..e6ddc55261c4feccccf476b925e85e67970f4c62 100644
+index fe64837ce62277b24eba9dcb83c02f2c9d4cad0f..df7821d72094bfe2c781d87bc2bc816569f22c2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1975,7 +1975,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1964,7 +1964,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void sendHealthUpdate() {
diff --git a/patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch
index d8349a70c7..d8349a70c7 100644
--- a/patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0263-Mob-Pathfinding-API.patch b/patches/server/0258-Mob-Pathfinding-API.patch
index 99a04d0b70..99a04d0b70 100644
--- a/patches/server/0263-Mob-Pathfinding-API.patch
+++ b/patches/server/0258-Mob-Pathfinding-API.patch
diff --git a/patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 62b297eaff..62b297eaff 100644
--- a/patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch
index 8e59eff59d..8e59eff59d 100644
--- a/patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch
+++ b/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
index ded712fe98..ded712fe98 100644
--- a/patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
+++ b/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch
index c42a3625c4..c42a3625c4 100644
--- a/patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch
index d75b53a879..d75b53a879 100644
--- a/patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch
index 740e527815..740e527815 100644
--- a/patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch
+++ b/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0270-Honor-EntityAgeable.ageLock.patch b/patches/server/0265-Honor-EntityAgeable.ageLock.patch
index 8a44dcb055..8a44dcb055 100644
--- a/patches/server/0270-Honor-EntityAgeable.ageLock.patch
+++ b/patches/server/0265-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0271-Configurable-connection-throttle-kick-message.patch b/patches/server/0266-Configurable-connection-throttle-kick-message.patch
index 3d7e5a655a..369ed58059 100644
--- a/patches/server/0271-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0266-Configurable-connection-throttle-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7682300eec0d097798c1bd68de519513c438fd17..83875260a131102612e700e7d620cc79a7452c5b 100644
+index 0e4cb05e78ff78bce6ca42fd30b6f9ff42f87f7d..b0b3820e9609b301f92545c87289279df975424e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -294,6 +294,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 7682300eec0d097798c1bd68de519513c438fd17..83875260a131102612e700e7d620cc79
          Object val = config.get("settings.save-player-data");
          if (val instanceof Boolean) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 85fea9b0bf84a8b40098f35eac503070914c98d8..687308a414095f95b567a2993b679d8b62856578 100644
+index a95b2ee0e80832f786bdb8f3d0bc00cbfae26fd4..86f99fbe3eb7a6c7ef288d7bff1d653df6f34790 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -50,7 +50,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0272-Hook-into-CB-plugin-rewrites.patch b/patches/server/0267-Hook-into-CB-plugin-rewrites.patch
index a10bd7e5d0..a10bd7e5d0 100644
--- a/patches/server/0272-Hook-into-CB-plugin-rewrites.patch
+++ b/patches/server/0267-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0273-PreSpawnerSpawnEvent.patch b/patches/server/0268-PreSpawnerSpawnEvent.patch
index 0e9cb1f017..0e9cb1f017 100644
--- a/patches/server/0273-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0268-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0274-Add-LivingEntity-getTargetEntity.patch b/patches/server/0269-Add-LivingEntity-getTargetEntity.patch
index 886dba3bbe..886dba3bbe 100644
--- a/patches/server/0274-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0269-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0275-Add-sun-related-API.patch b/patches/server/0270-Add-sun-related-API.patch
index dbba5a6c4f..dbba5a6c4f 100644
--- a/patches/server/0275-Add-sun-related-API.patch
+++ b/patches/server/0270-Add-sun-related-API.patch
diff --git a/patches/server/0276-Turtle-API.patch b/patches/server/0271-Turtle-API.patch
index fb6ff88d30..fb6ff88d30 100644
--- a/patches/server/0276-Turtle-API.patch
+++ b/patches/server/0271-Turtle-API.patch
diff --git a/patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch
index 18797e4cc4..18797e4cc4 100644
--- a/patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
index 3fad92473f..5d84ab043d 100644
--- a/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
+++ b/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
@@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 1382a16d21133b368158914509eb9ef3e0694ffd..47d27f95bdd4d556f1750e7ad8493248ba63888a 100644
+index 54dfc45f9b350a9d4c2872ded5199ad13c797c80..7837fb0419c94731eba618e903353ddc047bbed6 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -57,6 +57,18 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch
index 0d34c16c30..bc475ba2ee 100644
--- a/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 83875260a131102612e700e7d620cc79a7452c5b..c63b7b01094abaf41bc58c123d6ddeb68bc32195 100644
+index b0b3820e9609b301f92545c87289279df975424e..c1fbff8ccfdb95aebc330e2621c4fc9c71ebfb9e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -9,6 +9,7 @@ import java.io.IOException;
@@ -225,7 +225,7 @@ index 5ebc450432805d52457b9f8ff1e2b1981bdd78e6..4c06e62e967f28eb844d74237948834e
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 53650ba59f05d8c7549a71d89c3734e02c6a7fea..532185882420c04c1a996a7d269af554ee106ed1 100644
+index 57533be63ac4bb70be6e94598565211d4fce6da2..39389c3389eb6b118b662cb77552d198b0b21c05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -759,7 +759,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0280-Add-more-Witch-API.patch b/patches/server/0275-Add-more-Witch-API.patch
index 7d2cd72ae6..7d2cd72ae6 100644
--- a/patches/server/0280-Add-more-Witch-API.patch
+++ b/patches/server/0275-Add-more-Witch-API.patch
diff --git a/patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch
index 0e81942661..0e81942661 100644
--- a/patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch
+++ b/patches/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 7961dbbeb0..4099e9cc2e 100644
--- a/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e57ab8a3e6efd78e12385042b7d91dcd27fef11d..eb44aef0aecf65f5c1b19f42bf85a3a263965a7c 100644
+index 8c50036896602ab6b00979351918878d08c9c75e..a4b20f8616b6fe2046e7a5f00306565b59cd570d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -431,4 +431,9 @@ public class PaperWorldConfig {
+@@ -426,4 +426,9 @@ public class PaperWorldConfig {
          waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
          log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
      }
diff --git a/patches/server/0283-Reset-players-airTicks-on-respawn.patch b/patches/server/0278-Reset-players-airTicks-on-respawn.patch
index 6ff23153dd..6ff23153dd 100644
--- a/patches/server/0283-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0278-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index c4f99ad87b..c4f99ad87b 100644
--- a/patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index aeda232b23..e83e2ecb38 100644
--- a/patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -58,7 +58,7 @@ index 90d22b75fd33d8355e59b6bab79757c5b436c9d7..a8772417eb54e1a52c490b75b470a502
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ca48908148b6d9f4ae03fd55bcaf37e5fdb01cab..2cc2e496991db1ca4154816ecd6121b82fca07c6 100644
+index f347842c224ee565d45f5120b2e3a359a9cade65..e2150c3a7cb7898adda6e53d9aeed8698d819a30 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -320,6 +320,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0286-Optimize-World-Time-Updates.patch b/patches/server/0281-Optimize-World-Time-Updates.patch
index 1a47a58905..1a47a58905 100644
--- a/patches/server/0286-Optimize-World-Time-Updates.patch
+++ b/patches/server/0281-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0287-Restore-custom-InventoryHolder-support.patch b/patches/server/0282-Restore-custom-InventoryHolder-support.patch
index 62f1b3a9b0..62f1b3a9b0 100644
--- a/patches/server/0287-Restore-custom-InventoryHolder-support.patch
+++ b/patches/server/0282-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0288-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0283-Use-Vanilla-Minecart-Speeds.patch
index 00688862a0..00688862a0 100644
--- a/patches/server/0288-Use-Vanilla-Minecart-Speeds.patch
+++ b/patches/server/0283-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0289-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0284-Fix-SpongeAbsortEvent-handling.patch
index 85241ba175..85241ba175 100644
--- a/patches/server/0289-Fix-SpongeAbsortEvent-handling.patch
+++ b/patches/server/0284-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch
index 391c841f2a..391c841f2a 100644
--- a/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0291-Make-the-default-permission-message-configurable.patch b/patches/server/0286-Make-the-default-permission-message-configurable.patch
index 4cdae25eb0..f498d52fb4 100644
--- a/patches/server/0291-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0286-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 1fa190e098079522e0fe3593fa261c1b7ad4e24b..1eb45df9dca5d0c31ac46709e706136a
      }
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d728c42ba986c5c354a205b1eb4c4d93b0b2d128..f938bd401c384d8e03c8ff90af08efc70629c77e 100644
+index c1fbff8ccfdb95aebc330e2621c4fc9c71ebfb9e..36719c689a24c63e7d9a5b40f8c262c182a31b21 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -20,6 +20,7 @@ import java.util.regex.Pattern;
diff --git a/patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0287-Prevent-rayTrace-from-loading-chunks.patch
index dd9d69d953..dd9d69d953 100644
--- a/patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch
+++ b/patches/server/0287-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0293-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0288-Handle-Large-Packets-disconnecting-client.patch
index 0482070972..0482070972 100644
--- a/patches/server/0293-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0288-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0294-force-entity-dismount-during-teleportation.patch b/patches/server/0289-force-entity-dismount-during-teleportation.patch
index 860e145bcd..860e145bcd 100644
--- a/patches/server/0294-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0289-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0295-Add-more-Zombie-API.patch b/patches/server/0290-Add-more-Zombie-API.patch
index 27a69eb714..27a69eb714 100644
--- a/patches/server/0295-Add-more-Zombie-API.patch
+++ b/patches/server/0290-Add-more-Zombie-API.patch
diff --git a/patches/server/0296-Book-Size-Limits.patch b/patches/server/0291-Book-Size-Limits.patch
index 8e324dfaa7..94aa39a5b0 100644
--- a/patches/server/0296-Book-Size-Limits.patch
+++ b/patches/server/0291-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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0b0cdbea6693c18519212604a391e8100afbcc70..a3c3656ba4e8bb85bfb3186d6284f02f09975b13 100644
+index 36719c689a24c63e7d9a5b40f8c262c182a31b21..83bf428abd3be89e34cf42638bd1357a708ea0e3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -369,6 +369,13 @@ public class PaperConfig {
diff --git a/patches/server/0297-Add-PlayerConnectionCloseEvent.patch b/patches/server/0292-Add-PlayerConnectionCloseEvent.patch
index 5a881a7a41..5a881a7a41 100644
--- a/patches/server/0297-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0292-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0298-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0293-Prevent-Enderman-from-loading-chunks.patch
index 60ad30486e..60ad30486e 100644
--- a/patches/server/0298-Prevent-Enderman-from-loading-chunks.patch
+++ b/patches/server/0293-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 1d3998cbf7..0b2063eeb6 100644
--- a/patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -106,7 +106,7 @@ index f6665825e62a0cd912e6b06df6d68795596486f0..1f2bc88d4570c6ef00e67a772b745e0b
      public Location getBedSpawnLocation() {
          CompoundTag data = this.getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e6ddc55261c4feccccf476b925e85e67970f4c62..48dd4649b9ea92bb3fb1fa250d1dc0dd45e32e9a 100644
+index df7821d72094bfe2c781d87bc2bc816569f22c2e..3b26461e993207206bfbfd07a9e5ff04ed4460b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -161,6 +161,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -117,7 +117,7 @@ index e6ddc55261c4feccccf476b925e85e67970f4c62..48dd4649b9ea92bb3fb1fa250d1dc0dd
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -1587,6 +1588,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1576,6 +1577,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index e6ddc55261c4feccccf476b925e85e67970f4c62..48dd4649b9ea92bb3fb1fa250d1dc0dd
      public void readExtraData(CompoundTag nbttagcompound) {
          this.hasPlayedBefore = true;
          if (nbttagcompound.contains("bukkit")) {
-@@ -1609,6 +1622,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1598,6 +1611,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
@@ -145,7 +145,7 @@ index e6ddc55261c4feccccf476b925e85e67970f4c62..48dd4649b9ea92bb3fb1fa250d1dc0dd
          if (!nbttagcompound.contains("bukkit")) {
              nbttagcompound.put("bukkit", new CompoundTag());
          }
-@@ -1623,6 +1638,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1612,6 +1627,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("firstPlayed", this.getFirstPlayed());
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
diff --git a/patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 6ad108b93f..6ad108b93f 100644
--- a/patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0301-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0296-Block-Entity-remove-from-being-called-on-Players.patch
index e8642e61a3..bcccce1885 100644
--- a/patches/server/0301-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0296-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 48dd4649b9ea92bb3fb1fa250d1dc0dd45e32e9a..ba9262a610776cfadda6ac0fda007066c2d485b1 100644
+index 3b26461e993207206bfbfd07a9e5ff04ed4460b4..3412f03fae9857243ae51905218818c4ad64beec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2459,6 +2459,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2448,6 +2448,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetAttackStrengthTicker();
      }
diff --git a/patches/server/0302-BlockDestroyEvent.patch b/patches/server/0297-BlockDestroyEvent.patch
index 6671426322..6671426322 100644
--- a/patches/server/0302-BlockDestroyEvent.patch
+++ b/patches/server/0297-BlockDestroyEvent.patch
diff --git a/patches/server/0303-Async-command-map-building.patch b/patches/server/0298-Async-command-map-building.patch
index 22cd32cfcc..22cd32cfcc 100644
--- a/patches/server/0303-Async-command-map-building.patch
+++ b/patches/server/0298-Async-command-map-building.patch
diff --git a/patches/server/0304-Implement-Brigadier-Mojang-API.patch b/patches/server/0299-Implement-Brigadier-Mojang-API.patch
index 6ed7005ef5..8eeaded4e5 100644
--- a/patches/server/0304-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0299-Implement-Brigadier-Mojang-API.patch
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 80c533bc8966e4f9d7b19ef98faf04146d14be7d..d84e04f2cf8870611d36834c5ea77a82e42df6d5 100644
+index ccaef92ae87bd1723957e98b3b632fb79b8eeb3d..fd4b0c173be72516f22c6e5d540249e3079a7216 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,7 @@ repositories {
diff --git a/patches/server/0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
index 903ba48692..903ba48692 100644
--- a/patches/server/0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
+++ b/patches/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0306-Limit-Client-Sign-length-more.patch b/patches/server/0301-Limit-Client-Sign-length-more.patch
index 9a8c695108..9a8c695108 100644
--- a/patches/server/0306-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0301-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 1f80323016..1f80323016 100644
--- a/patches/server/0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index bdd97d4256..bdd97d4256 100644
--- a/patches/server/0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0309-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch
index 89a00c32d5..89a00c32d5 100644
--- a/patches/server/0309-Handle-Oversized-Tile-Entities-in-chunks.patch
+++ b/patches/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index cc6da2d01b..cc6da2d01b 100644
--- a/patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 5fc785eca6..5fc785eca6 100644
--- a/patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch
index 2b7d6b0305..2b7d6b0305 100644
--- a/patches/server/0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch
+++ b/patches/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0313-Entity-getEntitySpawnReason.patch b/patches/server/0308-Entity-getEntitySpawnReason.patch
index 67405e4977..67405e4977 100644
--- a/patches/server/0313-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0308-Entity-getEntitySpawnReason.patch
diff --git a/patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0309-Update-entity-Metadata-for-all-tracked-players.patch
index 4c83a4f456..4c83a4f456 100644
--- a/patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0309-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/patches/server/0315-Fire-event-on-GS4-query.patch b/patches/server/0310-Fire-event-on-GS4-query.patch
index 4196ec4456..4196ec4456 100644
--- a/patches/server/0315-Fire-event-on-GS4-query.patch
+++ b/patches/server/0310-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0316-Implement-PlayerPostRespawnEvent.patch b/patches/server/0311-Implement-PlayerPostRespawnEvent.patch
index 8765dc67f9..8765dc67f9 100644
--- a/patches/server/0316-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0311-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 309d46c6a4..309d46c6a4 100644
--- a/patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0318-Server-Tick-Events.patch b/patches/server/0313-Server-Tick-Events.patch
index 38d655d6f4..38d655d6f4 100644
--- a/patches/server/0318-Server-Tick-Events.patch
+++ b/patches/server/0313-Server-Tick-Events.patch
diff --git a/patches/server/0319-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0314-PlayerDeathEvent-getItemsToKeep.patch
index d9cfb38273..d9cfb38273 100644
--- a/patches/server/0319-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0314-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0315-Optimize-Captured-TileEntity-Lookup.patch
index 78a1360904..78a1360904 100644
--- a/patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0315-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0321-Add-Heightmap-API.patch b/patches/server/0316-Add-Heightmap-API.patch
index 6ab1bbb77e..6ab1bbb77e 100644
--- a/patches/server/0321-Add-Heightmap-API.patch
+++ b/patches/server/0316-Add-Heightmap-API.patch
diff --git a/patches/server/0322-Mob-Spawner-API-Enhancements.patch b/patches/server/0317-Mob-Spawner-API-Enhancements.patch
index 267037a711..267037a711 100644
--- a/patches/server/0322-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0317-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0323-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch
index 0a939fe4d5..0a939fe4d5 100644
--- a/patches/server/0323-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index de77003ffb..de77003ffb 100644
--- a/patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index c1ca78c2b7..876370429d 100644
--- a/patches/server/0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -29,7 +29,7 @@ index 9be13843b17fff55cac404bd372581f7fadee4ac..6cb94b3b188a43535658dedf00b74236
  
      public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 879ad3ef7ea5fc9e047d2abfb77d2b08c5a71079..c35b22387c242d8322e58825a85b2f5289a41b9d 100644
+index ba0b22c45e0bdcda7087a262a82405a9efe8cc61..36b20b697850dff10910d7f4cd9543ba11e60568 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2061,7 +2061,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0326-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0321-improve-CraftWorld-isChunkLoaded.patch
index 9845a27315..9845a27315 100644
--- a/patches/server/0326-improve-CraftWorld-isChunkLoaded.patch
+++ b/patches/server/0321-improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/0327-Implement-CraftBlockSoundGroup.patch b/patches/server/0322-Implement-CraftBlockSoundGroup.patch
index ee70b2532f..ee70b2532f 100644
--- a/patches/server/0327-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0322-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 10779a96dc..5558a4efa3 100644
--- a/patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eb44aef0aecf65f5c1b19f42bf85a3a263965a7c..5589ee42959e3665dd5df9049fe108b6f6629608 100644
+index a4b20f8616b6fe2046e7a5f00306565b59cd570d..47c8ea0e871959c01371f591c92d7955c0722878 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -56,6 +56,12 @@ public class PaperWorldConfig {
diff --git a/patches/server/0329-ChunkMapDistance-CME.patch b/patches/server/0324-ChunkMapDistance-CME.patch
index 6043b5d3d0..6043b5d3d0 100644
--- a/patches/server/0329-ChunkMapDistance-CME.patch
+++ b/patches/server/0324-ChunkMapDistance-CME.patch
diff --git a/patches/server/0330-Chunk-debug-command.patch b/patches/server/0325-Chunk-debug-command.patch
index 1f845abc5a..1f845abc5a 100644
--- a/patches/server/0330-Chunk-debug-command.patch
+++ b/patches/server/0325-Chunk-debug-command.patch
diff --git a/patches/server/0331-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0326-Allow-Saving-of-Oversized-Chunks.patch
index 7a71ae6af9..7a71ae6af9 100644
--- a/patches/server/0331-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0326-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0332-Expose-the-internal-current-tick.patch b/patches/server/0327-Expose-the-internal-current-tick.patch
index 6413e04251..6413e04251 100644
--- a/patches/server/0332-Expose-the-internal-current-tick.patch
+++ b/patches/server/0327-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0333-Fix-World-isChunkGenerated-calls.patch b/patches/server/0328-Fix-World-isChunkGenerated-calls.patch
index 3d88741861..3d88741861 100644
--- a/patches/server/0333-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0328-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch
index 2ba2f1d4f7..2ba2f1d4f7 100644
--- a/patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index c9a9791996..1cb6d02e6b 100644
--- a/patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -17,10 +17,10 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5589ee42959e3665dd5df9049fe108b6f6629608..e5365453655c0f394dea3d3b388afc24f7724b26 100644
+index 47c8ea0e871959c01371f591c92d7955c0722878..5dd6889e56b54402251978c9f2cff82729e0f3b6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -442,4 +442,15 @@ public class PaperWorldConfig {
+@@ -437,4 +437,15 @@ public class PaperWorldConfig {
      private void preventMovingIntoUnloadedChunks() {
          preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
      }
diff --git a/patches/server/0336-Configurable-projectile-relative-velocity.patch b/patches/server/0331-Configurable-projectile-relative-velocity.patch
index 1f78daf3b0..b5a5ea9023 100644
--- a/patches/server/0336-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0331-Configurable-projectile-relative-velocity.patch
@@ -25,10 +25,10 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e5365453655c0f394dea3d3b388afc24f7724b26..4cbb5e77dad6b096a7de818300c6fc112d983ceb 100644
+index 5dd6889e56b54402251978c9f2cff82729e0f3b6..b59eb179c188382d13c342ff78bc76c30ade8335 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -452,5 +452,10 @@ public class PaperWorldConfig {
+@@ -447,5 +447,10 @@ public class PaperWorldConfig {
              log("Using improved mob spawn limits (Only Natural Spawns impact spawn limits for more natural spawns)");
          }
      }
@@ -40,7 +40,7 @@ index e5365453655c0f394dea3d3b388afc24f7724b26..4cbb5e77dad6b096a7de818300c6fc11
  }
  
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 47d27f95bdd4d556f1750e7ad8493248ba63888a..15744949537430d8d8ae71ea72481126c9aff7bd 100644
+index 7837fb0419c94731eba618e903353ddc047bbed6..ccaa97956e40c6a79371d813719f65687991ec5b 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -161,7 +161,7 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0337-offset-item-frame-ticking.patch b/patches/server/0332-offset-item-frame-ticking.patch
index 982a600c76..982a600c76 100644
--- a/patches/server/0337-offset-item-frame-ticking.patch
+++ b/patches/server/0332-offset-item-frame-ticking.patch
diff --git a/patches/server/0338-Fix-MC-158900.patch b/patches/server/0333-Fix-MC-158900.patch
index 0a3f421920..0a3f421920 100644
--- a/patches/server/0338-Fix-MC-158900.patch
+++ b/patches/server/0333-Fix-MC-158900.patch
diff --git a/patches/server/0339-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0334-Prevent-consuming-the-wrong-itemstack.patch
index cb72cd0d52..cb72cd0d52 100644
--- a/patches/server/0339-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0334-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0340-Dont-send-unnecessary-sign-update.patch b/patches/server/0335-Dont-send-unnecessary-sign-update.patch
index 2d33438703..2d33438703 100644
--- a/patches/server/0340-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0335-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0341-Add-option-to-disable-pillager-patrols.patch b/patches/server/0336-Add-option-to-disable-pillager-patrols.patch
index 27849c5ae0..49e3130841 100644
--- a/patches/server/0341-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0336-Add-option-to-disable-pillager-patrols.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable pillager patrols
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4cbb5e77dad6b096a7de818300c6fc112d983ceb..3510509a02b5c0de695b55792c035943ceaef222 100644
+index b59eb179c188382d13c342ff78bc76c30ade8335..9bc6dc4e6159aa0ccad3cd7bdb331a852c5978ae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -457,5 +457,10 @@ public class PaperWorldConfig {
+@@ -452,5 +452,10 @@ public class PaperWorldConfig {
      private void disableRelativeProjectileVelocity() {
          disableRelativeProjectileVelocity = getBoolean("game-mechanics.disable-relative-projectile-velocity", false);
      }
diff --git a/patches/server/0342-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index f93696310b..f93696310b 100644
--- a/patches/server/0342-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/patches/server/0343-Flat-bedrock-generator-settings.patch b/patches/server/0338-Flat-bedrock-generator-settings.patch
index acb165ff56..30c87be52e 100644
--- a/patches/server/0343-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0338-Flat-bedrock-generator-settings.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Flat bedrock generator settings
 Co-authored-by: Noah van der Aa <[email protected]>
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3510509a02b5c0de695b55792c035943ceaef222..03fbe3ff215cc482108a8926960bb60150ffb80d 100644
+index 9bc6dc4e6159aa0ccad3cd7bdb331a852c5978ae..b602e30a7e1b760704ab2b53b594e1ebc057db01 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -462,5 +462,10 @@ public class PaperWorldConfig {
+@@ -457,5 +457,10 @@ public class PaperWorldConfig {
      private void pillagerSettings() {
          disablePillagerPatrols = getBoolean("game-mechanics.disable-pillager-patrols", disablePillagerPatrols);
      }
diff --git a/patches/server/0344-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index ea3c47b7b2..ea3c47b7b2 100644
--- a/patches/server/0344-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0345-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 21b246762c..902a1f2d5e 100644
--- a/patches/server/0345-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-145656 Fix Follow Range Initial Target
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 03fbe3ff215cc482108a8926960bb60150ffb80d..e4820ece5279a0324f1e7ebf0027dcb054b7ecc3 100644
+index b602e30a7e1b760704ab2b53b594e1ebc057db01..11c5c7c703cbf631097056dd00a18a0236fac806 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -467,5 +467,10 @@ public class PaperWorldConfig {
+@@ -462,5 +462,10 @@ public class PaperWorldConfig {
      private void generatorSettings() {
          generateFlatBedrock = getBoolean("generator-settings.flat-bedrock", this.generateFlatBedrock);
      }
diff --git a/patches/server/0346-Duplicate-UUID-Resolve-Option.patch b/patches/server/0341-Duplicate-UUID-Resolve-Option.patch
index 0498354902..9f63a884e0 100644
--- a/patches/server/0346-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0341-Duplicate-UUID-Resolve-Option.patch
@@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e4820ece5279a0324f1e7ebf0027dcb054b7ecc3..3e3a48a636c225ec113c1c64f6ffc8a37ad9169e 100644
+index 11c5c7c703cbf631097056dd00a18a0236fac806..2f060bc6b108df0c4fb07758005a911d92c09057 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -443,6 +443,45 @@ public class PaperWorldConfig {
+@@ -438,6 +438,45 @@ public class PaperWorldConfig {
          preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
      }
  
diff --git a/patches/server/0347-Optimize-Hoppers.patch b/patches/server/0342-Optimize-Hoppers.patch
index 1921d59992..66df27dd80 100644
--- a/patches/server/0347-Optimize-Hoppers.patch
+++ b/patches/server/0342-Optimize-Hoppers.patch
@@ -13,10 +13,10 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3e3a48a636c225ec113c1c64f6ffc8a37ad9169e..98adf2fd1c2e9fe75456266ea1d7604fe64109b1 100644
+index 2f060bc6b108df0c4fb07758005a911d92c09057..73d82e20d7353120a36815dc94be8c2253b2602d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -511,5 +511,17 @@ public class PaperWorldConfig {
+@@ -506,5 +506,17 @@ public class PaperWorldConfig {
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
      }
diff --git a/patches/server/0348-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch
index c929696bdd..c929696bdd 100644
--- a/patches/server/0348-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0349-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch
index 2c8a65022c..2c8a65022c 100644
--- a/patches/server/0349-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 71f28eb22f..71f28eb22f 100644
--- a/patches/server/0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch
index 64048f55c3..64048f55c3 100644
--- a/patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch
index 8ab8ea58fd..8ab8ea58fd 100644
--- a/patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/0353-Fix-items-not-falling-correctly.patch b/patches/server/0348-Fix-items-not-falling-correctly.patch
index c9c3bef8b4..c9c3bef8b4 100644
--- a/patches/server/0353-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0348-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0354-Lag-compensate-eating.patch b/patches/server/0349-Lag-compensate-eating.patch
index 26fdd71e3f..26fdd71e3f 100644
--- a/patches/server/0354-Lag-compensate-eating.patch
+++ b/patches/server/0349-Lag-compensate-eating.patch
diff --git a/patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch
index 6dc5f5aa31..6dc5f5aa31 100644
--- a/patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch
index 1b7f466946..1b7f466946 100644
--- a/patches/server/0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch
+++ b/patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0357-Add-effect-to-block-break-naturally.patch b/patches/server/0352-Add-effect-to-block-break-naturally.patch
index f05e2e493f..f05e2e493f 100644
--- a/patches/server/0357-Add-effect-to-block-break-naturally.patch
+++ b/patches/server/0352-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0358-Entity-Activation-Range-2.0.patch b/patches/server/0353-Entity-Activation-Range-2.0.patch
index 1438a9e4e0..1438a9e4e0 100644
--- a/patches/server/0358-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0353-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0359-Increase-Light-Queue-Size.patch b/patches/server/0354-Increase-Light-Queue-Size.patch
index 34095a9780..fa65647a58 100644
--- a/patches/server/0359-Increase-Light-Queue-Size.patch
+++ b/patches/server/0354-Increase-Light-Queue-Size.patch
@@ -14,10 +14,10 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 98adf2fd1c2e9fe75456266ea1d7604fe64109b1..d9c59ea6faa7155d415c89228c22da3311855c9d 100644
+index 73d82e20d7353120a36815dc94be8c2253b2602d..6b88162d286bdabda0449d52b87457ac70f84d69 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -523,5 +523,10 @@ public class PaperWorldConfig {
+@@ -518,5 +518,10 @@ public class PaperWorldConfig {
          hoppersIgnoreOccludingBlocks = getBoolean("hopper.ignore-occluding-blocks", hoppersIgnoreOccludingBlocks);
          log("Hopper Ignore Container Entities inside Occluding Blocks: " + (hoppersIgnoreOccludingBlocks ? "enabled" : "disabled"));
      }
diff --git a/patches/server/0360-Fix-Light-Command.patch b/patches/server/0355-Fix-Light-Command.patch
index 9829d9fb75..9829d9fb75 100644
--- a/patches/server/0360-Fix-Light-Command.patch
+++ b/patches/server/0355-Fix-Light-Command.patch
diff --git a/patches/server/0361-Anti-Xray.patch b/patches/server/0356-Anti-Xray.patch
index dd5f283f00..5dd064947f 100644
--- a/patches/server/0361-Anti-Xray.patch
+++ b/patches/server/0356-Anti-Xray.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Anti-Xray
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d9c59ea6faa7155d415c89228c22da3311855c9d..a17bf0ebe4d60effc72ea71ba4a7eba001875e19 100644
+index 6b88162d286bdabda0449d52b87457ac70f84d69..ed976e0582dee32ccf3aad49efb0dd773f5f9d80 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -1,11 +1,13 @@
@@ -22,7 +22,7 @@ index d9c59ea6faa7155d415c89228c22da3311855c9d..a17bf0ebe4d60effc72ea71ba4a7eba0
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
-@@ -528,5 +530,40 @@ public class PaperWorldConfig {
+@@ -523,5 +525,40 @@ public class PaperWorldConfig {
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
      }
@@ -1265,7 +1265,7 @@ index eea6816c52e6c0329f3bea0e7789cda9dd4a5a08..8038b37bdfdd41eadb4f3cb4dd7ef245
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index e9436ab14bac2b5267239bcb27ad450d93c680e4..b2050ea7e9c2ad544c45d37b01dd152b28cd3dc9 100644
+index 7b964beaaa66ac1c8b20dd7bda665ee30ca61b98..75dd63ffb2a7d8ec825162c66c156b07148b2f71 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -93,7 +93,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1597,7 +1597,7 @@ index f3c67a815c570beb14136905cbf5aa4046ee8394..f8f44cb6e823a0150f3abdab133f8ae2
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2cd64494b43a591c6471221bba649c7d74cfb64b..969a0fb7dba180b44cd5fe155b118ec28e0f61be 100644
+index 8bf2f50e314061a2493d0ce89b9d6104994fe6b6..a523e50d0542e8aeca961ed57346c3d7ecf01979 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2216,7 +2216,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0362-Implement-alternative-item-despawn-rate.patch b/patches/server/0357-Implement-alternative-item-despawn-rate.patch
index 2915ea05e6..13ab53a593 100644
--- a/patches/server/0362-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0357-Implement-alternative-item-despawn-rate.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement alternative item-despawn-rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a17bf0ebe4d60effc72ea71ba4a7eba001875e19..68ae6664541d1dbc611520e7e8612b4f5162c696 100644
+index ed976e0582dee32ccf3aad49efb0dd773f5f9d80..e129794e5cbf5155a232966ef4ff534c0007f1d9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -565,5 +565,52 @@ public class PaperWorldConfig {
+@@ -560,5 +560,52 @@ public class PaperWorldConfig {
              Bukkit.getLogger().warning("You have enabled permission-based Anti-Xray checking - depending on your permission plugin, this may cause performance issues");
          }
      }
diff --git a/patches/server/0363-Tracking-Range-Improvements.patch b/patches/server/0358-Tracking-Range-Improvements.patch
index 8d05c0e50d..8d05c0e50d 100644
--- a/patches/server/0363-Tracking-Range-Improvements.patch
+++ b/patches/server/0358-Tracking-Range-Improvements.patch
diff --git a/patches/server/0364-Fix-items-vanishing-through-end-portal.patch b/patches/server/0359-Fix-items-vanishing-through-end-portal.patch
index 0fd06fdeb9..0fd06fdeb9 100644
--- a/patches/server/0364-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0359-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0365-implement-optional-per-player-mob-spawns.patch b/patches/server/0360-implement-optional-per-player-mob-spawns.patch
index fdc9be4172..0c7f6968d5 100644
--- a/patches/server/0365-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0360-implement-optional-per-player-mob-spawns.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] implement optional per player mob spawns
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 68ae6664541d1dbc611520e7e8612b4f5162c696..6b0391743cd9e249c66796e7fe7a4da8c6b81b2e 100644
+index e129794e5cbf5155a232966ef4ff534c0007f1d9..575f277a5d38ade7d70c632712ea895cde3bfaae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -613,4 +613,12 @@ public class PaperWorldConfig {
+@@ -608,4 +608,12 @@ public class PaperWorldConfig {
              }
          }
      }
diff --git a/patches/server/0366-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch
index c5138af81d..c5138af81d 100644
--- a/patches/server/0366-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 9e66f6e302..9e66f6e302 100644
--- a/patches/server/0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index d84613d8f2..d84613d8f2 100644
--- a/patches/server/0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0369-Add-debug-for-sync-chunk-loads.patch b/patches/server/0364-Add-debug-for-sync-chunk-loads.patch
index 328659c043..328659c043 100644
--- a/patches/server/0369-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0364-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0370-Allow-overriding-the-java-version-check.patch b/patches/server/0365-Allow-overriding-the-java-version-check.patch
index 063aa0723b..063aa0723b 100644
--- a/patches/server/0370-Allow-overriding-the-java-version-check.patch
+++ b/patches/server/0365-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0371-Add-ThrownEggHatchEvent.patch b/patches/server/0366-Add-ThrownEggHatchEvent.patch
index c026427598..c026427598 100644
--- a/patches/server/0371-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0366-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0372-Entity-Jump-API.patch b/patches/server/0367-Entity-Jump-API.patch
index f99b63d8ef..f99b63d8ef 100644
--- a/patches/server/0372-Entity-Jump-API.patch
+++ b/patches/server/0367-Entity-Jump-API.patch
diff --git a/patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 8fa4357f98..2b2765c7e6 100644
--- a/patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6b0391743cd9e249c66796e7fe7a4da8c6b81b2e..5ba23152d2c7e45a824d49246706aa98c5d535ba 100644
+index 575f277a5d38ade7d70c632712ea895cde3bfaae..bcc6dd9f175431e47b92f6ee85b6f86d09011ac6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -526,6 +526,11 @@ public class PaperWorldConfig {
+@@ -521,6 +521,11 @@ public class PaperWorldConfig {
          log("Hopper Ignore Container Entities inside Occluding Blocks: " + (hoppersIgnoreOccludingBlocks ? "enabled" : "disabled"));
      }
  
diff --git a/patches/server/0374-Make-the-GUI-graph-fancier.patch b/patches/server/0369-Make-the-GUI-graph-fancier.patch
index b97ce20f84..b97ce20f84 100644
--- a/patches/server/0374-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0369-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0375-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch
index 9e73b8bda9..9e73b8bda9 100644
--- a/patches/server/0375-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0376-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0371-Validate-tripwire-hook-placement-before-update.patch
index 9c50f803d4..9c50f803d4 100644
--- a/patches/server/0376-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0371-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index f924b08743..9af21c4957 100644
--- a/patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5ba23152d2c7e45a824d49246706aa98c5d535ba..4c49a7a686ad1ff386999c21fa25acd30a615abf 100644
+index bcc6dd9f175431e47b92f6ee85b6f86d09011ac6..8ff3719184484399ba1760b0f5e43e3ca961a028 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -423,6 +423,11 @@ public class PaperWorldConfig {
+@@ -418,6 +418,11 @@ public class PaperWorldConfig {
          scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
      }
  
diff --git a/patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch
index 795b8b9c23..aa6c5e78b3 100644
--- a/patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch
@@ -8,10 +8,10 @@ This allows you to solve an issue in vanilla behavior where:
 * On normal difficulty they will have a 50% of getting infected or dying.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4c49a7a686ad1ff386999c21fa25acd30a615abf..c9d9461695d95e227f41b894b42b8be8d9d198cd 100644
+index 8ff3719184484399ba1760b0f5e43e3ca961a028..3db1230c3abe8f4ba321146f8adbff7fadad9362 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -536,6 +536,11 @@ public class PaperWorldConfig {
+@@ -531,6 +531,11 @@ public class PaperWorldConfig {
          nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
      }
  
diff --git a/patches/server/0379-Optimise-Chunk-getFluid.patch b/patches/server/0374-Optimise-Chunk-getFluid.patch
index a4e3dba9e4..1fdc56914c 100644
--- a/patches/server/0379-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0374-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index b2050ea7e9c2ad544c45d37b01dd152b28cd3dc9..a909fea6e1cedd1282bf975be200031dde41f99a 100644
+index 75dd63ffb2a7d8ec825162c66c156b07148b2f71..6129ea877c95445d358baf5036be8c4eee1f2770 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -373,18 +373,20 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0380-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 0af07e8203..0af07e8203 100644
--- a/patches/server/0380-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0381-Add-tick-times-API-and-mspt-command.patch b/patches/server/0376-Add-tick-times-API-and-mspt-command.patch
index 71ddf5838b..7bf2ffe7f4 100644
--- a/patches/server/0381-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0376-Add-tick-times-API-and-mspt-command.patch
@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f173e3e7d8ba8ffe1780e04dea41d8dbfe923917..483946af2d530bd5f311c0d76404a19deb69b7c2 100644
+index 83bf428abd3be89e34cf42638bd1357a708ea0e3..fda5a623ec6bba0ed4d230415f7b9779ee2e8ccf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -69,6 +69,7 @@ public class PaperConfig {
diff --git a/patches/server/0382-Expose-MinecraftServer-isRunning.patch b/patches/server/0377-Expose-MinecraftServer-isRunning.patch
index 78b67c9426..78b67c9426 100644
--- a/patches/server/0382-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0377-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0383-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch
index c6976b5d11..c6976b5d11 100644
--- a/patches/server/0383-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 65abeb63b7..dd92280d65 100644
--- a/patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,10 +10,10 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c9d9461695d95e227f41b894b42b8be8d9d198cd..e2b71ffd6057dcc84e4e0910fddd24c50ef9d38d 100644
+index 3db1230c3abe8f4ba321146f8adbff7fadad9362..feadef47940a1eab3ea79236a40ffd3deb2660b2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -505,8 +505,18 @@ public class PaperWorldConfig {
+@@ -500,8 +500,18 @@ public class PaperWorldConfig {
      }
  
      public boolean disablePillagerPatrols = false;
diff --git a/patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index c53005aca2..c53005aca2 100644
--- a/patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 881f96f85c..881f96f85c 100644
--- a/patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index e74cc3c4e0..e74cc3c4e0 100644
--- a/patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0388-Don-t-tick-dead-players.patch b/patches/server/0383-Don-t-tick-dead-players.patch
index 915abcb530..915abcb530 100644
--- a/patches/server/0388-Don-t-tick-dead-players.patch
+++ b/patches/server/0383-Don-t-tick-dead-players.patch
diff --git a/patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch
index f2b52414bc..f2b52414bc 100644
--- a/patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0390-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch
index 7d98711960..7d98711960 100644
--- a/patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch
index 894ba6bee6..894ba6bee6 100644
--- a/patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index bf7743fe1c..bf7743fe1c 100644
--- a/patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0393-Improved-Watchdog-Support.patch b/patches/server/0388-Improved-Watchdog-Support.patch
index 639953384d..2da28bf8c2 100644
--- a/patches/server/0393-Improved-Watchdog-Support.patch
+++ b/patches/server/0388-Improved-Watchdog-Support.patch
@@ -311,10 +311,10 @@ index 334fd625829c8e5e9c434b184f6d0084b2d6ccc8..e4c2bd0131a54495fbd1930ad0462251
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level.getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index a909fea6e1cedd1282bf975be200031dde41f99a..76a15f9a3419c430a288b52b824aa723a91f87fb 100644
+index 6129ea877c95445d358baf5036be8c4eee1f2770..9d667be3fe04b7d86986bd1ecaf4fce8b63198ae 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -1068,6 +1068,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -1057,6 +1057,7 @@ public class LevelChunk extends ChunkAccess {
  
                          gameprofilerfiller.pop();
                      } catch (Throwable throwable) {
@@ -323,7 +323,7 @@ index a909fea6e1cedd1282bf975be200031dde41f99a..76a15f9a3419c430a288b52b824aa723
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 20ee8418a40029d5bf962a8fa55b0c6a8aad0663..a4f3b793856042fccd072e76b65e02b6d2824c4f 100644
+index 6535d59e4fd04cce072de4d939b84e423b5ce52d..e8bb0ee58df4d175d39469555fb62accfe4c6cf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2061,7 +2061,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0394-Optimize-Pathfinding.patch b/patches/server/0389-Optimize-Pathfinding.patch
index 4259e48495..4259e48495 100644
--- a/patches/server/0394-Optimize-Pathfinding.patch
+++ b/patches/server/0389-Optimize-Pathfinding.patch
diff --git a/patches/server/0395-Reduce-Either-Optional-allocation.patch b/patches/server/0390-Reduce-Either-Optional-allocation.patch
index 0f4641263b..0f4641263b 100644
--- a/patches/server/0395-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0390-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch
index a47c3ab7a6..a47c3ab7a6 100644
--- a/patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch
+++ b/patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0397-Prevent-opening-inventories-when-frozen.patch b/patches/server/0392-Prevent-opening-inventories-when-frozen.patch
index 4581d52f28..4581d52f28 100644
--- a/patches/server/0397-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0392-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0398-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0393-Optimise-ArraySetSorted-removeIf.patch
index 1aa31112c4..1aa31112c4 100644
--- a/patches/server/0398-Optimise-ArraySetSorted-removeIf.patch
+++ b/patches/server/0393-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch
index f276bc6cb7..f276bc6cb7 100644
--- a/patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0400-Implement-Player-Client-Options-API.patch b/patches/server/0395-Implement-Player-Client-Options-API.patch
index a32f5dc87e..7bfc530eb2 100644
--- a/patches/server/0400-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0395-Implement-Player-Client-Options-API.patch
@@ -97,7 +97,7 @@ index 9b3f8b6ff7a2522e74bdbc914e35d566ab9c7697..e800229c294a04581c863349119f6727
          if (getMainArm() != packet.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ba9262a610776cfadda6ac0fda007066c2d485b1..b2785384d5f6d55a3a03525d7759e1616e2fb1f8 100644
+index 3412f03fae9857243ae51905218818c4ad64beec..f4643f7ca1468bd7bd60637bf6096a828d1c0a40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -561,6 +561,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index fe3a5aca21..fe3a5aca21 100644
--- a/patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0402-Broadcast-join-message-to-console.patch b/patches/server/0397-Broadcast-join-message-to-console.patch
index a24b77b0fc..a24b77b0fc 100644
--- a/patches/server/0402-Broadcast-join-message-to-console.patch
+++ b/patches/server/0397-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch
index f3f4e5d8b2..f3f4e5d8b2 100644
--- a/patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 1ea10446b3..1ea10446b3 100644
--- a/patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch
index bc37c146f2..bc37c146f2 100644
--- a/patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 50edad1be1..50edad1be1 100644
--- a/patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch
index f55e537dd5..f55e537dd5 100644
--- a/patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 8a5268c81a..8a5268c81a 100644
--- a/patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch
index 311f04b23c..06bbcb1f9b 100644
--- a/patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add phantom creative and insomniac controls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e2b71ffd6057dcc84e4e0910fddd24c50ef9d38d..e7cbdc75d7fd1252024c450ff0ec3b1ebdd17b93 100644
+index feadef47940a1eab3ea79236a40ffd3deb2660b2..e5d0168faf4988b2c033d146a798e6ab90e3b358 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -646,4 +646,11 @@ public class PaperWorldConfig {
+@@ -641,4 +641,11 @@ public class PaperWorldConfig {
          }
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true);
      }
diff --git a/patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 49de0408d7..49de0408d7 100644
--- a/patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0411-Villager-Restocks-API.patch b/patches/server/0406-Villager-Restocks-API.patch
index e0652b4cdb..e0652b4cdb 100644
--- a/patches/server/0411-Villager-Restocks-API.patch
+++ b/patches/server/0406-Villager-Restocks-API.patch
diff --git a/patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch
index e6a4d9322b..e6a4d9322b 100644
--- a/patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0413-Expose-game-version.patch b/patches/server/0408-Expose-game-version.patch
index 2d6166aa56..56c6885807 100644
--- a/patches/server/0413-Expose-game-version.patch
+++ b/patches/server/0408-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 41da8bba32211fedc6142b8e2a43e609571eab08..b38432ca44cca2fe459d15ef021c7243871fa899 100644
+index e8bb0ee58df4d175d39469555fb62accfe4c6cf9..9afc3e6b3717caa26f7239c4032b699b2226ddd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -572,6 +572,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0414-Optimize-Voxel-Shape-Merging.patch b/patches/server/0409-Optimize-Voxel-Shape-Merging.patch
index 7bfe849396..7bfe849396 100644
--- a/patches/server/0414-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0409-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 9ca79e1b80..9ca79e1b80 100644
--- a/patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0416-misc-debugging-dumps.patch b/patches/server/0411-misc-debugging-dumps.patch
index 735c1bb5b3..a56f23d099 100644
--- a/patches/server/0416-misc-debugging-dumps.patch
+++ b/patches/server/0411-misc-debugging-dumps.patch
@@ -74,7 +74,7 @@ index 0af65f1698e4ee9d94724f19b0abd61c437f18f2..d21f45d983bf3047811d2d73f4a38deb
                  this.connection.send(new ClientboundDisconnectPacket(chatmessage));
                  this.connection.disconnect(chatmessage);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index feaeb9ce28e800634ee624fd212ee2b7030557b6..eedea56124ebc17f0212eb5d7dc83696384b83d9 100644
+index 9afc3e6b3717caa26f7239c4032b699b2226ddd6..c48d2e560cd19fd7ac58844ed7e3c98597f09562 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -996,6 +996,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0417-Prevent-teleporting-dead-entities.patch b/patches/server/0412-Prevent-teleporting-dead-entities.patch
index e9454c60f1..e9454c60f1 100644
--- a/patches/server/0417-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0412-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0418-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index aec478d621..effa7bfeb5 100644
--- a/patches/server/0418-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d84e04f2cf8870611d36834c5ea77a82e42df6d5..ce5d9bb9bc4dc724af7dac263c61bbb64bf81be3 100644
+index fd4b0c173be72516f22c6e5d540249e3079a7216..cf6c265714d8241f52e83de59094d7ae2cd56884 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,4 +1,6 @@
@@ -92,7 +92,7 @@ index d84e04f2cf8870611d36834c5ea77a82e42df6d5..ce5d9bb9bc4dc724af7dac263c61bbb6
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6cfaef1886b517c56ed9a96347be6e51efa84d9f..5fe5732bd6753e8ca37d8c3f7f24c6620b91d4e3 100644
+index fda5a623ec6bba0ed4d230415f7b9779ee2e8ccf..af43c63df3c82e910b77afd2a8899b8e6fc6db6d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -430,4 +430,9 @@ public class PaperConfig {
diff --git a/patches/server/0419-Implement-Mob-Goal-API.patch b/patches/server/0414-Implement-Mob-Goal-API.patch
index 06643c5b25..06643c5b25 100644
--- a/patches/server/0419-Implement-Mob-Goal-API.patch
+++ b/patches/server/0414-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0420-Add-villager-reputation-API.patch b/patches/server/0415-Add-villager-reputation-API.patch
index e68e780e09..e68e780e09 100644
--- a/patches/server/0420-Add-villager-reputation-API.patch
+++ b/patches/server/0415-Add-villager-reputation-API.patch
diff --git a/patches/server/0421-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch
index f337ca8a4b..762367d700 100644
--- a/patches/server/0421-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e7cbdc75d7fd1252024c450ff0ec3b1ebdd17b93..bc880a78381b9c30e4ec92bdf17c9eca1ded41f2 100644
+index e5d0168faf4988b2c033d146a798e6ab90e3b358..8a12ad8417458d1ad71664e394f78db6b3770c0b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -653,4 +653,10 @@ public class PaperWorldConfig {
+@@ -648,4 +648,10 @@ public class PaperWorldConfig {
          phantomIgnoreCreative = getBoolean("phantoms-do-not-spawn-on-creative-players", phantomIgnoreCreative);
          phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
      }
diff --git a/patches/server/0422-ExperienceOrbMergeEvent.patch b/patches/server/0417-ExperienceOrbMergeEvent.patch
index 8161999bc5..8161999bc5 100644
--- a/patches/server/0422-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0417-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0423-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch
index e542865e62..e542865e62 100644
--- a/patches/server/0423-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0424-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0419-Optimize-brigadier-child-sorting-performance.patch
index 3dd2ebd6a4..3dd2ebd6a4 100644
--- a/patches/server/0424-Optimize-brigadier-child-sorting-performance.patch
+++ b/patches/server/0419-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0425-Potential-bed-API.patch b/patches/server/0420-Potential-bed-API.patch
index 45ebcdd575..45ebcdd575 100644
--- a/patches/server/0425-Potential-bed-API.patch
+++ b/patches/server/0420-Potential-bed-API.patch
diff --git a/patches/server/0426-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch
index 10c690c8e0..62f28a9fa9 100644
--- a/patches/server/0426-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index fe877316a1c347354ee8e0651bbc243fb5eddc81..4658883ffc150e38d29d5387784587e6
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6086b75025165d4adf56c15a625094ddeb4477d8..b00e95dabbccda983c0e2823bd31b8806ef7933d 100644
+index 7f41a66e51c91fca6c6069f8072d215e6eaee7e3..aed3861a783155095b6aaf5d08af20b19f2573e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1005,6 +1005,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0427-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index d0006238a9..d0006238a9 100644
--- a/patches/server/0427-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0428-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 7cfba9fc64..c3349320c4 100644
--- a/patches/server/0428-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5fe5732bd6753e8ca37d8c3f7f24c6620b91d4e3..92f64c3d0fabd913f9640635f74396757263fac5 100644
+index af43c63df3c82e910b77afd2a8899b8e6fc6db6d..045a49da7c17e48534b3bd5b7aa3968963681e6c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -435,4 +435,15 @@ public class PaperConfig {
diff --git a/patches/server/0429-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch
index 881c2f0231..881c2f0231 100644
--- a/patches/server/0429-Reduce-MutableInt-allocations-from-light-engine.patch
+++ b/patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0430-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index e2ed8544dc..e2ed8544dc 100644
--- a/patches/server/0430-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0431-Ensure-safe-gateway-teleport.patch b/patches/server/0426-Ensure-safe-gateway-teleport.patch
index 527175e57b..527175e57b 100644
--- a/patches/server/0431-Ensure-safe-gateway-teleport.patch
+++ b/patches/server/0426-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0432-Add-option-for-console-having-all-permissions.patch b/patches/server/0427-Add-option-for-console-having-all-permissions.patch
index 40511a4409..4efacab310 100644
--- a/patches/server/0432-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0427-Add-option-for-console-having-all-permissions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 92f64c3d0fabd913f9640635f74396757263fac5..dcc2b48f7784473c3c62fe062b66891e835694c4 100644
+index 045a49da7c17e48534b3bd5b7aa3968963681e6c..5dc7e897fdb2a572b800eb34c40961cdfa3c0309 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -446,4 +446,9 @@ public class PaperConfig {
diff --git a/patches/server/0433-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index a2d751fb31..a2d751fb31 100644
--- a/patches/server/0433-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch
index ef2dfbe246..ef2dfbe246 100644
--- a/patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0435-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch
index e10d972ecc..e10d972ecc 100644
--- a/patches/server/0435-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0436-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index a6227e1804..b36f8e8596 100644
--- a/patches/server/0436-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bc880a78381b9c30e4ec92bdf17c9eca1ded41f2..eae27a641ee69f3383f1200f8c8ab8dd7a4105a4 100644
+index 8a12ad8417458d1ad71664e394f78db6b3770c0b..64ceb8609891f59f4cf3b54844a25402bab32c26 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -659,4 +659,13 @@ public class PaperWorldConfig {
+@@ -654,4 +654,13 @@ public class PaperWorldConfig {
          expMergeMaxValue = getInt("experience-merge-max-value", -1);
          log("Experience Merge Max Value: " + expMergeMaxValue);
      }
diff --git a/patches/server/0437-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0432-Fix-villager-trading-demand-MC-163962.patch
index 0850983283..0850983283 100644
--- a/patches/server/0437-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0432-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0438-Maps-shouldn-t-load-chunks.patch b/patches/server/0433-Maps-shouldn-t-load-chunks.patch
index d3c9edb4f2..d3c9edb4f2 100644
--- a/patches/server/0438-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0433-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0439-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 3c0b925e52..3c0b925e52 100644
--- a/patches/server/0439-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0440-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch
index b1be3e839f..b1be3e839f 100644
--- a/patches/server/0440-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0441-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index 1cafad18f3..1cafad18f3 100644
--- a/patches/server/0441-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0442-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch
index bdc9e032a2..4882198947 100644
--- a/patches/server/0442-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index dcc2b48f7784473c3c62fe062b66891e835694c4..df1337c89c943a80a31d127c844f061c1e56eb91 100644
+index 5dc7e897fdb2a572b800eb34c40961cdfa3c0309..56b6d8019f72d11e97d30e83467839d8fcb85674 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -451,4 +451,12 @@ public class PaperConfig {
diff --git a/patches/server/0443-Fix-sand-duping.patch b/patches/server/0438-Fix-sand-duping.patch
index 6d58f06d8a..59c437cfea 100644
--- a/patches/server/0443-Fix-sand-duping.patch
+++ b/patches/server/0438-Fix-sand-duping.patch
@@ -7,7 +7,7 @@ If the falling block dies during teleportation (entity#move), then we need
 to detect that by placing a check after the move.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index c1de9740d199dc862f8e85251a5de021499e0031..483127e9418489ad7ba1fbcb14a045d91c1c3c30 100644
+index 2723816204ee61ea3fda9279369df030b8d70a13..c267bc75a5a2a410d941accbe8c41e3422a634a5 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -119,6 +119,11 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0444-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch
index e5cf4e564f..e5cf4e564f 100644
--- a/patches/server/0444-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0445-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch
index 9ed9fe0826..9ed9fe0826 100644
--- a/patches/server/0445-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0446-Improve-Arrow-API.patch b/patches/server/0441-Improve-Arrow-API.patch
index 47bb897a5a..47bb897a5a 100644
--- a/patches/server/0446-Improve-Arrow-API.patch
+++ b/patches/server/0441-Improve-Arrow-API.patch
diff --git a/patches/server/0447-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch
index a2b186db62..a2b186db62 100644
--- a/patches/server/0447-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0448-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch
index cb0833f0d3..cb0833f0d3 100644
--- a/patches/server/0448-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0449-Add-permission-for-command-blocks.patch b/patches/server/0444-Add-permission-for-command-blocks.patch
index 02e3126cfe..02e3126cfe 100644
--- a/patches/server/0449-Add-permission-for-command-blocks.patch
+++ b/patches/server/0444-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0450-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch
index b2040a5e81..b2040a5e81 100644
--- a/patches/server/0450-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0451-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index a60e940541..e1eb2923ff 100644
--- a/patches/server/0451-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -102,7 +102,7 @@ index 770f11ad28f17427306e79509ecd192555854f1e..e3cc64933133d086bb14b6a941f6dd30
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b00e95dabbccda983c0e2823bd31b8806ef7933d..c26fd12b2eb9706e3e5850883b9388d56cbdb2fb 100644
+index aed3861a783155095b6aaf5d08af20b19f2573e1..991843e6395bdc88c135a7352bc44452390230cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -944,8 +944,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0452-Paper-dumpitem-command.patch b/patches/server/0447-Paper-dumpitem-command.patch
index be0e942b1b..be0e942b1b 100644
--- a/patches/server/0452-Paper-dumpitem-command.patch
+++ b/patches/server/0447-Paper-dumpitem-command.patch
diff --git a/patches/server/0453-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch
index 79ac87a844..79ac87a844 100644
--- a/patches/server/0453-Don-t-allow-null-UUID-s-for-chat.patch
+++ b/patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0454-Improve-Legacy-Component-serialization-size.patch b/patches/server/0449-Improve-Legacy-Component-serialization-size.patch
index 8d30b49c6b..8d30b49c6b 100644
--- a/patches/server/0454-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0449-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0455-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch
index c84298a544..c84298a544 100644
--- a/patches/server/0455-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 4025eb4510..1a201b13a5 100644
--- a/patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3f613f1f5942452daa60e919abb80397e8357e63..829f97c44a68acf7ed59c6790461bcb1c0cd4de8 100644
+index 991843e6395bdc88c135a7352bc44452390230cf..139055e3e2641a204ac51ed847f08f300976f8fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -358,7 +358,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0457-incremental-chunk-and-player-saving.patch b/patches/server/0452-incremental-chunk-and-player-saving.patch
index 5bdc494d80..b3e2ede950 100644
--- a/patches/server/0457-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0452-incremental-chunk-and-player-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] incremental chunk and player saving
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index df1337c89c943a80a31d127c844f061c1e56eb91..cb967380155d34ff511346d54b61e1c2109780f3 100644
+index 56b6d8019f72d11e97d30e83467839d8fcb85674..d404105573f3cda57e8eb6cad70d248d4e5e1bdf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -459,4 +459,14 @@ public class PaperConfig {
@@ -24,7 +24,7 @@ index df1337c89c943a80a31d127c844f061c1e56eb91..cb967380155d34ff511346d54b61e1c2
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eae27a641ee69f3383f1200f8c8ab8dd7a4105a4..12a6f12ffa8a45b054b01a7edc73ca8a5bcb59b5 100644
+index 64ceb8609891f59f4cf3b54844a25402bab32c26..213e9db18d1e0eede0e825797a3d3c15f2b2567f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -64,6 +64,21 @@ public class PaperWorldConfig {
@@ -403,7 +403,7 @@ index 8038b37bdfdd41eadb4f3cb4dd7ef245051ed3a4..20b288fdef75c9994b174cb4d7d082c5
      // CraftBukkit start - decompile error
      public static record TicksToSave(SerializableTickContainer<Block> blocks, SerializableTickContainer<Fluid> fluids) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 76a15f9a3419c430a288b52b824aa723a91f87fb..bf4e03237225058efc63e23ac3ddb49c339b9f08 100644
+index 9d667be3fe04b7d86986bd1ecaf4fce8b63198ae..dc95aaa62220f2042e287c7d0d69753b8e891fba 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -87,6 +87,12 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0458-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch
index 3fe4a3693e..3fe4a3693e 100644
--- a/patches/server/0458-Stop-copy-on-write-operations-for-updating-light-dat.patch
+++ b/patches/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0459-Support-old-UUID-format-for-NBT.patch b/patches/server/0454-Support-old-UUID-format-for-NBT.patch
index acb06f11bc..acb06f11bc 100644
--- a/patches/server/0459-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0454-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0460-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0455-Clean-up-duplicated-GameProfile-Properties.patch
index 6a8048ec43..6a8048ec43 100644
--- a/patches/server/0460-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/server/0455-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0461-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch
index d1830740b8..d1830740b8 100644
--- a/patches/server/0461-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0462-Remove-some-streams-from-structures.patch b/patches/server/0457-Remove-some-streams-from-structures.patch
index 3feaf02aef..3feaf02aef 100644
--- a/patches/server/0462-Remove-some-streams-from-structures.patch
+++ b/patches/server/0457-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0463-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch
index 91540dce15..91540dce15 100644
--- a/patches/server/0463-Remove-streams-from-classes-related-villager-gossip.patch
+++ b/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0464-Support-components-in-ItemMeta.patch b/patches/server/0459-Support-components-in-ItemMeta.patch
index f8e10e62b2..f8e10e62b2 100644
--- a/patches/server/0464-Support-components-in-ItemMeta.patch
+++ b/patches/server/0459-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0465-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
index 9a07cce833..9a07cce833 100644
--- a/patches/server/0465-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
+++ b/patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0466-Add-entity-liquid-API.patch b/patches/server/0461-Add-entity-liquid-API.patch
index 4482f88f22..4482f88f22 100644
--- a/patches/server/0466-Add-entity-liquid-API.patch
+++ b/patches/server/0461-Add-entity-liquid-API.patch
diff --git a/patches/server/0467-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0462-Update-itemstack-legacy-name-and-lore.patch
index 159011097e..159011097e 100644
--- a/patches/server/0467-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0462-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0468-Spawn-player-in-correct-world-on-login.patch b/patches/server/0463-Spawn-player-in-correct-world-on-login.patch
index a12daa7fac..a12daa7fac 100644
--- a/patches/server/0468-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0463-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0469-Add-PrepareResultEvent.patch b/patches/server/0464-Add-PrepareResultEvent.patch
index f84d45cb4c..f84d45cb4c 100644
--- a/patches/server/0469-Add-PrepareResultEvent.patch
+++ b/patches/server/0464-Add-PrepareResultEvent.patch
diff --git a/patches/server/0470-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 8adbe38157..8adbe38157 100644
--- a/patches/server/0470-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 2293ca4b3e..1b34693479 100644
--- a/patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -360,7 +360,7 @@ index 05d2790b80a6d2e1dc6b8d2375f783be4eff2343..6ba7e2713452c4c6f48a1a825ef27b50
          return this.isEntityTickingReady;
      }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b1093b728f09a8b1235d27563004de3ff0fbe911..549facfa3e154fa1b1d3eeb4b6127d3bb75b5f8b 100644
+index 85a05c9e59ae1909e6d4ce7a2e45b16366a1b7dc..17af44ebe972158a4fa7b0cb5ea67406ec7bc5ac 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -131,6 +131,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1148,7 +1148,7 @@ index eac485db587eba68ab0d05ac5bfd07fb20c0e766..2df33172415c8da39b9f299027cd86d2
      public float yRotO;
      public float xRotO;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index bf4e03237225058efc63e23ac3ddb49c339b9f08..937ff5dfb9d2950b80eff57dde27222551c352fe 100644
+index dc95aaa62220f2042e287c7d0d69753b8e891fba..06577d9cd276e65f2fdf5082b9ee4dc2d5211611 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -141,7 +141,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1160,7 +1160,7 @@ index bf4e03237225058efc63e23ac3ddb49c339b9f08..937ff5dfb9d2950b80eff57dde272225
      private long neighbourChunksLoadedBitset;
      private final LevelChunk[] loadedNeighbourChunks = new LevelChunk[(NEIGHBOUR_CACHE_RADIUS * 2 + 1) * (NEIGHBOUR_CACHE_RADIUS * 2 + 1)];
  
-@@ -683,6 +683,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -672,6 +672,7 @@ public class LevelChunk extends ChunkAccess {
  
      // CraftBukkit start
      public void loadCallback() {
@@ -1168,7 +1168,7 @@ index bf4e03237225058efc63e23ac3ddb49c339b9f08..937ff5dfb9d2950b80eff57dde272225
          // Paper start - neighbour cache
          int chunkX = this.chunkPos.x;
          int chunkZ = this.chunkPos.z;
-@@ -737,6 +738,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -726,6 +727,7 @@ public class LevelChunk extends ChunkAccess {
      }
  
      public void unloadCallback() {
@@ -1194,7 +1194,7 @@ index a5c335715a25dc154682e38a49ff308f30b41216..220db41f348437ae2d703ebae883e882
              net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk) either.left().orElse(null);
              if (chunk != null) addTicket(x, z); // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b2785384d5f6d55a3a03525d7759e1616e2fb1f8..1d2d1c69b6f198abb5555c95f8def7f6233943d7 100644
+index f4643f7ca1468bd7bd60637bf6096a828d1c0a40..7054a162b3899537821972cf8e53f579ee73f853 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -937,6 +937,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0472-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0467-Optimize-NetworkManager-Exception-Handling.patch
index 013df0fbfa..013df0fbfa 100644
--- a/patches/server/0472-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0467-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0473-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch
index bcabd99f92..bcabd99f92 100644
--- a/patches/server/0473-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0474-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0469-Fix-arrows-never-despawning-MC-125757.patch
index 85c6131304..85c6131304 100644
--- a/patches/server/0474-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0469-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0475-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch
index 7145af352d..7145af352d 100644
--- a/patches/server/0475-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0476-Move-range-check-for-block-placing-up.patch b/patches/server/0471-Move-range-check-for-block-placing-up.patch
index cce90f624f..cce90f624f 100644
--- a/patches/server/0476-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0471-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0477-Fix-SPIGOT-5989.patch b/patches/server/0472-Fix-SPIGOT-5989.patch
index 7b8d5b1276..7b8d5b1276 100644
--- a/patches/server/0477-Fix-SPIGOT-5989.patch
+++ b/patches/server/0472-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0478-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index c434ad9703..c434ad9703 100644
--- a/patches/server/0478-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0479-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index 1525de48e4..1525de48e4 100644
--- a/patches/server/0479-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0480-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 935dc6919a..935dc6919a 100644
--- a/patches/server/0480-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0481-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index f2627e7796..f2627e7796 100644
--- a/patches/server/0481-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0482-Fix-some-rails-connecting-improperly.patch b/patches/server/0477-Fix-some-rails-connecting-improperly.patch
index 8de7ddf603..8de7ddf603 100644
--- a/patches/server/0482-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0477-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0483-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index be48fd5ae2..be48fd5ae2 100644
--- a/patches/server/0483-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0484-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch
index a26acb8e18..a26acb8e18 100644
--- a/patches/server/0484-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0485-Brand-support.patch b/patches/server/0480-Brand-support.patch
index cfaf8c3106..f06bd36173 100644
--- a/patches/server/0485-Brand-support.patch
+++ b/patches/server/0480-Brand-support.patch
@@ -64,10 +64,10 @@ index baa80ce55e815b179fcf55b3cda3f59d3efe1354..4b6f6bf8c79f2d496218ab02833c2524
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1d2d1c69b6f198abb5555c95f8def7f6233943d7..efb4abdbc914b00ed233bd7bfbee1be3028d0479 100644
+index 7054a162b3899537821972cf8e53f579ee73f853..03a0d25305a2f8e744e11493bb1f469b89f48d84 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2603,6 +2603,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2592,6 +2592,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0486-Add-setMaxPlayers-API.patch b/patches/server/0481-Add-setMaxPlayers-API.patch
index b49c1c0270..5eaec89f6f 100644
--- a/patches/server/0486-Add-setMaxPlayers-API.patch
+++ b/patches/server/0481-Add-setMaxPlayers-API.patch
@@ -18,7 +18,7 @@ index d5768986b1666691bbcefac158cea120eaf9cac5..e5dc73d7cfd2ec868b18c5d34010d79d
      private int simulationDistance;
      private boolean allowCheatsForAllPlayers;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 829f97c44a68acf7ed59c6790461bcb1c0cd4de8..18cd4950472d91d711c301a80f0946520dd87f84 100644
+index 139055e3e2641a204ac51ed847f08f300976f8fe..df03883495d1c682726bd17de703bb3b59dded60 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -667,6 +667,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0487-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch
index 9efead6d4e..9efead6d4e 100644
--- a/patches/server/0487-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0488-Don-t-require-FACING-data.patch b/patches/server/0483-Don-t-require-FACING-data.patch
index e1c274797e..e1c274797e 100644
--- a/patches/server/0488-Don-t-require-FACING-data.patch
+++ b/patches/server/0483-Don-t-require-FACING-data.patch
diff --git a/patches/server/0489-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 4a7aa73b9c..4a7aa73b9c 100644
--- a/patches/server/0489-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0490-Add-moon-phase-API.patch b/patches/server/0485-Add-moon-phase-API.patch
index 35bfa2ea8c..35bfa2ea8c 100644
--- a/patches/server/0490-Add-moon-phase-API.patch
+++ b/patches/server/0485-Add-moon-phase-API.patch
diff --git a/patches/server/0491-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch
index 85e8a85a9e..cefa980de0 100644
--- a/patches/server/0491-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch
@@ -54,7 +54,7 @@ index 6ba7e2713452c4c6f48a1a825ef27b500140aa16..cd4328bd606d778ebb45f36af8cf23d8
      public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) {
          this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size());
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 549facfa3e154fa1b1d3eeb4b6127d3bb75b5f8b..efe1d149eb0c6661b67d51375a264fb2b4aaad80 100644
+index 17af44ebe972158a4fa7b0cb5ea67406ec7bc5ac..9d9312cb8e9681428f7ab1b1e6eb803fc558d651 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -691,7 +691,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0492-Prevent-headless-pistons-from-being-created.patch b/patches/server/0487-Prevent-headless-pistons-from-being-created.patch
index e8b6baa19f..0d5eba8f24 100644
--- a/patches/server/0492-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0487-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index cb967380155d34ff511346d54b61e1c2109780f3..3029cd3138f9ae806666c741ce8a11de963f4aef 100644
+index d404105573f3cda57e8eb6cad70d248d4e5e1bdf..ff855232e9b94d1b05d7abb8fd5ce243cc0cd324 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -469,4 +469,10 @@ public class PaperConfig {
diff --git a/patches/server/0493-Add-BellRingEvent.patch b/patches/server/0488-Add-BellRingEvent.patch
index e101aa373c..e101aa373c 100644
--- a/patches/server/0493-Add-BellRingEvent.patch
+++ b/patches/server/0488-Add-BellRingEvent.patch
diff --git a/patches/server/0494-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0489-Add-zombie-targets-turtle-egg-config.patch
index c15fe21872..dc8b6e1811 100644
--- a/patches/server/0494-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0489-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 12a6f12ffa8a45b054b01a7edc73ca8a5bcb59b5..367b1e401f858dd34bfed94c0b55fc0f169f506c 100644
+index 213e9db18d1e0eede0e825797a3d3c15f2b2567f..0eecbb10fd82787293a41c213917b8885137ccc4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -58,6 +58,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0495-Buffer-joins-to-world.patch b/patches/server/0490-Buffer-joins-to-world.patch
index a9c394af70..61a120253f 100644
--- a/patches/server/0495-Buffer-joins-to-world.patch
+++ b/patches/server/0490-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3029cd3138f9ae806666c741ce8a11de963f4aef..b3f872e4920babfe521effb233b13f8e9c85bef1 100644
+index ff855232e9b94d1b05d7abb8fd5ce243cc0cd324..503d0a15a39d70c26140987f076047e3835ce9fa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
diff --git a/patches/server/0496-Optimize-redstone-algorithm.patch b/patches/server/0491-Optimize-redstone-algorithm.patch
index 6c810d8a29..a0b21ad242 100644
--- a/patches/server/0496-Optimize-redstone-algorithm.patch
+++ b/patches/server/0491-Optimize-redstone-algorithm.patch
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 367b1e401f858dd34bfed94c0b55fc0f169f506c..4bd324e2f4675612501e4eb82ec43bffa28495dd 100644
+index 0eecbb10fd82787293a41c213917b8885137ccc4..5c6c590a859e6a96b392a1146c4cc41dc6004c4c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -63,6 +63,16 @@ public class PaperWorldConfig {
diff --git a/patches/server/0497-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 5370f96d97..5370f96d97 100644
--- a/patches/server/0497-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0498-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch
index dc90dbfec8..dc90dbfec8 100644
--- a/patches/server/0498-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0499-Fix-CraftTeam-null-check.patch b/patches/server/0494-Fix-CraftTeam-null-check.patch
index 61de747dfd..61de747dfd 100644
--- a/patches/server/0499-Fix-CraftTeam-null-check.patch
+++ b/patches/server/0494-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0500-Add-more-Evoker-API.patch b/patches/server/0495-Add-more-Evoker-API.patch
index 367e900e25..367e900e25 100644
--- a/patches/server/0500-Add-more-Evoker-API.patch
+++ b/patches/server/0495-Add-more-Evoker-API.patch
diff --git a/patches/server/0501-Add-methods-to-get-translation-keys.patch b/patches/server/0496-Add-methods-to-get-translation-keys.patch
index a6fb1b05f7..a6fb1b05f7 100644
--- a/patches/server/0501-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0496-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0502-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch
index 9bc751402f..9bc751402f 100644
--- a/patches/server/0502-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0503-Cache-block-data-strings.patch b/patches/server/0498-Cache-block-data-strings.patch
index cb029f98bc..cb029f98bc 100644
--- a/patches/server/0503-Cache-block-data-strings.patch
+++ b/patches/server/0498-Cache-block-data-strings.patch
diff --git a/patches/server/0504-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 2624dd65c2..2624dd65c2 100644
--- a/patches/server/0504-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0505-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0500-Add-additional-open-container-api-to-HumanEntity.patch
index 188d4ee3d8..188d4ee3d8 100644
--- a/patches/server/0505-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0500-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0506-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 9787a24022..9787a24022 100644
--- a/patches/server/0506-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0507-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch
index 26250fd153..26250fd153 100644
--- a/patches/server/0507-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0508-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index 542c802f17..542c802f17 100644
--- a/patches/server/0508-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0509-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 0f59498bff..0f59498bff 100644
--- a/patches/server/0509-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0510-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0505-Lazily-track-plugin-scoreboards-by-default.patch
index 5875199be4..ec35b04d4f 100644
--- a/patches/server/0510-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0505-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,7 +14,7 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ba2d5e53f39234c8cd5927b6fc7aaf7049a0b4cb..b057fa550b287fe4dcd7c8c0be14dc9fde6eb92b 100644
+index 503d0a15a39d70c26140987f076047e3835ce9fa..d58429ef5c7e866ce36a00fd55462cb024043a71 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -96,6 +96,11 @@ public class PaperConfig {
diff --git a/patches/server/0511-Entity-isTicking.patch b/patches/server/0506-Entity-isTicking.patch
index 2b9164a120..2b9164a120 100644
--- a/patches/server/0511-Entity-isTicking.patch
+++ b/patches/server/0506-Entity-isTicking.patch
diff --git a/patches/server/0512-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 9305c28388..9305c28388 100644
--- a/patches/server/0512-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0513-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0508-Fix-Concurrency-issue-in-WeightedList.patch
index 4f6d7689d1..4f6d7689d1 100644
--- a/patches/server/0513-Fix-Concurrency-issue-in-WeightedList.patch
+++ b/patches/server/0508-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0514-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 380db649b6..380db649b6 100644
--- a/patches/server/0514-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0515-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0510-Fix-for-large-move-vectors-crashing-server.patch
index ce662351de..ce662351de 100644
--- a/patches/server/0515-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0510-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0516-Optimise-getType-calls.patch b/patches/server/0511-Optimise-getType-calls.patch
index acb74296b7..3db112812d 100644
--- a/patches/server/0516-Optimise-getType-calls.patch
+++ b/patches/server/0511-Optimise-getType-calls.patch
@@ -28,7 +28,7 @@ index 76133c77e8ebce7c9e5402e3e7cd50b30aa1c2e0..348a91a760bd728f8e732e1a35c86ab7
          super(block, propertyMap, codec);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-index 996cf334e3b59330d021a1b9cf991ed3c144345d..031cc00df50a3a2f68c1ab3b09f05a15d6b141c6 100644
+index 8001245c4ba619cd357a194d60fdc2efe186efb3..07fa4e4ae5f2cfb4447a608dc645c0b7b0a217dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
 @@ -83,7 +83,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
diff --git a/patches/server/0517-Villager-resetOffers.patch b/patches/server/0512-Villager-resetOffers.patch
index da091e898a..da091e898a 100644
--- a/patches/server/0517-Villager-resetOffers.patch
+++ b/patches/server/0512-Villager-resetOffers.patch
diff --git a/patches/server/0518-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch
index 75788a359a..75788a359a 100644
--- a/patches/server/0518-Improve-inlinig-for-some-hot-IBlockData-methods.patch
+++ b/patches/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0519-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0514-Retain-block-place-order-when-capturing-blockstates.patch
index f32ff304e3..f32ff304e3 100644
--- a/patches/server/0519-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0514-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0520-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch
index 08bd69837c..08bd69837c 100644
--- a/patches/server/0520-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0521-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0516-Fix-item-locations-dropped-from-campfires.patch
index 14795b0485..14795b0485 100644
--- a/patches/server/0521-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0516-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0522-Player-elytra-boost-API.patch b/patches/server/0517-Player-elytra-boost-API.patch
index 9ac68971f2..90599987a5 100644
--- a/patches/server/0522-Player-elytra-boost-API.patch
+++ b/patches/server/0517-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index efb4abdbc914b00ed233bd7bfbee1be3028d0479..4e77e1aefc14d202505637c624b40e27fd9a290a 100644
+index 03a0d25305a2f8e744e11493bb1f469b89f48d84..6133280b544cbd30cf1f67e5cbc452261a042b20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -579,6 +579,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0523-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0518-Fixed-TileEntityBell-memory-leak.patch
index 09d0b77f4a..09d0b77f4a 100644
--- a/patches/server/0523-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0518-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0524-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 7e3683901b..6dc3f348cd 100644
--- a/patches/server/0524-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
@@ -8,10 +8,10 @@ This can realistically only happen if there's custom loot active on fishing
 which can return 0 items. This would disconnect the player who's fishing.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 90a5a5ede2c65d74dec4ac247e8411636fc20f78..cc288174b22f959e8ef11e43f0ea4008bae7bdc5 100644
+index 8162ead7ca524f80b8b4a846273266a837db5924..a4c82bf1d8789adf255fd0fae09d90228cf81ef0 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-@@ -499,9 +499,15 @@ public class FishingHook extends Projectile {
+@@ -494,9 +494,15 @@ public class FishingHook extends Projectile {
  
                  while (iterator.hasNext()) {
                      ItemStack itemstack1 = (ItemStack) iterator.next();
@@ -29,7 +29,7 @@ index 90a5a5ede2c65d74dec4ac247e8411636fc20f78..cc288174b22f959e8ef11e43f0ea4008
                      playerFishEvent.setExpToDrop(this.random.nextInt(6) + 1);
                      this.level.getCraftServer().getPluginManager().callEvent(playerFishEvent);
  
-@@ -514,8 +520,12 @@ public class FishingHook extends Projectile {
+@@ -509,8 +515,12 @@ public class FishingHook extends Projectile {
                      double d2 = entityhuman.getZ() - this.getZ();
                      double d3 = 0.1D;
  
diff --git a/patches/server/0525-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0520-Add-getOfflinePlayerIfCached-String.patch
index f86dc2c52e..d001255dbc 100644
--- a/patches/server/0525-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0520-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 18cd4950472d91d711c301a80f0946520dd87f84..6124142faeeb792c0f7f6c167f8da47af446cba9 100644
+index df03883495d1c682726bd17de703bb3b59dded60..841d984292b7d3d7610a671b7f6192d6cbd48835 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1794,6 +1794,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0526-Add-ignore-discounts-API.patch b/patches/server/0521-Add-ignore-discounts-API.patch
index 2c2b5e411f..2c2b5e411f 100644
--- a/patches/server/0526-Add-ignore-discounts-API.patch
+++ b/patches/server/0521-Add-ignore-discounts-API.patch
diff --git a/patches/server/0527-Toggle-for-removing-existing-dragon.patch b/patches/server/0522-Toggle-for-removing-existing-dragon.patch
index 5839a45267..3b83fc6f46 100644
--- a/patches/server/0527-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0522-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4bd324e2f4675612501e4eb82ec43bffa28495dd..61ffa935098b461962bf0fee8b2422a07b3e17a2 100644
+index 5c6c590a859e6a96b392a1146c4cc41dc6004c4c..86cddde870f3ec45e3708aadc1f3e4b19cbaebcc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -73,6 +73,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0528-Fix-client-lag-on-advancement-loading.patch b/patches/server/0523-Fix-client-lag-on-advancement-loading.patch
index 1b9a74f3f0..1b9a74f3f0 100644
--- a/patches/server/0528-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0523-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0529-Item-no-age-no-player-pickup.patch b/patches/server/0524-Item-no-age-no-player-pickup.patch
index a121c378e3..a121c378e3 100644
--- a/patches/server/0529-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0524-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0530-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index a7916d16e0..a7916d16e0 100644
--- a/patches/server/0530-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0531-Beacon-API-custom-effect-ranges.patch b/patches/server/0526-Beacon-API-custom-effect-ranges.patch
index 6c611b18c1..6c611b18c1 100644
--- a/patches/server/0531-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0526-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0532-Add-API-for-quit-reason.patch b/patches/server/0527-Add-API-for-quit-reason.patch
index 1cdbb8d028..1cdbb8d028 100644
--- a/patches/server/0532-Add-API-for-quit-reason.patch
+++ b/patches/server/0527-Add-API-for-quit-reason.patch
diff --git a/patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch
index 24ed760819..af46d7f8ea 100644
--- a/patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch
@@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h
 values used in other places.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 61ffa935098b461962bf0fee8b2422a07b3e17a2..f46d0d22b99582070747e2fde3c6328b0ab6d707 100644
+index 86cddde870f3ec45e3708aadc1f3e4b19cbaebcc..681985c8412562fedea841738656ce0b7391964a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -81,6 +81,19 @@ public class PaperWorldConfig {
diff --git a/patches/server/0534-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
index bbe9da5258..bbe9da5258 100644
--- a/patches/server/0534-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0535-Expose-world-spawn-angle.patch b/patches/server/0530-Expose-world-spawn-angle.patch
index 691463a16a..691463a16a 100644
--- a/patches/server/0535-Expose-world-spawn-angle.patch
+++ b/patches/server/0530-Expose-world-spawn-angle.patch
diff --git a/patches/server/0536-Add-Destroy-Speed-API.patch b/patches/server/0531-Add-Destroy-Speed-API.patch
index cfd4fa1a5f..cfd4fa1a5f 100644
--- a/patches/server/0536-Add-Destroy-Speed-API.patch
+++ b/patches/server/0531-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 921f123ade..8cb2fbc01f 100644
--- a/patches/server/0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4e77e1aefc14d202505637c624b40e27fd9a290a..a0a6b33f533ff48534ee447ef780922ca67a7561 100644
+index 6133280b544cbd30cf1f67e5cbc452261a042b20..a0b9a611b8b744c24c6263fac5be608b706232b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2174,7 +2174,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2163,7 +2163,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null && !particle.getDataType().isInstance(data)) {
              throw new IllegalArgumentException("data should be " + particle.getDataType() + " got " + data.getClass());
          }
diff --git a/patches/server/0538-Add-LivingEntity-clearActiveItem.patch b/patches/server/0533-Add-LivingEntity-clearActiveItem.patch
index 6b43687673..6b43687673 100644
--- a/patches/server/0538-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0533-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0539-Add-PlayerItemCooldownEvent.patch b/patches/server/0534-Add-PlayerItemCooldownEvent.patch
index 584621c1af..584621c1af 100644
--- a/patches/server/0539-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0534-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0540-More-lightning-API.patch b/patches/server/0535-More-lightning-API.patch
index 5b18a81437..5b18a81437 100644
--- a/patches/server/0540-More-lightning-API.patch
+++ b/patches/server/0535-More-lightning-API.patch
diff --git a/patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch
index 4e99201db9..2faa1121c8 100644
--- a/patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f46d0d22b99582070747e2fde3c6328b0ab6d707..b9164fb28a49ccc3113f7010786960ec36080df6 100644
+index 681985c8412562fedea841738656ce0b7391964a..657a199a78262442427b308e94344790b6fa55dd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -94,6 +94,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0542-Added-missing-default-perms-for-commands.patch b/patches/server/0537-Added-missing-default-perms-for-commands.patch
index e9e468da5e..e9e468da5e 100644
--- a/patches/server/0542-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0537-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0543-Add-PlayerShearBlockEvent.patch b/patches/server/0538-Add-PlayerShearBlockEvent.patch
index 80f40f1eba..80f40f1eba 100644
--- a/patches/server/0543-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0538-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0539-Fix-curing-zombie-villager-discount-exploit.patch
index a874b056d0..ae2a285eda 100644
--- a/patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0539-Fix-curing-zombie-villager-discount-exploit.patch
@@ -8,7 +8,7 @@ and curing a villager on repeat by simply resetting the relevant part of
 the reputation when it is cured.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b9164fb28a49ccc3113f7010786960ec36080df6..17e4ee9224a79eded353a7098f277d502269ad38 100644
+index 657a199a78262442427b308e94344790b6fa55dd..bebc057d4b7ca0944532e0377d794d7fdb5aebc2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -99,6 +99,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0545-Limit-recipe-packets.patch b/patches/server/0540-Limit-recipe-packets.patch
index 0830063b0d..7856d5e929 100644
--- a/patches/server/0545-Limit-recipe-packets.patch
+++ b/patches/server/0540-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7a99db37a91edd12ef4a5d8cad690f6e62d31ba0..4c2d11d04b63d0e5e2eeb3743a1f79fea301c5aa 100644
+index d58429ef5c7e866ce36a00fd55462cb024043a71..7413cbbcf0ab572483adc0ab915978593b8ea658 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -366,6 +366,13 @@ public class PaperConfig {
diff --git a/patches/server/0546-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0541-Fix-CraftSound-backwards-compatibility.patch
index 60e8ef1e6b..60e8ef1e6b 100644
--- a/patches/server/0546-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0541-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0547-MC-4-Fix-item-position-desync.patch b/patches/server/0542-MC-4-Fix-item-position-desync.patch
index 9dd6c9cfdb..f073db3b17 100644
--- a/patches/server/0547-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0542-MC-4-Fix-item-position-desync.patch
@@ -9,7 +9,7 @@ loss, which forces the server to lose the same precision as the client
 keeping them in sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4c2d11d04b63d0e5e2eeb3743a1f79fea301c5aa..c75005b934271e4b8864d949052d56465571f011 100644
+index 7413cbbcf0ab572483adc0ab915978593b8ea658..a0a3cec47c8f9e379a5bc1d43eeda5eb9d81f814 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -101,6 +101,11 @@ public class PaperConfig {
diff --git a/patches/server/0548-Player-Chunk-Load-Unload-Events.patch b/patches/server/0543-Player-Chunk-Load-Unload-Events.patch
index 3f52ecd3bc..3f52ecd3bc 100644
--- a/patches/server/0548-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0543-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0549-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0544-Optimize-Dynamic-get-Missing-Keys.patch
index 5a4efe035c..5a4efe035c 100644
--- a/patches/server/0549-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0544-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0550-Expose-LivingEntity-hurt-direction.patch b/patches/server/0545-Expose-LivingEntity-hurt-direction.patch
index 2f461711f6..2f461711f6 100644
--- a/patches/server/0550-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0545-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 243fab4a51..243fab4a51 100644
--- a/patches/server/0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
index e870bb8917..e870bb8917 100644
--- a/patches/server/0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
+++ b/patches/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index c7309cc0c3..c7309cc0c3 100644
--- a/patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0554-Implement-TargetHitEvent.patch b/patches/server/0549-Implement-TargetHitEvent.patch
index 3386fe16dd..3386fe16dd 100644
--- a/patches/server/0554-Implement-TargetHitEvent.patch
+++ b/patches/server/0549-Implement-TargetHitEvent.patch
diff --git a/patches/server/0555-Additional-Block-Material-API-s.patch b/patches/server/0550-Additional-Block-Material-API-s.patch
index 8d23c9d902..8d23c9d902 100644
--- a/patches/server/0555-Additional-Block-Material-API-s.patch
+++ b/patches/server/0550-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0556-Fix-harming-potion-dupe.patch b/patches/server/0551-Fix-harming-potion-dupe.patch
index 40de75b0d2..40de75b0d2 100644
--- a/patches/server/0556-Fix-harming-potion-dupe.patch
+++ b/patches/server/0551-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
index 69d3ef793f..69d3ef793f 100644
--- a/patches/server/0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
+++ b/patches/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0558-Cache-burn-durations.patch b/patches/server/0553-Cache-burn-durations.patch
index 9ef84f0bb9..9ef84f0bb9 100644
--- a/patches/server/0558-Cache-burn-durations.patch
+++ b/patches/server/0553-Cache-burn-durations.patch
diff --git a/patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 54f580f087..9785ce3d5e 100644
--- a/patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 17e4ee9224a79eded353a7098f277d502269ad38..f61e0c14db835a6b79f7c4b1f68a1005d5b3e913 100644
+index bebc057d4b7ca0944532e0377d794d7fdb5aebc2..9cbff12cdfe7882d90c481496a6e8d96b7f19315 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -104,6 +104,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0560-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch
index 8967f3f735..8967f3f735 100644
--- a/patches/server/0560-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0561-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch
index 8f512f54d6..8f512f54d6 100644
--- a/patches/server/0561-Implement-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0562-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0557-Fix-interact-event-not-being-called-in-adventure.patch
index 49080fbb8e..49080fbb8e 100644
--- a/patches/server/0562-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0557-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0563-Zombie-API-breaking-doors.patch b/patches/server/0558-Zombie-API-breaking-doors.patch
index 2b1fa20025..2b1fa20025 100644
--- a/patches/server/0563-Zombie-API-breaking-doors.patch
+++ b/patches/server/0558-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0564-Fix-nerfed-slime-when-splitting.patch b/patches/server/0559-Fix-nerfed-slime-when-splitting.patch
index 31fe051bdb..31fe051bdb 100644
--- a/patches/server/0564-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0559-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0565-Add-EntityLoadCrossbowEvent.patch b/patches/server/0560-Add-EntityLoadCrossbowEvent.patch
index 73aa3dc3bc..73aa3dc3bc 100644
--- a/patches/server/0565-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0560-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0566-Guardian-beam-workaround.patch b/patches/server/0561-Guardian-beam-workaround.patch
index fa66573d2b..fa66573d2b 100644
--- a/patches/server/0566-Guardian-beam-workaround.patch
+++ b/patches/server/0561-Guardian-beam-workaround.patch
diff --git a/patches/server/0567-Added-WorldGameRuleChangeEvent.patch b/patches/server/0562-Added-WorldGameRuleChangeEvent.patch
index aa2a6cc9f1..aa2a6cc9f1 100644
--- a/patches/server/0567-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0562-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0568-Added-ServerResourcesReloadedEvent.patch b/patches/server/0563-Added-ServerResourcesReloadedEvent.patch
index 3ea83769b9..3ea83769b9 100644
--- a/patches/server/0568-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0563-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0569-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch
index d6e6b4f242..cc656efba7 100644
--- a/patches/server/0569-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added world settings for mobs picking up loot
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f61e0c14db835a6b79f7c4b1f68a1005d5b3e913..ab52e655d16dc565cfb890ec8fdb07ce7f68e4cf 100644
+index 9cbff12cdfe7882d90c481496a6e8d96b7f19315..c22b05f9385efb0cb1f6ae3ae6af6e70f42e7506 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -720,6 +720,14 @@ public class PaperWorldConfig {
+@@ -715,6 +715,14 @@ public class PaperWorldConfig {
          phantomOnlyAttackInsomniacs = getBoolean("phantoms-only-attack-insomniacs", phantomOnlyAttackInsomniacs);
      }
  
diff --git a/patches/server/0570-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0565-Implemented-BlockFailedDispenseEvent.patch
index bfc051b1b8..bfc051b1b8 100644
--- a/patches/server/0570-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0565-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0571-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0566-Added-PlayerLecternPageChangeEvent.patch
index cd550d08ad..cd550d08ad 100644
--- a/patches/server/0571-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0566-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0572-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0567-Added-PlayerLoomPatternSelectEvent.patch
index 336ac8dfc8..336ac8dfc8 100644
--- a/patches/server/0572-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0567-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0573-Configurable-door-breaking-difficulty.patch b/patches/server/0568-Configurable-door-breaking-difficulty.patch
index e754c90c3f..b7a57b57f6 100644
--- a/patches/server/0573-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0568-Configurable-door-breaking-difficulty.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable door breaking difficulty
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ab52e655d16dc565cfb890ec8fdb07ce7f68e4cf..797275dd2dc0f7c2ef24311ebdd9659e8b2fdf2f 100644
+index c22b05f9385efb0cb1f6ae3ae6af6e70f42e7506..512720c6c13edcdae8f334ee584da8c4bca30c5f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -109,6 +109,25 @@ public class PaperWorldConfig {
diff --git a/patches/server/0574-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0569-Empty-commands-shall-not-be-dispatched.patch
index 39f7cea127..39f7cea127 100644
--- a/patches/server/0574-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0569-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0575-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0570-Implement-API-to-expose-exact-interaction-point.patch
index 32548f350b..32548f350b 100644
--- a/patches/server/0575-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0570-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0576-Remove-stale-POIs.patch b/patches/server/0571-Remove-stale-POIs.patch
index 59efbc0b2b..59efbc0b2b 100644
--- a/patches/server/0576-Remove-stale-POIs.patch
+++ b/patches/server/0571-Remove-stale-POIs.patch
diff --git a/patches/server/0577-Fix-villager-boat-exploit.patch b/patches/server/0572-Fix-villager-boat-exploit.patch
index 832ad8704c..832ad8704c 100644
--- a/patches/server/0577-Fix-villager-boat-exploit.patch
+++ b/patches/server/0572-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0578-Add-sendOpLevel-API.patch b/patches/server/0573-Add-sendOpLevel-API.patch
index 54eab9e289..8dbde4b661 100644
--- a/patches/server/0578-Add-sendOpLevel-API.patch
+++ b/patches/server/0573-Add-sendOpLevel-API.patch
@@ -32,7 +32,7 @@ index f0e2f637d443db71bd9df26cebb0f02c3e1ae85f..64b8d76642e8bbcdc685ea30d95a83ad
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a0a6b33f533ff48534ee447ef780922ca67a7561..d185304572b76f4aa427f51e888afd08f72bb30e 100644
+index a0b9a611b8b744c24c6263fac5be608b706232b7..d5d73ba9d6c7d1e91aa469c6d0e2df80393a621c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -593,6 +593,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0579-Add-PaperRegistry.patch b/patches/server/0574-Add-PaperRegistry.patch
index 07bb4192a0..07bb4192a0 100644
--- a/patches/server/0579-Add-PaperRegistry.patch
+++ b/patches/server/0574-Add-PaperRegistry.patch
diff --git a/patches/server/0580-Add-StructuresLocateEvent.patch b/patches/server/0575-Add-StructuresLocateEvent.patch
index f5c3398594..f5c3398594 100644
--- a/patches/server/0580-Add-StructuresLocateEvent.patch
+++ b/patches/server/0575-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0581-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0576-Collision-option-for-requiring-a-player-participant.patch
index 2453830557..21d72fe31c 100644
--- a/patches/server/0581-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0576-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 797275dd2dc0f7c2ef24311ebdd9659e8b2fdf2f..55c997bc5fb41e16d965c6017128c90321d8457a 100644
+index 512720c6c13edcdae8f334ee584da8c4bca30c5f..ea5f021c4ce2274869d884b90aeaba35d4e2db84 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -81,6 +81,18 @@ public class PaperWorldConfig {
diff --git a/patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index b74ce3c39c..b74ce3c39c 100644
--- a/patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch
index a9e7d4baac..a9e7d4baac 100644
--- a/patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0584-Make-schedule-command-per-world.patch b/patches/server/0579-Make-schedule-command-per-world.patch
index 4859bb69f5..4859bb69f5 100644
--- a/patches/server/0584-Make-schedule-command-per-world.patch
+++ b/patches/server/0579-Make-schedule-command-per-world.patch
diff --git a/patches/server/0585-Configurable-max-leash-distance.patch b/patches/server/0580-Configurable-max-leash-distance.patch
index 39f8d7dd66..1a1c38fcdd 100644
--- a/patches/server/0585-Configurable-max-leash-distance.patch
+++ b/patches/server/0580-Configurable-max-leash-distance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max leash distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 55c997bc5fb41e16d965c6017128c90321d8457a..7b771d8467027b9ec898efe96b423a98556e54c3 100644
+index ea5f021c4ce2274869d884b90aeaba35d4e2db84..8a97978f16f8a4c759cb2eba9f408159b3382db6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -301,6 +301,12 @@ public class PaperWorldConfig {
diff --git a/patches/server/0586-Implement-BlockPreDispenseEvent.patch b/patches/server/0581-Implement-BlockPreDispenseEvent.patch
index 0356bec392..0356bec392 100644
--- a/patches/server/0586-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0581-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
index 0c470fc8f2..0c470fc8f2 100644
--- a/patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch
index 544c347429..2e2e3fcc2d 100644
--- a/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7b771d8467027b9ec898efe96b423a98556e54c3..e6b8f71c81daf1e886a9d46a2bed18d4d414e18d 100644
+index 8a97978f16f8a4c759cb2eba9f408159b3382db6..4ab8e20efc54e7094e3e0f98109c95252d5e7c01 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -750,6 +750,11 @@ public class PaperWorldConfig {
+@@ -745,6 +745,11 @@ public class PaperWorldConfig {
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true);
      }
  
diff --git a/patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch
index c8cefc8ca5..c8cefc8ca5 100644
--- a/patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 766d05e286..766d05e286 100644
--- a/patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0591-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0586-Reset-shield-blocking-on-dimension-change.patch
index e80304d90b..e80304d90b 100644
--- a/patches/server/0591-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0586-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0592-add-DragonEggFormEvent.patch b/patches/server/0587-add-DragonEggFormEvent.patch
index ab3f7fd05b..ab3f7fd05b 100644
--- a/patches/server/0592-add-DragonEggFormEvent.patch
+++ b/patches/server/0587-add-DragonEggFormEvent.patch
diff --git a/patches/server/0593-EntityMoveEvent.patch b/patches/server/0588-EntityMoveEvent.patch
index 65856e82cd..65856e82cd 100644
--- a/patches/server/0593-EntityMoveEvent.patch
+++ b/patches/server/0588-EntityMoveEvent.patch
diff --git a/patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch
index a03f8b0be8..3206f89517 100644
--- a/patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e6b8f71c81daf1e886a9d46a2bed18d4d414e18d..59675e523625b95169236bd0ead063cf0d87847e 100644
+index 4ab8e20efc54e7094e3e0f98109c95252d5e7c01..cdcb877e374bcd2dd944c754bfc91e23ef6986ae 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -755,6 +755,11 @@ public class PaperWorldConfig {
+@@ -750,6 +750,11 @@ public class PaperWorldConfig {
          enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
      }
  
diff --git a/patches/server/0595-Inline-shift-direction-fields.patch b/patches/server/0590-Inline-shift-direction-fields.patch
index aea372f6f4..aea372f6f4 100644
--- a/patches/server/0595-Inline-shift-direction-fields.patch
+++ b/patches/server/0590-Inline-shift-direction-fields.patch
diff --git a/patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch
index fdd2359e10..fdd2359e10 100644
--- a/patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 8cfe3357dc..8cfe3357dc 100644
--- a/patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0598-living-entity-allow-attribute-registration.patch b/patches/server/0593-living-entity-allow-attribute-registration.patch
index 88cf7f15c6..88cf7f15c6 100644
--- a/patches/server/0598-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0593-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0599-fix-dead-slime-setSize-invincibility.patch b/patches/server/0594-fix-dead-slime-setSize-invincibility.patch
index 33ce1b72f2..33ce1b72f2 100644
--- a/patches/server/0599-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0594-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch
index cbb0cdc052..cbb0cdc052 100644
--- a/patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0601-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0596-Add-support-for-hex-color-codes-in-console.patch
index 4d129a981e..4d129a981e 100644
--- a/patches/server/0601-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0596-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0602-Expose-Tracked-Players.patch b/patches/server/0597-Expose-Tracked-Players.patch
index ec9396cdd0..ec9396cdd0 100644
--- a/patches/server/0602-Expose-Tracked-Players.patch
+++ b/patches/server/0597-Expose-Tracked-Players.patch
diff --git a/patches/server/0603-Remove-streams-from-SensorNearest.patch b/patches/server/0598-Remove-streams-from-SensorNearest.patch
index 91ae33c411..91ae33c411 100644
--- a/patches/server/0603-Remove-streams-from-SensorNearest.patch
+++ b/patches/server/0598-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch
index e013e32526..e013e32526 100644
--- a/patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0605-Improve-ServerGUI.patch b/patches/server/0600-Improve-ServerGUI.patch
index e573bd2f58..e573bd2f58 100644
--- a/patches/server/0605-Improve-ServerGUI.patch
+++ b/patches/server/0600-Improve-ServerGUI.patch
diff --git a/patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
index 1099f41d55..1099f41d55 100644
--- a/patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
+++ b/patches/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0607-fix-converting-txt-to-json-file.patch b/patches/server/0602-fix-converting-txt-to-json-file.patch
index eb9cd86dd7..eb9cd86dd7 100644
--- a/patches/server/0607-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0602-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0608-Add-worldborder-events.patch b/patches/server/0603-Add-worldborder-events.patch
index 26898cfba0..26898cfba0 100644
--- a/patches/server/0608-Add-worldborder-events.patch
+++ b/patches/server/0603-Add-worldborder-events.patch
diff --git a/patches/server/0609-added-PlayerNameEntityEvent.patch b/patches/server/0604-added-PlayerNameEntityEvent.patch
index c1df33b717..c1df33b717 100644
--- a/patches/server/0609-added-PlayerNameEntityEvent.patch
+++ b/patches/server/0604-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0610-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0605-Prevent-grindstones-from-overstacking-items.patch
index 3719f82383..3719f82383 100644
--- a/patches/server/0610-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0605-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0611-Add-recipe-to-cook-events.patch b/patches/server/0606-Add-recipe-to-cook-events.patch
index 183bc80987..183bc80987 100644
--- a/patches/server/0611-Add-recipe-to-cook-events.patch
+++ b/patches/server/0606-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0612-Add-Block-isValidTool.patch b/patches/server/0607-Add-Block-isValidTool.patch
index 8442851de2..8442851de2 100644
--- a/patches/server/0612-Add-Block-isValidTool.patch
+++ b/patches/server/0607-Add-Block-isValidTool.patch
diff --git a/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0608-Allow-using-signs-inside-spawn-protection.patch
index 2134c6d27d..0775386a0c 100644
--- a/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0608-Allow-using-signs-inside-spawn-protection.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 59675e523625b95169236bd0ead063cf0d87847e..bdd531806a4f006085be113c34b5780cb1a06fb7 100644
+index cdcb877e374bcd2dd944c754bfc91e23ef6986ae..3ea410faba8412fa5aa1c1b6bcdd3aeddc982f59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -789,4 +789,9 @@ public class PaperWorldConfig {
+@@ -784,4 +784,9 @@ public class PaperWorldConfig {
              delayChunkUnloadsBy *= 20;
          }
      }
diff --git a/patches/server/0614-Implement-Keyed-on-World.patch b/patches/server/0609-Implement-Keyed-on-World.patch
index 891f329487..891f329487 100644
--- a/patches/server/0614-Implement-Keyed-on-World.patch
+++ b/patches/server/0609-Implement-Keyed-on-World.patch
diff --git a/patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0610-Add-fast-alternative-constructor-for-Rotations.patch
index d2a627b5b6..d2a627b5b6 100644
--- a/patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0610-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0616-Item-Rarity-API.patch b/patches/server/0611-Item-Rarity-API.patch
index 29bd01b295..29bd01b295 100644
--- a/patches/server/0616-Item-Rarity-API.patch
+++ b/patches/server/0611-Item-Rarity-API.patch
diff --git a/patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index ff46048dcd..ff46048dcd 100644
--- a/patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0618-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0613-copy-TESign-isEditable-from-snapshots.patch
index 0cfc8f03a3..0cfc8f03a3 100644
--- a/patches/server/0618-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/server/0613-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0614-Drop-carried-item-when-player-has-disconnected.patch
index 26cffa4d21..26cffa4d21 100644
--- a/patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0614-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0620-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0615-forced-whitelist-use-configurable-kick-message.patch
index 4a57708ea9..4a57708ea9 100644
--- a/patches/server/0620-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0615-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index a80d297e37..a80d297e37 100644
--- a/patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0622-Entity-load-save-limit-per-chunk.patch b/patches/server/0617-Entity-load-save-limit-per-chunk.patch
index 177d06c8fc..f7e7bf2808 100644
--- a/patches/server/0622-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0617-Entity-load-save-limit-per-chunk.patch
@@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bdd531806a4f006085be113c34b5780cb1a06fb7..502d7cbff05c9fd6ef64d6e6483b7c7d5cebfb22 100644
+index 3ea410faba8412fa5aa1c1b6bcdd3aeddc982f59..f06c9b615079b8200b45c4cea7aeacaf789159f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -8,6 +8,8 @@ import it.unimi.dsi.fastutil.objects.Reference2IntMap;
diff --git a/patches/server/0623-Expose-protocol-version.patch b/patches/server/0618-Expose-protocol-version.patch
index 3f69974e93..3f69974e93 100644
--- a/patches/server/0623-Expose-protocol-version.patch
+++ b/patches/server/0618-Expose-protocol-version.patch
diff --git a/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 1935ce4852..1935ce4852 100644
--- a/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch
index aeffa16121..9885b939ea 100644
--- a/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 327e39646bd2ab398d9da582d4620052c3c92bc1..f06ba478f3ed7c333cba18c2443d62f0eb01d4d7 100644
+index a0a3cec47c8f9e379a5bc1d43eeda5eb9d81f814..5f22fdedd5456ffde94b038d294fe14ac9c6ad20 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -106,6 +106,13 @@ public class PaperConfig {
diff --git a/patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 7141d18a53..7141d18a53 100644
--- a/patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0627-Add-bypass-host-check.patch b/patches/server/0622-Add-bypass-host-check.patch
index 5e9b983ad1..5e9b983ad1 100644
--- a/patches/server/0627-Add-bypass-host-check.patch
+++ b/patches/server/0622-Add-bypass-host-check.patch
diff --git a/patches/server/0628-Set-area-affect-cloud-rotation.patch b/patches/server/0623-Set-area-affect-cloud-rotation.patch
index b0f478a353..b0f478a353 100644
--- a/patches/server/0628-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0623-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0624-add-isDeeplySleeping-to-HumanEntity.patch
index 8c7bfe4fbb..8c7bfe4fbb 100644
--- a/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0624-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0625-Fix-duplicating-give-items-on-item-drop-cancel.patch
index 1fdb5f16ee..1fdb5f16ee 100644
--- a/patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch
+++ b/patches/server/0625-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0626-add-consumeFuel-to-FurnaceBurnEvent.patch
index ffb9062039..ffb9062039 100644
--- a/patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0626-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0627-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0627-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0628-fix-PigZombieAngerEvent-cancellation.patch
index 9b69dc24f2..9b69dc24f2 100644
--- a/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0628-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0629-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/server/0629-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0630-fix-PlayerItemHeldEvent-firing-twice.patch
index 7a332176ff..7a332176ff 100644
--- a/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0630-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0636-Added-PlayerDeepSleepEvent.patch b/patches/server/0631-Added-PlayerDeepSleepEvent.patch
index 00b71569b1..00b71569b1 100644
--- a/patches/server/0636-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0631-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0637-More-World-API.patch b/patches/server/0632-More-World-API.patch
index 3fac16090a..3fac16090a 100644
--- a/patches/server/0637-More-World-API.patch
+++ b/patches/server/0632-More-World-API.patch
diff --git a/patches/server/0638-Added-PlayerBedFailEnterEvent.patch b/patches/server/0633-Added-PlayerBedFailEnterEvent.patch
index 95b8821728..95b8821728 100644
--- a/patches/server/0638-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0633-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0634-Implement-methods-to-convert-between-Component-and-B.patch
index ad3e98c8b5..ad3e98c8b5 100644
--- a/patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0634-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0635-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 576aa63f5a..576aa63f5a 100644
--- a/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0635-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0641-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0636-Introduce-beacon-activation-deactivation-events.patch
index 4858e0f40b..4858e0f40b 100644
--- a/patches/server/0641-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0636-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0637-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 5fff43eeb8..5fff43eeb8 100644
--- a/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0637-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0643-Add-Channel-initialization-listeners.patch b/patches/server/0638-Add-Channel-initialization-listeners.patch
index 1f7fe2772b..1f7fe2772b 100644
--- a/patches/server/0643-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0638-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0639-Send-empty-commands-if-tab-completion-is-disabled.patch
index 2b52bb5343..2b52bb5343 100644
--- a/patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0639-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0645-Add-more-WanderingTrader-API.patch b/patches/server/0640-Add-more-WanderingTrader-API.patch
index 65d351d6df..65d351d6df 100644
--- a/patches/server/0645-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0640-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0646-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0641-Add-EntityBlockStorage-clearEntities.patch
index 4742b14dac..4742b14dac 100644
--- a/patches/server/0646-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0641-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0642-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index b53cff9d00..b53cff9d00 100644
--- a/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0642-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0643-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 0b88624654..0b88624654 100644
--- a/patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0643-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0649-Inventory-close.patch b/patches/server/0644-Inventory-close.patch
index e7f478324a..e7f478324a 100644
--- a/patches/server/0649-Inventory-close.patch
+++ b/patches/server/0644-Inventory-close.patch
diff --git a/patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0645-call-PortalCreateEvent-players-and-end-platform.patch
index ea0c797028..ea0c797028 100644
--- a/patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0645-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0646-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 9fc439f344..9fc439f344 100644
--- a/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0646-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0652-Fix-CraftPotionBrewer-cache.patch b/patches/server/0647-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0652-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0647-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0653-Add-basic-Datapack-API.patch b/patches/server/0648-Add-basic-Datapack-API.patch
index 70549c3014..70549c3014 100644
--- a/patches/server/0653-Add-basic-Datapack-API.patch
+++ b/patches/server/0648-Add-basic-Datapack-API.patch
diff --git a/patches/server/0654-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0649-Add-environment-variable-to-disable-server-gui.patch
index a8785b7a29..a8785b7a29 100644
--- a/patches/server/0654-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0649-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0650-additions-to-PlayerGameModeChangeEvent.patch
index 4f95b0914b..769f85c58f 100644
--- a/patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0650-additions-to-PlayerGameModeChangeEvent.patch
@@ -139,10 +139,10 @@ index 6764cfef07169db97662177837aa7815f7346a5d..1dce75b762c2b9134819bcd66d14fc07
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d185304572b76f4aa427f51e888afd08f72bb30e..1acc475774dd50fbfbf68fff4675b9e1e31bbf2a 100644
+index d5d73ba9d6c7d1e91aa469c6d0e2df80393a621c..f623aad54714449d0c2793d68adbf8cfb1f640a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1297,7 +1297,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1286,7 +1286,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalArgumentException("Mode cannot be null");
          }
  
diff --git a/patches/server/0656-ItemStack-repair-check-API.patch b/patches/server/0651-ItemStack-repair-check-API.patch
index 4663820353..4663820353 100644
--- a/patches/server/0656-ItemStack-repair-check-API.patch
+++ b/patches/server/0651-ItemStack-repair-check-API.patch
diff --git a/patches/server/0657-More-Enchantment-API.patch b/patches/server/0652-More-Enchantment-API.patch
index be8a7f96c7..be8a7f96c7 100644
--- a/patches/server/0657-More-Enchantment-API.patch
+++ b/patches/server/0652-More-Enchantment-API.patch
diff --git a/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0653-Fix-and-optimise-world-force-upgrading.patch
index b110c0d528..b110c0d528 100644
--- a/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0653-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0659-Add-Mob-lookAt-API.patch b/patches/server/0654-Add-Mob-lookAt-API.patch
index 26b90782d2..26b90782d2 100644
--- a/patches/server/0659-Add-Mob-lookAt-API.patch
+++ b/patches/server/0654-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0660-Add-Unix-domain-socket-support.patch b/patches/server/0655-Add-Unix-domain-socket-support.patch
index 85d133844f..85d133844f 100644
--- a/patches/server/0660-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0655-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0661-Add-EntityInsideBlockEvent.patch b/patches/server/0656-Add-EntityInsideBlockEvent.patch
index 2c221ccdeb..2c221ccdeb 100644
--- a/patches/server/0661-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0656-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0662-Attributes-API-for-item-defaults.patch b/patches/server/0657-Attributes-API-for-item-defaults.patch
index dd2a25bfc9..dd2a25bfc9 100644
--- a/patches/server/0662-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0657-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0658-Add-cause-to-Weather-ThunderChangeEvents.patch
index 74ac72ae3b..74ac72ae3b 100644
--- a/patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0658-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0664-More-Lidded-Block-API.patch b/patches/server/0659-More-Lidded-Block-API.patch
index 5b7c8a3b64..5b7c8a3b64 100644
--- a/patches/server/0664-More-Lidded-Block-API.patch
+++ b/patches/server/0659-More-Lidded-Block-API.patch
diff --git a/patches/server/0665-Limit-item-frame-cursors-on-maps.patch b/patches/server/0660-Limit-item-frame-cursors-on-maps.patch
index dfc4282000..97ce04c935 100644
--- a/patches/server/0665-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0660-Limit-item-frame-cursors-on-maps.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 502d7cbff05c9fd6ef64d6e6483b7c7d5cebfb22..eff5a39968c8a4ff49ca9a7de5e2bf2a20ea7fd8 100644
+index f06c9b615079b8200b45c4cea7aeacaf789159f3..489c81493ecae59c5d02572b447ed2696959c947 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -828,4 +828,9 @@ public class PaperWorldConfig {
+@@ -823,4 +823,9 @@ public class PaperWorldConfig {
      private void allowUsingSignsInsideSpawnProtection() {
          allowUsingSignsInsideSpawnProtection = getBoolean("allow-using-signs-inside-spawn-protection", allowUsingSignsInsideSpawnProtection);
      }
diff --git a/patches/server/0666-Add-PlayerKickEvent-causes.patch b/patches/server/0661-Add-PlayerKickEvent-causes.patch
index 5ee609de77..9d07cf1b03 100644
--- a/patches/server/0666-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0661-Add-PlayerKickEvent-causes.patch
@@ -342,7 +342,7 @@ index 5d7d1372e012ce609073eecea83232b085c6c404..ee139c746328fcff67b1ee75629dbee0
          // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1acc475774dd50fbfbf68fff4675b9e1e31bbf2a..61c1fdbdd3de1862238bc8e78dff90e5faf7786c 100644
+index f623aad54714449d0c2793d68adbf8cfb1f640a2..f23dbb48e051d69ecae408080a30a1ebe8c32a2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -509,16 +509,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0667-Add-PufferFishStateChangeEvent.patch b/patches/server/0662-Add-PufferFishStateChangeEvent.patch
index e15126884a..e15126884a 100644
--- a/patches/server/0667-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0662-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0663-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 2d2d6ea63a..2d2d6ea63a 100644
--- a/patches/server/0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0663-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0664-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
index 670063cc65..670063cc65 100644
--- a/patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
+++ b/patches/server/0664-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0665-Add-option-to-fix-items-merging-through-walls.patch
index 362a1b16f3..3855ef8543 100644
--- a/patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0665-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index eff5a39968c8a4ff49ca9a7de5e2bf2a20ea7fd8..0059c837ab3b1223c56aa9fbc96dd2aedd13e0eb 100644
+index 489c81493ecae59c5d02572b447ed2696959c947..56d0c34446a962b46143a43a179b7c3307481296 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -833,4 +833,9 @@ public class PaperWorldConfig {
+@@ -828,4 +828,9 @@ public class PaperWorldConfig {
      private void mapItemFrameCursorLimit() {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
diff --git a/patches/server/0671-Add-BellRevealRaiderEvent.patch b/patches/server/0666-Add-BellRevealRaiderEvent.patch
index 587e0f0400..587e0f0400 100644
--- a/patches/server/0671-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0666-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0672-Fix-invulnerable-end-crystals.patch b/patches/server/0667-Fix-invulnerable-end-crystals.patch
index 69911150b1..e4866ecc06 100644
--- a/patches/server/0672-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0667-Fix-invulnerable-end-crystals.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix invulnerable end crystals
 MC-108513
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0059c837ab3b1223c56aa9fbc96dd2aedd13e0eb..d980e31884ea70493628e4934e19fa68314ba8e2 100644
+index 56d0c34446a962b46143a43a179b7c3307481296..db4aed53ce28393ac34c06753647cbe1322e89c6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -838,4 +838,9 @@ public class PaperWorldConfig {
+@@ -833,4 +833,9 @@ public class PaperWorldConfig {
      private void fixItemsMergingThroughWalls() {
          fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
      }
diff --git a/patches/server/0673-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0668-Add-ElderGuardianAppearanceEvent.patch
index 540926f9ef..540926f9ef 100644
--- a/patches/server/0673-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0668-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0674-Fix-dangerous-end-portal-logic.patch b/patches/server/0669-Fix-dangerous-end-portal-logic.patch
index 1be4e84ec5..1be4e84ec5 100644
--- a/patches/server/0674-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0669-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0670-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index c3c7f53663..c3c7f53663 100644
--- a/patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0670-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0676-Make-item-validations-configurable.patch b/patches/server/0671-Make-item-validations-configurable.patch
index 346b39da15..f71df48285 100644
--- a/patches/server/0676-Make-item-validations-configurable.patch
+++ b/patches/server/0671-Make-item-validations-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f06ba478f3ed7c333cba18c2443d62f0eb01d4d7..86cd1409de5d367e9c48460c1b5bcc1554ecfa98 100644
+index 5f22fdedd5456ffde94b038d294fe14ac9c6ad20..bb66ecc34e2f618444ea0a3b106e6e4a2d5a0c70 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -504,4 +504,19 @@ public class PaperConfig {
diff --git a/patches/server/0677-Line-Of-Sight-Changes.patch b/patches/server/0672-Line-Of-Sight-Changes.patch
index 28e1141d0b..28e1141d0b 100644
--- a/patches/server/0677-Line-Of-Sight-Changes.patch
+++ b/patches/server/0672-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0678-add-per-world-spawn-limits.patch b/patches/server/0673-add-per-world-spawn-limits.patch
index 68527d5cff..adf5a71947 100644
--- a/patches/server/0678-add-per-world-spawn-limits.patch
+++ b/patches/server/0673-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d980e31884ea70493628e4934e19fa68314ba8e2..54a1fb5b6d1dee73761851c55c6bdc1c30d9934a 100644
+index db4aed53ce28393ac34c06753647cbe1322e89c6..54a2f43e568b0104571abcb5d84aac35ddde3cd7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -53,6 +53,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index d980e31884ea70493628e4934e19fa68314ba8e2..54a1fb5b6d1dee73761851c55c6bdc1c
          }
  
          if (needsSave) {
-@@ -688,6 +693,21 @@ public class PaperWorldConfig {
+@@ -683,6 +688,21 @@ public class PaperWorldConfig {
          zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
      }
  
diff --git a/patches/server/0679-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0674-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56f02dad6e..56f02dad6e 100644
--- a/patches/server/0679-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0674-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0680-Add-more-LimitedRegion-API.patch b/patches/server/0675-Add-more-LimitedRegion-API.patch
index e9e7611f99..e9e7611f99 100644
--- a/patches/server/0680-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0675-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0681-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0676-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 6ae023df0a..6ae023df0a 100644
--- a/patches/server/0681-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0676-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0682-Missing-Entity-Behavior-API.patch b/patches/server/0677-Missing-Entity-Behavior-API.patch
index b1edabe7e5..b1edabe7e5 100644
--- a/patches/server/0682-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0677-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0678-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 61eab94f77..61eab94f77 100644
--- a/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0678-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0679-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 179e878420..179e878420 100644
--- a/patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0679-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0680-Use-getChunkIfLoadedImmediately-in-places.patch
index 99213d6d81..99213d6d81 100644
--- a/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0680-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0681-Fix-commands-from-signs-not-firing-command-events.patch
index ae4da58c6b..386073e2a7 100644
--- a/patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0681-Fix-commands-from-signs-not-firing-command-events.patch
@@ -10,10 +10,10 @@ This patch changes sign command logic so that `run_command` click events:
   - sends failure messages to the player who clicked the sign
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 54a1fb5b6d1dee73761851c55c6bdc1c30d9934a..047d2b47b5af22087359e76362d84dc69ae26707 100644
+index 54a2f43e568b0104571abcb5d84aac35ddde3cd7..ee5479b0b168f230ec4f29db56cf481706bbfeb6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -863,4 +863,9 @@ public class PaperWorldConfig {
+@@ -858,4 +858,9 @@ public class PaperWorldConfig {
      private void fixInvulnerableEndCrystalExploit() {
          fixInvulnerableEndCrystalExploit = getBoolean("unsupported-settings.fix-invulnerable-end-crystal-exploit", fixInvulnerableEndCrystalExploit);
      }
diff --git a/patches/server/0687-Adds-PlayerArmSwingEvent.patch b/patches/server/0682-Adds-PlayerArmSwingEvent.patch
index 0ac17873c1..0ac17873c1 100644
--- a/patches/server/0687-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0682-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0683-Fixes-kick-event-leave-message-not-being-sent.patch
index 316e9e0de5..316e9e0de5 100644
--- a/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0683-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0684-Add-config-for-mobs-immune-to-default-effects.patch
index 1119d3551b..a5538750c3 100644
--- a/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0684-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 047d2b47b5af22087359e76362d84dc69ae26707..36730b851203602a49d5a76b25a9e3a11c005033 100644
+index ee5479b0b168f230ec4f29db56cf481706bbfeb6..c8e1e1f59a689f60846fa88a4a4e48cb21e9863c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -683,6 +683,21 @@ public class PaperWorldConfig {
+@@ -678,6 +678,21 @@ public class PaperWorldConfig {
          log("Hopper Ignore Container Entities inside Occluding Blocks: " + (hoppersIgnoreOccludingBlocks ? "enabled" : "disabled"));
      }
  
diff --git a/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0685-Fix-incorrect-message-for-outdated-client.patch
index 1b0f3a3869..1b0f3a3869 100644
--- a/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0685-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0686-Don-t-apply-cramming-damage-to-players.patch
index 2e2e9543af..12bca847ff 100644
--- a/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0686-Don-t-apply-cramming-damage-to-players.patch
@@ -11,10 +11,10 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 36730b851203602a49d5a76b25a9e3a11c005033..e3551edd1693c388f22436db1c2bee22385962de 100644
+index c8e1e1f59a689f60846fa88a4a4e48cb21e9863c..960240240d76d408489f5c0274d56b0496c69928 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -883,4 +883,9 @@ public class PaperWorldConfig {
+@@ -878,4 +878,9 @@ public class PaperWorldConfig {
      private void showSignClickCommandFailureMessagesToPlayer() {
          showSignClickCommandFailureMessagesToPlayer = getBoolean("show-sign-click-command-failure-msgs-to-player", showSignClickCommandFailureMessagesToPlayer);
      }
diff --git a/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0687-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 95d554e0ea..74cf0c5264 100644
--- a/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0687-Rate-options-and-timings-for-sensors-and-behaviors.patch
@@ -28,7 +28,7 @@ index b47b7dce26805badd422c1867733ff4bfd00e9f4..b27021a42cbed3f0648a8d0903d00d03
       * Get a named timer for the specified tile entity type to track type specific timings.
       * @param entity
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e3551edd1693c388f22436db1c2bee22385962de..45a317c46bbe05dfaf5b555d9a8c281ff8d9103d 100644
+index 960240240d76d408489f5c0274d56b0496c69928..5ad05615e4dc1cc14112ab40e435a72672eedb87 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -9,8 +9,10 @@ import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
@@ -42,7 +42,7 @@ index e3551edd1693c388f22436db1c2bee22385962de..45a317c46bbe05dfaf5b555d9a8c281f
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.spigotmc.SpigotWorldConfig;
  
-@@ -888,4 +890,57 @@ public class PaperWorldConfig {
+@@ -883,4 +885,57 @@ public class PaperWorldConfig {
      private void playerCrammingDamage() {
          allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
      }
diff --git a/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0688-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 8e69a76f25..8e69a76f25 100644
--- a/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0688-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0694-Stinger-API.patch b/patches/server/0689-Stinger-API.patch
index 33f8959315..33f8959315 100644
--- a/patches/server/0694-Stinger-API.patch
+++ b/patches/server/0689-Stinger-API.patch
diff --git a/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0690-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 8d4fe001d2..8d4fe001d2 100644
--- a/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0690-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0696-Add-System.out-err-catcher.patch b/patches/server/0691-Add-System.out-err-catcher.patch
index dde83aa3c8..dde83aa3c8 100644
--- a/patches/server/0696-Add-System.out-err-catcher.patch
+++ b/patches/server/0691-Add-System.out-err-catcher.patch
diff --git a/patches/server/0697-Fix-test-not-bootstrapping.patch b/patches/server/0692-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0697-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0692-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0693-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0693-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0699-Improve-boat-collision-performance.patch b/patches/server/0694-Improve-boat-collision-performance.patch
index 24fc315296..24fc315296 100644
--- a/patches/server/0699-Improve-boat-collision-performance.patch
+++ b/patches/server/0694-Improve-boat-collision-performance.patch
diff --git a/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0695-Prevent-AFK-kick-while-watching-end-credits.patch
index 44c6dff957..44c6dff957 100644
--- a/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0695-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0696-Allow-skipping-writing-of-comments-to-server.propert.patch
index 6395f3f4a8..6395f3f4a8 100644
--- a/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0696-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0702-Add-PlayerSetSpawnEvent.patch b/patches/server/0697-Add-PlayerSetSpawnEvent.patch
index 2b8050b030..5af986d650 100644
--- a/patches/server/0702-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0697-Add-PlayerSetSpawnEvent.patch
@@ -93,10 +93,10 @@ index d620f559cdd1bd0e161a99123ef6c6f64e3302df..07e893f1859abe3c2a765694c21309d6
                      return InteractionResult.SUCCESS;
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 61c1fdbdd3de1862238bc8e78dff90e5faf7786c..2e2d637d2943f22983bde7011f41f41a3500e7b1 100644
+index f23dbb48e051d69ecae408080a30a1ebe8c32a2b..d5c05d7f09a9b7dd82401760baea2bc429438dbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1117,9 +1117,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1106,9 +1106,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0698-Make-hoppers-respect-inventory-max-stack-size.patch
index ea86736121..ea86736121 100644
--- a/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0698-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0699-Optimize-entity-tracker-passenger-checks.patch
index cf8b4494f3..cf8b4494f3 100644
--- a/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0699-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0700-Config-option-for-Piglins-guarding-chests.patch
index 4134b7a5f1..ca40719e13 100644
--- a/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0700-Config-option-for-Piglins-guarding-chests.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 45a317c46bbe05dfaf5b555d9a8c281ff8d9103d..b33a8e15153375316b9c8e856c14669667599225 100644
+index 5ad05615e4dc1cc14112ab40e435a72672eedb87..81d47e800b1dc1ae944b12313a8241c1d877e6a4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -72,6 +72,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0706-Added-EntityDamageItemEvent.patch b/patches/server/0701-Added-EntityDamageItemEvent.patch
index 0f5056e7ce..0f5056e7ce 100644
--- a/patches/server/0706-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0701-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0707-Optimize-indirect-passenger-iteration.patch b/patches/server/0702-Optimize-indirect-passenger-iteration.patch
index 3f6f8f2a1f..3f6f8f2a1f 100644
--- a/patches/server/0707-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0702-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0703-Fix-block-drops-position-losing-precision-millions-o.patch
index a32af5a891..a32af5a891 100644
--- a/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/server/0703-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0704-Configurable-item-frame-map-cursor-update-interval.patch
index 8378741c11..ad55f5c5ec 100644
--- a/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0704-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b33a8e15153375316b9c8e856c14669667599225..848169bdab0a20e41cfb917cd6ec1abc771c1a7d 100644
+index 81d47e800b1dc1ae944b12313a8241c1d877e6a4..f5c1de088ff49178aac4b2bea7059b98d5e8d338 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -876,6 +876,11 @@ public class PaperWorldConfig {
+@@ -871,6 +871,11 @@ public class PaperWorldConfig {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
  
diff --git a/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0705-Make-EntityUnleashEvent-cancellable.patch
index 2d8246afff..2d8246afff 100644
--- a/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0705-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0711-Clear-bucket-NBT-after-dispense.patch b/patches/server/0706-Clear-bucket-NBT-after-dispense.patch
index 50f3155d75..50f3155d75 100644
--- a/patches/server/0711-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0706-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0707-Respect-despawn-rate-in-item-merge-check.patch
index 8967390e3e..8967390e3e 100644
--- a/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch
+++ b/patches/server/0707-Respect-despawn-rate-in-item-merge-check.patch
diff --git a/patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0708-Change-EnderEye-target-without-changing-other-things.patch
index e4af6267df..e4af6267df 100644
--- a/patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0708-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0714-Add-BlockBreakBlockEvent.patch b/patches/server/0709-Add-BlockBreakBlockEvent.patch
index b7f264d94f..b7f264d94f 100644
--- a/patches/server/0714-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0709-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0710-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0710-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0716-More-CommandBlock-API.patch b/patches/server/0711-More-CommandBlock-API.patch
index daf682f8a0..daf682f8a0 100644
--- a/patches/server/0716-More-CommandBlock-API.patch
+++ b/patches/server/0711-More-CommandBlock-API.patch
diff --git a/patches/server/0717-Add-missing-team-sidebar-display-slots.patch b/patches/server/0712-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0717-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0712-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0718-Add-back-EntityPortalExitEvent.patch b/patches/server/0713-Add-back-EntityPortalExitEvent.patch
index a44e713ebd..a44e713ebd 100644
--- a/patches/server/0718-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0713-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0714-Add-methods-to-find-targets-for-lightning-strikes.patch
index 742d7716ff..742d7716ff 100644
--- a/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0714-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0720-Get-entity-default-attributes.patch b/patches/server/0715-Get-entity-default-attributes.patch
index 6ae983a717..6ae983a717 100644
--- a/patches/server/0720-Get-entity-default-attributes.patch
+++ b/patches/server/0715-Get-entity-default-attributes.patch
diff --git a/patches/server/0721-Left-handed-API.patch b/patches/server/0716-Left-handed-API.patch
index dd1acc7723..dd1acc7723 100644
--- a/patches/server/0721-Left-handed-API.patch
+++ b/patches/server/0716-Left-handed-API.patch
diff --git a/patches/server/0722-Add-advancement-display-API.patch b/patches/server/0717-Add-advancement-display-API.patch
index c2bd6b94c0..c2bd6b94c0 100644
--- a/patches/server/0722-Add-advancement-display-API.patch
+++ b/patches/server/0717-Add-advancement-display-API.patch
diff --git a/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0718-Add-ItemFactory-getMonsterEgg-API.patch
index f22d19fef2..f22d19fef2 100644
--- a/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0718-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0724-Add-critical-damage-API.patch b/patches/server/0719-Add-critical-damage-API.patch
index ca4be99b06..ca4be99b06 100644
--- a/patches/server/0724-Add-critical-damage-API.patch
+++ b/patches/server/0719-Add-critical-damage-API.patch
diff --git a/patches/server/0725-Fix-issues-with-mob-conversion.patch b/patches/server/0720-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0725-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0720-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0726-Add-isCollidable-methods-to-various-places.patch b/patches/server/0721-Add-isCollidable-methods-to-various-places.patch
index 6e08b33501..6e08b33501 100644
--- a/patches/server/0726-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0721-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0727-Goat-ram-API.patch b/patches/server/0722-Goat-ram-API.patch
index f1fcff3a29..f1fcff3a29 100644
--- a/patches/server/0727-Goat-ram-API.patch
+++ b/patches/server/0722-Goat-ram-API.patch
diff --git a/patches/server/0728-Add-API-for-resetting-a-single-score.patch b/patches/server/0723-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0728-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0723-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0724-Add-Raw-Byte-Entity-Serialization.patch
index d7e938d57a..d7e938d57a 100644
--- a/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0724-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0730-Vanilla-command-permission-fixes.patch b/patches/server/0725-Vanilla-command-permission-fixes.patch
index d9b53520f4..d9b53520f4 100644
--- a/patches/server/0730-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0725-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0731-Make-CallbackExecutor-strict-again.patch b/patches/server/0726-Make-CallbackExecutor-strict-again.patch
index d2fcbba34f..d2fcbba34f 100644
--- a/patches/server/0731-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0726-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0727-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index d2c7c618d7..d2c7c618d7 100644
--- a/patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0727-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0728-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index b4e5807041..b4e5807041 100644
--- a/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0728-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0729-Correctly-handle-recursion-for-chunkholder-updates.patch
index 48e805996a..48e805996a 100644
--- a/patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/server/0729-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0730-Separate-lookup-locking-from-state-access-in-UserCac.patch
index 86c0e502fd..86c0e502fd 100644
--- a/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch
+++ b/patches/server/0730-Separate-lookup-locking-from-state-access-in-UserCac.patch
diff --git a/patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0731-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index 0ea9e0770d..0ea9e0770d 100644
--- a/patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/server/0731-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0732-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index 477937d99b..477937d99b 100644
--- a/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0732-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0733-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index d0f51016fc..d0f51016fc 100644
--- a/patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/server/0733-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0734-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 7654abc8b4..7654abc8b4 100644
--- a/patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0734-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0735-Log-when-the-async-catcher-is-tripped.patch
index bede76faf6..bede76faf6 100644
--- a/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0735-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0736-Add-paper-mobcaps-and-paper-playermobcaps.patch
index f36284ae0c..f36284ae0c 100644
--- a/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0736-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0737-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index e2c4416234..e2c4416234 100644
--- a/patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0737-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0738-Sanitize-ResourceLocation-error-logging.patch
index ff7e0b7826..ff7e0b7826 100644
--- a/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0738-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0744-Optimise-general-POI-access.patch b/patches/server/0739-Optimise-general-POI-access.patch
index 7fa35796de..7fa35796de 100644
--- a/patches/server/0744-Optimise-general-POI-access.patch
+++ b/patches/server/0739-Optimise-general-POI-access.patch
diff --git a/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0740-Allow-controlled-flushing-for-network-manager.patch
index 9b061bed55..9b061bed55 100644
--- a/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0740-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0746-Add-more-async-catchers.patch b/patches/server/0741-Add-more-async-catchers.patch
index f0813b3370..f0813b3370 100644
--- a/patches/server/0746-Add-more-async-catchers.patch
+++ b/patches/server/0741-Add-more-async-catchers.patch
diff --git a/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0742-Rewrite-entity-bounding-box-lookup-calls.patch
index 0a840e45df..0a840e45df 100644
--- a/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0742-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0748-Optimise-chunk-tick-iteration.patch b/patches/server/0743-Optimise-chunk-tick-iteration.patch
index 4e6d8f0cb1..4e6d8f0cb1 100644
--- a/patches/server/0748-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0743-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0749-Execute-chunk-tasks-mid-tick.patch b/patches/server/0744-Execute-chunk-tasks-mid-tick.patch
index 3705f009e8..3705f009e8 100644
--- a/patches/server/0749-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0744-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0750-Do-not-copy-visible-chunks.patch b/patches/server/0745-Do-not-copy-visible-chunks.patch
index fdcf7f41ba..fdcf7f41ba 100644
--- a/patches/server/0750-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0745-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0746-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 5459269b64..5459269b64 100644
--- a/patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0746-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0747-Custom-table-implementation-for-blockstate-state-loo.patch
index 9b556d7fe8..9b556d7fe8 100644
--- a/patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0747-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0748-Detail-more-information-in-watchdog-dumps.patch
index 7d2d44d42b..7d2d44d42b 100644
--- a/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0748-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0749-Manually-inline-methods-in-BlockPosition.patch
index 6668339cba..6668339cba 100644
--- a/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0749-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0755-Distance-manager-tick-timings.patch b/patches/server/0750-Distance-manager-tick-timings.patch
index 69c8bf095e..69c8bf095e 100644
--- a/patches/server/0755-Distance-manager-tick-timings.patch
+++ b/patches/server/0750-Distance-manager-tick-timings.patch
diff --git a/patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0751-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0751-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0752-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index c3f6182749..c3f6182749 100644
--- a/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0752-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0758-Add-packet-limiter-config.patch b/patches/server/0753-Add-packet-limiter-config.patch
index bd4772cc73..89443c567a 100644
--- a/patches/server/0758-Add-packet-limiter-config.patch
+++ b/patches/server/0753-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 86cd1409de5d367e9c48460c1b5bcc1554ecfa98..1636a937ee29940954e4ce8dc7667cdd72c5ac68 100644
+index bb66ecc34e2f618444ea0a3b106e6e4a2d5a0c70..d9a63e0574676357265c5b971b061b9595081d7d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -519,4 +519,102 @@ public class PaperConfig {
diff --git a/patches/server/0759-Lag-compensate-block-breaking.patch b/patches/server/0754-Lag-compensate-block-breaking.patch
index c4b6860616..7ab54b9bd7 100644
--- a/patches/server/0759-Lag-compensate-block-breaking.patch
+++ b/patches/server/0754-Lag-compensate-block-breaking.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Lag compensate block breaking
 Use time instead of ticks if ticks fall behind
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1636a937ee29940954e4ce8dc7667cdd72c5ac68..b2a5735c7f9f6d266c7c70325255465b0399fd15 100644
+index d9a63e0574676357265c5b971b061b9595081d7d..780754f1c6252fa567d27389978f59dbd71abc94 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -617,4 +617,10 @@ public class PaperConfig {
diff --git a/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0755-Use-correct-LevelStem-registry-when-loading-default-.patch
index 53e2e20e8f..53e2e20e8f 100644
--- a/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0755-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0756-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index c5bd6526f7..c5bd6526f7 100644
--- a/patches/server/0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0756-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0757-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 4669941fb1..4669941fb1 100644
--- a/patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0757-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0763-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0758-Don-t-lookup-fluid-state-when-raytracing.patch
index eef7de0e32..eef7de0e32 100644
--- a/patches/server/0763-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0758-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0764-Time-scoreboard-search.patch b/patches/server/0759-Time-scoreboard-search.patch
index 48469b83af..48469b83af 100644
--- a/patches/server/0764-Time-scoreboard-search.patch
+++ b/patches/server/0759-Time-scoreboard-search.patch
diff --git a/patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0760-Send-full-pos-packets-for-hard-colliding-entities.patch
index 8041aebdcf..e259d0f785 100644
--- a/patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0760-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b2a5735c7f9f6d266c7c70325255465b0399fd15..0c5cb5251f9a3379a4c8bc21b3c87e71232e97e6 100644
+index 780754f1c6252fa567d27389978f59dbd71abc94..8b641e13f5b13eae2f2969ccb4b4551afcb50299 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -623,4 +623,10 @@ public class PaperConfig {
diff --git a/patches/server/0766-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0761-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0766-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0761-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0767-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0762-Oprimise-map-impl-for-tracked-players.patch
index 7ee2e496b9..7ee2e496b9 100644
--- a/patches/server/0767-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0762-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0768-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0763-Optimise-BlockSoil-nearby-water-lookup.patch
index f3fe0f0f17..f3fe0f0f17 100644
--- a/patches/server/0768-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0763-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0764-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index d68c8524e7..d68c8524e7 100644
--- a/patches/server/0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/server/0764-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0770-Optimise-random-block-ticking.patch b/patches/server/0765-Optimise-random-block-ticking.patch
index 1d0d60fbe6..1d0d60fbe6 100644
--- a/patches/server/0770-Optimise-random-block-ticking.patch
+++ b/patches/server/0765-Optimise-random-block-ticking.patch
diff --git a/patches/server/0771-Optimise-non-flush-packet-sending.patch b/patches/server/0766-Optimise-non-flush-packet-sending.patch
index f4d6e1b6b4..f4d6e1b6b4 100644
--- a/patches/server/0771-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0766-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0772-Optimise-nearby-player-lookups.patch b/patches/server/0767-Optimise-nearby-player-lookups.patch
index f552ae79f5..6f6a160a7e 100644
--- a/patches/server/0772-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0767-Optimise-nearby-player-lookups.patch
@@ -322,7 +322,7 @@ index f6a225eed29eed364b7e2ea6bc85d55d8a325a11..13eded53a64d0f36f8c9bce2077de4f1
  
      private static Boolean isValidSpawnPostitionForType(ServerLevel world, MobCategory group, StructureFeatureManager structureAccessor, ChunkGenerator chunkGenerator, MobSpawnSettings.SpawnerData spawnEntry, BlockPos.MutableBlockPos pos, double squaredDistance) { // Paper
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 937ff5dfb9d2950b80eff57dde27222551c352fe..b6f8600838f243f72c1f0a9a2425837338df8bf6 100644
+index 06577d9cd276e65f2fdf5082b9ee4dc2d5211611..4c5e3e6aa6c6ec88ce472e8dff10bc591245c4f7 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -235,6 +235,98 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0773-Optimise-WorldServer-notify.patch b/patches/server/0768-Optimise-WorldServer-notify.patch
index a84a979c64..a84a979c64 100644
--- a/patches/server/0773-Optimise-WorldServer-notify.patch
+++ b/patches/server/0768-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0774-Remove-streams-for-villager-AI.patch b/patches/server/0769-Remove-streams-for-villager-AI.patch
index 8257c2de40..8257c2de40 100644
--- a/patches/server/0774-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0769-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0775-Rewrite-dataconverter-system.patch b/patches/server/0770-Rewrite-dataconverter-system.patch
index 89bdb29386..89bdb29386 100644
--- a/patches/server/0775-Rewrite-dataconverter-system.patch
+++ b/patches/server/0770-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0771-Use-Velocity-compression-and-cipher-natives.patch
index cb29c8b7b1..cb29c8b7b1 100644
--- a/patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0771-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0772-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 5103d7a24c..5103d7a24c 100644
--- a/patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0772-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0773-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index 5c0a433617..5c0a433617 100644
--- a/patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0773-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0779-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0774-Async-catch-modifications-to-critical-entity-state.patch
index 305329fc53..305329fc53 100644
--- a/patches/server/0779-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0774-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0780-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0775-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 8f152dd0e7..8f152dd0e7 100644
--- a/patches/server/0780-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0775-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0776-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 8dfad9ab0f..52fbf4f871 100644
--- a/patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0776-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ae1de6544f488ff14202fd9df6267b2c98b81111..41972a8db871b5a4a74e7735a2883d3d8e24c0ee 100644
+index ca9c43f48ab269430accbefe0ed470bc62efade9..2187331d2f3c4f14281dde6f01422fc4d5458e0e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2482,6 +2482,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0782-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0777-Check-requirement-before-suggesting-root-nodes.patch
index da19d3f1ca..da19d3f1ca 100644
--- a/patches/server/0782-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0777-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0778-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 5f48d6b3b1..5f48d6b3b1 100644
--- a/patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0778-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0779-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 31e987614a..31e987614a 100644
--- a/patches/server/0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0779-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0785-Ensure-valid-vehicle-status.patch b/patches/server/0780-Ensure-valid-vehicle-status.patch
index 5715c2ca86..5715c2ca86 100644
--- a/patches/server/0785-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0780-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0781-Prevent-softlocked-end-exit-portal-generation.patch
index 855c2ec833..855c2ec833 100644
--- a/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0781-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0782-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 2ce994e362..2ce994e362 100644
--- a/patches/server/0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0782-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0788-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0783-Don-t-log-debug-logging-being-disabled.patch
index 5bec880eb8..5bec880eb8 100644
--- a/patches/server/0788-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0783-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0784-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
index a29e839964..a29e839964 100644
--- a/patches/server/0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
+++ b/patches/server/0784-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0790-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0785-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0790-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0785-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0786-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index dad671a3bd..dad671a3bd 100644
--- a/patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0786-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0792-Preserve-overstacked-loot.patch b/patches/server/0787-Preserve-overstacked-loot.patch
index 2d41e5c253..57bfd046f8 100644
--- a/patches/server/0792-Preserve-overstacked-loot.patch
+++ b/patches/server/0787-Preserve-overstacked-loot.patch
@@ -10,10 +10,10 @@ chunk bans via the large amount of NBT created by unstacking the items.
 Fixes GH-5140 and GH-4748.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 848169bdab0a20e41cfb917cd6ec1abc771c1a7d..e5eeab49d167a9a151301ca910e1421550e14245 100644
+index f5c1de088ff49178aac4b2bea7059b98d5e8d338..5cae8f1c0d1d9642ad6ee53d9897b28eab02c4cd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -901,6 +901,11 @@ public class PaperWorldConfig {
+@@ -896,6 +896,11 @@ public class PaperWorldConfig {
          allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage);
      }
  
diff --git a/patches/server/0793-Update-head-rotation-in-missing-places.patch b/patches/server/0788-Update-head-rotation-in-missing-places.patch
index 2dd4efaae9..2dd4efaae9 100644
--- a/patches/server/0793-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0788-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0794-prevent-unintended-light-block-manipulation.patch b/patches/server/0789-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0794-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0789-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0790-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 89603862f0..89603862f0 100644
--- a/patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/server/0790-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
diff --git a/patches/server/0796-Fix-CraftCriteria-defaults-map.patch b/patches/server/0791-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0796-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0791-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0797-Fix-upstreams-block-state-factories.patch b/patches/server/0792-Fix-upstreams-block-state-factories.patch
index 4a88c25608..4a88c25608 100644
--- a/patches/server/0797-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0792-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0793-Add-config-option-for-logging-player-ip-addresses.patch
index b9207d7268..dab95bb75b 100644
--- a/patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0793-Add-config-option-for-logging-player-ip-addresses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for logging player ip addresses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0c5cb5251f9a3379a4c8bc21b3c87e71232e97e6..6223c90932338070294e2241345ac76ef40d3412 100644
+index 8b641e13f5b13eae2f2969ccb4b4551afcb50299..b7db009e9002bf517ce085fe250a9eba0da58807 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
diff --git a/patches/server/0799-Configurable-feature-seeds.patch b/patches/server/0794-Configurable-feature-seeds.patch
index 9a732207ea..31778d1a17 100644
--- a/patches/server/0799-Configurable-feature-seeds.patch
+++ b/patches/server/0794-Configurable-feature-seeds.patch
@@ -19,10 +19,10 @@ index ee72086b2dee2bd6415803e77825b2b1cb83cd3d..309dbf5fce3ce940d5e1b57d267b9d6b
              }
              final Object val = config.get(key);
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e5eeab49d167a9a151301ca910e1421550e14245..0a70dfd7880f5fcf1292dd2fdae2964bc2f51d61 100644
+index 5cae8f1c0d1d9642ad6ee53d9897b28eab02c4cd..ed49f70d6a259dcbc72d9fe8addc42c4717a9e59 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -946,6 +946,55 @@ public class PaperWorldConfig {
+@@ -941,6 +941,55 @@ public class PaperWorldConfig {
          return table;
      }
  
diff --git a/patches/server/0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0795-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 6e33709dbe..6e33709dbe 100644
--- a/patches/server/0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0795-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0801-Add-root-admin-user-detection.patch b/patches/server/0796-Add-root-admin-user-detection.patch
index 86c355de50..86c355de50 100644
--- a/patches/server/0801-Add-root-admin-user-detection.patch
+++ b/patches/server/0796-Add-root-admin-user-detection.patch
diff --git a/patches/server/0802-Always-allow-item-changing-in-Fireball.patch b/patches/server/0797-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0802-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0797-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0798-don-t-attempt-to-teleport-dead-entities.patch
index 0d78c1bee5..0d78c1bee5 100644
--- a/patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0798-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0799-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
index efa5aa2399..efa5aa2399 100644
--- a/patches/server/0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
+++ b/patches/server/0799-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/patches/server/0805-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0800-Prevent-excessive-velocity-through-repeated-crits.patch
index 4304993831..4304993831 100644
--- a/patches/server/0805-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0800-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0801-Remove-client-side-code-using-deprecated-for-removal.patch
index a11975f1ad..a11975f1ad 100644
--- a/patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0801-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0807-Rewrite-the-light-engine.patch b/patches/server/0802-Rewrite-the-light-engine.patch
index 0ecc63685e..f0e4f7552d 100644
--- a/patches/server/0807-Rewrite-the-light-engine.patch
+++ b/patches/server/0802-Rewrite-the-light-engine.patch
@@ -4974,7 +4974,7 @@ index 37e7f766e0de7b47c7240c9365bb134fda26a756..cac036ac3c7abb520fbd97b9cea4fb1c
          super(wrapped.getPos(), UpgradeData.EMPTY, wrapped.levelHeightAccessor, wrapped.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), wrapped.getBlendingData());
          this.wrapped = wrapped;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index b6f8600838f243f72c1f0a9a2425837338df8bf6..a141071966428315484480831a58f02a2b0bc025 100644
+index 4c5e3e6aa6c6ec88ce472e8dff10bc591245c4f7..b46648301396930478391967b371bf8d201901e1 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -100,6 +100,10 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0803-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index a1b655d7c1..a1b655d7c1 100644
--- a/patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0803-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0804-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0804-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0805-Prevent-sending-oversized-item-data-in-equipment-and.patch
index e35fbc79b1..e35fbc79b1 100644
--- a/patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0805-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0806-Hide-unnecessary-itemmeta-from-clients.patch
index 9231e57b2b..7290d9ffe1 100644
--- a/patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0806-Hide-unnecessary-itemmeta-from-clients.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Hide unnecessary itemmeta from clients
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0a70dfd7880f5fcf1292dd2fdae2964bc2f51d61..365c907efc100bbb5cf9223a10f6b56e3d7846ec 100644
+index ed49f70d6a259dcbc72d9fe8addc42c4717a9e59..1d7d6859531a470eea5d0cf25935250f7cba7d2a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -916,6 +916,13 @@ public class PaperWorldConfig {
+@@ -911,6 +911,13 @@ public class PaperWorldConfig {
          behaviorTickRates = loadTickRates("behavior");
      }
  
diff --git a/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0807-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index da0f208d4e..da0f208d4e 100644
--- a/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0807-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0808-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 0e41fd2743..0e41fd2743 100644
--- a/patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0808-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0814-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0809-Add-PlayerItemFrameChangeEvent.patch
index 464f2144c1..464f2144c1 100644
--- a/patches/server/0814-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0809-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0815-Add-player-health-update-API.patch b/patches/server/0810-Add-player-health-update-API.patch
index 133c17a922..9f6cac922a 100644
--- a/patches/server/0815-Add-player-health-update-API.patch
+++ b/patches/server/0810-Add-player-health-update-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2e2d637d2943f22983bde7011f41f41a3500e7b1..af439e9e9572d5cda81792f89a7bb3eb506a8c72 100644
+index d5c05d7f09a9b7dd82401760baea2bc429438dbf..2d60a7ceaa87178b456f509eb51a451d67e5312b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2053,9 +2053,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2042,9 +2042,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().maxHealthCache = getMaxHealth();
      }
  
@@ -22,7 +22,7 @@ index 2e2d637d2943f22983bde7011f41f41a3500e7b1..af439e9e9572d5cda81792f89a7bb3eb
          if (this.getHandle().queueHealthUpdatePacket) {
              this.getHandle().queuedHealthUpdatePacket = packet;
          } else {
-@@ -2063,7 +2065,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2052,7 +2054,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          // Paper end
      }
diff --git a/patches/server/0816-Optimize-HashMapPalette.patch b/patches/server/0811-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0816-Optimize-HashMapPalette.patch
+++ b/patches/server/0811-Optimize-HashMapPalette.patch
diff --git a/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0812-Allow-delegation-to-vanilla-chunk-gen.patch
index 13bdd0f1d7..13bdd0f1d7 100644
--- a/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0812-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0813-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 99a5334c59..99a5334c59 100644
--- a/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0813-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0814-Optimise-collision-checking-in-player-move-packet-ha.patch
index f33b2ef6aa..f33b2ef6aa 100644
--- a/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0814-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0820-Actually-unload-POI-data.patch b/patches/server/0815-Actually-unload-POI-data.patch
index b23193ed6b..b23193ed6b 100644
--- a/patches/server/0820-Actually-unload-POI-data.patch
+++ b/patches/server/0815-Actually-unload-POI-data.patch
diff --git a/patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0816-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index c03eefb28c..c03eefb28c 100644
--- a/patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0816-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0822-Update-Log4j.patch b/patches/server/0817-Update-Log4j.patch
index 1b301675ed..1b301675ed 100644
--- a/patches/server/0822-Update-Log4j.patch
+++ b/patches/server/0817-Update-Log4j.patch
diff --git a/patches/server/0823-Add-more-Campfire-API.patch b/patches/server/0818-Add-more-Campfire-API.patch
index 75cef9d65b..75cef9d65b 100644
--- a/patches/server/0823-Add-more-Campfire-API.patch
+++ b/patches/server/0818-Add-more-Campfire-API.patch
diff --git a/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0819-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 324e828c7c..324e828c7c 100644
--- a/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0819-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0825-Fix-tripwire-state-inconsistency.patch b/patches/server/0820-Fix-tripwire-state-inconsistency.patch
index ef3e8540d4..ef3e8540d4 100644
--- a/patches/server/0825-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0820-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0821-Fix-fluid-logging-on-Block-breakNaturally.patch
index 3d1428bea5..3d1428bea5 100644
--- a/patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/server/0821-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0822-Forward-CraftEntity-in-teleport-command.patch
index 9eec59ce99..9eec59ce99 100644
--- a/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0822-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0828-Improve-scoreboard-entries.patch b/patches/server/0823-Improve-scoreboard-entries.patch
index ee3bcefafe..ee3bcefafe 100644
--- a/patches/server/0828-Improve-scoreboard-entries.patch
+++ b/patches/server/0823-Improve-scoreboard-entries.patch
diff --git a/patches/server/0829-Entity-powdered-snow-API.patch b/patches/server/0824-Entity-powdered-snow-API.patch
index 7df19b80b9..7df19b80b9 100644
--- a/patches/server/0829-Entity-powdered-snow-API.patch
+++ b/patches/server/0824-Entity-powdered-snow-API.patch
diff --git a/patches/server/0830-Add-API-for-item-entity-health.patch b/patches/server/0825-Add-API-for-item-entity-health.patch
index c475b8fda1..c475b8fda1 100644
--- a/patches/server/0830-Add-API-for-item-entity-health.patch
+++ b/patches/server/0825-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0826-Fix-entity-type-tags-suggestions-in-selectors.patch
index a007386ad1..4f5855412c 100644
--- a/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0826-Fix-entity-type-tags-suggestions-in-selectors.patch
@@ -10,7 +10,7 @@ when if this was fixed on the client, that wouldn't be needed.
 Mojira Issue: https://bugs.mojang.com/browse/MC-235045
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6223c90932338070294e2241345ac76ef40d3412..d1868e8521ea923587f3364fc83e1aaa98dc0288 100644
+index b7db009e9002bf517ce085fe250a9eba0da58807..7d80480de7a37f1fa0d1fdedf6a967488e4977a3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -525,6 +525,11 @@ public class PaperConfig {
diff --git a/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0827-Configurable-max-block-light-for-monster-spawning.patch
index 6b5f660377..9adc6a2a1c 100644
--- a/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0827-Configurable-max-block-light-for-monster-spawning.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max block light for monster spawning
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 365c907efc100bbb5cf9223a10f6b56e3d7846ec..c9eefc9455e3db248216a38cd6120cdfa27c1eab 100644
+index 1d7d6859531a470eea5d0cf25935250f7cba7d2a..ed56c7b42fa3dc454423a283d058deaacc7bd407 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -1014,4 +1014,9 @@ public class PaperWorldConfig {
+@@ -1009,4 +1009,9 @@ public class PaperWorldConfig {
          Integer rate = table.get(columnKey, rowKey);
          return rate != null && rate > -1 ? rate : def;
      }
diff --git a/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0828-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 8ed1ba062d..8ed1ba062d 100644
--- a/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0828-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0829-Load-effect-amplifiers-greater-than-127-correctly.patch
index 83f5b4740d..83f5b4740d 100644
--- a/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0829-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0830-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0830-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0836-Fix-bees-aging-inside-hives.patch b/patches/server/0831-Fix-bees-aging-inside-hives.patch
index c9303da67b..c9303da67b 100644
--- a/patches/server/0836-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0831-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0837-Bucketable-API.patch b/patches/server/0832-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0837-Bucketable-API.patch
+++ b/patches/server/0832-Bucketable-API.patch
diff --git a/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0833-Check-player-world-in-endPortalSoundRadius.patch
index a632d3d594..a632d3d594 100644
--- a/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch
+++ b/patches/server/0833-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0839-Validate-usernames.patch b/patches/server/0834-Validate-usernames.patch
index 2b952eef57..2d5e017522 100644
--- a/patches/server/0839-Validate-usernames.patch
+++ b/patches/server/0834-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d1868e8521ea923587f3364fc83e1aaa98dc0288..15ed7b66aefc5665ebbe81dc491f4944269ace14 100644
+index 7d80480de7a37f1fa0d1fdedf6a967488e4977a3..29932d3b80b26481fd54631d33fec4ead42a3b41 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -493,6 +493,12 @@ public class PaperConfig {
diff --git a/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0835-Fix-saving-configs-with-more-long-comments.patch
index 7d52b01085..7d52b01085 100644
--- a/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch
+++ b/patches/server/0835-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0841-Make-water-animal-spawn-height-configurable.patch b/patches/server/0836-Make-water-animal-spawn-height-configurable.patch
index 70d7bcd1a9..39b751fcef 100644
--- a/patches/server/0841-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0836-Make-water-animal-spawn-height-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make water animal spawn height configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c9eefc9455e3db248216a38cd6120cdfa27c1eab..bcac771024f406e2b60739162671a5d5bdbb39cd 100644
+index ed56c7b42fa3dc454423a283d058deaacc7bd407..12615f12c64c62400ec57fc8930d55251da0ff8c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -385,6 +385,24 @@ public class PaperWorldConfig {
diff --git a/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0837-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index ba7ebe0dba..ba7ebe0dba 100644
--- a/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0837-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0838-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 268a2c4acb..e49962d39e 100644
--- a/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0838-Add-config-option-for-worlds-affected-by-time-cmd.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for worlds affected by time cmd
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 15ed7b66aefc5665ebbe81dc491f4944269ace14..b44d73d86e4105d31c8c8a3cd98661a3ec0adc9c 100644
+index 29932d3b80b26481fd54631d33fec4ead42a3b41..4587e9a43d2a6ddc9aadd5e1a84ed7a77248967a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -645,4 +645,9 @@ public class PaperConfig {
diff --git a/patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0839-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0839-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0845-Multiple-Entries-with-Scoreboards.patch b/patches/server/0840-Multiple-Entries-with-Scoreboards.patch
index 2f9e8e9118..2f9e8e9118 100644
--- a/patches/server/0845-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0840-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0846-Reset-placed-block-on-exception.patch b/patches/server/0841-Reset-placed-block-on-exception.patch
index 7666ecdfe1..7666ecdfe1 100644
--- a/patches/server/0846-Reset-placed-block-on-exception.patch
+++ b/patches/server/0841-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0847-Add-configurable-height-for-slime-spawn.patch b/patches/server/0842-Add-configurable-height-for-slime-spawn.patch
index 4491816842..0e03810577 100644
--- a/patches/server/0847-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0842-Add-configurable-height-for-slime-spawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable height for slime spawn
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bcac771024f406e2b60739162671a5d5bdbb39cd..d7dcf36c8c972e30320c56e447822cf26f6d5fb3 100644
+index 12615f12c64c62400ec57fc8930d55251da0ff8c..ad3f0ff353a0448babde334641d1b1ac94779b07 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -423,6 +423,16 @@ public class PaperWorldConfig {
diff --git a/patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0843-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index a834180d50..a834180d50 100644
--- a/patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0843-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0849-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0844-Fix-xp-reward-for-baby-zombies.patch
index 0c5733a372..0c5733a372 100644
--- a/patches/server/0849-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0844-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0850-Kick-on-main-for-illegal-chars.patch b/patches/server/0845-Kick-on-main-for-illegal-chars.patch
index f5c7e34afc..f5c7e34afc 100644
--- a/patches/server/0850-Kick-on-main-for-illegal-chars.patch
+++ b/patches/server/0845-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0851-Multi-Block-Change-API-Implementation.patch b/patches/server/0846-Multi-Block-Change-API-Implementation.patch
index c2863f8ade..97bf93afe6 100644
--- a/patches/server/0851-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0846-Multi-Block-Change-API-Implementation.patch
@@ -25,7 +25,7 @@ index 82ea4fabd5732052a286d50bcff8bbcc2c4aa7d7..652bea6868a03a5315965f79c76172fb
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index af439e9e9572d5cda81792f89a7bb3eb506a8c72..087a91ff9c564ad8a137f268331b0e198194b19b 100644
+index 2d60a7ceaa87178b456f509eb51a451d67e5312b..ae65164dc356480ab731012308615dcf14fba6fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -30,6 +30,7 @@ import javax.annotation.Nullable;
diff --git a/patches/server/0852-Fix-NotePlayEvent.patch b/patches/server/0847-Fix-NotePlayEvent.patch
index 3d7aa4d732..3d7aa4d732 100644
--- a/patches/server/0852-Fix-NotePlayEvent.patch
+++ b/patches/server/0847-Fix-NotePlayEvent.patch
diff --git a/patches/server/0853-Freeze-Tick-Lock-API.patch b/patches/server/0848-Freeze-Tick-Lock-API.patch
index e3599f4743..e3599f4743 100644
--- a/patches/server/0853-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0848-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0854-Dolphin-API.patch b/patches/server/0849-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0854-Dolphin-API.patch
+++ b/patches/server/0849-Dolphin-API.patch
diff --git a/patches/server/0855-More-PotionEffectType-API.patch b/patches/server/0850-More-PotionEffectType-API.patch
index 14fb482187..14fb482187 100644
--- a/patches/server/0855-More-PotionEffectType-API.patch
+++ b/patches/server/0850-More-PotionEffectType-API.patch
diff --git a/patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0851-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 3b79f9947c..3b79f9947c 100644
--- a/patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0851-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0852-API-for-creating-command-sender-which-forwards-feedb.patch
index aa0eae89a4..aa0eae89a4 100644
--- a/patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0852-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0858-Add-config-for-stronghold-seed.patch b/patches/server/0853-Add-config-for-stronghold-seed.patch
index 97945d92cf..97945d92cf 100644
--- a/patches/server/0858-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0853-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0859-Implement-regenerateChunk.patch b/patches/server/0854-Implement-regenerateChunk.patch
index 21a5aa32b4..21a5aa32b4 100644
--- a/patches/server/0859-Implement-regenerateChunk.patch
+++ b/patches/server/0854-Implement-regenerateChunk.patch
diff --git a/patches/server/0860-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0855-Log-exceptions-thrown-during-chat-processing.patch
index 76bdbcdd9c..76bdbcdd9c 100644
--- a/patches/server/0860-Log-exceptions-thrown-during-chat-processing.patch
+++ b/patches/server/0855-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0861-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0856-Fix-cancelled-powdered-snow-bucket-placement.patch
index 9a95fdb1d3..9a95fdb1d3 100644
--- a/patches/server/0861-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0856-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0857-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 82fcd35c3f..82fcd35c3f 100644
--- a/patches/server/0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0857-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0863-Add-GameEvent-tags.patch b/patches/server/0858-Add-GameEvent-tags.patch
index ad8dc46e85..ad8dc46e85 100644
--- a/patches/server/0863-Add-GameEvent-tags.patch
+++ b/patches/server/0858-Add-GameEvent-tags.patch
diff --git a/patches/server/0864-Replace-player-chunk-loader-system.patch b/patches/server/0859-Replace-player-chunk-loader-system.patch
index 010edcd917..de5dee0f37 100644
--- a/patches/server/0864-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0859-Replace-player-chunk-loader-system.patch
@@ -84,7 +84,7 @@ index 309dbf5fce3ce940d5e1b57d267b9d6b2c5ff5b6..5ba64e1083b7cb1eec64d1925095c6ca
          }));
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b44d73d86e4105d31c8c8a3cd98661a3ec0adc9c..c2286c3ef5b997e24dae04e24444b417851de919 100644
+index 4587e9a43d2a6ddc9aadd5e1a84ed7a77248967a..78fdf24658ca8f72ad12f69c502b15bd16a73c57 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -650,4 +650,33 @@ public class PaperConfig {
@@ -1874,7 +1874,7 @@ index cd6eb305f4d36be923f6c5f0dd85e449d0f94c8f..5793154c0deca7fc570bbe858c6bea0d
                  return true;
              } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 41972a8db871b5a4a74e7735a2883d3d8e24c0ee..8e87aca16879d7dd1dc0bd17d3215fca40b547cd 100644
+index 2187331d2f3c4f14281dde6f01422fc4d5458e0e..af7e4ce201a471d2f59d16c0810bb08cc586363b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -658,7 +658,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2019,7 +2019,7 @@ index 03824f73ecbac8ef6da586feb82f851557f82b6a..160c0f37aa3aaf7598f852acf9bd444f
  
              if ((i & 1) != 0) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index a141071966428315484480831a58f02a2b0bc025..d4ce71d98c5071cd3567c772a0853ca86550bad5 100644
+index b46648301396930478391967b371bf8d201901e1..c8fb4b2bc86c9aa2e7c2e9ee10208cf9598b39ef 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -191,6 +191,43 @@ public class LevelChunk extends ChunkAccess {
@@ -2066,7 +2066,7 @@ index a141071966428315484480831a58f02a2b0bc025..d4ce71d98c5071cd3567c772a0853ca8
      }
  
      public final boolean isAnyNeighborsLoaded() {
-@@ -805,6 +842,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -794,6 +831,7 @@ public class LevelChunk extends ChunkAccess {
          // Paper end - neighbour cache
          org.bukkit.Server server = this.level.getCraftServer();
          this.level.getChunkSource().addLoadedChunk(this); // Paper
@@ -2074,7 +2074,7 @@ index a141071966428315484480831a58f02a2b0bc025..d4ce71d98c5071cd3567c772a0853ca8
          if (server != null) {
              /*
               * If it's a new world, the first few chunks are generated inside
-@@ -929,7 +967,10 @@ public class LevelChunk extends ChunkAccess {
+@@ -918,7 +956,10 @@ public class LevelChunk extends ChunkAccess {
          });
      }
  
@@ -2085,7 +2085,7 @@ index a141071966428315484480831a58f02a2b0bc025..d4ce71d98c5071cd3567c772a0853ca8
          ChunkPos chunkcoordintpair = this.getPos();
  
          for (int i = 0; i < this.postProcessing.length; ++i) {
-@@ -967,6 +1008,11 @@ public class LevelChunk extends ChunkAccess {
+@@ -956,6 +997,11 @@ public class LevelChunk extends ChunkAccess {
  
          this.pendingBlockEntities.clear();
          this.upgradeData.upgrade(this);
@@ -2167,7 +2167,7 @@ index 7e8be67b85fc28ecf9d27241e1a7157b976885a5..a3ddeb9862bc87294c215dc906cd8cca
      // Paper end - view distance api
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 087a91ff9c564ad8a137f268331b0e198194b19b..603e9234294c01f1cde4bfc0b0053e69b99861d9 100644
+index ae65164dc356480ab731012308615dcf14fba6fe..6feeadad9aecb7d63e24d5daae115a93e39aeb3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -528,45 +528,80 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0860-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 17181993c9..17181993c9 100644
--- a/patches/server/0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0860-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0866-Replace-ticket-level-propagator.patch b/patches/server/0861-Replace-ticket-level-propagator.patch
index 03d6ba0cb1..03d6ba0cb1 100644
--- a/patches/server/0866-Replace-ticket-level-propagator.patch
+++ b/patches/server/0861-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0867-Furnace-RecipesUsed-API.patch b/patches/server/0862-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0867-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0862-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0868-Configurable-sculk-sensor-listener-range.patch b/patches/server/0863-Configurable-sculk-sensor-listener-range.patch
index 2e9adfa399..2e9adfa399 100644
--- a/patches/server/0868-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0863-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0869-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0864-Add-missing-block-data-mins-and-maxes.patch
index 6f3d051671..6f3d051671 100644
--- a/patches/server/0869-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0864-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0865-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index c9b0cee2b6..84d6c86140 100644
--- a/patches/server/0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0865-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c2286c3ef5b997e24dae04e24444b417851de919..2becc9a274eddb1a01655f24f54d5cf72470580d 100644
+index 78fdf24658ca8f72ad12f69c502b15bd16a73c57..73bc7a82254114ab8a5cddaac02322438517d8a3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -679,4 +679,9 @@ public class PaperConfig {
diff --git a/patches/server/0871-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0866-Put-world-into-worldlist-before-initing-the-world.patch
index b277ac14c6..b277ac14c6 100644
--- a/patches/server/0871-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0866-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0872-Fix-Entity-Position-Desync.patch b/patches/server/0867-Fix-Entity-Position-Desync.patch
index 32aeaec69d..32aeaec69d 100644
--- a/patches/server/0872-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0867-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0873-Custom-Potion-Mixes.patch b/patches/server/0868-Custom-Potion-Mixes.patch
index 31003aba09..31003aba09 100644
--- a/patches/server/0873-Custom-Potion-Mixes.patch
+++ b/patches/server/0868-Custom-Potion-Mixes.patch
diff --git a/patches/server/0874-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0869-Fix-Fluid-tags-isTagged-method.patch
index 95eeab8b2f..95eeab8b2f 100644
--- a/patches/server/0874-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0869-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0875-Fix-World-locateNearestStructure.patch b/patches/server/0870-Fix-World-locateNearestStructure.patch
index 95d96b579b..79fdc88050 100644
--- a/patches/server/0875-Fix-World-locateNearestStructure.patch
+++ b/patches/server/0870-Fix-World-locateNearestStructure.patch
@@ -23,7 +23,7 @@ index 85b3bf7718e51ffa52799c0748843aaad3fd3813..17e87875a95495940899b862eabf98b3
              if (Thread.currentThread() != this.serverThread) return; // Paper
              //this.getPlayerList().saveAll(); // Paper - we don't need to do this
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8e87aca16879d7dd1dc0bd17d3215fca40b547cd..b5b56d4549e97abbbe9e91d881b9bca8428f1eec 100644
+index af7e4ce201a471d2f59d16c0810bb08cc586363b..5181f061c73c120c8e9ef30b7da1945c8f57b418 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1790,7 +1790,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0876-Force-close-world-loading-screen.patch b/patches/server/0871-Force-close-world-loading-screen.patch
index 24a6fd821f..24a6fd821f 100644
--- a/patches/server/0876-Force-close-world-loading-screen.patch
+++ b/patches/server/0871-Force-close-world-loading-screen.patch
diff --git a/patches/server/0877-Fix-falling-block-spawn-methods.patch b/patches/server/0872-Fix-falling-block-spawn-methods.patch
index 5ff117ee09..5ff117ee09 100644
--- a/patches/server/0877-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0872-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0878-Expose-furnace-minecart-push-values.patch b/patches/server/0873-Expose-furnace-minecart-push-values.patch
index 4086d94249..4086d94249 100644
--- a/patches/server/0878-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0873-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0879-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0874-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index b95d6ace5a..b95d6ace5a 100644
--- a/patches/server/0879-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0874-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0880-Fix-save-problems-on-shutdown.patch b/patches/server/0875-Fix-save-problems-on-shutdown.patch
index 97b9516f09..51a0ce45a7 100644
--- a/patches/server/0880-Fix-save-problems-on-shutdown.patch
+++ b/patches/server/0875-Fix-save-problems-on-shutdown.patch
@@ -55,7 +55,7 @@ index 17e87875a95495940899b862eabf98b3d6a365da..39b7c78b032ed6fc29ac765020d5a388
          if (isOversleep) return canOversleep();// Paper - because of our changes, this logic is broken
          return this.forceTicks || this.runningTask() || Util.getMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b5b56d4549e97abbbe9e91d881b9bca8428f1eec..dce7452d58d6081f1a83baddafb1596ebd423d21 100644
+index 5181f061c73c120c8e9ef30b7da1945c8f57b418..9696bb71921824dc8a0b25a44b803db03296f4fc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1258,7 +1258,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0881-More-Projectile-API.patch b/patches/server/0876-More-Projectile-API.patch
index 3a0c2d24c1..3a0c2d24c1 100644
--- a/patches/server/0881-More-Projectile-API.patch
+++ b/patches/server/0876-More-Projectile-API.patch