255 files changed, 11 insertions, 30 deletions

diff --git a/patches/server/0624-Expose-protocol-version.patch b/patches/server/0623-Expose-protocol-version.patch
index 0bb6bf0dc5..0bb6bf0dc5 100644
--- a/patches/server/0624-Expose-protocol-version.patch
+++ b/patches/server/0623-Expose-protocol-version.patch
diff --git a/patches/server/0623-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0623-fix-cancelling-block-falling-causing-client-desync.patch
deleted file mode 100644
index 33b4505448..0000000000
--- a/patches/server/0623-fix-cancelling-block-falling-causing-client-desync.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Trigary <[email protected]>
-Date: Sat, 27 Mar 2021 11:13:30 +0100
-Subject: [PATCH] fix cancelling block falling causing client desync
-
-
-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 483127e9418489ad7ba1fbcb14a045d91c1c3c30..880521f25a6c8483c79043f237866cb7a49c3a54 100644
---- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-@@ -192,7 +192,7 @@ public class FallingBlockEntity extends Entity {
- 
-                                 // CraftBukkit start
-                                 if (CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, this.blockState).isCancelled()) {
--                                    this.discard(); // SPIGOT-6586 called before the event in previous versions
-+                                    this.discard(); // SPIGOT-6586 called before the event in previous versions //TODO test if desync happens on cancel
-                                     return;
-                                 }
-                                 // CraftBukkit end
diff --git a/patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 1935ce4852..1935ce4852 100644
--- a/patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch
index 0fe6d987f6..0fe6d987f6 100644
--- a/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 7141d18a53..7141d18a53 100644
--- a/patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0628-Add-bypass-host-check.patch b/patches/server/0627-Add-bypass-host-check.patch
index a9a87f8a74..a9a87f8a74 100644
--- a/patches/server/0628-Add-bypass-host-check.patch
+++ b/patches/server/0627-Add-bypass-host-check.patch
diff --git a/patches/server/0629-Set-area-affect-cloud-rotation.patch b/patches/server/0628-Set-area-affect-cloud-rotation.patch
index b0f478a353..b0f478a353 100644
--- a/patches/server/0629-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0628-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch
index 8c7bfe4fbb..8c7bfe4fbb 100644
--- a/patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch
index 1fdb5f16ee..1fdb5f16ee 100644
--- a/patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch
+++ b/patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch
index ffb9062039..ffb9062039 100644
--- a/patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch
index 9720fcdaf4..9720fcdaf4 100644
--- a/patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch
index 9b69dc24f2..9b69dc24f2 100644
--- a/patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch
index e63651a68f..e63651a68f 100644
--- a/patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch
+++ b/patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch
index 7a332176ff..7a332176ff 100644
--- a/patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0637-Added-PlayerDeepSleepEvent.patch b/patches/server/0636-Added-PlayerDeepSleepEvent.patch
index 00b71569b1..00b71569b1 100644
--- a/patches/server/0637-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0636-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0638-More-World-API.patch b/patches/server/0637-More-World-API.patch
index 3fac16090a..3fac16090a 100644
--- a/patches/server/0638-More-World-API.patch
+++ b/patches/server/0637-More-World-API.patch
diff --git a/patches/server/0639-Added-PlayerBedFailEnterEvent.patch b/patches/server/0638-Added-PlayerBedFailEnterEvent.patch
index 95b8821728..95b8821728 100644
--- a/patches/server/0639-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0638-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch
index ad3e98c8b5..ad3e98c8b5 100644
--- a/patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 576aa63f5a..576aa63f5a 100644
--- a/patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0642-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0641-Introduce-beacon-activation-deactivation-events.patch
index 4858e0f40b..4858e0f40b 100644
--- a/patches/server/0642-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0641-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 5fff43eeb8..5fff43eeb8 100644
--- a/patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0644-Add-Channel-initialization-listeners.patch b/patches/server/0643-Add-Channel-initialization-listeners.patch
index 1f7fe2772b..1f7fe2772b 100644
--- a/patches/server/0644-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0643-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch
index 2b52bb5343..2b52bb5343 100644
--- a/patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0646-Add-more-WanderingTrader-API.patch b/patches/server/0645-Add-more-WanderingTrader-API.patch
index 65d351d6df..65d351d6df 100644
--- a/patches/server/0646-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0645-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0647-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0646-Add-EntityBlockStorage-clearEntities.patch
index 4742b14dac..4742b14dac 100644
--- a/patches/server/0647-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0646-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index b53cff9d00..b53cff9d00 100644
--- a/patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index 0b88624654..0b88624654 100644
--- a/patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0650-Inventory-close.patch b/patches/server/0649-Inventory-close.patch
index e7f478324a..e7f478324a 100644
--- a/patches/server/0650-Inventory-close.patch
+++ b/patches/server/0649-Inventory-close.patch
diff --git a/patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch
index ea0c797028..ea0c797028 100644
--- a/patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 9fc439f344..9fc439f344 100644
--- a/patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0653-Fix-CraftPotionBrewer-cache.patch b/patches/server/0652-Fix-CraftPotionBrewer-cache.patch
index 2d8295382f..2d8295382f 100644
--- a/patches/server/0653-Fix-CraftPotionBrewer-cache.patch
+++ b/patches/server/0652-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0654-Add-basic-Datapack-API.patch b/patches/server/0653-Add-basic-Datapack-API.patch
index 9d3354fc69..9d3354fc69 100644
--- a/patches/server/0654-Add-basic-Datapack-API.patch
+++ b/patches/server/0653-Add-basic-Datapack-API.patch
diff --git a/patches/server/0655-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0654-Add-environment-variable-to-disable-server-gui.patch
index a8785b7a29..a8785b7a29 100644
--- a/patches/server/0655-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0654-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch
index 4f95b0914b..4f95b0914b 100644
--- a/patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0657-ItemStack-repair-check-API.patch b/patches/server/0656-ItemStack-repair-check-API.patch
index 4a91ed49f7..4a91ed49f7 100644
--- a/patches/server/0657-ItemStack-repair-check-API.patch
+++ b/patches/server/0656-ItemStack-repair-check-API.patch
diff --git a/patches/server/0658-More-Enchantment-API.patch b/patches/server/0657-More-Enchantment-API.patch
index be8a7f96c7..be8a7f96c7 100644
--- a/patches/server/0658-More-Enchantment-API.patch
+++ b/patches/server/0657-More-Enchantment-API.patch
diff --git a/patches/server/0659-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch
index ffaa5bdd50..ffaa5bdd50 100644
--- a/patches/server/0659-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0660-Add-Mob-lookAt-API.patch b/patches/server/0659-Add-Mob-lookAt-API.patch
index 26b90782d2..26b90782d2 100644
--- a/patches/server/0660-Add-Mob-lookAt-API.patch
+++ b/patches/server/0659-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0661-Add-Unix-domain-socket-support.patch b/patches/server/0660-Add-Unix-domain-socket-support.patch
index b70b3641af..b70b3641af 100644
--- a/patches/server/0661-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0660-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0662-Add-EntityInsideBlockEvent.patch b/patches/server/0661-Add-EntityInsideBlockEvent.patch
index 2c221ccdeb..2c221ccdeb 100644
--- a/patches/server/0662-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0661-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0663-Attributes-API-for-item-defaults.patch b/patches/server/0662-Attributes-API-for-item-defaults.patch
index 2915d2428f..2915d2428f 100644
--- a/patches/server/0663-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0662-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0664-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch
index 74ac72ae3b..74ac72ae3b 100644
--- a/patches/server/0664-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0665-More-Lidded-Block-API.patch b/patches/server/0664-More-Lidded-Block-API.patch
index 5b7c8a3b64..5b7c8a3b64 100644
--- a/patches/server/0665-More-Lidded-Block-API.patch
+++ b/patches/server/0664-More-Lidded-Block-API.patch
diff --git a/patches/server/0666-Limit-item-frame-cursors-on-maps.patch b/patches/server/0665-Limit-item-frame-cursors-on-maps.patch
index dfc4282000..dfc4282000 100644
--- a/patches/server/0666-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0665-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0667-Add-PlayerKickEvent-causes.patch b/patches/server/0666-Add-PlayerKickEvent-causes.patch
index ed375924a0..ed375924a0 100644
--- a/patches/server/0667-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0666-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0668-Add-PufferFishStateChangeEvent.patch b/patches/server/0667-Add-PufferFishStateChangeEvent.patch
index e15126884a..e15126884a 100644
--- a/patches/server/0668-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0667-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 2d2d6ea63a..2d2d6ea63a 100644
--- a/patches/server/0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
index 670063cc65..670063cc65 100644
--- a/patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
+++ b/patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch
index 362a1b16f3..362a1b16f3 100644
--- a/patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0672-Add-BellRevealRaiderEvent.patch b/patches/server/0671-Add-BellRevealRaiderEvent.patch
index 587e0f0400..587e0f0400 100644
--- a/patches/server/0672-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0671-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0673-Fix-invulnerable-end-crystals.patch b/patches/server/0672-Fix-invulnerable-end-crystals.patch
index 69911150b1..69911150b1 100644
--- a/patches/server/0673-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0672-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0674-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0673-Add-ElderGuardianAppearanceEvent.patch
index 540926f9ef..540926f9ef 100644
--- a/patches/server/0674-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0673-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0675-Fix-dangerous-end-portal-logic.patch b/patches/server/0674-Fix-dangerous-end-portal-logic.patch
index 1be4e84ec5..1be4e84ec5 100644
--- a/patches/server/0675-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0674-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index c3c7f53663..c3c7f53663 100644
--- a/patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0677-Make-item-validations-configurable.patch b/patches/server/0676-Make-item-validations-configurable.patch
index 1bff191b03..1bff191b03 100644
--- a/patches/server/0677-Make-item-validations-configurable.patch
+++ b/patches/server/0676-Make-item-validations-configurable.patch
diff --git a/patches/server/0678-Line-Of-Sight-Changes.patch b/patches/server/0677-Line-Of-Sight-Changes.patch
index 28e1141d0b..28e1141d0b 100644
--- a/patches/server/0678-Line-Of-Sight-Changes.patch
+++ b/patches/server/0677-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0679-add-per-world-spawn-limits.patch b/patches/server/0678-add-per-world-spawn-limits.patch
index 68527d5cff..68527d5cff 100644
--- a/patches/server/0679-add-per-world-spawn-limits.patch
+++ b/patches/server/0678-add-per-world-spawn-limits.patch
diff --git a/patches/server/0680-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0679-Fix-PotionSplashEvent-for-water-splash-potions.patch
index 56f02dad6e..56f02dad6e 100644
--- a/patches/server/0680-Fix-PotionSplashEvent-for-water-splash-potions.patch
+++ b/patches/server/0679-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0681-Add-more-LimitedRegion-API.patch b/patches/server/0680-Add-more-LimitedRegion-API.patch
index e9e7611f99..e9e7611f99 100644
--- a/patches/server/0681-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0680-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0681-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 6ae023df0a..6ae023df0a 100644
--- a/patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0681-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0683-Missing-Entity-Behavior-API.patch b/patches/server/0682-Missing-Entity-Behavior-API.patch
index ac5c9fdaa1..ac5c9fdaa1 100644
--- a/patches/server/0683-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0682-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 61eab94f77..61eab94f77 100644
--- a/patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 179e878420..179e878420 100644
--- a/patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch
index 99213d6d81..99213d6d81 100644
--- a/patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch
index ae4da58c6b..ae4da58c6b 100644
--- a/patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0688-Adds-PlayerArmSwingEvent.patch b/patches/server/0687-Adds-PlayerArmSwingEvent.patch
index 0ac17873c1..0ac17873c1 100644
--- a/patches/server/0688-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0687-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
index 316e9e0de5..316e9e0de5 100644
--- a/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch
index 1119d3551b..1119d3551b 100644
--- a/patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0691-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch
index 87ff34d0b8..87ff34d0b8 100644
--- a/patches/server/0691-Fix-incorrect-message-for-outdated-client.patch
+++ b/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0692-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch
index 2e2e9543af..2e2e9543af 100644
--- a/patches/server/0692-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch
index 95d554e0ea..95d554e0ea 100644
--- a/patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 8e69a76f25..8e69a76f25 100644
--- a/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0695-Stinger-API.patch b/patches/server/0694-Stinger-API.patch
index 33f8959315..33f8959315 100644
--- a/patches/server/0695-Stinger-API.patch
+++ b/patches/server/0694-Stinger-API.patch
diff --git a/patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index 8d4fe001d2..8d4fe001d2 100644
--- a/patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0697-Add-System.out-err-catcher.patch b/patches/server/0696-Add-System.out-err-catcher.patch
index 704b758183..704b758183 100644
--- a/patches/server/0697-Add-System.out-err-catcher.patch
+++ b/patches/server/0696-Add-System.out-err-catcher.patch
diff --git a/patches/server/0698-Fix-test-not-bootstrapping.patch b/patches/server/0697-Fix-test-not-bootstrapping.patch
index 5d0466c3b3..5d0466c3b3 100644
--- a/patches/server/0698-Fix-test-not-bootstrapping.patch
+++ b/patches/server/0697-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index 10cd90749d..10cd90749d 100644
--- a/patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0700-Improve-boat-collision-performance.patch b/patches/server/0699-Improve-boat-collision-performance.patch
index 24fc315296..24fc315296 100644
--- a/patches/server/0700-Improve-boat-collision-performance.patch
+++ b/patches/server/0699-Improve-boat-collision-performance.patch
diff --git a/patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch
index 44c6dff957..44c6dff957 100644
--- a/patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch
index 6395f3f4a8..6395f3f4a8 100644
--- a/patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0703-Add-PlayerSetSpawnEvent.patch b/patches/server/0702-Add-PlayerSetSpawnEvent.patch
index 2b8050b030..2b8050b030 100644
--- a/patches/server/0703-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0702-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch
index ea86736121..ea86736121 100644
--- a/patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0705-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch
index cf8b4494f3..cf8b4494f3 100644
--- a/patches/server/0705-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0706-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch
index 4134b7a5f1..4134b7a5f1 100644
--- a/patches/server/0706-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0707-Added-EntityDamageItemEvent.patch b/patches/server/0706-Added-EntityDamageItemEvent.patch
index 0f5056e7ce..0f5056e7ce 100644
--- a/patches/server/0707-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0706-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0708-Optimize-indirect-passenger-iteration.patch b/patches/server/0707-Optimize-indirect-passenger-iteration.patch
index 3f6f8f2a1f..3f6f8f2a1f 100644
--- a/patches/server/0708-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0707-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch
index a32af5a891..a32af5a891 100644
--- a/patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch
+++ b/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch
index 8378741c11..8378741c11 100644
--- a/patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch
index 2d8246afff..2d8246afff 100644
--- a/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0712-Clear-bucket-NBT-after-dispense.patch b/patches/server/0711-Clear-bucket-NBT-after-dispense.patch
index 50f3155d75..50f3155d75 100644
--- a/patches/server/0712-Clear-bucket-NBT-after-dispense.patch
+++ b/patches/server/0711-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch
index 8967390e3e..8967390e3e 100644
--- a/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch
+++ b/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch
diff --git a/patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch
index e4af6267df..e4af6267df 100644
--- a/patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0715-Add-BlockBreakBlockEvent.patch b/patches/server/0714-Add-BlockBreakBlockEvent.patch
index b7f264d94f..b7f264d94f 100644
--- a/patches/server/0715-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0714-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 14e666a79e..14e666a79e 100644
--- a/patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0717-More-CommandBlock-API.patch b/patches/server/0716-More-CommandBlock-API.patch
index daf682f8a0..daf682f8a0 100644
--- a/patches/server/0717-More-CommandBlock-API.patch
+++ b/patches/server/0716-More-CommandBlock-API.patch
diff --git a/patches/server/0718-Add-missing-team-sidebar-display-slots.patch b/patches/server/0717-Add-missing-team-sidebar-display-slots.patch
index 5581728a48..5581728a48 100644
--- a/patches/server/0718-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0717-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0719-Add-back-EntityPortalExitEvent.patch b/patches/server/0718-Add-back-EntityPortalExitEvent.patch
index a44e713ebd..a44e713ebd 100644
--- a/patches/server/0719-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0718-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch
index 742d7716ff..742d7716ff 100644
--- a/patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0721-Get-entity-default-attributes.patch b/patches/server/0720-Get-entity-default-attributes.patch
index cd8586d90e..cd8586d90e 100644
--- a/patches/server/0721-Get-entity-default-attributes.patch
+++ b/patches/server/0720-Get-entity-default-attributes.patch
diff --git a/patches/server/0722-Left-handed-API.patch b/patches/server/0721-Left-handed-API.patch
index dd1acc7723..dd1acc7723 100644
--- a/patches/server/0722-Left-handed-API.patch
+++ b/patches/server/0721-Left-handed-API.patch
diff --git a/patches/server/0723-Add-advancement-display-API.patch b/patches/server/0722-Add-advancement-display-API.patch
index c2bd6b94c0..c2bd6b94c0 100644
--- a/patches/server/0723-Add-advancement-display-API.patch
+++ b/patches/server/0722-Add-advancement-display-API.patch
diff --git a/patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch
index f22d19fef2..f22d19fef2 100644
--- a/patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0725-Add-critical-damage-API.patch b/patches/server/0724-Add-critical-damage-API.patch
index ca4be99b06..ca4be99b06 100644
--- a/patches/server/0725-Add-critical-damage-API.patch
+++ b/patches/server/0724-Add-critical-damage-API.patch
diff --git a/patches/server/0726-Fix-issues-with-mob-conversion.patch b/patches/server/0725-Fix-issues-with-mob-conversion.patch
index 69feb4b3a4..69feb4b3a4 100644
--- a/patches/server/0726-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0725-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0727-Add-isCollidable-methods-to-various-places.patch b/patches/server/0726-Add-isCollidable-methods-to-various-places.patch
index 3a5a209277..3a5a209277 100644
--- a/patches/server/0727-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0726-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0728-Goat-ram-API.patch b/patches/server/0727-Goat-ram-API.patch
index f1fcff3a29..f1fcff3a29 100644
--- a/patches/server/0728-Goat-ram-API.patch
+++ b/patches/server/0727-Goat-ram-API.patch
diff --git a/patches/server/0729-Add-API-for-resetting-a-single-score.patch b/patches/server/0728-Add-API-for-resetting-a-single-score.patch
index c2e1fd93b9..c2e1fd93b9 100644
--- a/patches/server/0729-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0728-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch
index 0a3c4951b9..0a3c4951b9 100644
--- a/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0731-Vanilla-command-permission-fixes.patch b/patches/server/0730-Vanilla-command-permission-fixes.patch
index d9b53520f4..d9b53520f4 100644
--- a/patches/server/0731-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0730-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0732-Make-CallbackExecutor-strict-again.patch b/patches/server/0731-Make-CallbackExecutor-strict-again.patch
index 479a8f98f9..b1f2cffeba 100644
--- a/patches/server/0732-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0731-Make-CallbackExecutor-strict-again.patch
@@ -10,7 +10,7 @@ schedules. Effectively, use the callback executor as a tool of
 finding issues rather than hiding these issues.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index efe1d149eb0c6661b67d51375a264fb2b4aaad80..5261c7a44200e2cc191b67900c7771ca31fb33df 100644
+index 4f7894d9458733a5bf42e6d1094db2aaf5ae8ea0..7595f2bd6b26946e9f437dbd962a3b23e95a52b6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -164,17 +164,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index d2c7c618d7..d2c7c618d7 100644
--- a/patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index b4e5807041..b4e5807041 100644
--- a/patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch
index 48e805996a..48e805996a 100644
--- a/patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch
+++ b/patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch
index 86c0e502fd..86c0e502fd 100644
--- a/patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch
+++ b/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch
diff --git a/patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch
index 90920dfb9e..90920dfb9e 100644
--- a/patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch
+++ b/patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index 1bbeb83fd9..a057742e50 100644
--- a/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
@@ -8,7 +8,7 @@ Sync loading the chunk at this stage would cause it to load
 older data, as well as screwing our region state.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 16350310a235c321e48c29fbace2969b43778bf5..0326d187ac19b5c8577e377d9ad92f1839112fc7 100644
+index 5602576dd8aea04fc233a801cce9bc14d27a55ec..3dc7e0188bc279f640e0c9655e49e85624742e85 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -313,6 +313,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch
index d0f51016fc..d0f51016fc 100644
--- a/patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch
+++ b/patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 7654abc8b4..7654abc8b4 100644
--- a/patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0741-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch
index bede76faf6..bede76faf6 100644
--- a/patches/server/0741-Log-when-the-async-catcher-is-tripped.patch
+++ b/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 906528460b..906528460b 100644
--- a/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index e2c4416234..e2c4416234 100644
--- a/patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0744-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch
index ff7e0b7826..ff7e0b7826 100644
--- a/patches/server/0744-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0745-Optimise-general-POI-access.patch b/patches/server/0744-Optimise-general-POI-access.patch
index 7fa35796de..7fa35796de 100644
--- a/patches/server/0745-Optimise-general-POI-access.patch
+++ b/patches/server/0744-Optimise-general-POI-access.patch
diff --git a/patches/server/0746-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch
index 9b061bed55..9b061bed55 100644
--- a/patches/server/0746-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0747-Add-more-async-catchers.patch b/patches/server/0746-Add-more-async-catchers.patch
index f0813b3370..f0813b3370 100644
--- a/patches/server/0747-Add-more-async-catchers.patch
+++ b/patches/server/0746-Add-more-async-catchers.patch
diff --git a/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch
index 0a840e45df..0a840e45df 100644
--- a/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch
diff --git a/patches/server/0749-Optimise-chunk-tick-iteration.patch b/patches/server/0748-Optimise-chunk-tick-iteration.patch
index 4dbe3f42f1..7485f16502 100644
--- a/patches/server/0749-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0748-Optimise-chunk-tick-iteration.patch
@@ -70,7 +70,7 @@ index fbfbe9adeca7364e6346c887616890bf968f38a1..bd43fbc8a93afa7604aa467392520ed7
              int i = 0;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0326d187ac19b5c8577e377d9ad92f1839112fc7..93170820a091062bc8a41c6af7f470889e0b57d8 100644
+index 3dc7e0188bc279f640e0c9655e49e85624742e85..9c55ab3475397040ea3ae4a530c3ee3cb10bb899 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -159,6 +159,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0750-Execute-chunk-tasks-mid-tick.patch b/patches/server/0749-Execute-chunk-tasks-mid-tick.patch
index 577f243d3b..577f243d3b 100644
--- a/patches/server/0750-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0749-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0751-Do-not-copy-visible-chunks.patch b/patches/server/0750-Do-not-copy-visible-chunks.patch
index c8837f5533..e04a1deb15 100644
--- a/patches/server/0751-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0750-Do-not-copy-visible-chunks.patch
@@ -35,7 +35,7 @@ index b3516862d796c2d9fcc1c67a6073445403d73088..b61abf227a04b4565c2525e5f469db30
              List<ChunkHolder> allChunks = new ArrayList<>(visibleChunks.values());
              List<ServerPlayer> players = world.players;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 93170820a091062bc8a41c6af7f470889e0b57d8..1f6fdb65e28af63860700c5571cb77a0c05b692a 100644
+index 9c55ab3475397040ea3ae4a530c3ee3cb10bb899..c70bff94a356706e1051199de690ce2934cdaf4a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -123,9 +123,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 5459269b64..5459269b64 100644
--- a/patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch
index 9b556d7fe8..9b556d7fe8 100644
--- a/patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch
index 7d2d44d42b..7d2d44d42b 100644
--- a/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0755-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch
index 6668339cba..6668339cba 100644
--- a/patches/server/0755-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0756-Distance-manager-tick-timings.patch b/patches/server/0755-Distance-manager-tick-timings.patch
index 69c8bf095e..69c8bf095e 100644
--- a/patches/server/0756-Distance-manager-tick-timings.patch
+++ b/patches/server/0755-Distance-manager-tick-timings.patch
diff --git a/patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 7d081ee195..7d081ee195 100644
--- a/patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index c3f6182749..c3f6182749 100644
--- a/patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0759-Add-packet-limiter-config.patch b/patches/server/0758-Add-packet-limiter-config.patch
index 4647b9c71b..4647b9c71b 100644
--- a/patches/server/0759-Add-packet-limiter-config.patch
+++ b/patches/server/0758-Add-packet-limiter-config.patch
diff --git a/patches/server/0760-Lag-compensate-block-breaking.patch b/patches/server/0759-Lag-compensate-block-breaking.patch
index ca2395eead..ca2395eead 100644
--- a/patches/server/0760-Lag-compensate-block-breaking.patch
+++ b/patches/server/0759-Lag-compensate-block-breaking.patch
diff --git a/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch
index 6003909071..6003909071 100644
--- a/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index c5bd6526f7..c5bd6526f7 100644
--- a/patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch
index 4669941fb1..4669941fb1 100644
--- a/patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0764-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0763-Don-t-lookup-fluid-state-when-raytracing.patch
index eef7de0e32..eef7de0e32 100644
--- a/patches/server/0764-Don-t-lookup-fluid-state-when-raytracing.patch
+++ b/patches/server/0763-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0765-Time-scoreboard-search.patch b/patches/server/0764-Time-scoreboard-search.patch
index 48469b83af..48469b83af 100644
--- a/patches/server/0765-Time-scoreboard-search.patch
+++ b/patches/server/0764-Time-scoreboard-search.patch
diff --git a/patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch
index 87d034b685..87d034b685 100644
--- a/patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0767-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0766-Do-not-run-raytrace-logic-for-AIR.patch
index baedf55a9d..baedf55a9d 100644
--- a/patches/server/0767-Do-not-run-raytrace-logic-for-AIR.patch
+++ b/patches/server/0766-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0768-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0767-Oprimise-map-impl-for-tracked-players.patch
index bd0b6903b2..42dbf19683 100644
--- a/patches/server/0768-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0767-Oprimise-map-impl-for-tracked-players.patch
@@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 1f6fdb65e28af63860700c5571cb77a0c05b692a..17b02c7ca671577f27b86cac0533cc2261f16e44 100644
+index c70bff94a356706e1051199de690ce2934cdaf4a..34847448b9808dc52deb76f654fa2797adea25d9 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -110,6 +110,7 @@ import org.apache.commons.lang3.mutable.MutableObject;
diff --git a/patches/server/0769-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0768-Optimise-BlockSoil-nearby-water-lookup.patch
index f3fe0f0f17..f3fe0f0f17 100644
--- a/patches/server/0769-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0768-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch
index d68c8524e7..d68c8524e7 100644
--- a/patches/server/0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch
+++ b/patches/server/0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0771-Optimise-random-block-ticking.patch b/patches/server/0770-Optimise-random-block-ticking.patch
index 1d0d60fbe6..1d0d60fbe6 100644
--- a/patches/server/0771-Optimise-random-block-ticking.patch
+++ b/patches/server/0770-Optimise-random-block-ticking.patch
diff --git a/patches/server/0772-Optimise-non-flush-packet-sending.patch b/patches/server/0771-Optimise-non-flush-packet-sending.patch
index f4d6e1b6b4..f4d6e1b6b4 100644
--- a/patches/server/0772-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0771-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0773-Optimise-nearby-player-lookups.patch b/patches/server/0772-Optimise-nearby-player-lookups.patch
index d5bebad96c..fe7448ae4f 100644
--- a/patches/server/0773-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0772-Optimise-nearby-player-lookups.patch
@@ -39,7 +39,7 @@ index bd43fbc8a93afa7604aa467392520ed7b30a1d83..1a7fc533afced7235162f81b2de8148c
      // Paper end - optimise anyPlayerCloseEnoughForSpawning
      long lastAutoSaveTime; // Paper - incremental autosave
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 17b02c7ca671577f27b86cac0533cc2261f16e44..6c7a9ad153eb5c08852602ca73a630aa61a58e0c 100644
+index 34847448b9808dc52deb76f654fa2797adea25d9..9a269f0ab59b4ea2ce01957f89677d2f304ebf02 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -164,6 +164,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0774-Optimise-WorldServer-notify.patch b/patches/server/0773-Optimise-WorldServer-notify.patch
index 6cfd3dac52..6cfd3dac52 100644
--- a/patches/server/0774-Optimise-WorldServer-notify.patch
+++ b/patches/server/0773-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0775-Remove-streams-for-villager-AI.patch b/patches/server/0774-Remove-streams-for-villager-AI.patch
index 8257c2de40..8257c2de40 100644
--- a/patches/server/0775-Remove-streams-for-villager-AI.patch
+++ b/patches/server/0774-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0776-Rewrite-dataconverter-system.patch b/patches/server/0775-Rewrite-dataconverter-system.patch
index 72192de57f..72192de57f 100644
--- a/patches/server/0776-Rewrite-dataconverter-system.patch
+++ b/patches/server/0775-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch
index 2ec02bf6a3..cb29c8b7b1 100644
--- a/patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5ec76300234f29d9a153eb60cd60dccb849e5dc9..faf2b9524687b556af71b6d1cabf4a611e940df2 100644
+index f83bed210b97508affd6523065b53f2876f964f0..a205db80a1a8dbe53130c4148b25163741c33406 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -44,6 +44,11 @@ dependencies {
diff --git a/patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index 5103d7a24c..5103d7a24c 100644
--- a/patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index 5c0a433617..5c0a433617 100644
--- a/patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
diff --git a/patches/server/0780-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0779-Async-catch-modifications-to-critical-entity-state.patch
index 305329fc53..305329fc53 100644
--- a/patches/server/0780-Async-catch-modifications-to-critical-entity-state.patch
+++ b/patches/server/0779-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0781-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0780-Fix-Bukkit-NamespacedKey-shenanigans.patch
index 8f152dd0e7..8f152dd0e7 100644
--- a/patches/server/0781-Fix-Bukkit-NamespacedKey-shenanigans.patch
+++ b/patches/server/0780-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 8dfad9ab0f..8dfad9ab0f 100644
--- a/patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0783-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0782-Check-requirement-before-suggesting-root-nodes.patch
index da19d3f1ca..da19d3f1ca 100644
--- a/patches/server/0783-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0782-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 5f48d6b3b1..5f48d6b3b1 100644
--- a/patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 31e987614a..31e987614a 100644
--- a/patches/server/0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0786-Ensure-valid-vehicle-status.patch b/patches/server/0785-Ensure-valid-vehicle-status.patch
index 5715c2ca86..5715c2ca86 100644
--- a/patches/server/0786-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0785-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0787-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch
index 855c2ec833..855c2ec833 100644
--- a/patches/server/0787-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 2ce994e362..2ce994e362 100644
--- a/patches/server/0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0789-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0788-Don-t-log-debug-logging-being-disabled.patch
index 5bec880eb8..5bec880eb8 100644
--- a/patches/server/0789-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0788-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
index a29e839964..a29e839964 100644
--- a/patches/server/0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
+++ b/patches/server/0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0791-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0790-fix-various-menus-with-empty-level-accesses.patch
index 3bda24b9c6..3bda24b9c6 100644
--- a/patches/server/0791-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0790-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index 4269df0d81..9672075382 100644
--- a/patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
@@ -12,7 +12,7 @@ time to save, as flush saving performs a full flush at
 the end anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5ba598c136bca2be1badd41e9cfba39ee5f02994..7f73703cf9dc4ecdd049d6c72c0ecbdcca95a784 100644
+index b6a17bb19a45ccd4bfc4be5f177a792a9a3727f5..09d266afc606817309ba0ca795f0d86fff1fc127 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -928,6 +928,16 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0793-Preserve-overstacked-loot.patch b/patches/server/0792-Preserve-overstacked-loot.patch
index 2d41e5c253..2d41e5c253 100644
--- a/patches/server/0793-Preserve-overstacked-loot.patch
+++ b/patches/server/0792-Preserve-overstacked-loot.patch
diff --git a/patches/server/0794-Update-head-rotation-in-missing-places.patch b/patches/server/0793-Update-head-rotation-in-missing-places.patch
index 2dd4efaae9..2dd4efaae9 100644
--- a/patches/server/0794-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0793-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0795-prevent-unintended-light-block-manipulation.patch b/patches/server/0794-prevent-unintended-light-block-manipulation.patch
index 08bd6164f5..08bd6164f5 100644
--- a/patches/server/0795-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0794-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 89603862f0..89603862f0 100644
--- a/patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
diff --git a/patches/server/0797-Fix-CraftCriteria-defaults-map.patch b/patches/server/0796-Fix-CraftCriteria-defaults-map.patch
index 11fce3ca24..11fce3ca24 100644
--- a/patches/server/0797-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0796-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0798-Fix-upstreams-block-state-factories.patch b/patches/server/0797-Fix-upstreams-block-state-factories.patch
index 4a88c25608..4a88c25608 100644
--- a/patches/server/0798-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0797-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch
index cc81a11fff..cc81a11fff 100644
--- a/patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0800-Configurable-feature-seeds.patch b/patches/server/0799-Configurable-feature-seeds.patch
index e0ce52de05..e0ce52de05 100644
--- a/patches/server/0800-Configurable-feature-seeds.patch
+++ b/patches/server/0799-Configurable-feature-seeds.patch
diff --git a/patches/server/0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
index 6e33709dbe..6e33709dbe 100644
--- a/patches/server/0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
+++ b/patches/server/0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0802-Add-root-admin-user-detection.patch b/patches/server/0801-Add-root-admin-user-detection.patch
index 86c355de50..86c355de50 100644
--- a/patches/server/0802-Add-root-admin-user-detection.patch
+++ b/patches/server/0801-Add-root-admin-user-detection.patch
diff --git a/patches/server/0803-Always-allow-item-changing-in-Fireball.patch b/patches/server/0802-Always-allow-item-changing-in-Fireball.patch
index fe4cbf2ef1..fe4cbf2ef1 100644
--- a/patches/server/0803-Always-allow-item-changing-in-Fireball.patch
+++ b/patches/server/0802-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch
index 0d78c1bee5..0d78c1bee5 100644
--- a/patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
index efa5aa2399..efa5aa2399 100644
--- a/patches/server/0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
+++ b/patches/server/0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/patches/server/0806-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0805-Prevent-excessive-velocity-through-repeated-crits.patch
index 4304993831..4304993831 100644
--- a/patches/server/0806-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0805-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch
index a11975f1ad..a11975f1ad 100644
--- a/patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0808-Rewrite-the-light-engine.patch b/patches/server/0807-Rewrite-the-light-engine.patch
index b1b7d36c2f..a558bbc963 100644
--- a/patches/server/0808-Rewrite-the-light-engine.patch
+++ b/patches/server/0807-Rewrite-the-light-engine.patch
@@ -4432,7 +4432,7 @@ index 1a7fc533afced7235162f81b2de8148cef05414a..36b6e7295cf7484675c8c2b9624c1f6f
      private final DebugBuffer<ChunkHolder.ChunkSaveDebug> chunkToSaveHistory;
      public int oldTicketLevel;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7f73703cf9dc4ecdd049d6c72c0ecbdcca95a784..7d877eb5f87b718306ac2fd6cf2dd4106d99d823 100644
+index 09d266afc606817309ba0ca795f0d86fff1fc127..24b2191d0d0e88b701492f4f42e31745f28975d2 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -133,7 +133,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch
index a1b655d7c1..a1b655d7c1 100644
--- a/patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch
+++ b/patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch
index 5784fd4dc3..5784fd4dc3 100644
--- a/patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch
index e35fbc79b1..e35fbc79b1 100644
--- a/patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch
index 9231e57b2b..9231e57b2b 100644
--- a/patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index da0f208d4e..da0f208d4e 100644
--- a/patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index 0e41fd2743..0e41fd2743 100644
--- a/patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0815-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0814-Add-PlayerItemFrameChangeEvent.patch
index 464f2144c1..464f2144c1 100644
--- a/patches/server/0815-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0814-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0816-Add-player-health-update-API.patch b/patches/server/0815-Add-player-health-update-API.patch
index 133c17a922..133c17a922 100644
--- a/patches/server/0816-Add-player-health-update-API.patch
+++ b/patches/server/0815-Add-player-health-update-API.patch
diff --git a/patches/server/0817-Optimize-HashMapPalette.patch b/patches/server/0816-Optimize-HashMapPalette.patch
index ef1880895f..ef1880895f 100644
--- a/patches/server/0817-Optimize-HashMapPalette.patch
+++ b/patches/server/0816-Optimize-HashMapPalette.patch
diff --git a/patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch
index fd3b042044..fd3b042044 100644
--- a/patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 99a5334c59..99a5334c59 100644
--- a/patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch
index f33b2ef6aa..f33b2ef6aa 100644
--- a/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0821-Actually-unload-POI-data.patch b/patches/server/0820-Actually-unload-POI-data.patch
index 1530fe9f12..a9863251a5 100644
--- a/patches/server/0821-Actually-unload-POI-data.patch
+++ b/patches/server/0820-Actually-unload-POI-data.patch
@@ -10,7 +10,7 @@ This patch also prevents the saving/unloading of POI data when
 world saving is disabled.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 7d877eb5f87b718306ac2fd6cf2dd4106d99d823..b2efa5f24d20cb16218a0e7522866ee2faaef244 100644
+index 24b2191d0d0e88b701492f4f42e31745f28975d2..9f367f3e33c6bad8b9df4f18559ebcd98a97c95c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -848,6 +848,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index c03eefb28c..c03eefb28c 100644
--- a/patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0823-Update-Log4j.patch b/patches/server/0822-Update-Log4j.patch
index e0341c557e..1b301675ed 100644
--- a/patches/server/0823-Update-Log4j.patch
+++ b/patches/server/0822-Update-Log4j.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update Log4j
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index faf2b9524687b556af71b6d1cabf4a611e940df2..4662952bd0a389fe77e00ede9ab4a57f33522794 100644
+index a205db80a1a8dbe53130c4148b25163741c33406..4beb35d1e5b013395f5df101e843f41c2ce174ad 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -29,10 +29,11 @@ dependencies {
diff --git a/patches/server/0824-Add-more-Campfire-API.patch b/patches/server/0823-Add-more-Campfire-API.patch
index 75cef9d65b..75cef9d65b 100644
--- a/patches/server/0824-Add-more-Campfire-API.patch
+++ b/patches/server/0823-Add-more-Campfire-API.patch
diff --git a/patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 324e828c7c..324e828c7c 100644
--- a/patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0826-Fix-tripwire-state-inconsistency.patch b/patches/server/0825-Fix-tripwire-state-inconsistency.patch
index ef3e8540d4..ef3e8540d4 100644
--- a/patches/server/0826-Fix-tripwire-state-inconsistency.patch
+++ b/patches/server/0825-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0827-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch
index 3d1428bea5..3d1428bea5 100644
--- a/patches/server/0827-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ b/patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0828-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
index 9eec59ce99..9eec59ce99 100644
--- a/patches/server/0828-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0829-Improve-scoreboard-entries.patch b/patches/server/0828-Improve-scoreboard-entries.patch
index 07b32e52e9..07b32e52e9 100644
--- a/patches/server/0829-Improve-scoreboard-entries.patch
+++ b/patches/server/0828-Improve-scoreboard-entries.patch
diff --git a/patches/server/0830-Entity-powdered-snow-API.patch b/patches/server/0829-Entity-powdered-snow-API.patch
index 7df19b80b9..7df19b80b9 100644
--- a/patches/server/0830-Entity-powdered-snow-API.patch
+++ b/patches/server/0829-Entity-powdered-snow-API.patch
diff --git a/patches/server/0831-Add-API-for-item-entity-health.patch b/patches/server/0830-Add-API-for-item-entity-health.patch
index c475b8fda1..c475b8fda1 100644
--- a/patches/server/0831-Add-API-for-item-entity-health.patch
+++ b/patches/server/0830-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
index 8e61b0d569..8e61b0d569 100644
--- a/patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0833-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch
index 6b5f660377..6b5f660377 100644
--- a/patches/server/0833-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 8ed1ba062d..8ed1ba062d 100644
--- a/patches/server/0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0835-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch
index 83f5b4740d..83f5b4740d 100644
--- a/patches/server/0835-Load-effect-amplifiers-greater-than-127-correctly.patch
+++ b/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 9f3ee548ee..9f3ee548ee 100644
--- a/patches/server/0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0837-Fix-bees-aging-inside-hives.patch b/patches/server/0836-Fix-bees-aging-inside-hives.patch
index c9303da67b..c9303da67b 100644
--- a/patches/server/0837-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0836-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0838-Bucketable-API.patch b/patches/server/0837-Bucketable-API.patch
index ff1194970a..ff1194970a 100644
--- a/patches/server/0838-Bucketable-API.patch
+++ b/patches/server/0837-Bucketable-API.patch
diff --git a/patches/server/0839-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch
index a632d3d594..a632d3d594 100644
--- a/patches/server/0839-Check-player-world-in-endPortalSoundRadius.patch
+++ b/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0840-Validate-usernames.patch b/patches/server/0839-Validate-usernames.patch
index 1b417d320d..1b417d320d 100644
--- a/patches/server/0840-Validate-usernames.patch
+++ b/patches/server/0839-Validate-usernames.patch
diff --git a/patches/server/0841-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch
index 7d52b01085..7d52b01085 100644
--- a/patches/server/0841-Fix-saving-configs-with-more-long-comments.patch
+++ b/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0842-Make-water-animal-spawn-height-configurable.patch b/patches/server/0841-Make-water-animal-spawn-height-configurable.patch
index 70d7bcd1a9..70d7bcd1a9 100644
--- a/patches/server/0842-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0841-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index db11b10e30..db11b10e30 100644
--- a/patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0844-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 052a280f72..052a280f72 100644
--- a/patches/server/0844-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0845-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch
index d19f7179e1..d19f7179e1 100644
--- a/patches/server/0845-Add-new-overload-to-PersistentDataContainer-has.patch
+++ b/patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0846-Multiple-Entries-with-Scoreboards.patch b/patches/server/0845-Multiple-Entries-with-Scoreboards.patch
index 2f9e8e9118..2f9e8e9118 100644
--- a/patches/server/0846-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0845-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0847-Reset-placed-block-on-exception.patch b/patches/server/0846-Reset-placed-block-on-exception.patch
index 7666ecdfe1..7666ecdfe1 100644
--- a/patches/server/0847-Reset-placed-block-on-exception.patch
+++ b/patches/server/0846-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0848-Add-configurable-height-for-slime-spawn.patch b/patches/server/0847-Add-configurable-height-for-slime-spawn.patch
index 4491816842..4491816842 100644
--- a/patches/server/0848-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0847-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0849-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index a834180d50..a834180d50 100644
--- a/patches/server/0849-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0850-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0849-Fix-xp-reward-for-baby-zombies.patch
index 0c5733a372..0c5733a372 100644
--- a/patches/server/0850-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0849-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0851-Kick-on-main-for-illegal-chars.patch b/patches/server/0850-Kick-on-main-for-illegal-chars.patch
index f5c7e34afc..f5c7e34afc 100644
--- a/patches/server/0851-Kick-on-main-for-illegal-chars.patch
+++ b/patches/server/0850-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0852-Multi-Block-Change-API-Implementation.patch b/patches/server/0851-Multi-Block-Change-API-Implementation.patch
index c2863f8ade..c2863f8ade 100644
--- a/patches/server/0852-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0851-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0853-Fix-NotePlayEvent.patch b/patches/server/0852-Fix-NotePlayEvent.patch
index 3d7aa4d732..3d7aa4d732 100644
--- a/patches/server/0853-Fix-NotePlayEvent.patch
+++ b/patches/server/0852-Fix-NotePlayEvent.patch
diff --git a/patches/server/0854-Freeze-Tick-Lock-API.patch b/patches/server/0853-Freeze-Tick-Lock-API.patch
index e3599f4743..e3599f4743 100644
--- a/patches/server/0854-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0853-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0855-Dolphin-API.patch b/patches/server/0854-Dolphin-API.patch
index 4bb12a6785..4bb12a6785 100644
--- a/patches/server/0855-Dolphin-API.patch
+++ b/patches/server/0854-Dolphin-API.patch
diff --git a/patches/server/0856-More-PotionEffectType-API.patch b/patches/server/0855-More-PotionEffectType-API.patch
index 14fb482187..14fb482187 100644
--- a/patches/server/0856-More-PotionEffectType-API.patch
+++ b/patches/server/0855-More-PotionEffectType-API.patch
diff --git a/patches/server/0857-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 3b79f9947c..3b79f9947c 100644
--- a/patches/server/0857-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0858-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch
index 8123d804ba..8123d804ba 100644
--- a/patches/server/0858-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0859-Add-config-for-stronghold-seed.patch b/patches/server/0858-Add-config-for-stronghold-seed.patch
index 4f078313a4..4f078313a4 100644
--- a/patches/server/0859-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0858-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0860-Implement-regenerateChunk.patch b/patches/server/0859-Implement-regenerateChunk.patch
index 21a5aa32b4..21a5aa32b4 100644
--- a/patches/server/0860-Implement-regenerateChunk.patch
+++ b/patches/server/0859-Implement-regenerateChunk.patch
diff --git a/patches/server/0861-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0860-Log-exceptions-thrown-during-chat-processing.patch
index 76bdbcdd9c..76bdbcdd9c 100644
--- a/patches/server/0861-Log-exceptions-thrown-during-chat-processing.patch
+++ b/patches/server/0860-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0862-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0861-Fix-cancelled-powdered-snow-bucket-placement.patch
index 9a95fdb1d3..9a95fdb1d3 100644
--- a/patches/server/0862-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0861-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0863-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index b72e1c19b3..b72e1c19b3 100644
--- a/patches/server/0863-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0864-Add-GameEvent-tags.patch b/patches/server/0863-Add-GameEvent-tags.patch
index 74cb5fcbb6..74cb5fcbb6 100644
--- a/patches/server/0864-Add-GameEvent-tags.patch
+++ b/patches/server/0863-Add-GameEvent-tags.patch
diff --git a/patches/server/0865-Replace-player-chunk-loader-system.patch b/patches/server/0864-Replace-player-chunk-loader-system.patch
index 94e9434704..94e9434704 100644
--- a/patches/server/0865-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0864-Replace-player-chunk-loader-system.patch
diff --git a/patches/server/0866-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index f36aa20770..f36aa20770 100644
--- a/patches/server/0866-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0867-Replace-ticket-level-propagator.patch b/patches/server/0866-Replace-ticket-level-propagator.patch
index 03d6ba0cb1..03d6ba0cb1 100644
--- a/patches/server/0867-Replace-ticket-level-propagator.patch
+++ b/patches/server/0866-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0868-Furnace-RecipesUsed-API.patch b/patches/server/0867-Furnace-RecipesUsed-API.patch
index 2e6cf1c2fe..2e6cf1c2fe 100644
--- a/patches/server/0868-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0867-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0869-Configurable-sculk-sensor-listener-range.patch b/patches/server/0868-Configurable-sculk-sensor-listener-range.patch
index 2e9adfa399..2e9adfa399 100644
--- a/patches/server/0869-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0868-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0870-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0869-Add-missing-block-data-mins-and-maxes.patch
index 6f3d051671..6f3d051671 100644
--- a/patches/server/0870-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0869-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0871-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index cef52178d6..cef52178d6 100644
--- a/patches/server/0871-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0872-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0871-Put-world-into-worldlist-before-initing-the-world.patch
index 517ce2e848..517ce2e848 100644
--- a/patches/server/0872-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0871-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0873-Fix-Entity-Position-Desync.patch b/patches/server/0872-Fix-Entity-Position-Desync.patch
index 32aeaec69d..32aeaec69d 100644
--- a/patches/server/0873-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0872-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0874-Custom-Potion-Mixes.patch b/patches/server/0873-Custom-Potion-Mixes.patch
index 3e22e5b043..3e22e5b043 100644
--- a/patches/server/0874-Custom-Potion-Mixes.patch
+++ b/patches/server/0873-Custom-Potion-Mixes.patch
diff --git a/patches/server/0875-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0874-Fix-Fluid-tags-isTagged-method.patch
index 51e7ed638e..51e7ed638e 100644
--- a/patches/server/0875-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0874-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0876-Fix-World-locateNearestStructure.patch b/patches/server/0875-Fix-World-locateNearestStructure.patch
index 0006208930..0006208930 100644
--- a/patches/server/0876-Fix-World-locateNearestStructure.patch
+++ b/patches/server/0875-Fix-World-locateNearestStructure.patch
diff --git a/patches/server/0877-Force-close-world-loading-screen.patch b/patches/server/0876-Force-close-world-loading-screen.patch
index 24a6fd821f..24a6fd821f 100644
--- a/patches/server/0877-Force-close-world-loading-screen.patch
+++ b/patches/server/0876-Force-close-world-loading-screen.patch