From 1c1aeb20e27d4be5134f0abeec45916cfc6952b0 Mon Sep 17 00:00:00 2001
From: evan <evanmccarthy@outlook.com>
Date: Sun, 23 Oct 2022 13:52:40 -0500
Subject: [PATCH] Only limit global sounds to same world if limiting radius
 (#8499)

---
 ...sounds-to-same-world-if-limiting-ra.patch} | 26 ++++++++++++++-----
 ...player-world-in-endPortalSoundRadius.patch | 20 --------------
 ...es.patch => 0790-Validate-usernames.patch} |  2 +-
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  0
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...5-Multiple-Entries-with-Scoreboards.patch} |  0
 ...796-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  2 +-
 ...0799-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0800-Kick-on-main-for-illegal-chat.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  0
 ...ent.patch => 0802-Fix-NotePlayEvent.patch} |  0
 ....patch => 0803-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0804-Dolphin-API.patch} |  0
 ...h => 0805-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  0
 ...-missing-structure-set-seed-configs.patch} |  0
 ...h => 0809-Implement-regenerateChunk.patch} |  0
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0812-Add-GameEvent-tags.patch} |  0
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...tch => 0814-Furnace-RecipesUsed-API.patch} |  0
 ...gurable-sculk-sensor-listener-range.patch} |  0
 ...d-missing-block-data-mins-and-maxes.patch} |  0
 ...fault-CustomSpawners-in-custom-worl.patch} |  0
 ...-worldlist-before-initing-the-world.patch} |  0
 ... => 0819-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0820-Custom-Potion-Mixes.patch} |  0
 ...0821-Fix-Fluid-tags-isTagged-method.patch} |  0
 ...22-Force-close-world-loading-screen.patch} |  0
 ...823-Fix-falling-block-spawn-methods.patch} |  0
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  2 +-
 ...I.patch => 0826-More-Projectile-API.patch} |  0
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  0
 ...0829-Implement-getComputedBiome-API.patch} |  0
 ...> 0830-Make-some-itemstacks-nonnull.patch} |  0
 ...alid-GameProfiles-on-skull-blocks-i.patch} |  0
 ...832-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0833-Fix-saving-in-unloadWorld.patch} |  0
 ...h => 0834-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0835-Add-TameableDeathMessageEvent.patch} |  0
 ...a-for-EntityChangeBlockEvent-when-s.patch} |  0
 ...bles-running-when-mob-loot-gamerule.patch} |  0
 ...ssenger-world-matches-ridden-entity.patch} |  0
 ...rd-against-invalid-entity-positions.patch} |  0
 ...s.patch => 0840-cache-resource-keys.patch} |  0
 ...ange-the-podium-for-the-EnderDragon.patch} |  2 +-
 ...erriding-a-block-entity-during-worl.patch} |  0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |  2 +-
 ...t-tile-entity-copies-loading-chunks.patch} |  0
 ...ead-of-display-name-in-PlayerList-g.patch} |  0
 ...s-not-spawning-outside-slime-chunks.patch} |  0
 ...-ServerLevel-for-gamerule-callbacks.patch} |  0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  0
 ...> 0849-WorldCreator-keepSpawnLoaded.patch} |  0
 ...-NPE-for-BlockDataMeta-getBlockData.patch} |  0
 ...destroyed-trigger-in-the-correct-pl.patch} |  0
 ...Event-and-CollarColorable-interface.patch} |  0
 ...CauldronLevelChange-on-initial-fill.patch} |  0
 ...snow-cauldrons-not-turning-to-water.patch} |  0
 ...> 0855-Add-PlayerStopUsingItemEvent.patch} |  0
 ...56-FallingBlock-auto-expire-setting.patch} |  2 +-
 ...rs.patch => 0857-Don-t-tick-markers.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0859-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0862-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  0
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...-on-world-create-while-being-ticked.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...67-Dont-resent-entity-on-art-update.patch} |  0
 ...atch => 0868-Add-missing-spawn-eggs.patch} |  0
 ... => 0869-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  0
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0872-Nameable-Banner-API.patch} |  0
 ...roadcast-messages-to-command-blocks.patch} |  0
 ...pty-items-from-being-added-to-world.patch} |  0
 ...hPotion-and-LingeringPotion-spawnin.patch} |  0
 ...nent-in-resource-pack-rejection-mes.patch} |  0
 ...atch => 0877-Add-Player-getFishHook.patch} |  0
 ...chunk-for-dynamic-game-event-listen.patch} |  0
 ...s-missing-EntityDropItemEvent-calls.patch} |  0
 ...debug-information-to-chat-packet-er.patch} |  0
 ...PE.patch => 0881-Fix-Bee-flower-NPE.patch} |  2 +-
 ...-not-using-commands.spam-exclusions.patch} |  0
 ...nd-additions-to-the-SpawnReason-API.patch} |  0
 ...API.patch => 0884-More-Teleport-API.patch} |  2 +-
 ... => 0885-Add-EntityPortalReadyEvent.patch} |  0
 ...level-random-in-entity-constructors.patch} |  4 +--
 ...k-entities-after-destroy-prediction.patch} |  0
 ...on-plugins-accessing-faraway-chunks.patch} |  0
 ...tom-Chat-Completion-Suggestions-API.patch} |  0
 ...=> 0890-Add-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0891-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...ocess-cancelling-and-command-changi.patch} |  0
 ...-invalid-signature-login-stacktrace.patch} |  2 +-
 ...-to-PlayerConnection-internalTelepo.patch} |  2 +-
 ...API.patch => 0896-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  2 +-
 ...andom-in-ServerLoginPacketListenerI.patch} |  2 +-
 ...899-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  0
 ...und-for-client-lag-spikes-MC-162253.patch} |  0
 ...ok-changes-from-crashing-the-server.patch} |  2 +-
 ...estroyerIdentity-to-sendBlockDamage.patch} |  0
 ...t-killed-statuses-should-be-false-f.patch} |  0
 ...tityChangeBlockEvent-in-more-places.patch} |  0
 ...> 0906-Missing-eating-regain-reason.patch} |  2 +-
 ....patch => 0907-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...0-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0911-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  0
 ...re-player-sending-on-dimension-chan.patch} |  0
 ... 0914-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ...lockState-and-isPreferredTool-to-Bl.patch} |  0
 ...=> 0917-Fix-a-bunch-of-vanilla-bugs.patch} |  0
 ...g-mlg.patch => 0918-Fix-nothing-mlg.patch} |  2 +-
 ...y-onTrackingStart-during-navigation.patch} |  0
 ... 0920-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0921-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  0
 ... 0924-Elder-Guardian-appearance-API.patch} |  0
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0926-Add-entity-knockback-API.patch} |  0
 ....patch => 0927-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...9-optimized-dirt-and-snow-spreading.patch} |  0
 ... => 0930-Added-EntityToggleSitEvent.patch} |  0
 ... => 0931-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0932-Add-Moving-Piston-API.patch} |  0
 ...> 0933-Ignore-impossible-spawn-tick.patch} |  0
 146 files changed, 37 insertions(+), 43 deletions(-)
 rename patches/server/{0101-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch} (54%)
 delete mode 100644 patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch
 rename patches/server/{0791-Validate-usernames.patch => 0790-Validate-usernames.patch} (97%)
 rename patches/server/{0792-Make-water-animal-spawn-height-configurable.patch => 0791-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0793-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0792-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/server/{0794-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0793-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0795-Add-new-overload-to-PersistentDataContainer-has.patch => 0794-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0796-Multiple-Entries-with-Scoreboards.patch => 0795-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0797-Reset-placed-block-on-exception.patch => 0796-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0798-Add-configurable-height-for-slime-spawn.patch => 0797-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0799-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0798-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (93%)
 rename patches/server/{0800-Fix-xp-reward-for-baby-zombies.patch => 0799-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0801-Kick-on-main-for-illegal-chat.patch => 0800-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0802-Multi-Block-Change-API-Implementation.patch => 0801-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0803-Fix-NotePlayEvent.patch => 0802-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0804-Freeze-Tick-Lock-API.patch => 0803-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0805-Dolphin-API.patch => 0804-Dolphin-API.patch} (100%)
 rename patches/server/{0806-More-PotionEffectType-API.patch => 0805-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0807-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0806-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0808-API-for-creating-command-sender-which-forwards-feedb.patch => 0807-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0809-Add-missing-structure-set-seed-configs.patch => 0808-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0810-Implement-regenerateChunk.patch => 0809-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0811-Fix-cancelled-powdered-snow-bucket-placement.patch => 0810-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0812-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0811-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0813-Add-GameEvent-tags.patch => 0812-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0814-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0813-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0815-Furnace-RecipesUsed-API.patch => 0814-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0816-Configurable-sculk-sensor-listener-range.patch => 0815-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0817-Add-missing-block-data-mins-and-maxes.patch => 0816-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0818-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0817-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0819-Put-world-into-worldlist-before-initing-the-world.patch => 0818-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0820-Fix-Entity-Position-Desync.patch => 0819-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0821-Custom-Potion-Mixes.patch => 0820-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0822-Fix-Fluid-tags-isTagged-method.patch => 0821-Fix-Fluid-tags-isTagged-method.patch} (100%)
 rename patches/server/{0823-Force-close-world-loading-screen.patch => 0822-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0824-Fix-falling-block-spawn-methods.patch => 0823-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0825-Expose-furnace-minecart-push-values.patch => 0824-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0826-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0825-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (94%)
 rename patches/server/{0827-More-Projectile-API.patch => 0826-More-Projectile-API.patch} (100%)
 rename patches/server/{0828-Fix-swamp-hut-cat-generation-deadlock.patch => 0827-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0829-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0828-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0830-Implement-getComputedBiome-API.patch => 0829-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0831-Make-some-itemstacks-nonnull.patch => 0830-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0832-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch => 0831-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch} (100%)
 rename patches/server/{0833-Implement-enchantWithLevels-API.patch => 0832-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0834-Fix-saving-in-unloadWorld.patch => 0833-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0835-Buffer-OOB-setBlock-calls.patch => 0834-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0836-Add-TameableDeathMessageEvent.patch => 0835-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0837-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch => 0836-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch} (100%)
 rename patches/server/{0838-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0837-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0839-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0838-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0840-Guard-against-invalid-entity-positions.patch => 0839-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0841-cache-resource-keys.patch => 0840-cache-resource-keys.patch} (100%)
 rename patches/server/{0842-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0841-Allow-to-change-the-podium-for-the-EnderDragon.patch} (99%)
 rename patches/server/{0843-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0842-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0844-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0843-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (92%)
 rename patches/server/{0845-Prevent-tile-entity-copies-loading-chunks.patch => 0844-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0846-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0845-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0847-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0846-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0848-Pass-ServerLevel-for-gamerule-callbacks.patch => 0847-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0849-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0848-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0850-WorldCreator-keepSpawnLoaded.patch => 0849-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0851-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0850-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0852-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0851-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0853-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0852-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0854-Fire-CauldronLevelChange-on-initial-fill.patch => 0853-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0855-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0854-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0856-Add-PlayerStopUsingItemEvent.patch => 0855-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0857-FallingBlock-auto-expire-setting.patch => 0856-FallingBlock-auto-expire-setting.patch} (97%)
 rename patches/server/{0858-Don-t-tick-markers.patch => 0857-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0859-Do-not-accept-invalid-client-settings.patch => 0858-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0860-Add-support-for-Proxy-Protocol.patch => 0859-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0861-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0860-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0862-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0861-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0863-Sanitize-Sent-BlockEntity-NBT.patch => 0862-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0864-Prevent-entity-loading-causing-async-lookups.patch => 0863-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0865-Disable-component-selector-resolving-in-books-by-def.patch => 0864-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0866-Throw-exception-on-world-create-while-being-ticked.patch => 0865-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0867-Add-Alternate-Current-redstone-implementation.patch => 0866-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0868-Dont-resent-entity-on-art-update.patch => 0867-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0869-Add-missing-spawn-eggs.patch => 0868-Add-missing-spawn-eggs.patch} (100%)
 rename patches/server/{0870-Add-WardenAngerChangeEvent.patch => 0869-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0871-Add-option-for-strict-advancement-dimension-checks.patch => 0870-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0872-Add-missing-important-BlockStateListPopulator-method.patch => 0871-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0873-Nameable-Banner-API.patch => 0872-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0874-Don-t-broadcast-messages-to-command-blocks.patch => 0873-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0875-Prevent-empty-items-from-being-added-to-world.patch => 0874-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0876-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0875-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0877-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0876-Don-t-print-component-in-resource-pack-rejection-mes.patch} (100%)
 rename patches/server/{0878-Add-Player-getFishHook.patch => 0877-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0879-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0878-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0880-Add-various-missing-EntityDropItemEvent-calls.patch => 0879-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0881-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0880-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0882-Fix-Bee-flower-NPE.patch => 0881-Fix-Bee-flower-NPE.patch} (91%)
 rename patches/server/{0883-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0882-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0884-Fixes-and-additions-to-the-SpawnReason-API.patch => 0883-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0885-More-Teleport-API.patch => 0884-More-Teleport-API.patch} (99%)
 rename patches/server/{0886-Add-EntityPortalReadyEvent.patch => 0885-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0887-Don-t-use-level-random-in-entity-constructors.patch => 0886-Don-t-use-level-random-in-entity-constructors.patch} (94%)
 rename patches/server/{0888-Send-block-entities-after-destroy-prediction.patch => 0887-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0889-Warn-on-plugins-accessing-faraway-chunks.patch => 0888-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0890-Custom-Chat-Completion-Suggestions-API.patch => 0889-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0891-Add-missing-BlockFadeEvents.patch => 0890-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0892-Collision-API.patch => 0891-Collision-API.patch} (100%)
 rename patches/server/{0893-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0892-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0894-Fix-command-preprocess-cancelling-and-command-changi.patch => 0893-Fix-command-preprocess-cancelling-and-command-changi.patch} (100%)
 rename patches/server/{0895-Remove-invalid-signature-login-stacktrace.patch => 0894-Remove-invalid-signature-login-stacktrace.patch} (93%)
 rename patches/server/{0896-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0895-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (91%)
 rename patches/server/{0897-Block-Ticking-API.patch => 0896-Block-Ticking-API.patch} (100%)
 rename patches/server/{0898-Add-Velocity-IP-Forwarding-Support.patch => 0897-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename patches/server/{0899-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0898-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (92%)
 rename patches/server/{0900-Add-NamespacedKey-biome-methods.patch => 0899-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0901-Fix-plugin-loggers-on-server-shutdown.patch => 0900-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0902-Workaround-for-client-lag-spikes-MC-162253.patch => 0901-Workaround-for-client-lag-spikes-MC-162253.patch} (100%)
 rename patches/server/{0903-Stop-large-look-changes-from-crashing-the-server.patch => 0902-Stop-large-look-changes-from-crashing-the-server.patch} (96%)
 rename patches/server/{0904-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0903-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (100%)
 rename patches/server/{0905-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch => 0904-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch} (100%)
 rename patches/server/{0906-Fire-EntityChangeBlockEvent-in-more-places.patch => 0905-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0907-Missing-eating-regain-reason.patch => 0906-Missing-eating-regain-reason.patch} (95%)
 rename patches/server/{0908-Missing-effect-cause.patch => 0907-Missing-effect-cause.patch} (100%)
 rename patches/server/{0909-Added-byte-array-serialization-deserialization-for-P.patch => 0908-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0910-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0909-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0911-Call-BlockPhysicsEvent-more-often.patch => 0910-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0912-Configurable-chat-thread-limit.patch => 0911-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0913-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0912-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0914-Set-position-before-player-sending-on-dimension-chan.patch => 0913-Set-position-before-player-sending-on-dimension-chan.patch} (100%)
 rename patches/server/{0915-fix-Jigsaw-block-kicking-user.patch => 0914-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0916-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0915-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0917-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0916-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%)
 rename patches/server/{0918-Fix-a-bunch-of-vanilla-bugs.patch => 0917-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0919-Fix-nothing-mlg.patch => 0918-Fix-nothing-mlg.patch} (95%)
 rename patches/server/{0920-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0919-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0921-Fix-custom-piglin-loved-items.patch => 0920-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0922-EntityPickupItemEvent-fixes.patch => 0921-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0923-Correctly-handle-interactions-with-items-on-cooldown.patch => 0922-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0924-Add-PlayerInventorySlotChangeEvent.patch => 0923-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0925-Elder-Guardian-appearance-API.patch => 0924-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0926-Allow-changing-bed-s-occupied-property.patch => 0925-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0927-Add-entity-knockback-API.patch => 0926-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0928-Detect-headless-JREs.patch => 0927-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0929-fixed-entity-vehicle-collision-event-not-called.patch => 0928-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0930-optimized-dirt-and-snow-spreading.patch => 0929-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0931-Added-EntityToggleSitEvent.patch => 0930-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0932-Add-fire-tick-delay-option.patch => 0931-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0933-Add-Moving-Piston-API.patch => 0932-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0934-Ignore-impossible-spawn-tick.patch => 0933-Ignore-impossible-spawn-tick.patch} (100%)

diff --git a/patches/server/0101-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
similarity index 54%
rename from patches/server/0101-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
index 9bd57f4d9..bc7d89b3b 100644
--- a/patches/server/0101-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch
@@ -1,12 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
-Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
+Subject: [PATCH] Only send global sounds to same world if limiting radius
 
-Also fix view distance lookup
+Co-authored-by: Evan McCarthy <evanmccarthy@outlook.com>
+Co-authored-by: lexikiq <noellekiq@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index dd1d606543da93e6068b8fa4239d369a4b648523..e6a6b0a298e69ce975eac413723f068aaef72ec0 100644
+index dd1d606543da93e6068b8fa4239d369a4b648523..127aab56eef67d7f02f5c3de80d8f445ba70e7db 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -654,7 +654,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -14,12 +15,12 @@ index dd1d606543da93e6068b8fa4239d369a4b648523..e6a6b0a298e69ce975eac413723f068a
                  // this.world.b(1028, this.getChunkCoordinates(), 0);
                  int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16;
 -                for (net.minecraft.server.level.ServerPlayer player : this.level.getServer().getPlayerList().players) {
-+                for (net.minecraft.server.level.ServerPlayer player : (List<net.minecraft.server.level.ServerPlayer>) ((ServerLevel)level).players()) {
++                for (net.minecraft.server.level.ServerPlayer player : level.spigotConfig.dragonDeathSoundRadius > 0 ? ((ServerLevel) level).players() : level.getServer().getPlayerList().players) { // Paper
                      double deltaX = this.getX() - player.getX();
                      double deltaZ = this.getZ() - player.getZ();
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 78bffaddbc9e478fb53639396e9c4970e9961b21..1fc862a3b5d40a45cf91703051bcfb06ec1b177a 100644
+index 78bffaddbc9e478fb53639396e9c4970e9961b21..0d36a903b7aa8d26232e6edcb0fdbba1defde660 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -272,7 +272,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -27,7 +28,20 @@ index 78bffaddbc9e478fb53639396e9c4970e9961b21..1fc862a3b5d40a45cf91703051bcfb06
                      // this.world.globalLevelEvent(1023, new BlockPosition(this), 0);
                      int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16;
 -                    for (ServerPlayer player : (List<ServerPlayer>) MinecraftServer.getServer().getPlayerList().players) {
-+                    for (ServerPlayer player : (List<ServerPlayer>)this.level.players()) { // Paper
++                    for (ServerPlayer player : level.spigotConfig.witherSpawnSoundRadius > 0 ? ((ServerLevel) level).players() : level.getServer().getPlayerList().players) { // Paper
                          double deltaX = this.getX() - player.getX();
                          double deltaZ = this.getZ() - player.getZ();
                          double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
+diff --git a/src/main/java/net/minecraft/world/item/EnderEyeItem.java b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
+index a88ffff41481d346a99762352094cdb4e8dd6cc2..e0c3aa1285709a40ff0ea8c1d74d43d2b341aecc 100644
+--- a/src/main/java/net/minecraft/world/item/EnderEyeItem.java
++++ b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
+@@ -64,7 +64,7 @@ public class EnderEyeItem extends Item {
+                     // world.b(1038, blockposition1.c(1, 0, 1), 0);
+                     int viewDistance = world.getCraftServer().getViewDistance() * 16;
+                     BlockPos soundPos = blockposition1.offset(1, 0, 1);
+-                    for (ServerPlayer player : world.getServer().getPlayerList().players) {
++                    for (ServerPlayer player : world.spigotConfig.endPortalSoundRadius > 0 ? ((ServerLevel) world).players() : world.getServer().getPlayerList().players) { // Paper
+                         double deltaX = soundPos.getX() - player.getX();
+                         double deltaZ = soundPos.getZ() - player.getZ();
+                         double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
diff --git a/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch
deleted file mode 100644
index a5edd3fe4..000000000
--- a/patches/server/0790-Check-player-world-in-endPortalSoundRadius.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: lexikiq <noellekiq@gmail.com>
-Date: Sat, 17 Jul 2021 20:37:02 -0400
-Subject: [PATCH] Check player world in endPortalSoundRadius
-
-Fixes Spigot's endPortalSoundRadius not checking player worlds
-
-diff --git a/src/main/java/net/minecraft/world/item/EnderEyeItem.java b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-index a88ffff41481d346a99762352094cdb4e8dd6cc2..0b3e9e4ed162a6d9e1f3f55b9522b75c94d13254 100644
---- a/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-+++ b/src/main/java/net/minecraft/world/item/EnderEyeItem.java
-@@ -68,7 +68,7 @@ public class EnderEyeItem extends Item {
-                         double deltaX = soundPos.getX() - player.getX();
-                         double deltaZ = soundPos.getZ() - player.getZ();
-                         double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
--                        if (world.spigotConfig.endPortalSoundRadius > 0 && distanceSquared > world.spigotConfig.endPortalSoundRadius * world.spigotConfig.endPortalSoundRadius) continue; // Spigot
-+                        if (world.spigotConfig.endPortalSoundRadius > 0 && (distanceSquared > world.spigotConfig.endPortalSoundRadius * world.spigotConfig.endPortalSoundRadius || player.getLevel() != world)) continue; // Spigot // Paper - ensure recipient is in same world as portal
-                         if (distanceSquared > viewDistance * viewDistance) {
-                             double deltaLength = Math.sqrt(distanceSquared);
-                             double relativeX = player.getX() + (deltaX / deltaLength) * viewDistance;
diff --git a/patches/server/0791-Validate-usernames.patch b/patches/server/0790-Validate-usernames.patch
similarity index 97%
rename from patches/server/0791-Validate-usernames.patch
rename to patches/server/0790-Validate-usernames.patch
index af37250ab..6abb6a6f0 100644
--- a/patches/server/0791-Validate-usernames.patch
+++ b/patches/server/0790-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b87bd1c2d3a371e2fca1d0bff6d0985188b22584..64e2004e023f79d28c400f7182b0ffa93789620d 100644
+index dd599443c7197868eaa0708b4be26f1a341ce4e4..82b55548d4652ec0c25d3dc6da628573a9c9000a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -66,6 +66,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0792-Make-water-animal-spawn-height-configurable.patch b/patches/server/0791-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0792-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0791-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0793-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0792-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0793-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0792-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0794-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0793-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0794-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0793-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0795-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0794-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0795-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0794-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0796-Multiple-Entries-with-Scoreboards.patch b/patches/server/0795-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0796-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0795-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0797-Reset-placed-block-on-exception.patch b/patches/server/0796-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0797-Reset-placed-block-on-exception.patch
rename to patches/server/0796-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0798-Add-configurable-height-for-slime-spawn.patch b/patches/server/0797-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0798-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0797-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0799-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0798-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 93%
rename from patches/server/0799-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0798-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 1f0e3525b..d9b38bfa0 100644
--- a/patches/server/0799-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0798-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 64e2004e023f79d28c400f7182b0ffa93789620d..dff440dc51724e85d9fea88a9602efcbb5450776 100644
+index 82b55548d4652ec0c25d3dc6da628573a9c9000a..62a404871650ff5caffcd9c6c83046abeefff49d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -411,7 +411,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0800-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0799-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0800-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0799-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0801-Kick-on-main-for-illegal-chat.patch b/patches/server/0800-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0801-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0800-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0802-Multi-Block-Change-API-Implementation.patch b/patches/server/0801-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0802-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0801-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0803-Fix-NotePlayEvent.patch b/patches/server/0802-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0803-Fix-NotePlayEvent.patch
rename to patches/server/0802-Fix-NotePlayEvent.patch
diff --git a/patches/server/0804-Freeze-Tick-Lock-API.patch b/patches/server/0803-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0804-Freeze-Tick-Lock-API.patch
rename to patches/server/0803-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0805-Dolphin-API.patch b/patches/server/0804-Dolphin-API.patch
similarity index 100%
rename from patches/server/0805-Dolphin-API.patch
rename to patches/server/0804-Dolphin-API.patch
diff --git a/patches/server/0806-More-PotionEffectType-API.patch b/patches/server/0805-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0806-More-PotionEffectType-API.patch
rename to patches/server/0805-More-PotionEffectType-API.patch
diff --git a/patches/server/0807-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0806-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0807-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0806-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0808-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0807-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0808-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0807-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0809-Add-missing-structure-set-seed-configs.patch b/patches/server/0808-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0809-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0808-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0810-Implement-regenerateChunk.patch b/patches/server/0809-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0810-Implement-regenerateChunk.patch
rename to patches/server/0809-Implement-regenerateChunk.patch
diff --git a/patches/server/0811-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0810-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0811-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0810-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0812-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0811-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0812-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0811-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0813-Add-GameEvent-tags.patch b/patches/server/0812-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0813-Add-GameEvent-tags.patch
rename to patches/server/0812-Add-GameEvent-tags.patch
diff --git a/patches/server/0814-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0813-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0814-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0813-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0815-Furnace-RecipesUsed-API.patch b/patches/server/0814-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0815-Furnace-RecipesUsed-API.patch
rename to patches/server/0814-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0816-Configurable-sculk-sensor-listener-range.patch b/patches/server/0815-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0816-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0815-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0817-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0816-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0817-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0816-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0818-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0817-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0818-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0817-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0819-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0818-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0819-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0818-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0820-Fix-Entity-Position-Desync.patch b/patches/server/0819-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0820-Fix-Entity-Position-Desync.patch
rename to patches/server/0819-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0821-Custom-Potion-Mixes.patch b/patches/server/0820-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0821-Custom-Potion-Mixes.patch
rename to patches/server/0820-Custom-Potion-Mixes.patch
diff --git a/patches/server/0822-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0821-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0822-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0821-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0823-Force-close-world-loading-screen.patch b/patches/server/0822-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0823-Force-close-world-loading-screen.patch
rename to patches/server/0822-Force-close-world-loading-screen.patch
diff --git a/patches/server/0824-Fix-falling-block-spawn-methods.patch b/patches/server/0823-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0824-Fix-falling-block-spawn-methods.patch
rename to patches/server/0823-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0825-Expose-furnace-minecart-push-values.patch b/patches/server/0824-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0825-Expose-furnace-minecart-push-values.patch
rename to patches/server/0824-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0826-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0825-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 94%
rename from patches/server/0826-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0825-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index a9cdda7a7..6d3b59c1d 100644
--- a/patches/server/0826-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0825-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
@@ -12,7 +12,7 @@ already-existing field on AbstractArrow for tracking entities hit by
 piercing arrows to avoid duplicate damage being applied.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 8564ecd20578d907bcfa1b9c149da22e424e254a..bc01e5014e1355a225bdf5c47f2965290b45e2d2 100644
+index 39136b9707221e4e4934ee0ef18fc2cb92723aa2..def3b3f8dac4b28eaaafdd9bc2e7f4b9ec9d6855 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -300,6 +300,19 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0827-More-Projectile-API.patch b/patches/server/0826-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0827-More-Projectile-API.patch
rename to patches/server/0826-More-Projectile-API.patch
diff --git a/patches/server/0828-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0827-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0828-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0827-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0829-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0828-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0829-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0828-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0830-Implement-getComputedBiome-API.patch b/patches/server/0829-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0830-Implement-getComputedBiome-API.patch
rename to patches/server/0829-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0831-Make-some-itemstacks-nonnull.patch b/patches/server/0830-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0831-Make-some-itemstacks-nonnull.patch
rename to patches/server/0830-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0832-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0831-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0832-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0831-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0833-Implement-enchantWithLevels-API.patch b/patches/server/0832-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0833-Implement-enchantWithLevels-API.patch
rename to patches/server/0832-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0834-Fix-saving-in-unloadWorld.patch b/patches/server/0833-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0834-Fix-saving-in-unloadWorld.patch
rename to patches/server/0833-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0835-Buffer-OOB-setBlock-calls.patch b/patches/server/0834-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0835-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0834-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0836-Add-TameableDeathMessageEvent.patch b/patches/server/0835-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0836-Add-TameableDeathMessageEvent.patch
rename to patches/server/0835-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0837-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0836-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
similarity index 100%
rename from patches/server/0837-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
rename to patches/server/0836-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0838-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0837-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0838-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0837-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0839-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0838-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0839-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0838-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0840-Guard-against-invalid-entity-positions.patch b/patches/server/0839-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0840-Guard-against-invalid-entity-positions.patch
rename to patches/server/0839-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0841-cache-resource-keys.patch b/patches/server/0840-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0841-cache-resource-keys.patch
rename to patches/server/0840-cache-resource-keys.patch
diff --git a/patches/server/0842-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0841-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 99%
rename from patches/server/0842-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0841-Allow-to-change-the-podium-for-the-EnderDragon.patch
index ca79a2f05..8dde383d5 100644
--- a/patches/server/0842-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0841-Allow-to-change-the-podium-for-the-EnderDragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow to change the podium for the EnderDragon
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 6495b0421cab1b067b9483cc448222705c15578c..ac3d4d90407288526a8c787e365ff41234a58543 100644
+index 3f854bea2e6be82c7ad12b4d13064de8baec55c7..b786bd5178a605a5dfb7682b7cb809646895aea3 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -99,6 +99,10 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0843-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0842-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0843-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0842-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0844-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0843-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 92%
rename from patches/server/0844-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0843-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
index 4b39ce4dc..55e32b5b6 100644
--- a/patches/server/0844-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
+++ b/patches/server/0843-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix StructureGrowEvent species for RED_MUSHROOM
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/MushroomBlock.java b/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
-index 5333188e45e47c12c8c56939b87603750a45af57..881d899ff551bc2c2c6fc7d58107a2aee7d86f2a 100644
+index 30dac710f355de75e620b807f88c6a209615b05f..88a7b38f33500a618f42aed427e7e15db9e837b3 100644
 --- a/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/MushroomBlock.java
 @@ -85,7 +85,7 @@ public class MushroomBlock extends BushBlock implements BonemealableBlock {
diff --git a/patches/server/0845-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0844-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0845-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0844-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0846-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0845-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0846-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0845-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0847-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0846-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0847-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0846-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0848-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0847-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0848-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0847-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0849-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0848-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0849-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0848-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0850-WorldCreator-keepSpawnLoaded.patch b/patches/server/0849-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0850-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0849-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0851-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0850-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0851-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0850-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0852-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0851-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0852-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0851-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0853-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0852-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0853-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0852-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0854-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0853-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0854-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0853-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0855-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0854-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0855-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0854-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0856-Add-PlayerStopUsingItemEvent.patch b/patches/server/0855-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0856-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0855-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0857-FallingBlock-auto-expire-setting.patch b/patches/server/0856-FallingBlock-auto-expire-setting.patch
similarity index 97%
rename from patches/server/0857-FallingBlock-auto-expire-setting.patch
rename to patches/server/0856-FallingBlock-auto-expire-setting.patch
index a7b0c20dd..59902948f 100644
--- a/patches/server/0857-FallingBlock-auto-expire-setting.patch
+++ b/patches/server/0856-FallingBlock-auto-expire-setting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] FallingBlock auto expire setting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
-index f6405e862b15b71dbb96215e604610fe5ff59bfc..ef07967b64180c54338b8fb2ba1780adec87f333 100644
+index da00fab453f3fb580acc9de65a0853656f9b6fc4..b2d1a17867cdbaad0c6e5c2376c716f9461af124 100644
 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -61,6 +61,7 @@ public class FallingBlockEntity extends Entity {
diff --git a/patches/server/0858-Don-t-tick-markers.patch b/patches/server/0857-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0858-Don-t-tick-markers.patch
rename to patches/server/0857-Don-t-tick-markers.patch
diff --git a/patches/server/0859-Do-not-accept-invalid-client-settings.patch b/patches/server/0858-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0859-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0858-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0860-Add-support-for-Proxy-Protocol.patch b/patches/server/0859-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0860-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0859-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0861-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0860-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0861-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0860-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0862-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0861-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0862-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0861-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0863-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0862-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0863-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0862-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0864-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0863-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0864-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0863-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0865-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0864-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0865-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0864-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0866-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0865-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0866-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0865-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0867-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0866-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0867-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0866-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0868-Dont-resent-entity-on-art-update.patch b/patches/server/0867-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0868-Dont-resent-entity-on-art-update.patch
rename to patches/server/0867-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0869-Add-missing-spawn-eggs.patch b/patches/server/0868-Add-missing-spawn-eggs.patch
similarity index 100%
rename from patches/server/0869-Add-missing-spawn-eggs.patch
rename to patches/server/0868-Add-missing-spawn-eggs.patch
diff --git a/patches/server/0870-Add-WardenAngerChangeEvent.patch b/patches/server/0869-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0870-Add-WardenAngerChangeEvent.patch
rename to patches/server/0869-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0871-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0870-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0871-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0870-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0872-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0871-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0872-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0871-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0873-Nameable-Banner-API.patch b/patches/server/0872-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0873-Nameable-Banner-API.patch
rename to patches/server/0872-Nameable-Banner-API.patch
diff --git a/patches/server/0874-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0873-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0874-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0873-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0875-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0874-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0875-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0874-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0876-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0875-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0876-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0875-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0877-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0876-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0877-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0876-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0878-Add-Player-getFishHook.patch b/patches/server/0877-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0878-Add-Player-getFishHook.patch
rename to patches/server/0877-Add-Player-getFishHook.patch
diff --git a/patches/server/0879-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0878-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0879-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0878-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0880-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0879-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0880-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0879-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0881-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0880-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0881-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0880-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0882-Fix-Bee-flower-NPE.patch b/patches/server/0881-Fix-Bee-flower-NPE.patch
similarity index 91%
rename from patches/server/0882-Fix-Bee-flower-NPE.patch
rename to patches/server/0881-Fix-Bee-flower-NPE.patch
index d1fca0922..6072e1dcc 100644
--- a/patches/server/0882-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0881-Fix-Bee-flower-NPE.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Bee flower NPE
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index bd048cc30046f19f9eee89c6ba45d0816a160e67..e5de2c1d11e5de88420caba35bf75c8bbd799db5 100644
+index f2243f65cdf0e4b327e8597dfefe5b2de8912cef..87f8d46cb2032474008811ca11dc7ff1f7859f7e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -802,7 +802,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0883-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0882-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0883-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0882-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0884-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0884-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0883-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0885-More-Teleport-API.patch b/patches/server/0884-More-Teleport-API.patch
similarity index 99%
rename from patches/server/0885-More-Teleport-API.patch
rename to patches/server/0884-More-Teleport-API.patch
index e2e71abd9..43474de5a 100644
--- a/patches/server/0885-More-Teleport-API.patch
+++ b/patches/server/0884-More-Teleport-API.patch
@@ -29,7 +29,7 @@ index 421d7e28370085dffa415d71d4e28d3c4d38ac87..92617a19fb328320e17b58956cf0276d
              d0 = to.getX();
              d1 = to.getY();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c4ffccddce33cf461d9b04ccbb90026544f16b7d..99b99fae67e53a688b3519d8a8d0cc5f3468e7e8 100644
+index 2015147126f463f11202d04ca475cc86e5ac12c2..a1e2664c9a6cc41edf0dfb92cd2b9d77170d8fde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -542,15 +542,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0886-Add-EntityPortalReadyEvent.patch b/patches/server/0885-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0886-Add-EntityPortalReadyEvent.patch
rename to patches/server/0885-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0887-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0886-Don-t-use-level-random-in-entity-constructors.patch
similarity index 94%
rename from patches/server/0887-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0886-Don-t-use-level-random-in-entity-constructors.patch
index aea2ef259..32c6071e9 100644
--- a/patches/server/0887-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0886-Don-t-use-level-random-in-entity-constructors.patch
@@ -9,7 +9,7 @@ should be supported. Some entities (for whatever
 reason) use the level's random in some places.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index e5de2c1d11e5de88420caba35bf75c8bbd799db5..a9cdf9034ad269f7a71358443acc053288cfbe6d 100644
+index 87f8d46cb2032474008811ca11dc7ff1f7859f7e..2e05c953182c27e3571b2c33eceeb379e60b54be 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -1028,7 +1028,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -49,7 +49,7 @@ index 4c78c04ed031ec2e04642ebe5d79527e848d95f6..fcc5444a1268931a0fd2df1e6bbbc17c
  
      public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 8101f358975b35b5a2dafbade3d14a910e408fa2..e09271450cae84f6206a20d6622918fe37380d59 100644
+index 65f0aa076dbfc4cd72d14ec485d1edf5533d825e..438de71a17d7bfaed8fbb1b4f7aa7f53538603a2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -35,7 +35,7 @@ public class PrimedTnt extends Entity {
diff --git a/patches/server/0888-Send-block-entities-after-destroy-prediction.patch b/patches/server/0887-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0888-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0887-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0889-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0888-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0889-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0888-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0890-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0889-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0890-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0889-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0891-Add-missing-BlockFadeEvents.patch b/patches/server/0890-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0891-Add-missing-BlockFadeEvents.patch
rename to patches/server/0890-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0892-Collision-API.patch b/patches/server/0891-Collision-API.patch
similarity index 100%
rename from patches/server/0892-Collision-API.patch
rename to patches/server/0891-Collision-API.patch
diff --git a/patches/server/0893-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0892-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0893-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0892-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0894-Fix-command-preprocess-cancelling-and-command-changi.patch b/patches/server/0893-Fix-command-preprocess-cancelling-and-command-changi.patch
similarity index 100%
rename from patches/server/0894-Fix-command-preprocess-cancelling-and-command-changi.patch
rename to patches/server/0893-Fix-command-preprocess-cancelling-and-command-changi.patch
diff --git a/patches/server/0895-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0894-Remove-invalid-signature-login-stacktrace.patch
similarity index 93%
rename from patches/server/0895-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0894-Remove-invalid-signature-login-stacktrace.patch
index af4b5e1ae..b72544935 100644
--- a/patches/server/0895-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0894-Remove-invalid-signature-login-stacktrace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index dff440dc51724e85d9fea88a9602efcbb5450776..dfebe4ae6f19a36f2802195f2989a562c5570526 100644
+index 62a404871650ff5caffcd9c6c83046abeefff49d..cb761c4d87eded85a80996e6894b731381b7516c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -167,7 +167,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0896-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0895-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 91%
rename from patches/server/0896-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0895-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 05e9d349b..6ebf299ac 100644
--- a/patches/server/0896-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/server/0895-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add async catcher to PlayerConnection internalTeleport
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1ff25ce408aba3620455f74e1535b5862b3bbdf9..9eb921fec32afa360f3a402e978411fcf3ec618c 100644
+index 8ae8055c185237a76159285c8fce3aacc295fb3b..8a35db69e986c393bf56ae556ea28adff91da08d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1757,6 +1757,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0897-Block-Ticking-API.patch b/patches/server/0896-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0897-Block-Ticking-API.patch
rename to patches/server/0896-Block-Ticking-API.patch
diff --git a/patches/server/0898-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0897-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0898-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0897-Add-Velocity-IP-Forwarding-Support.patch
index d651ad310..31827a8f9 100644
--- a/patches/server/0898-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0897-Add-Velocity-IP-Forwarding-Support.patch
@@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..5de2dabbc076a9482b1d6c299f1cff74
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index dfebe4ae6f19a36f2802195f2989a562c5570526..36802586717613abfce9f23e0d2a405f0590ae6e 100644
+index cb761c4d87eded85a80996e6894b731381b7516c..18a8bf9a26c7aa2b73bc696ebb54846643262e25 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -67,6 +67,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0899-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0898-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 92%
rename from patches/server/0899-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0898-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 5d5ebb5ff..9e8a29aee 100644
--- a/patches/server/0899-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0898-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 36802586717613abfce9f23e0d2a405f0590ae6e..b607f5ccbce10570f827dd21eb38504f42781d2f 100644
+index 18a8bf9a26c7aa2b73bc696ebb54846643262e25..ea9b56fd6ae1d5577da5bd3e0c38abfeec8f3646 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -52,7 +52,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se
diff --git a/patches/server/0900-Add-NamespacedKey-biome-methods.patch b/patches/server/0899-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0900-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0899-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0901-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0900-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0901-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0900-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0902-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0901-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 100%
rename from patches/server/0902-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0901-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0903-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0902-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 96%
rename from patches/server/0903-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0902-Stop-large-look-changes-from-crashing-the-server.patch
index 430fec0ed..1566b53cc 100644
--- a/patches/server/0903-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0902-Stop-large-look-changes-from-crashing-the-server.patch
@@ -54,7 +54,7 @@ index 780cff9638fe717e98a97f1241cf65337b55382c..0318c9483a4d96eb39ff4df9054a9e63
          this.level.getProfiler().pop();
          this.animStep += f2;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 66c3f374a779cd3a4548393ba23e9219f1caf6d3..c61ed38d0a824fee9b45acfc862baf03c85fe54b 100644
+index 68f3131eb5d3c725279796effff083345edbaec9..713c11d6547cb02ac4b6a02aec07a8ba68019f3f 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -245,13 +245,7 @@ public abstract class Projectile extends Entity {
diff --git a/patches/server/0904-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0903-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/server/0904-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0903-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0905-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0904-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0905-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0904-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0906-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0905-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0906-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0905-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0907-Missing-eating-regain-reason.patch b/patches/server/0906-Missing-eating-regain-reason.patch
similarity index 95%
rename from patches/server/0907-Missing-eating-regain-reason.patch
rename to patches/server/0906-Missing-eating-regain-reason.patch
index 1f8bd2bc7..43860b492 100644
--- a/patches/server/0907-Missing-eating-regain-reason.patch
+++ b/patches/server/0906-Missing-eating-regain-reason.patch
@@ -18,7 +18,7 @@ index ab86bfdaebe9b8791f0cfa6e0c61f80c8f891a93..745883a7b9c2590ae8e28db79e1bd034
                          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 5ffae9d3be22b5e78645da57a6bd0e7350749ef1..ed8dfabdad28e27054aa0679e06fcf87dc049f77 100644
+index 9aec9f80c564fa3ae03e445423d9e50afc45f837..149be8bf166282e651a375a27ca209010f25d688 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -211,7 +211,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
diff --git a/patches/server/0908-Missing-effect-cause.patch b/patches/server/0907-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0908-Missing-effect-cause.patch
rename to patches/server/0907-Missing-effect-cause.patch
diff --git a/patches/server/0909-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0908-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0909-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0908-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0910-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0909-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0910-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0909-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0911-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0910-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0911-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0910-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0912-Configurable-chat-thread-limit.patch b/patches/server/0911-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0912-Configurable-chat-thread-limit.patch
rename to patches/server/0911-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0913-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0912-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0913-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0912-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0914-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0913-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 100%
rename from patches/server/0914-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0913-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0915-fix-Jigsaw-block-kicking-user.patch b/patches/server/0914-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0915-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0914-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0916-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0915-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0916-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0915-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0917-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0916-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0917-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0916-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0918-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0917-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0918-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0917-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0919-Fix-nothing-mlg.patch b/patches/server/0918-Fix-nothing-mlg.patch
similarity index 95%
rename from patches/server/0919-Fix-nothing-mlg.patch
rename to patches/server/0918-Fix-nothing-mlg.patch
index 5daa6a890..b3405c25b 100644
--- a/patches/server/0919-Fix-nothing-mlg.patch
+++ b/patches/server/0918-Fix-nothing-mlg.patch
@@ -19,7 +19,7 @@ doCheckFallDamage method is meant to be called repeatedly anyway.
 Mojira-ID: MC-255653
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9eb921fec32afa360f3a402e978411fcf3ec618c..63c9040ed2349eec500ba6e9090440347c514a3b 100644
+index 8a35db69e986c393bf56ae556ea28adff91da08d..9ad36447e82a3504576f6c10cb297514a2f69289 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1564,6 +1564,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0920-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0919-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0920-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0919-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0921-Fix-custom-piglin-loved-items.patch b/patches/server/0920-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0921-Fix-custom-piglin-loved-items.patch
rename to patches/server/0920-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0922-EntityPickupItemEvent-fixes.patch b/patches/server/0921-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0922-EntityPickupItemEvent-fixes.patch
rename to patches/server/0921-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0923-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0922-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0923-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0922-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0924-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0923-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0924-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0923-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0925-Elder-Guardian-appearance-API.patch b/patches/server/0924-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0925-Elder-Guardian-appearance-API.patch
rename to patches/server/0924-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0926-Allow-changing-bed-s-occupied-property.patch b/patches/server/0925-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0926-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0925-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0927-Add-entity-knockback-API.patch b/patches/server/0926-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0927-Add-entity-knockback-API.patch
rename to patches/server/0926-Add-entity-knockback-API.patch
diff --git a/patches/server/0928-Detect-headless-JREs.patch b/patches/server/0927-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0928-Detect-headless-JREs.patch
rename to patches/server/0927-Detect-headless-JREs.patch
diff --git a/patches/server/0929-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0928-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0929-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0928-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0930-optimized-dirt-and-snow-spreading.patch b/patches/server/0929-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0930-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0929-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0931-Added-EntityToggleSitEvent.patch b/patches/server/0930-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0931-Added-EntityToggleSitEvent.patch
rename to patches/server/0930-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0932-Add-fire-tick-delay-option.patch b/patches/server/0931-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0932-Add-fire-tick-delay-option.patch
rename to patches/server/0931-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0933-Add-Moving-Piston-API.patch b/patches/server/0932-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0933-Add-Moving-Piston-API.patch
rename to patches/server/0932-Add-Moving-Piston-API.patch
diff --git a/patches/server/0934-Ignore-impossible-spawn-tick.patch b/patches/server/0933-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0934-Ignore-impossible-spawn-tick.patch
rename to patches/server/0933-Ignore-impossible-spawn-tick.patch