diff --git a/patches/server/0786-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0786-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
deleted file mode 100644
index 89603862f0..0000000000
--- a/patches/server/0786-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 20 Aug 2021 18:36:02 -0700
-Subject: [PATCH] Dont count named piglins and hoglins towards mob cap
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 49ca4f6a9e33fdb5295dae2b059d071551353c24..373ec915412899e4893aa182abd6fb63f3dff0aa 100644
---- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -181,7 +181,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
- 
-     @Override
-     public boolean removeWhenFarAway(double distanceSquared) {
--        return !this.isPersistenceRequired();
-+        return /*!this.isPersistenceRequired();*/ true; // Paper - what a jank fix, CBs like totally tried to change what removeWhenFarAway does, that method isnt even called in NaturalSpawner in vanilla, idk wtf is going on, there are so many places where this is done, for whatever reason
-     }
- 
-     @Override
diff --git a/patches/server/0787-Fix-CraftCriteria-defaults-map.patch b/patches/server/0786-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0787-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0786-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0788-Fix-upstreams-block-state-factories.patch b/patches/server/0787-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0788-Fix-upstreams-block-state-factories.patch
rename to patches/server/0787-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0789-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0788-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0789-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0788-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0790-Configurable-feature-seeds.patch b/patches/server/0789-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0790-Configurable-feature-seeds.patch
rename to patches/server/0789-Configurable-feature-seeds.patch
diff --git a/patches/server/0791-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0790-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0791-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0790-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0792-Add-root-admin-user-detection.patch b/patches/server/0791-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0792-Add-root-admin-user-detection.patch
rename to patches/server/0791-Add-root-admin-user-detection.patch
diff --git a/patches/server/0793-Always-allow-item-changing-in-Fireball.patch b/patches/server/0792-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0793-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0792-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0794-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0793-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0794-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0793-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0795-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0794-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0795-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0794-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0796-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0795-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0796-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0795-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0797-Rewrite-the-light-engine.patch b/patches/server/0796-Rewrite-the-light-engine.patch
similarity index 100%
rename from patches/server/0797-Rewrite-the-light-engine.patch
rename to patches/server/0796-Rewrite-the-light-engine.patch
diff --git a/patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0797-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0798-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0797-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0799-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0798-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0799-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0798-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0800-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0799-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0800-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0799-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0801-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0800-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0801-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0800-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0801-Fix-kelp-modifier-changing-growth-for-other-crops.patch
similarity index 100%
rename from patches/server/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch
rename to patches/server/0801-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0803-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0802-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0803-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0802-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0804-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0803-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0804-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0803-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0805-Add-player-health-update-API.patch b/patches/server/0804-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0805-Add-player-health-update-API.patch
rename to patches/server/0804-Add-player-health-update-API.patch
diff --git a/patches/server/0806-Optimize-HashMapPalette.patch b/patches/server/0805-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0806-Optimize-HashMapPalette.patch
rename to patches/server/0805-Optimize-HashMapPalette.patch
diff --git a/patches/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0806-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0807-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0806-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0808-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0807-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0808-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0807-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0808-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0809-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0808-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0810-Actually-unload-POI-data.patch b/patches/server/0809-Actually-unload-POI-data.patch
similarity index 100%
rename from patches/server/0810-Actually-unload-POI-data.patch
rename to patches/server/0809-Actually-unload-POI-data.patch
diff --git a/patches/server/0811-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0810-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0811-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0810-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0812-Update-Log4j.patch b/patches/server/0811-Update-Log4j.patch
similarity index 100%
rename from patches/server/0812-Update-Log4j.patch
rename to patches/server/0811-Update-Log4j.patch
diff --git a/patches/server/0813-Add-more-Campfire-API.patch b/patches/server/0812-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0813-Add-more-Campfire-API.patch
rename to patches/server/0812-Add-more-Campfire-API.patch
diff --git a/patches/server/0814-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0813-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0814-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0813-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0815-Fix-tripwire-state-inconsistency.patch b/patches/server/0814-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0815-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0814-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0816-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0815-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0816-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0815-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0817-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0816-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0817-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0816-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0818-Improve-scoreboard-entries.patch b/patches/server/0817-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0818-Improve-scoreboard-entries.patch
rename to patches/server/0817-Improve-scoreboard-entries.patch
diff --git a/patches/server/0819-Entity-powdered-snow-API.patch b/patches/server/0818-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0819-Entity-powdered-snow-API.patch
rename to patches/server/0818-Entity-powdered-snow-API.patch
diff --git a/patches/server/0820-Add-API-for-item-entity-health.patch b/patches/server/0819-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0820-Add-API-for-item-entity-health.patch
rename to patches/server/0819-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0821-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0820-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0821-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0820-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0822-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0821-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0822-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0821-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0823-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0822-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0823-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0822-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0824-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0823-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0824-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0823-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0825-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0824-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0825-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0824-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0826-Fix-bees-aging-inside-hives.patch b/patches/server/0825-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0826-Fix-bees-aging-inside-hives.patch
rename to patches/server/0825-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0827-Bucketable-API.patch b/patches/server/0826-Bucketable-API.patch
similarity index 100%
rename from patches/server/0827-Bucketable-API.patch
rename to patches/server/0826-Bucketable-API.patch
diff --git a/patches/server/0828-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0827-Check-player-world-in-endPortalSoundRadius.patch
similarity index 100%
rename from patches/server/0828-Check-player-world-in-endPortalSoundRadius.patch
rename to patches/server/0827-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0829-Validate-usernames.patch b/patches/server/0828-Validate-usernames.patch
similarity index 100%
rename from patches/server/0829-Validate-usernames.patch
rename to patches/server/0828-Validate-usernames.patch
diff --git a/patches/server/0830-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0829-Fix-saving-configs-with-more-long-comments.patch
similarity index 100%
rename from patches/server/0830-Fix-saving-configs-with-more-long-comments.patch
rename to patches/server/0829-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0831-Make-water-animal-spawn-height-configurable.patch b/patches/server/0830-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0831-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0830-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0832-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0832-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0831-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0833-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0832-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0833-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0832-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0834-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0833-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0834-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0833-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0835-Multiple-Entries-with-Scoreboards.patch b/patches/server/0834-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0835-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0834-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0836-Reset-placed-block-on-exception.patch b/patches/server/0835-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0836-Reset-placed-block-on-exception.patch
rename to patches/server/0835-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0837-Add-configurable-height-for-slime-spawn.patch b/patches/server/0836-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0837-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0836-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0838-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0837-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0838-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0837-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0839-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0838-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0839-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0838-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0840-Kick-on-main-for-illegal-chars.patch b/patches/server/0839-Kick-on-main-for-illegal-chars.patch
similarity index 100%
rename from patches/server/0840-Kick-on-main-for-illegal-chars.patch
rename to patches/server/0839-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0841-Multi-Block-Change-API-Implementation.patch b/patches/server/0840-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0841-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0840-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0842-Fix-NotePlayEvent.patch b/patches/server/0841-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0842-Fix-NotePlayEvent.patch
rename to patches/server/0841-Fix-NotePlayEvent.patch
diff --git a/patches/server/0843-Freeze-Tick-Lock-API.patch b/patches/server/0842-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0843-Freeze-Tick-Lock-API.patch
rename to patches/server/0842-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0844-Dolphin-API.patch b/patches/server/0843-Dolphin-API.patch
similarity index 100%
rename from patches/server/0844-Dolphin-API.patch
rename to patches/server/0843-Dolphin-API.patch
diff --git a/patches/server/0845-More-PotionEffectType-API.patch b/patches/server/0844-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0845-More-PotionEffectType-API.patch
rename to patches/server/0844-More-PotionEffectType-API.patch
diff --git a/patches/server/0846-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0845-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0846-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0845-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0846-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0847-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0846-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0848-Add-config-for-stronghold-seed.patch b/patches/server/0847-Add-config-for-stronghold-seed.patch
similarity index 100%
rename from patches/server/0848-Add-config-for-stronghold-seed.patch
rename to patches/server/0847-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0849-Implement-regenerateChunk.patch b/patches/server/0848-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0849-Implement-regenerateChunk.patch
rename to patches/server/0848-Implement-regenerateChunk.patch
diff --git a/patches/server/0850-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0849-Log-exceptions-thrown-during-chat-processing.patch
similarity index 100%
rename from patches/server/0850-Log-exceptions-thrown-during-chat-processing.patch
rename to patches/server/0849-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0851-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0850-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0851-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0850-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0851-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0852-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0851-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0853-Add-GameEvent-tags.patch b/patches/server/0852-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0853-Add-GameEvent-tags.patch
rename to patches/server/0852-Add-GameEvent-tags.patch
diff --git a/patches/server/0854-Replace-player-chunk-loader-system.patch b/patches/server/0853-Replace-player-chunk-loader-system.patch
similarity index 100%
rename from patches/server/0854-Replace-player-chunk-loader-system.patch
rename to patches/server/0853-Replace-player-chunk-loader-system.patch
diff --git a/patches/server/0855-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0854-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0855-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0854-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0856-Replace-ticket-level-propagator.patch b/patches/server/0855-Replace-ticket-level-propagator.patch
similarity index 100%
rename from patches/server/0856-Replace-ticket-level-propagator.patch
rename to patches/server/0855-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0857-Furnace-RecipesUsed-API.patch b/patches/server/0856-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0857-Furnace-RecipesUsed-API.patch
rename to patches/server/0856-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0858-Configurable-sculk-sensor-listener-range.patch b/patches/server/0857-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0858-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0857-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0859-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0858-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0859-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0858-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0860-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0859-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0860-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0859-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0861-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0860-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0861-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0860-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0862-Fix-Entity-Position-Desync.patch b/patches/server/0861-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0862-Fix-Entity-Position-Desync.patch
rename to patches/server/0861-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0863-Custom-Potion-Mixes.patch b/patches/server/0862-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0863-Custom-Potion-Mixes.patch
rename to patches/server/0862-Custom-Potion-Mixes.patch
diff --git a/patches/server/0864-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0863-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0864-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0863-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0865-Fix-World-locateNearestStructure.patch b/patches/server/0864-Fix-World-locateNearestStructure.patch
similarity index 100%
rename from patches/server/0865-Fix-World-locateNearestStructure.patch
rename to patches/server/0864-Fix-World-locateNearestStructure.patch
diff --git a/patches/server/0866-Force-close-world-loading-screen.patch b/patches/server/0865-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0866-Force-close-world-loading-screen.patch
rename to patches/server/0865-Force-close-world-loading-screen.patch
diff --git a/patches/server/0867-Fix-falling-block-spawn-methods.patch b/patches/server/0866-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0867-Fix-falling-block-spawn-methods.patch
rename to patches/server/0866-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0868-Expose-furnace-minecart-push-values.patch b/patches/server/0867-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0868-Expose-furnace-minecart-push-values.patch
rename to patches/server/0867-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0869-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0868-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0869-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0868-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0870-Fix-save-problems-on-shutdown.patch b/patches/server/0869-Fix-save-problems-on-shutdown.patch
similarity index 100%
rename from patches/server/0870-Fix-save-problems-on-shutdown.patch
rename to patches/server/0869-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0871-More-Projectile-API.patch b/patches/server/0870-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0871-More-Projectile-API.patch
rename to patches/server/0870-More-Projectile-API.patch
diff --git a/patches/server/0872-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0871-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0872-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0871-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0872-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0873-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0872-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0874-Implement-getComputedBiome-API.patch b/patches/server/0873-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0874-Implement-getComputedBiome-API.patch
rename to patches/server/0873-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0875-Make-some-itemstacks-nonnull.patch b/patches/server/0874-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0875-Make-some-itemstacks-nonnull.patch
rename to patches/server/0874-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0876-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0875-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0876-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0875-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0877-Implement-enchantWithLevels-API.patch b/patches/server/0876-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0877-Implement-enchantWithLevels-API.patch
rename to patches/server/0876-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0878-Fix-saving-in-unloadWorld.patch b/patches/server/0877-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0878-Fix-saving-in-unloadWorld.patch
rename to patches/server/0877-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0879-Buffer-OOB-setBlock-calls.patch b/patches/server/0878-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0879-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0878-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0880-Add-TameableDeathMessageEvent.patch b/patches/server/0879-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0880-Add-TameableDeathMessageEvent.patch
rename to patches/server/0879-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0881-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0880-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
similarity index 100%
rename from patches/server/0881-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
rename to patches/server/0880-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0882-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0881-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0882-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0881-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0883-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0882-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0883-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0882-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0884-Guard-against-invalid-entity-positions.patch b/patches/server/0883-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0884-Guard-against-invalid-entity-positions.patch
rename to patches/server/0883-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0885-cache-resource-keys.patch b/patches/server/0884-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0885-cache-resource-keys.patch
rename to patches/server/0884-cache-resource-keys.patch
diff --git a/patches/server/0886-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0885-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0886-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0885-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0887-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0886-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0887-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0886-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0888-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0887-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0888-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0887-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0889-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0888-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0889-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0888-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0890-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0889-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0890-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0889-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0891-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0890-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0891-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0890-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0892-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0891-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0892-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0891-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0893-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0892-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0893-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0892-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0894-WorldCreator-keepSpawnLoaded.patch b/patches/server/0893-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0894-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0893-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0895-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0894-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0895-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0894-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0896-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0895-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0896-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0895-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0897-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0896-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0897-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0896-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0898-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0897-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0898-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0897-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0899-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0898-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0899-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0898-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0900-Sign-cleanup-filtering.patch b/patches/server/0899-Sign-cleanup-filtering.patch
similarity index 100%
rename from patches/server/0900-Sign-cleanup-filtering.patch
rename to patches/server/0899-Sign-cleanup-filtering.patch
diff --git a/patches/server/0901-Add-PlayerStopUsingItemEvent.patch b/patches/server/0900-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0901-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0900-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0902-FallingBlock-auto-expire-setting.patch b/patches/server/0901-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0902-FallingBlock-auto-expire-setting.patch
rename to patches/server/0901-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0903-Don-t-tick-markers.patch b/patches/server/0902-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0903-Don-t-tick-markers.patch
rename to patches/server/0902-Don-t-tick-markers.patch
diff --git a/patches/server/0904-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0903-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0904-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0903-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0905-Do-not-accept-invalid-client-settings.patch b/patches/server/0904-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0905-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0904-Do-not-accept-invalid-client-settings.patch