diff --git a/patches/server/0571-copy-TESign-isEditable-from-snapshots.patch b/patches/removed/1.20/0571-copy-TESign-isEditable-from-snapshots.patch similarity index 78% rename from patches/server/0571-copy-TESign-isEditable-from-snapshots.patch rename to patches/removed/1.20/0571-copy-TESign-isEditable-from-snapshots.patch index 6f5318698c..2eb5d9a101 100644 --- a/patches/server/0571-copy-TESign-isEditable-from-snapshots.patch +++ b/patches/removed/1.20/0571-copy-TESign-isEditable-from-snapshots.patch @@ -3,7 +3,9 @@ From: Shane Freeder Date: Tue, 23 Mar 2021 06:43:30 +0000 Subject: [PATCH] copy TESign#isEditable from snapshots - +Dropped in 1.20 as isEditable no longer exists and the full uuid of the editing player +is stored. New API is needed, but the current #setEditable only mutates the is_waxed state of a sign, which +is part of the compound tag and hence already copied by applyTo. diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java index 97028a14830384f06f4f1de36abfbc6bc1b90a19..a7d75d33367933fdec27538cde5a53cd41f3c252 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java diff --git a/patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0571-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0573-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0572-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0573-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0572-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0573-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0575-Expose-protocol-version.patch b/patches/server/0574-Expose-protocol-version.patch similarity index 100% rename from patches/server/0575-Expose-protocol-version.patch rename to patches/server/0574-Expose-protocol-version.patch diff --git a/patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0575-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0576-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0578-Add-bypass-host-check.patch b/patches/server/0577-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0578-Add-bypass-host-check.patch rename to patches/server/0577-Add-bypass-host-check.patch diff --git a/patches/server/0579-Set-area-affect-cloud-rotation.patch b/patches/server/0578-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0579-Set-area-affect-cloud-rotation.patch rename to patches/server/0578-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0579-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0580-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0581-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0582-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0583-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0585-Added-PlayerDeepSleepEvent.patch b/patches/server/0584-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0585-Added-PlayerDeepSleepEvent.patch rename to patches/server/0584-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0586-More-World-API.patch b/patches/server/0585-More-World-API.patch similarity index 100% rename from patches/server/0586-More-World-API.patch rename to patches/server/0585-More-World-API.patch diff --git a/patches/server/0587-Added-PlayerBedFailEnterEvent.patch b/patches/server/0586-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0587-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0586-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0588-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0590-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0589-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0590-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0589-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0590-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0592-Add-Channel-initialization-listeners.patch b/patches/server/0591-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0592-Add-Channel-initialization-listeners.patch rename to patches/server/0591-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0592-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0592-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0594-Add-more-WanderingTrader-API.patch b/patches/server/0593-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0594-Add-more-WanderingTrader-API.patch rename to patches/server/0593-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0595-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0594-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0595-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0594-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0595-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0596-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0598-Inventory-close.patch b/patches/server/0597-Inventory-close.patch similarity index 100% rename from patches/server/0598-Inventory-close.patch rename to patches/server/0597-Inventory-close.patch diff --git a/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0598-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0600-Fix-CraftPotionBrewer-cache.patch b/patches/server/0599-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0600-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0599-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0601-Add-basic-Datapack-API.patch b/patches/server/0600-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0601-Add-basic-Datapack-API.patch rename to patches/server/0600-Add-basic-Datapack-API.patch diff --git a/patches/server/0602-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0601-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0602-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0601-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0602-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0604-ItemStack-repair-check-API.patch b/patches/server/0603-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0604-ItemStack-repair-check-API.patch rename to patches/server/0603-ItemStack-repair-check-API.patch diff --git a/patches/server/0605-More-Enchantment-API.patch b/patches/server/0604-More-Enchantment-API.patch similarity index 100% rename from patches/server/0605-More-Enchantment-API.patch rename to patches/server/0604-More-Enchantment-API.patch diff --git a/patches/server/0606-Move-range-check-for-block-placing-up.patch b/patches/server/0605-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0606-Move-range-check-for-block-placing-up.patch rename to patches/server/0605-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0607-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0606-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0608-Add-Mob-lookAt-API.patch b/patches/server/0607-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0608-Add-Mob-lookAt-API.patch rename to patches/server/0607-Add-Mob-lookAt-API.patch diff --git a/patches/server/0609-Add-Unix-domain-socket-support.patch b/patches/server/0608-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0609-Add-Unix-domain-socket-support.patch rename to patches/server/0608-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0610-Add-EntityInsideBlockEvent.patch b/patches/server/0609-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0610-Add-EntityInsideBlockEvent.patch rename to patches/server/0609-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0611-Attributes-API-for-item-defaults.patch b/patches/server/0610-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0611-Attributes-API-for-item-defaults.patch rename to patches/server/0610-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0611-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0613-More-Lidded-Block-API.patch b/patches/server/0612-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0613-More-Lidded-Block-API.patch rename to patches/server/0612-More-Lidded-Block-API.patch diff --git a/patches/server/0614-Limit-item-frame-cursors-on-maps.patch b/patches/server/0613-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0614-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0613-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0615-Add-PlayerKickEvent-causes.patch b/patches/server/0614-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0615-Add-PlayerKickEvent-causes.patch rename to patches/server/0614-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0616-Add-PufferFishStateChangeEvent.patch b/patches/server/0615-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0616-Add-PufferFishStateChangeEvent.patch rename to patches/server/0615-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0616-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0617-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0618-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0620-Add-BellRevealRaiderEvent.patch b/patches/server/0619-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0620-Add-BellRevealRaiderEvent.patch rename to patches/server/0619-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0621-Fix-invulnerable-end-crystals.patch b/patches/server/0620-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0621-Fix-invulnerable-end-crystals.patch rename to patches/server/0620-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0622-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0621-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0622-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0621-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0623-Fix-dangerous-end-portal-logic.patch b/patches/server/0622-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0623-Fix-dangerous-end-portal-logic.patch rename to patches/server/0622-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0623-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0625-Make-item-validations-configurable.patch b/patches/server/0624-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0625-Make-item-validations-configurable.patch rename to patches/server/0624-Make-item-validations-configurable.patch diff --git a/patches/server/0626-Line-Of-Sight-Changes.patch b/patches/server/0625-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0626-Line-Of-Sight-Changes.patch rename to patches/server/0625-Line-Of-Sight-Changes.patch diff --git a/patches/server/0627-add-per-world-spawn-limits.patch b/patches/server/0626-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0627-add-per-world-spawn-limits.patch rename to patches/server/0626-add-per-world-spawn-limits.patch diff --git a/patches/server/0628-Fix-potions-splash-events.patch b/patches/server/0627-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0628-Fix-potions-splash-events.patch rename to patches/server/0627-Fix-potions-splash-events.patch diff --git a/patches/server/0629-Add-more-LimitedRegion-API.patch b/patches/server/0628-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0629-Add-more-LimitedRegion-API.patch rename to patches/server/0628-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0629-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0631-Missing-Entity-Behavior-API.patch b/patches/server/0630-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0631-Missing-Entity-Behavior-API.patch rename to patches/server/0630-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0631-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0632-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0633-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0634-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0636-Adds-PlayerArmSwingEvent.patch b/patches/server/0635-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0636-Adds-PlayerArmSwingEvent.patch rename to patches/server/0635-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0636-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0637-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0639-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0638-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0639-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0638-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0639-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0640-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0639-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0640-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0641-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0643-Stinger-API.patch b/patches/server/0642-Stinger-API.patch similarity index 100% rename from patches/server/0643-Stinger-API.patch rename to patches/server/0642-Stinger-API.patch diff --git a/patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0643-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0645-Add-System.out-err-catcher.patch b/patches/server/0644-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0645-Add-System.out-err-catcher.patch rename to patches/server/0644-Add-System.out-err-catcher.patch diff --git a/patches/server/0646-Fix-test-not-bootstrapping.patch b/patches/server/0645-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0646-Fix-test-not-bootstrapping.patch rename to patches/server/0645-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0648-Improve-boat-collision-performance.patch b/patches/server/0647-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0648-Improve-boat-collision-performance.patch rename to patches/server/0647-Improve-boat-collision-performance.patch diff --git a/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0650-Add-PlayerSetSpawnEvent.patch b/patches/server/0649-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0650-Add-PlayerSetSpawnEvent.patch rename to patches/server/0649-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0650-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0650-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0651-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0652-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0651-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0653-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0652-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0653-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0652-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0654-Added-EntityDamageItemEvent.patch b/patches/server/0653-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0654-Added-EntityDamageItemEvent.patch rename to patches/server/0653-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0655-Optimize-indirect-passenger-iteration.patch b/patches/server/0654-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0655-Optimize-indirect-passenger-iteration.patch rename to patches/server/0654-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0655-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0655-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0657-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0656-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0657-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0656-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0658-Clear-bucket-NBT-after-dispense.patch b/patches/server/0657-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0658-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0657-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0658-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0658-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0660-Add-BlockBreakBlockEvent.patch b/patches/server/0659-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0660-Add-BlockBreakBlockEvent.patch rename to patches/server/0659-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0662-More-CommandBlock-API.patch b/patches/server/0661-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0662-More-CommandBlock-API.patch rename to patches/server/0661-More-CommandBlock-API.patch diff --git a/patches/server/0663-Add-missing-team-sidebar-display-slots.patch b/patches/server/0662-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0663-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0662-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0664-Add-back-EntityPortalExitEvent.patch b/patches/server/0663-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0664-Add-back-EntityPortalExitEvent.patch rename to patches/server/0663-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0666-Get-entity-default-attributes.patch b/patches/server/0665-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0666-Get-entity-default-attributes.patch rename to patches/server/0665-Get-entity-default-attributes.patch diff --git a/patches/server/0667-Left-handed-API.patch b/patches/server/0666-Left-handed-API.patch similarity index 100% rename from patches/server/0667-Left-handed-API.patch rename to patches/server/0666-Left-handed-API.patch diff --git a/patches/server/0668-Add-more-advancement-API.patch b/patches/server/0667-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0668-Add-more-advancement-API.patch rename to patches/server/0667-Add-more-advancement-API.patch diff --git a/patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0668-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0668-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0670-Add-critical-damage-API.patch b/patches/server/0669-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0670-Add-critical-damage-API.patch rename to patches/server/0669-Add-critical-damage-API.patch diff --git a/patches/server/0671-Fix-issues-with-mob-conversion.patch b/patches/server/0670-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0671-Fix-issues-with-mob-conversion.patch rename to patches/server/0670-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0672-Add-isCollidable-methods-to-various-places.patch b/patches/server/0671-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0672-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0671-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0673-Goat-ram-API.patch b/patches/server/0672-Goat-ram-API.patch similarity index 100% rename from patches/server/0673-Goat-ram-API.patch rename to patches/server/0672-Goat-ram-API.patch diff --git a/patches/server/0674-Add-API-for-resetting-a-single-score.patch b/patches/server/0673-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0674-Add-API-for-resetting-a-single-score.patch rename to patches/server/0673-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0674-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0674-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0676-Vanilla-command-permission-fixes.patch b/patches/server/0675-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0676-Vanilla-command-permission-fixes.patch rename to patches/server/0675-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0678-Fix-GameProfileCache-concurrency.patch b/patches/server/0677-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0678-Fix-GameProfileCache-concurrency.patch rename to patches/server/0677-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0679-Improve-and-expand-AsyncCatcher.patch b/patches/server/0678-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0679-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0678-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0681-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0680-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0681-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0680-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0682-Optimise-general-POI-access.patch b/patches/server/0681-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0682-Optimise-general-POI-access.patch rename to patches/server/0681-Optimise-general-POI-access.patch diff --git a/patches/server/0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0682-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0682-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0684-Optimise-chunk-tick-iteration.patch b/patches/server/0683-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0684-Optimise-chunk-tick-iteration.patch rename to patches/server/0683-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0685-Execute-chunk-tasks-mid-tick.patch b/patches/server/0684-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0685-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0684-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0685-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0685-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0687-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0686-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0687-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0686-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0687-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0688-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0687-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0689-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0688-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0689-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0688-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0690-Distance-manager-tick-timings.patch b/patches/server/0689-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0690-Distance-manager-tick-timings.patch rename to patches/server/0689-Distance-manager-tick-timings.patch diff --git a/patches/server/0691-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0690-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0691-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0690-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0691-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0691-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0693-Add-packet-limiter-config.patch b/patches/server/0692-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0693-Add-packet-limiter-config.patch rename to patches/server/0692-Add-packet-limiter-config.patch diff --git a/patches/server/0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0693-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0693-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0695-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0694-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0695-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0694-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0695-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0695-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0697-Time-scoreboard-search.patch b/patches/server/0696-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0697-Time-scoreboard-search.patch rename to patches/server/0696-Time-scoreboard-search.patch diff --git a/patches/server/0698-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0697-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0698-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0697-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0698-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0698-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0700-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0699-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0700-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0699-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0701-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0700-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0701-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0700-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0702-Optimise-random-block-ticking.patch b/patches/server/0701-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0702-Optimise-random-block-ticking.patch rename to patches/server/0701-Optimise-random-block-ticking.patch diff --git a/patches/server/0703-Optimise-nearby-player-lookups.patch b/patches/server/0702-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0703-Optimise-nearby-player-lookups.patch rename to patches/server/0702-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0704-Remove-streams-for-villager-AI.patch b/patches/server/0703-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0704-Remove-streams-for-villager-AI.patch rename to patches/server/0703-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0705-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0705-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0704-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0706-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0705-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0706-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0705-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0707-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0706-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0707-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0706-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0708-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0707-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0708-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0707-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0709-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0708-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0709-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0708-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0710-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0709-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0710-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0709-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0711-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0710-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0711-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0710-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0712-Ensure-valid-vehicle-status.patch b/patches/server/0711-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0712-Ensure-valid-vehicle-status.patch rename to patches/server/0711-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0713-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0712-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0713-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0712-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0714-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0713-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0714-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0713-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0715-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0714-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0715-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0714-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0716-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0715-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0716-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0715-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0717-Preserve-overstacked-loot.patch b/patches/server/0716-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0717-Preserve-overstacked-loot.patch rename to patches/server/0716-Preserve-overstacked-loot.patch diff --git a/patches/server/0718-Update-head-rotation-in-missing-places.patch b/patches/server/0717-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0718-Update-head-rotation-in-missing-places.patch rename to patches/server/0717-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0719-prevent-unintended-light-block-manipulation.patch b/patches/server/0718-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0719-prevent-unintended-light-block-manipulation.patch rename to patches/server/0718-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0720-Fix-CraftCriteria-defaults-map.patch b/patches/server/0719-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0720-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0719-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0721-Fix-upstreams-block-state-factories.patch b/patches/server/0720-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0721-Fix-upstreams-block-state-factories.patch rename to patches/server/0720-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0722-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0721-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0722-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0721-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0723-Configurable-feature-seeds.patch b/patches/server/0722-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0723-Configurable-feature-seeds.patch rename to patches/server/0722-Configurable-feature-seeds.patch diff --git a/patches/server/0724-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0723-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0724-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0723-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0725-Add-root-admin-user-detection.patch b/patches/server/0724-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0725-Add-root-admin-user-detection.patch rename to patches/server/0724-Add-root-admin-user-detection.patch diff --git a/patches/server/0726-Always-allow-item-changing-in-Fireball.patch b/patches/server/0725-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0726-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0725-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0727-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0726-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0727-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0726-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0727-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0727-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0729-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0728-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0729-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0728-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0730-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0729-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0730-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0729-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0730-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0730-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0731-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0731-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0733-Fix-Spigot-growth-modifiers.patch b/patches/server/0732-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0733-Fix-Spigot-growth-modifiers.patch rename to patches/server/0732-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0733-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0733-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0735-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0734-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0735-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0734-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0736-Add-player-health-update-API.patch b/patches/server/0735-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0736-Add-player-health-update-API.patch rename to patches/server/0735-Add-player-health-update-API.patch diff --git a/patches/server/0737-Optimize-HashMapPalette.patch b/patches/server/0736-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0737-Optimize-HashMapPalette.patch rename to patches/server/0736-Optimize-HashMapPalette.patch diff --git a/patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0737-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0737-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0739-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0739-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0742-Add-more-Campfire-API.patch b/patches/server/0741-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0742-Add-more-Campfire-API.patch rename to patches/server/0741-Add-more-Campfire-API.patch diff --git a/patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0744-Fix-tripwire-state-inconsistency.patch b/patches/server/0743-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0744-Fix-tripwire-state-inconsistency.patch rename to patches/server/0743-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0745-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0744-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0745-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0744-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0746-Improve-scoreboard-entries.patch b/patches/server/0745-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0746-Improve-scoreboard-entries.patch rename to patches/server/0745-Improve-scoreboard-entries.patch diff --git a/patches/server/0747-Entity-powdered-snow-API.patch b/patches/server/0746-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0747-Entity-powdered-snow-API.patch rename to patches/server/0746-Entity-powdered-snow-API.patch diff --git a/patches/server/0748-Add-API-for-item-entity-health.patch b/patches/server/0747-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0748-Add-API-for-item-entity-health.patch rename to patches/server/0747-Add-API-for-item-entity-health.patch diff --git a/patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0748-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0748-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0749-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0749-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0751-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0751-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0754-Fix-bees-aging-inside-hives.patch b/patches/server/0753-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0754-Fix-bees-aging-inside-hives.patch rename to patches/server/0753-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0755-Bucketable-API.patch b/patches/server/0754-Bucketable-API.patch similarity index 100% rename from patches/server/0755-Bucketable-API.patch rename to patches/server/0754-Bucketable-API.patch diff --git a/patches/server/0756-Validate-usernames.patch b/patches/server/0755-Validate-usernames.patch similarity index 100% rename from patches/server/0756-Validate-usernames.patch rename to patches/server/0755-Validate-usernames.patch diff --git a/patches/server/0757-Make-water-animal-spawn-height-configurable.patch b/patches/server/0756-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0757-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0756-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0758-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0758-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0759-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0759-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0761-Multiple-Entries-with-Scoreboards.patch b/patches/server/0760-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0761-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0760-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0762-Reset-placed-block-on-exception.patch b/patches/server/0761-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0762-Reset-placed-block-on-exception.patch rename to patches/server/0761-Reset-placed-block-on-exception.patch diff --git a/patches/server/0763-Add-configurable-height-for-slime-spawn.patch b/patches/server/0762-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0763-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0762-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0765-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0764-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0765-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0764-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0766-Kick-on-main-for-illegal-chat.patch b/patches/server/0765-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0766-Kick-on-main-for-illegal-chat.patch rename to patches/server/0765-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0767-Multi-Block-Change-API-Implementation.patch b/patches/server/0766-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0767-Multi-Block-Change-API-Implementation.patch rename to patches/server/0766-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0768-Fix-NotePlayEvent.patch b/patches/server/0767-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0768-Fix-NotePlayEvent.patch rename to patches/server/0767-Fix-NotePlayEvent.patch diff --git a/patches/server/0769-Freeze-Tick-Lock-API.patch b/patches/server/0768-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0769-Freeze-Tick-Lock-API.patch rename to patches/server/0768-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0770-Dolphin-API.patch b/patches/server/0769-Dolphin-API.patch similarity index 100% rename from patches/server/0770-Dolphin-API.patch rename to patches/server/0769-Dolphin-API.patch diff --git a/patches/server/0771-More-PotionEffectType-API.patch b/patches/server/0770-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0771-More-PotionEffectType-API.patch rename to patches/server/0770-More-PotionEffectType-API.patch diff --git a/patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0774-Add-missing-structure-set-seed-configs.patch b/patches/server/0773-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0774-Add-missing-structure-set-seed-configs.patch rename to patches/server/0773-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0775-Implement-regenerateChunk.patch b/patches/server/0774-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0775-Implement-regenerateChunk.patch rename to patches/server/0774-Implement-regenerateChunk.patch diff --git a/patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0778-Add-GameEvent-tags.patch b/patches/server/0777-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0778-Add-GameEvent-tags.patch rename to patches/server/0777-Add-GameEvent-tags.patch diff --git a/patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0780-Furnace-RecipesUsed-API.patch b/patches/server/0779-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0780-Furnace-RecipesUsed-API.patch rename to patches/server/0779-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0781-Configurable-sculk-sensor-listener-range.patch b/patches/server/0780-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0781-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0780-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0782-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0781-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0782-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0781-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0785-Fix-Entity-Position-Desync.patch b/patches/server/0784-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0785-Fix-Entity-Position-Desync.patch rename to patches/server/0784-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0786-Custom-Potion-Mixes.patch b/patches/server/0785-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0786-Custom-Potion-Mixes.patch rename to patches/server/0785-Custom-Potion-Mixes.patch diff --git a/patches/server/0787-Force-close-world-loading-screen.patch b/patches/server/0786-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0787-Force-close-world-loading-screen.patch rename to patches/server/0786-Force-close-world-loading-screen.patch diff --git a/patches/server/0788-Fix-falling-block-spawn-methods.patch b/patches/server/0787-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0788-Fix-falling-block-spawn-methods.patch rename to patches/server/0787-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0789-Expose-furnace-minecart-push-values.patch b/patches/server/0788-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0789-Expose-furnace-minecart-push-values.patch rename to patches/server/0788-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0791-More-Projectile-API.patch b/patches/server/0790-More-Projectile-API.patch similarity index 100% rename from patches/server/0791-More-Projectile-API.patch rename to patches/server/0790-More-Projectile-API.patch diff --git a/patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0791-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0791-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0794-Implement-getComputedBiome-API.patch b/patches/server/0793-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0794-Implement-getComputedBiome-API.patch rename to patches/server/0793-Implement-getComputedBiome-API.patch diff --git a/patches/server/0795-Make-some-itemstacks-nonnull.patch b/patches/server/0794-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0795-Make-some-itemstacks-nonnull.patch rename to patches/server/0794-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0796-Implement-enchantWithLevels-API.patch b/patches/server/0795-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0796-Implement-enchantWithLevels-API.patch rename to patches/server/0795-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0797-Fix-saving-in-unloadWorld.patch b/patches/server/0796-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0797-Fix-saving-in-unloadWorld.patch rename to patches/server/0796-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0798-Buffer-OOB-setBlock-calls.patch b/patches/server/0797-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0798-Buffer-OOB-setBlock-calls.patch rename to patches/server/0797-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0799-Add-TameableDeathMessageEvent.patch b/patches/server/0798-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0799-Add-TameableDeathMessageEvent.patch rename to patches/server/0798-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0800-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0800-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0801-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0801-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0803-Guard-against-invalid-entity-positions.patch b/patches/server/0802-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0803-Guard-against-invalid-entity-positions.patch rename to patches/server/0802-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0804-cache-resource-keys.patch b/patches/server/0803-cache-resource-keys.patch similarity index 100% rename from patches/server/0804-cache-resource-keys.patch rename to patches/server/0803-cache-resource-keys.patch diff --git a/patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0804-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0804-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0807-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0807-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0808-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0808-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0813-WorldCreator-keepSpawnLoaded.patch b/patches/server/0812-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0813-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0812-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0814-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0813-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0814-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/server/0813-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0819-Add-PlayerStopUsingItemEvent.patch b/patches/server/0818-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0819-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0818-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0820-FallingBlock-auto-expire-setting.patch b/patches/server/0819-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0820-FallingBlock-auto-expire-setting.patch rename to patches/server/0819-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0821-Don-t-tick-markers.patch b/patches/server/0820-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0821-Don-t-tick-markers.patch rename to patches/server/0820-Don-t-tick-markers.patch diff --git a/patches/server/0822-Do-not-accept-invalid-client-settings.patch b/patches/server/0821-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0822-Do-not-accept-invalid-client-settings.patch rename to patches/server/0821-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0823-Add-support-for-Proxy-Protocol.patch b/patches/server/0822-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0823-Add-support-for-Proxy-Protocol.patch rename to patches/server/0822-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0829-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0830-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0829-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0831-Dont-resent-entity-on-art-update.patch b/patches/server/0830-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0831-Dont-resent-entity-on-art-update.patch rename to patches/server/0830-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0832-Add-WardenAngerChangeEvent.patch b/patches/server/0831-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0832-Add-WardenAngerChangeEvent.patch rename to patches/server/0831-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0835-Nameable-Banner-API.patch b/patches/server/0834-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0835-Nameable-Banner-API.patch rename to patches/server/0834-Nameable-Banner-API.patch diff --git a/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 100% rename from patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch diff --git a/patches/server/0840-Add-Player-getFishHook.patch b/patches/server/0839-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0840-Add-Player-getFishHook.patch rename to patches/server/0839-Add-Player-getFishHook.patch diff --git a/patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0844-Fix-Bee-flower-NPE.patch b/patches/server/0843-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0844-Fix-Bee-flower-NPE.patch rename to patches/server/0843-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0846-More-Teleport-API.patch b/patches/server/0845-More-Teleport-API.patch similarity index 100% rename from patches/server/0846-More-Teleport-API.patch rename to patches/server/0845-More-Teleport-API.patch diff --git a/patches/server/0847-Add-EntityPortalReadyEvent.patch b/patches/server/0846-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0847-Add-EntityPortalReadyEvent.patch rename to patches/server/0846-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0849-Send-block-entities-after-destroy-prediction.patch b/patches/server/0848-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0849-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0848-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0852-Add-missing-BlockFadeEvents.patch b/patches/server/0851-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0852-Add-missing-BlockFadeEvents.patch rename to patches/server/0851-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0853-Collision-API.patch b/patches/server/0852-Collision-API.patch similarity index 100% rename from patches/server/0853-Collision-API.patch rename to patches/server/0852-Collision-API.patch diff --git a/patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0855-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0854-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0855-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0854-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0856-Block-Ticking-API.patch b/patches/server/0855-Block-Ticking-API.patch similarity index 100% rename from patches/server/0856-Block-Ticking-API.patch rename to patches/server/0855-Block-Ticking-API.patch diff --git a/patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0859-Add-NamespacedKey-biome-methods.patch b/patches/server/0858-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0859-Add-NamespacedKey-biome-methods.patch rename to patches/server/0858-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0863-Missing-eating-regain-reason.patch b/patches/server/0862-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0863-Missing-eating-regain-reason.patch rename to patches/server/0862-Missing-eating-regain-reason.patch diff --git a/patches/server/0864-Missing-effect-cause.patch b/patches/server/0863-Missing-effect-cause.patch similarity index 100% rename from patches/server/0864-Missing-effect-cause.patch rename to patches/server/0863-Missing-effect-cause.patch diff --git a/patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0867-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0866-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0867-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0866-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0868-Configurable-chat-thread-limit.patch b/patches/server/0867-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0868-Configurable-chat-thread-limit.patch rename to patches/server/0867-Configurable-chat-thread-limit.patch diff --git a/patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0870-fix-Jigsaw-block-kicking-user.patch b/patches/server/0869-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0870-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0869-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0872-Add-getDrops-to-BlockState.patch b/patches/server/0871-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0872-Add-getDrops-to-BlockState.patch rename to patches/server/0871-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0875-Fix-custom-piglin-loved-items.patch b/patches/server/0874-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0875-Fix-custom-piglin-loved-items.patch rename to patches/server/0874-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0876-EntityPickupItemEvent-fixes.patch b/patches/server/0875-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0876-EntityPickupItemEvent-fixes.patch rename to patches/server/0875-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0879-Elder-Guardian-appearance-API.patch b/patches/server/0878-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0879-Elder-Guardian-appearance-API.patch rename to patches/server/0878-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0880-Allow-changing-bed-s-occupied-property.patch b/patches/server/0879-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0880-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0879-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0881-Add-entity-knockback-API.patch b/patches/server/0880-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0881-Add-entity-knockback-API.patch rename to patches/server/0880-Add-entity-knockback-API.patch diff --git a/patches/server/0882-Detect-headless-JREs.patch b/patches/server/0881-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0882-Detect-headless-JREs.patch rename to patches/server/0881-Detect-headless-JREs.patch diff --git a/patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0884-optimized-dirt-and-snow-spreading.patch b/patches/server/0883-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0884-optimized-dirt-and-snow-spreading.patch rename to patches/server/0883-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0885-Added-EntityToggleSitEvent.patch b/patches/server/0884-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0885-Added-EntityToggleSitEvent.patch rename to patches/server/0884-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0886-Add-fire-tick-delay-option.patch b/patches/server/0885-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0886-Add-fire-tick-delay-option.patch rename to patches/server/0885-Add-fire-tick-delay-option.patch diff --git a/patches/server/0887-Add-Moving-Piston-API.patch b/patches/server/0886-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0887-Add-Moving-Piston-API.patch rename to patches/server/0886-Add-Moving-Piston-API.patch diff --git a/patches/server/0888-Ignore-impossible-spawn-tick.patch b/patches/server/0887-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0888-Ignore-impossible-spawn-tick.patch rename to patches/server/0887-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0892-Prevent-compass-from-loading-chunks.patch b/patches/server/0891-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0892-Prevent-compass-from-loading-chunks.patch rename to patches/server/0891-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0893-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0892-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0893-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0892-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0896-Add-Player-Warden-Warning-API.patch b/patches/server/0895-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0896-Add-Player-Warden-Warning-API.patch rename to patches/server/0895-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0898-Add-paper-dumplisteners-command.patch b/patches/server/0897-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0898-Add-paper-dumplisteners-command.patch rename to patches/server/0897-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0899-check-global-player-list-where-appropriate.patch b/patches/server/0898-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0899-check-global-player-list-where-appropriate.patch rename to patches/server/0898-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0901-ItemStack-damage-API.patch b/patches/server/0900-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0901-ItemStack-damage-API.patch rename to patches/server/0900-ItemStack-damage-API.patch diff --git a/patches/server/0902-Friction-API.patch b/patches/server/0901-Friction-API.patch similarity index 100% rename from patches/server/0902-Friction-API.patch rename to patches/server/0901-Friction-API.patch diff --git a/patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0904-Fix-player-kick-on-shutdown.patch b/patches/server/0903-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0904-Fix-player-kick-on-shutdown.patch rename to patches/server/0903-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0905-Sync-offhand-slot-in-menus.patch b/patches/server/0904-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0905-Sync-offhand-slot-in-menus.patch rename to patches/server/0904-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0906-Player-Entity-Tracking-Events.patch b/patches/server/0905-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0906-Player-Entity-Tracking-Events.patch rename to patches/server/0905-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0907-Limit-pet-look-distance.patch b/patches/server/0906-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0907-Limit-pet-look-distance.patch rename to patches/server/0906-Limit-pet-look-distance.patch diff --git a/patches/server/0908-Properly-resend-entities.patch b/patches/server/0907-Properly-resend-entities.patch similarity index 100% rename from patches/server/0908-Properly-resend-entities.patch rename to patches/server/0907-Properly-resend-entities.patch diff --git a/patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0910-fix-Instruments.patch b/patches/server/0909-fix-Instruments.patch similarity index 100% rename from patches/server/0910-fix-Instruments.patch rename to patches/server/0909-fix-Instruments.patch diff --git a/patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0913-Improve-logging-and-errors.patch b/patches/server/0912-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0913-Improve-logging-and-errors.patch rename to patches/server/0912-Improve-logging-and-errors.patch diff --git a/patches/server/0914-Add-BlockLockCheckEvent.patch b/patches/server/0913-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0914-Add-BlockLockCheckEvent.patch rename to patches/server/0913-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0915-Add-Sneaking-API-for-Entities.patch b/patches/server/0914-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0915-Add-Sneaking-API-for-Entities.patch rename to patches/server/0914-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0916-Improve-PortalEvents.patch b/patches/server/0915-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0916-Improve-PortalEvents.patch rename to patches/server/0915-Improve-PortalEvents.patch diff --git a/patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0920-Flying-Fall-Damage.patch b/patches/server/0919-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0920-Flying-Fall-Damage.patch rename to patches/server/0919-Flying-Fall-Damage.patch diff --git a/patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0923-config-for-disabling-entity-tag-tags.patch b/patches/server/0922-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0923-config-for-disabling-entity-tag-tags.patch rename to patches/server/0922-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0924-Use-single-player-info-update-packet-on-join.patch b/patches/server/0923-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0924-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0923-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0926-Win-Screen-API.patch b/patches/server/0925-Win-Screen-API.patch similarity index 100% rename from patches/server/0926-Win-Screen-API.patch rename to patches/server/0925-Win-Screen-API.patch diff --git a/patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0928-Fix-force-opening-enchantment-tables.patch b/patches/server/0927-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0928-Fix-force-opening-enchantment-tables.patch rename to patches/server/0927-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0929-Add-Entity-Body-Yaw-API.patch b/patches/server/0928-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0929-Add-Entity-Body-Yaw-API.patch rename to patches/server/0928-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0932-Add-EntityFertilizeEggEvent.patch b/patches/server/0931-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0932-Add-EntityFertilizeEggEvent.patch rename to patches/server/0931-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0937-Fix-text-display-error-on-spawn.patch b/patches/server/0936-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0937-Fix-text-display-error-on-spawn.patch rename to patches/server/0936-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0939-Add-Shearable-API.patch b/patches/server/0938-Add-Shearable-API.patch similarity index 100% rename from patches/server/0939-Add-Shearable-API.patch rename to patches/server/0938-Add-Shearable-API.patch diff --git a/patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0942-Optimize-Hoppers.patch b/patches/server/0941-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0942-Optimize-Hoppers.patch rename to patches/server/0941-Optimize-Hoppers.patch diff --git a/patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0944-Fix-api-checking-banned-ips.patch b/patches/server/0943-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0944-Fix-api-checking-banned-ips.patch rename to patches/server/0943-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0945-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0944-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0945-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0944-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0946-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0945-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0946-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0945-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0947-remove-duplicate-animate-packet-for-records.patch b/patches/server/0946-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0947-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0946-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0948-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0948-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0947-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0949-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0948-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0949-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0948-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0950-Use-array-for-gamerule-storage.patch b/patches/server/0949-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0950-Use-array-for-gamerule-storage.patch rename to patches/server/0949-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0951-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0950-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0951-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0950-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0952-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0951-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0952-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0951-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0953-Add-Mob-Experience-reward-API.patch b/patches/server/0952-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0953-Add-Mob-Experience-reward-API.patch rename to patches/server/0952-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0954-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0953-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0954-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0953-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0955-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0955-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0954-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0956-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0955-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0956-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0955-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0957-More-accurate-isInOpenWater-impl.patch b/patches/server/0956-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0957-More-accurate-isInOpenWater-impl.patch rename to patches/server/0956-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0958-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0957-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0958-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0957-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0959-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0958-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0959-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0958-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0960-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0959-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0960-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/server/0959-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0961-Expand-PlayerItemMendEvent.patch b/patches/server/0960-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0961-Expand-PlayerItemMendEvent.patch rename to patches/server/0960-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0962-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0962-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0961-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0963-Add-transient-modifier-API.patch b/patches/server/0962-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0963-Add-transient-modifier-API.patch rename to patches/server/0962-Add-transient-modifier-API.patch