From 244a523df33cbf7aa962693076fb2454b4a1f5e8 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 8 Dec 2022 11:06:54 -0800
Subject: [PATCH] readd missing structure set seeds patch

---
 ...-missing-structure-set-seed-configs.patch} | 175 +++++++++++-------
 ...h => 0800-Implement-regenerateChunk.patch} |   2 +-
 ...lled-powdered-snow-bucket-placement.patch} |   0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   2 +-
 ...gs.patch => 0803-Add-GameEvent-tags.patch} |   2 +-
 ...ks-fairly-for-worlds-while-waiting-.patch} |   0
 ...tch => 0805-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} |   4 +-
 ... => 0810-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0811-Custom-Potion-Mixes.patch} |   4 +-
 ...0812-Fix-Fluid-tags-isTagged-method.patch} |   2 +-
 ...13-Force-close-world-loading-screen.patch} |   0
 ...814-Fix-falling-block-spawn-methods.patch} |   2 +-
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0817-More-Projectile-API.patch} |   4 +-
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   2 +-
 ...0820-Implement-getComputedBiome-API.patch} |   0
 ...> 0821-Make-some-itemstacks-nonnull.patch} |   0
 ...alid-GameProfiles-on-skull-blocks-i.patch} |   0
 ...823-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0824-Fix-saving-in-unloadWorld.patch} |   2 +-
 ...h => 0825-Buffer-OOB-setBlock-calls.patch} |   0
 ... 0826-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   0
 ...bles-running-when-mob-loot-gamerule.patch} |   2 +-
 ...ssenger-world-matches-ridden-entity.patch} |   0
 ...rd-against-invalid-entity-positions.patch} |   0
 ...s.patch => 0831-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} |   0
 ...t-tile-entity-copies-loading-chunks.patch} |   2 +-
 ...ead-of-display-name-in-PlayerList-g.patch} |   2 +-
 ...s-not-spawning-outside-slime-chunks.patch} |   0
 ...-ServerLevel-for-gamerule-callbacks.patch} |   4 +-
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   0
 ...> 0840-WorldCreator-keepSpawnLoaded.patch} |   2 +-
 ...-NPE-for-BlockDataMeta-getBlockData.patch} |   2 +-
 ...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
 ...> 0846-Add-PlayerStopUsingItemEvent.patch} |   0
 ...47-FallingBlock-auto-expire-setting.patch} |   0
 ...rs.patch => 0848-Don-t-tick-markers.patch} |   0
 ...-not-accept-invalid-client-settings.patch} |   2 +-
 ...0850-Add-support-for-Proxy-Protocol.patch} |   0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0853-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} |   4 +-
 ...ate-Current-redstone-implementation.patch} |   0
 ...58-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0859-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   0
 ...tant-BlockStateListPopulator-method.patch} |   0
 ...I.patch => 0862-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} |   2 +-
 ...atch => 0867-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} |   2 +-
 ...PE.patch => 0871-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   2 +-
 ...API.patch => 0873-More-Teleport-API.patch} |   2 +-
 ... => 0874-Add-EntityPortalReadyEvent.patch} |   0
 ...level-random-in-entity-constructors.patch} |   0
 ...k-entities-after-destroy-prediction.patch} |   2 +-
 ...on-plugins-accessing-faraway-chunks.patch} |   0
 ...tom-Chat-Completion-Suggestions-API.patch} |   0
 ...=> 0879-Add-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0880-Collision-API.patch} |   0
 ...nd-message-for-brigadier-syntax-exc.patch} |   0
 ...-invalid-signature-login-stacktrace.patch} |   0
 ...-to-PlayerConnection-internalTelepo.patch} |   2 +-
 ...API.patch => 0884-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   0
 ...andom-in-ServerLoginPacketListenerI.patch} |   2 +-
 ...887-Add-NamespacedKey-biome-methods.patch} |   0
 ...x-plugin-loggers-on-server-shutdown.patch} |   0
 ...und-for-client-lag-spikes-MC-162253.patch} |   2 +-
 ...ok-changes-from-crashing-the-server.patch} |   0
 ...estroyerIdentity-to-sendBlockDamage.patch} |   0
 ...t-killed-statuses-should-be-false-f.patch} |   0
 ...tityChangeBlockEvent-in-more-places.patch} |   0
 ...> 0894-Missing-eating-regain-reason.patch} |   0
 ....patch => 0895-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...8-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0899-Configurable-chat-thread-limit.patch} |   0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ...re-player-sending-on-dimension-chan.patch} |   0
 ... 0902-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ...lockState-and-isPreferredTool-to-Bl.patch} |   0
 ...=> 0905-Fix-a-bunch-of-vanilla-bugs.patch} |   0
 ...y-onTrackingStart-during-navigation.patch} |   0
 ... 0907-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0908-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   0
 ... 0911-Elder-Guardian-appearance-API.patch} |   0
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0913-Add-entity-knockback-API.patch} |   0
 ....patch => 0914-Detect-headless-JREs.patch} |   0
 ...-vehicle-collision-event-not-called.patch} |   0
 ...6-optimized-dirt-and-snow-spreading.patch} |   0
 ... => 0917-Added-EntityToggleSitEvent.patch} |   0
 ... => 0918-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0919-Add-Moving-Piston-API.patch} |   0
 ...> 0920-Ignore-impossible-spawn-tick.patch} |   0
 ...source-for-fireworks-from-dispenser.patch} |   0
 ...t-suggestion-permissions-to-align-w.patch} |   0
 ...Event-cancellation-cant-fully-preve.patch} |   0
 ...Prevent-compass-from-loading-chunks.patch} |   0
 ...0925-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ...mage-source-entity-for-explosion-to.patch} |   0
 ...-121048.patch => 0929-Fix-MC-121048.patch} |   0
 ... 0930-Add-Player-Warden-Warning-API.patch} |   0
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...932-Add-paper-dumplisteners-command.patch} |   0
 ...lobal-player-list-where-appropriate.patch} |   0
 ...sync-entity-add-due-to-fungus-trees.patch} |   0
 ....patch => 0935-ItemStack-damage-API.patch} |   0
 ...tion-API.patch => 0936-Friction-API.patch} |   0
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...=> 0938-Fix-player-kick-on-shutdown.patch} |   0
 ... => 0939-Sync-offhand-slot-in-menus.patch} |   0
 ... 0940-Player-Entity-Tracking-Events.patch} |   0
 ...tch => 0941-Limit-pet-look-distance.patch} |   0
 ...ch => 0942-Properly-resend-entities.patch} |   2 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |   0
 145 files changed, 143 insertions(+), 98 deletions(-)
 rename patches/{removed/1.19.3/0806-Add-missing-structure-set-seed-configs.patch => server/0799-Add-missing-structure-set-seed-configs.patch} (57%)
 rename patches/server/{0799-Implement-regenerateChunk.patch => 0800-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0800-Fix-cancelled-powdered-snow-bucket-placement.patch => 0801-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (91%)
 rename patches/server/{0802-Add-GameEvent-tags.patch => 0803-Add-GameEvent-tags.patch} (97%)
 rename patches/server/{0803-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0804-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0804-Furnace-RecipesUsed-API.patch => 0805-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0805-Configurable-sculk-sensor-listener-range.patch => 0806-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0806-Add-missing-block-data-mins-and-maxes.patch => 0807-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0807-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0808-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0808-Put-world-into-worldlist-before-initing-the-world.patch => 0809-Put-world-into-worldlist-before-initing-the-world.patch} (91%)
 rename patches/server/{0809-Fix-Entity-Position-Desync.patch => 0810-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0810-Custom-Potion-Mixes.patch => 0811-Custom-Potion-Mixes.patch} (98%)
 rename patches/server/{0811-Fix-Fluid-tags-isTagged-method.patch => 0812-Fix-Fluid-tags-isTagged-method.patch} (94%)
 rename patches/server/{0812-Force-close-world-loading-screen.patch => 0813-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0813-Fix-falling-block-spawn-methods.patch => 0814-Fix-falling-block-spawn-methods.patch} (97%)
 rename patches/server/{0814-Expose-furnace-minecart-push-values.patch => 0815-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0815-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0816-More-Projectile-API.patch => 0817-More-Projectile-API.patch} (98%)
 rename patches/server/{0817-Fix-swamp-hut-cat-generation-deadlock.patch => 0818-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0819-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (93%)
 rename patches/server/{0819-Implement-getComputedBiome-API.patch => 0820-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0820-Make-some-itemstacks-nonnull.patch => 0821-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0821-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch => 0822-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch} (100%)
 rename patches/server/{0822-Implement-enchantWithLevels-API.patch => 0823-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0823-Fix-saving-in-unloadWorld.patch => 0824-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0824-Buffer-OOB-setBlock-calls.patch => 0825-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0825-Add-TameableDeathMessageEvent.patch => 0826-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0826-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0827-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0827-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0828-fix-player-loottables-running-when-mob-loot-gamerule.patch} (92%)
 rename patches/server/{0828-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0829-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0829-Guard-against-invalid-entity-positions.patch => 0830-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0830-cache-resource-keys.patch => 0831-cache-resource-keys.patch} (100%)
 rename patches/server/{0831-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0832-Allow-to-change-the-podium-for-the-EnderDragon.patch} (99%)
 rename patches/server/{0832-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0833-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0833-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0834-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0834-Prevent-tile-entity-copies-loading-chunks.patch => 0835-Prevent-tile-entity-copies-loading-chunks.patch} (93%)
 rename patches/server/{0835-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0836-Use-username-instead-of-display-name-in-PlayerList-g.patch} (92%)
 rename patches/server/{0836-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0837-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0837-Pass-ServerLevel-for-gamerule-callbacks.patch => 0838-Pass-ServerLevel-for-gamerule-callbacks.patch} (98%)
 rename patches/server/{0838-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0839-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0839-WorldCreator-keepSpawnLoaded.patch => 0840-WorldCreator-keepSpawnLoaded.patch} (91%)
 rename patches/server/{0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (92%)
 rename patches/server/{0841-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0842-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0842-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0843-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0843-Fire-CauldronLevelChange-on-initial-fill.patch => 0844-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0844-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0845-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0845-Add-PlayerStopUsingItemEvent.patch => 0846-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0846-FallingBlock-auto-expire-setting.patch => 0847-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0847-Don-t-tick-markers.patch => 0848-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0848-Do-not-accept-invalid-client-settings.patch => 0849-Do-not-accept-invalid-client-settings.patch} (93%)
 rename patches/server/{0849-Add-support-for-Proxy-Protocol.patch => 0850-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0850-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0851-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0851-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0852-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0852-Sanitize-Sent-BlockEntity-NBT.patch => 0853-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0853-Prevent-entity-loading-causing-async-lookups.patch => 0854-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0854-Disable-component-selector-resolving-in-books-by-def.patch => 0855-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0855-Throw-exception-on-world-create-while-being-ticked.patch => 0856-Throw-exception-on-world-create-while-being-ticked.patch} (95%)
 rename patches/server/{0856-Add-Alternate-Current-redstone-implementation.patch => 0857-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0857-Dont-resent-entity-on-art-update.patch => 0858-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0858-Add-WardenAngerChangeEvent.patch => 0859-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0859-Add-option-for-strict-advancement-dimension-checks.patch => 0860-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0860-Add-missing-important-BlockStateListPopulator-method.patch => 0861-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0861-Nameable-Banner-API.patch => 0862-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0862-Don-t-broadcast-messages-to-command-blocks.patch => 0863-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0863-Prevent-empty-items-from-being-added-to-world.patch => 0864-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0865-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0866-Don-t-print-component-in-resource-pack-rejection-mes.patch} (94%)
 rename patches/server/{0866-Add-Player-getFishHook.patch => 0867-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0868-Add-various-missing-EntityDropItemEvent-calls.patch => 0869-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0869-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0870-Add-some-minimal-debug-information-to-chat-packet-er.patch} (94%)
 rename patches/server/{0870-Fix-Bee-flower-NPE.patch => 0871-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (92%)
 rename patches/server/{0872-More-Teleport-API.patch => 0873-More-Teleport-API.patch} (99%)
 rename patches/server/{0873-Add-EntityPortalReadyEvent.patch => 0874-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0874-Don-t-use-level-random-in-entity-constructors.patch => 0875-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0875-Send-block-entities-after-destroy-prediction.patch => 0876-Send-block-entities-after-destroy-prediction.patch} (98%)
 rename patches/server/{0876-Warn-on-plugins-accessing-faraway-chunks.patch => 0877-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0877-Custom-Chat-Completion-Suggestions-API.patch => 0878-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0878-Add-missing-BlockFadeEvents.patch => 0879-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0879-Collision-API.patch => 0880-Collision-API.patch} (100%)
 rename patches/server/{0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0881-Remove-invalid-signature-login-stacktrace.patch => 0882-Remove-invalid-signature-login-stacktrace.patch} (100%)
 rename patches/server/{0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (91%)
 rename patches/server/{0883-Block-Ticking-API.patch => 0884-Block-Ticking-API.patch} (100%)
 rename patches/server/{0884-Add-Velocity-IP-Forwarding-Support.patch => 0885-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (92%)
 rename patches/server/{0886-Add-NamespacedKey-biome-methods.patch => 0887-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0887-Fix-plugin-loggers-on-server-shutdown.patch => 0888-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0888-Workaround-for-client-lag-spikes-MC-162253.patch => 0889-Workaround-for-client-lag-spikes-MC-162253.patch} (98%)
 rename patches/server/{0889-Stop-large-look-changes-from-crashing-the-server.patch => 0890-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (100%)
 rename patches/server/{0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch => 0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch} (100%)
 rename patches/server/{0892-Fire-EntityChangeBlockEvent-in-more-places.patch => 0893-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0893-Missing-eating-regain-reason.patch => 0894-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0894-Missing-effect-cause.patch => 0895-Missing-effect-cause.patch} (100%)
 rename patches/server/{0895-Added-byte-array-serialization-deserialization-for-P.patch => 0896-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0897-Call-BlockPhysicsEvent-more-often.patch => 0898-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0898-Configurable-chat-thread-limit.patch => 0899-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0900-Set-position-before-player-sending-on-dimension-chan.patch => 0901-Set-position-before-player-sending-on-dimension-chan.patch} (100%)
 rename patches/server/{0901-fix-Jigsaw-block-kicking-user.patch => 0902-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0902-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0903-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%)
 rename patches/server/{0904-Fix-a-bunch-of-vanilla-bugs.patch => 0905-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0905-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0906-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0906-Fix-custom-piglin-loved-items.patch => 0907-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0907-EntityPickupItemEvent-fixes.patch => 0908-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0908-Correctly-handle-interactions-with-items-on-cooldown.patch => 0909-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0909-Add-PlayerInventorySlotChangeEvent.patch => 0910-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0910-Elder-Guardian-appearance-API.patch => 0911-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0911-Allow-changing-bed-s-occupied-property.patch => 0912-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0912-Add-entity-knockback-API.patch => 0913-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0913-Detect-headless-JREs.patch => 0914-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0914-fixed-entity-vehicle-collision-event-not-called.patch => 0915-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0915-optimized-dirt-and-snow-spreading.patch => 0916-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0916-Added-EntityToggleSitEvent.patch => 0917-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0917-Add-fire-tick-delay-option.patch => 0918-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0918-Add-Moving-Piston-API.patch => 0919-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0919-Ignore-impossible-spawn-tick.patch => 0920-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0920-Track-projectile-source-for-fireworks-from-dispenser.patch => 0921-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0923-Prevent-compass-from-loading-chunks.patch => 0924-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0924-Add-PrePlayerAttackEntityEvent.patch => 0925-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0925-ensure-reset-EnderDragon-boss-event-name.patch => 0926-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0926-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0927-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch => 0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch} (100%)
 rename patches/server/{0928-Fix-MC-121048.patch => 0929-Fix-MC-121048.patch} (100%)
 rename patches/server/{0929-Add-Player-Warden-Warning-API.patch => 0930-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0930-More-vanilla-friendly-methods-to-update-trades.patch => 0931-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0931-Add-paper-dumplisteners-command.patch => 0932-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0932-check-global-player-list-where-appropriate.patch => 0933-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0933-Fix-async-entity-add-due-to-fungus-trees.patch => 0934-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0934-ItemStack-damage-API.patch => 0935-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0935-Friction-API.patch => 0936-Friction-API.patch} (100%)
 rename patches/server/{0936-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0937-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0937-Fix-player-kick-on-shutdown.patch => 0938-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0938-Sync-offhand-slot-in-menus.patch => 0939-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0939-Player-Entity-Tracking-Events.patch => 0940-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0940-Limit-pet-look-distance.patch => 0941-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0941-Properly-resend-entities.patch => 0942-Properly-resend-entities.patch} (98%)
 rename patches/server/{0942-Fixes-and-additions-to-the-SpawnReason-API.patch => 0943-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)

diff --git a/patches/removed/1.19.3/0806-Add-missing-structure-set-seed-configs.patch b/patches/server/0799-Add-missing-structure-set-seed-configs.patch
similarity index 57%
rename from patches/removed/1.19.3/0806-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0799-Add-missing-structure-set-seed-configs.patch
index e5ee2d2e6e..a11def8163 100644
--- a/patches/removed/1.19.3/0806-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0799-Add-missing-structure-set-seed-configs.patch
@@ -20,91 +20,136 @@ seeds/salts to the frequency reducer which has a similar effect.
 Co-authored-by: William Blake Galbreath <blake.galbreath@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index 4ce5d41b23d6204f280e6d4d21713ec5d9a724d1..9579889e4c7dedefc4f901ccac6157c425740481 100644
+index 95dd058fca280a1e16f3d327be2aabeab91be534..f4a321e05098d42026a9a150fe9d11782ff0dfd4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-@@ -133,7 +133,7 @@ public abstract class ChunkGenerator {
-     // Spigot start
-     private Stream<StructureSet> possibleStructureSetsSpigot() {
-         return this.possibleStructureSets().map(Holder::value).map((structureset) -> {
--            if (structureset.placement() instanceof RandomSpreadStructurePlacement randomConfig) {
-+            if (structureset.placement() instanceof RandomSpreadStructurePlacement randomConfig && this.structureSets.getKey(structureset).getNamespace().equals(net.minecraft.resources.ResourceLocation.DEFAULT_NAMESPACE)) { // Paper - check namespace cause datapacks could add structure sets with the same path
-                 String name = this.structureSets.getKey(structureset).getPath();
-                 int seed = randomConfig.salt;
- 
-@@ -180,6 +180,11 @@ public abstract class ChunkGenerator {
-                     case "villages":
-                         seed = conf.villageSeed;
-                         break;
-+                        // Paper start
-+                    case "ancient_cities":
-+                        seed = conf.ancientCitySeed;
-+                        break;
-+                        // Paper end
-                 }
- 
-                 structureset = new StructureSet(structureset.structures(), new RandomSpreadStructurePlacement(randomConfig.locateOffset, randomConfig.frequencyReductionMethod, randomConfig.frequency, seed, randomConfig.exclusionZone, randomConfig.spacing(), randomConfig.separation(), randomConfig.spreadType()));
-@@ -236,7 +241,13 @@ public abstract class ChunkGenerator {
-             HolderSet<Biome> holderset = concentricringsstructureplacement.preferredBiomes();
-             RandomSource randomsource = RandomSource.create();
- 
-+            // Paper start
-+            if (this.conf.strongholdSeed != null && this.structureSets.getResourceKey(holder).orElse(null) == net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.STRONGHOLDS) {
-+                randomsource.setSeed(this.conf.strongholdSeed);
-+            } else {
-             randomsource.setSeed(this instanceof FlatLevelSource ? 0L : randomstate.legacyLevelSeed());
-+            }
-+            // Paper end
-             double d0 = randomsource.nextDouble() * 3.141592653589793D * 2.0D;
-             int l = 0;
-             int i1 = 0;
-@@ -677,7 +688,7 @@ public abstract class ChunkGenerator {
- 
-             for (int i1 = chunkX - chunkRange; i1 <= chunkX + chunkRange; ++i1) {
-                 for (int j1 = chunkZ - chunkRange; j1 <= chunkZ + chunkRange; ++j1) {
--                    if (structureplacement.isStructureChunk(this, noiseConfig, seed, i1, j1)) {
-+                    if (structureplacement.isStructureChunk(this, noiseConfig, seed, i1, j1, structureSet.unwrapKey().map(ResourceKey::location).orElse(null))) { // Paper
-                         return true;
-                     }
-                 }
-@@ -764,7 +775,7 @@ public abstract class ChunkGenerator {
+@@ -570,7 +570,7 @@ public abstract class ChunkGenerator {
                  }
              }
  
--            if (structureplacement.isStructureChunk(this, noiseConfig, seed, chunkcoordintpair.x, chunkcoordintpair.z)) {
-+            if (structureplacement.isStructureChunk(this, noiseConfig, seed, chunkcoordintpair.x, chunkcoordintpair.z, this.structureSets.getResourceKey(holder).map(ResourceKey::location).orElse(null))) { // Paper
+-            if (structureplacement.isStructureChunk(placementCalculator, chunkcoordintpair.x, chunkcoordintpair.z)) {
++            if (structureplacement.isStructureChunk(placementCalculator, chunkcoordintpair.x, chunkcoordintpair.z, holder::is)) { // Paper - add missing structure set configs
                  if (list.size() == 1) {
-                     this.tryGenerateStructure((StructureSet.StructureSelectionEntry) list.get(0), structureAccessor, registryManager, noiseConfig, structureTemplateManager, seed, chunk, chunkcoordintpair, sectionposition);
+                     this.tryGenerateStructure((StructureSet.StructureSelectionEntry) list.get(0), structureAccessor, registryManager, randomstate, structureTemplateManager, placementCalculator.getLevelSeed(), chunk, chunkcoordintpair, sectionposition);
                  } else {
+diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
+index a310bfbf0d08187375ea17f4b04b276a0b7d0b9f..31d071a26615c418c222df72478e3f60f556a7ad 100644
+--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
++++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGeneratorStructureState.java
+@@ -50,13 +50,14 @@ public class ChunkGeneratorStructureState {
+     private final Map<ConcentricRingsStructurePlacement, CompletableFuture<List<ChunkPos>>> ringPositions = new Object2ObjectArrayMap();
+     private boolean hasGeneratedPositions;
+     private final List<Holder<StructureSet>> possibleStructureSets;
++    public final SpigotWorldConfig conf; // Paper
+ 
+     public static ChunkGeneratorStructureState createForFlat(RandomState randomstate, long i, BiomeSource worldchunkmanager, Stream<Holder<StructureSet>> stream, SpigotWorldConfig conf) { // Spigot
+         List<Holder<StructureSet>> list = stream.filter((holder) -> {
+             return ChunkGeneratorStructureState.hasBiomesForStructureSet((StructureSet) holder.value(), worldchunkmanager);
+         }).toList();
+ 
+-        return new ChunkGeneratorStructureState(randomstate, worldchunkmanager, i, 0L, ChunkGeneratorStructureState.injectSpigot(list, conf)); // Spigot
++        return new ChunkGeneratorStructureState(randomstate, worldchunkmanager, i, 0L, ChunkGeneratorStructureState.injectSpigot(list, conf), conf); // Spigot
+     }
+ 
+     public static ChunkGeneratorStructureState createForNormal(RandomState randomstate, long i, BiomeSource worldchunkmanager, HolderLookup<StructureSet> holderlookup, SpigotWorldConfig conf) { // Spigot
+@@ -64,14 +65,14 @@ public class ChunkGeneratorStructureState {
+             return ChunkGeneratorStructureState.hasBiomesForStructureSet((StructureSet) holder_c.value(), worldchunkmanager);
+         }).collect(Collectors.toUnmodifiableList());
+ 
+-        return new ChunkGeneratorStructureState(randomstate, worldchunkmanager, i, i, ChunkGeneratorStructureState.injectSpigot(list, conf)); // Spigot
++        return new ChunkGeneratorStructureState(randomstate, worldchunkmanager, i, i, ChunkGeneratorStructureState.injectSpigot(list, conf), conf); // Spigot
+     }
+ 
+     // Spigot start
+     private static List<Holder<StructureSet>> injectSpigot(List<Holder<StructureSet>> list, SpigotWorldConfig conf) {
+         return list.stream().map((holder) -> {
+             StructureSet structureset = holder.value();
+-            if (structureset.placement() instanceof RandomSpreadStructurePlacement randomConfig) {
++            if (structureset.placement() instanceof RandomSpreadStructurePlacement randomConfig && holder.unwrapKey().orElseThrow().location().getNamespace().equals(net.minecraft.resources.ResourceLocation.DEFAULT_NAMESPACE)) { // Paper - check namespace cause datapacks could add structure sets with the same path
+                 String name = holder.unwrapKey().orElseThrow().location().getPath();
+                 int seed = randomConfig.salt;
+ 
+@@ -118,6 +119,11 @@ public class ChunkGeneratorStructureState {
+                     case "villages":
+                         seed = conf.villageSeed;
+                         break;
++                    // Paper start
++                    case "ancient_cities":
++                        seed = conf.ancientCitySeed;
++                        break;
++                    // Paper end
+                 }
+ 
+                 structureset = new StructureSet(structureset.structures(), new RandomSpreadStructurePlacement(randomConfig.locateOffset, randomConfig.frequencyReductionMethod, randomConfig.frequency, seed, randomConfig.exclusionZone, randomConfig.spacing(), randomConfig.separation(), randomConfig.spreadType()));
+@@ -139,12 +145,13 @@ public class ChunkGeneratorStructureState {
+         return stream.anyMatch(set::contains);
+     }
+ 
+-    private ChunkGeneratorStructureState(RandomState noiseConfig, BiomeSource biomeSource, long structureSeed, long concentricRingSeed, List<Holder<StructureSet>> structureSets) {
++    private ChunkGeneratorStructureState(RandomState noiseConfig, BiomeSource biomeSource, long structureSeed, long concentricRingSeed, List<Holder<StructureSet>> structureSets, SpigotWorldConfig conf) { // Paper
+         this.randomState = noiseConfig;
+         this.levelSeed = structureSeed;
+         this.biomeSource = biomeSource;
+         this.concentricRingsSeed = concentricRingSeed;
+         this.possibleStructureSets = structureSets;
++        this.conf = conf; // Paper
+     }
+ 
+     public List<Holder<StructureSet>> possibleStructureSets() {
+@@ -198,7 +205,13 @@ public class ChunkGeneratorStructureState {
+             HolderSet<Biome> holderset = placement.preferredBiomes();
+             RandomSource randomsource = RandomSource.create();
+ 
++            // Paper start
++            if (this.conf.strongholdSeed != null && structureSetEntry.is(net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.STRONGHOLDS)) {
++                randomsource.setSeed(this.conf.strongholdSeed);
++            } else {
++            // Paper end
+             randomsource.setSeed(this.concentricRingsSeed);
++            } // Paper
+             double d0 = randomsource.nextDouble() * 3.141592653589793D * 2.0D;
+             int l = 0;
+             int i1 = 0;
+@@ -275,7 +288,7 @@ public class ChunkGeneratorStructureState {
+ 
+         for (int l = centerChunkX - chunkCount; l <= centerChunkX + chunkCount; ++l) {
+             for (int i1 = centerChunkZ - chunkCount; i1 <= centerChunkZ + chunkCount; ++i1) {
+-                if (structureplacement.isStructureChunk(this, l, i1)) {
++                if (structureplacement.isStructureChunk(this, l, i1, structureSetEntry::is)) { // Paper - add missing structure set configs
+                     return true;
+                 }
+             }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java b/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-index 2fd1284c7f0d8e2cf35d03072089256d990b06eb..8ef0e9fa126cd96289bab48eaa06c2a1fbe4281e 100644
+index 65dcb14241baadb2c9f8f16919d7b562198ad9c3..991d94b6c03ab5b23f5f42dd70fd205bc84c2b9b 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/placement/StructurePlacement.java
-@@ -59,10 +59,22 @@ public abstract class StructurePlacement {
+@@ -59,10 +59,24 @@ public abstract class StructurePlacement {
          return this.exclusionZone;
      }
  
 +    @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper
-     public boolean isStructureChunk(ChunkGenerator chunkGenerator, RandomState noiseConfig, long seed, int chunkX, int chunkZ) {
+     public boolean isStructureChunk(ChunkGeneratorStructureState calculator, int chunkX, int chunkZ) {
 +        // Paper start - add missing structure set configs
-+        return this.isStructureChunk(chunkGenerator, noiseConfig, seed, chunkX, chunkZ, null);
++        return this.isStructureChunk(calculator, chunkX, chunkZ, null);
 +    }
-+    public boolean isStructureChunk(ChunkGenerator chunkGenerator, RandomState noiseConfig, long seed, int chunkX, int chunkZ, @org.jetbrains.annotations.Nullable net.minecraft.resources.ResourceLocation structureSetKey) {
++    public boolean isStructureChunk(ChunkGeneratorStructureState calculator, int chunkX, int chunkZ, @org.jetbrains.annotations.Nullable java.util.function.Predicate<net.minecraft.resources.ResourceKey<StructureSet>> structureSetPredicate) {
 +        Integer saltOverride = null;
-+        if (net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.MINESHAFTS.location().equals(structureSetKey)) {
-+            saltOverride = chunkGenerator.conf.mineshaftSeed;
-+        } else if (net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.BURIED_TREASURES.location().equals(structureSetKey)) {
-+            saltOverride = chunkGenerator.conf.buriedTreasureSeed;
++        if (structureSetPredicate != null) {
++            if (structureSetPredicate.test(net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.MINESHAFTS)) {
++                saltOverride = calculator.conf.mineshaftSeed;
++            } else if (structureSetPredicate.test(net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.BURIED_TREASURES)) {
++                saltOverride = calculator.conf.buriedTreasureSeed;
++            }
 +        }
 +        // Paper end
-         if (!this.isPlacementChunk(chunkGenerator, noiseConfig, seed, chunkX, chunkZ)) {
+         if (!this.isPlacementChunk(calculator, chunkX, chunkZ)) {
              return false;
--        } else if (this.frequency < 1.0F && !this.frequencyReductionMethod.shouldGenerate(seed, this.salt, chunkX, chunkZ, this.frequency)) {
-+        } else if (this.frequency < 1.0F && !this.frequencyReductionMethod.shouldGenerate(seed, this.salt, chunkX, chunkZ, this.frequency, saltOverride)) { // Paper
+-        } else if (this.frequency < 1.0F && !this.frequencyReductionMethod.shouldGenerate(calculator.getLevelSeed(), this.salt, chunkX, chunkZ, this.frequency)) {
++        } else if (this.frequency < 1.0F && !this.frequencyReductionMethod.shouldGenerate(calculator.getLevelSeed(), this.salt, chunkX, chunkZ, this.frequency, saltOverride)) { // Paper
              return false;
          } else {
-             return !this.exclusionZone.isPresent() || !this.exclusionZone.get().isPlacementForbidden(chunkGenerator, noiseConfig, seed, chunkX, chunkZ);
-@@ -77,25 +89,31 @@ public abstract class StructurePlacement {
+             return !this.exclusionZone.isPresent() || !this.exclusionZone.get().isPlacementForbidden(calculator, chunkX, chunkZ);
+@@ -77,25 +91,31 @@ public abstract class StructurePlacement {
  
      public abstract StructurePlacementType<?> type();
  
@@ -141,7 +186,7 @@ index 2fd1284c7f0d8e2cf35d03072089256d990b06eb..8ef0e9fa126cd96289bab48eaa06c2a1
          int i = chunkX >> 4;
          int j = chunkZ >> 4;
          WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L));
-@@ -118,7 +136,7 @@ public abstract class StructurePlacement {
+@@ -118,7 +138,7 @@ public abstract class StructurePlacement {
  
      @FunctionalInterface
      public interface FrequencyReducer {
@@ -150,7 +195,7 @@ index 2fd1284c7f0d8e2cf35d03072089256d990b06eb..8ef0e9fa126cd96289bab48eaa06c2a1
      }
  
      public static enum FrequencyReductionMethod implements StringRepresentable {
-@@ -136,8 +154,8 @@ public abstract class StructurePlacement {
+@@ -136,8 +156,8 @@ public abstract class StructurePlacement {
              this.reducer = generationPredicate;
          }
  
diff --git a/patches/server/0799-Implement-regenerateChunk.patch b/patches/server/0800-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0799-Implement-regenerateChunk.patch
rename to patches/server/0800-Implement-regenerateChunk.patch
index b722ddf84a..c1683dc486 100644
--- a/patches/server/0799-Implement-regenerateChunk.patch
+++ b/patches/server/0800-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c9ec47de502adfc63f5d3ef4ec479208635f3967..2ce47f709f0e7dbfbfe9f7e4e25266b1ed5ed53d 100644
+index 04b4c2f4796046828a73d3911da880ccd3fdf349..a71886568581f39f91e3b06eada560aa60cf0c93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -138,6 +138,7 @@ import org.bukkit.util.Vector;
diff --git a/patches/server/0800-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0801-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0800-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0801-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 91%
rename from patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index bca7cc62e4..431d48f396 100644
--- a/patches/server/0801-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 82d3869afe0f4e9fd453d2e1cb179c4aabce9f14..278bbd6b1bfc3abc434d982a77f18e7b5fe1a70f 100644
+index 3b5295b1ee2c2a7614b46ac4798efd55baff2815..b248468fca0b2000734f48432fa9df4d0c2ce9df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2188,6 +2188,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0802-Add-GameEvent-tags.patch b/patches/server/0803-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0802-Add-GameEvent-tags.patch
rename to patches/server/0803-Add-GameEvent-tags.patch
index a35e4810c3..060101f240 100644
--- a/patches/server/0802-Add-GameEvent-tags.patch
+++ b/patches/server/0803-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d4ae0bc664b2c616b4b15edf8e5567478b98c959..f719644331175bd09e059ecb6629a53bcd7bf03d 100644
+index b248468fca0b2000734f48432fa9df4d0c2ce9df..6193dcaa8e771edeff7cd38df4e8db2f88bf4564 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2599,6 +2599,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0803-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0804-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0803-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0804-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0804-Furnace-RecipesUsed-API.patch b/patches/server/0805-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0804-Furnace-RecipesUsed-API.patch
rename to patches/server/0805-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0805-Configurable-sculk-sensor-listener-range.patch b/patches/server/0806-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0805-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0806-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0806-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0807-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0806-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0807-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0807-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0808-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0807-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0808-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 91%
rename from patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch
index 5bfda9c851..1e36ce2c69 100644
--- a/patches/server/0808-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b029b04d53b1a9253942de0b2252707f779dde4e..b79486847e1568a65673ef944a1eeabfa3bdd1a1 100644
+index d2409599c9d9765a2e1dc7418339923049abc416..f42d7d9e11542370489fcc8dc42ea6eca50cf284 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -600,9 +600,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index b029b04d53b1a9253942de0b2252707f779dde4e..b79486847e1568a65673ef944a1eeabf
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 462b1732205d4d36ff5f6d8f2ce56fe851080bf0..5b3c274d055c6a123078fe8e819eabb2e1b2c33b 100644
+index 6193dcaa8e771edeff7cd38df4e8db2f88bf4564..c9570b5f137beace01fccb38dae28e14b50e9aeb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1265,10 +1265,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0809-Fix-Entity-Position-Desync.patch b/patches/server/0810-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0809-Fix-Entity-Position-Desync.patch
rename to patches/server/0810-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0810-Custom-Potion-Mixes.patch b/patches/server/0811-Custom-Potion-Mixes.patch
similarity index 98%
rename from patches/server/0810-Custom-Potion-Mixes.patch
rename to patches/server/0811-Custom-Potion-Mixes.patch
index b0d7b84032..d78d0897fa 100644
--- a/patches/server/0810-Custom-Potion-Mixes.patch
+++ b/patches/server/0811-Custom-Potion-Mixes.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..6b0bed550763f34e18c9e92f9a47ec0c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b79486847e1568a65673ef944a1eeabfa3bdd1a1..cbdf2753fca41663185cbfc3b375516b40d238c1 100644
+index f42d7d9e11542370489fcc8dc42ea6eca50cf284..a8b3f0e8be414c4ea92cc85c9811ecd42e5ce9c1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2032,6 +2032,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -164,7 +164,7 @@ index 3d688e334c7287f41460bd866bfd1155e8bb55d2..55006724ccec9f3de828ec18693728e9
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5b3c274d055c6a123078fe8e819eabb2e1b2c33b..03961e7c61170b912e118d93a0c996e0b7070424 100644
+index c9570b5f137beace01fccb38dae28e14b50e9aeb..f8a729b4429c4b9b508c81bcffd281c31c6a7a15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -298,6 +298,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0811-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0812-Fix-Fluid-tags-isTagged-method.patch
similarity index 94%
rename from patches/server/0811-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0812-Fix-Fluid-tags-isTagged-method.patch
index abab1bbf2c..45c0d27536 100644
--- a/patches/server/0811-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0812-Fix-Fluid-tags-isTagged-method.patch
@@ -18,7 +18,7 @@ index 89cb1ec575c0f58e9934d98b056621348dbbe27a..cdd474e9b0363641839a66d3e61fec46
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ca0b9b6f2b9bbbc53ab0001d5eabad341bfb3b0d..7afa387ab07da199ba719fa08a1faba66c3025fa 100644
+index ba9ce30003eb787fe974ae53f375ae9c0591d619..45e13c9dc4a65207728cdb401511b187597fe199 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -205,7 +205,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0812-Force-close-world-loading-screen.patch b/patches/server/0813-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0812-Force-close-world-loading-screen.patch
rename to patches/server/0813-Force-close-world-loading-screen.patch
diff --git a/patches/server/0813-Fix-falling-block-spawn-methods.patch b/patches/server/0814-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0813-Fix-falling-block-spawn-methods.patch
rename to patches/server/0814-Fix-falling-block-spawn-methods.patch
index 4acdc19257..6980488fd9 100644
--- a/patches/server/0813-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0814-Fix-falling-block-spawn-methods.patch
@@ -24,7 +24,7 @@ index bb486249d409743b0fc9891ac5ae76a38034800b..e365081bf532488f2b41b22deb2fb234
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2ce47f709f0e7dbfbfe9f7e4e25266b1ed5ed53d..70fc51e5689dd1012afac8df40c2d1200baffd0e 100644
+index a71886568581f39f91e3b06eada560aa60cf0c93..56f1952a4595df2b2647dc9e6632cee44e8299ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1394,7 +1394,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0814-Expose-furnace-minecart-push-values.patch b/patches/server/0815-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0814-Expose-furnace-minecart-push-values.patch
rename to patches/server/0815-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0815-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0815-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0816-More-Projectile-API.patch b/patches/server/0817-More-Projectile-API.patch
similarity index 98%
rename from patches/server/0816-More-Projectile-API.patch
rename to patches/server/0817-More-Projectile-API.patch
index 1eb6c7b146..a0dd05bf5f 100644
--- a/patches/server/0816-More-Projectile-API.patch
+++ b/patches/server/0817-More-Projectile-API.patch
@@ -18,7 +18,7 @@ public net.minecraft.world.entity.projectile.Projectile leftOwner
 Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
-index 87c148922d693b5a5bfde89b0dcbc44438df592b..488bf8a197f06a9024bae97ca005f112e4afbb51 100644
+index b1abab9396cf1dc867e9b8df8f2479f75d07fa01..f034d5f89f9a751249d0536c50d2739113bc193d 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java
 @@ -100,6 +100,11 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie
@@ -340,7 +340,7 @@ index 832981b07ef5c633ef00a382f56798ee87eec0df..faf071201b7c1414225a33fe9641eac9
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 05dc7159f178b971a8bd5aa06b0b6551ef27ec7d..2d0e828687e9f4e860348eb10b1a40e12a654f2a 100644
+index 7f6d331cf832f57857519b6e9801c3b45b53fc32..998370e84410d54cae5d5ba15212701fefb40782 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -278,12 +278,20 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0817-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0818-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0817-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0818-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0819-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 93%
rename from patches/server/0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0819-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 5c8f6677bb..c3410f10dd 100644
--- a/patches/server/0818-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0819-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e94c307a56a0fc3040b8c1d992e078aefa3bdf85..b51e0dfad64cf9844bd511689786a456f7c8e48e 100644
+index 25b2bdca86b62e0c76059d87da9214c0bb41fe51..cdfb47713c690dbdfb54e20f68c3f6361209de0b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -577,6 +577,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0819-Implement-getComputedBiome-API.patch b/patches/server/0820-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0819-Implement-getComputedBiome-API.patch
rename to patches/server/0820-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0820-Make-some-itemstacks-nonnull.patch b/patches/server/0821-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0820-Make-some-itemstacks-nonnull.patch
rename to patches/server/0821-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0821-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0822-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0821-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0822-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0822-Implement-enchantWithLevels-API.patch b/patches/server/0823-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0822-Implement-enchantWithLevels-API.patch
rename to patches/server/0823-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0823-Fix-saving-in-unloadWorld.patch b/patches/server/0824-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0823-Fix-saving-in-unloadWorld.patch
rename to patches/server/0824-Fix-saving-in-unloadWorld.patch
index 5be35a39a3..c04928c276 100644
--- a/patches/server/0823-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0824-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 03961e7c61170b912e118d93a0c996e0b7070424..8c0ad5680e20b2a5109a3c5d2c8d46854438cc1c 100644
+index f8a729b4429c4b9b508c81bcffd281c31c6a7a15..67dc0c58988a502dea300cc471cfdc311208abf5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1313,7 +1313,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0824-Buffer-OOB-setBlock-calls.patch b/patches/server/0825-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0824-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0825-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0825-Add-TameableDeathMessageEvent.patch b/patches/server/0826-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0825-Add-TameableDeathMessageEvent.patch
rename to patches/server/0826-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0826-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0827-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0826-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0827-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0827-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0828-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 92%
rename from patches/server/0827-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0828-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 74921013b7..d2cc48f6fd 100644
--- a/patches/server/0827-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0828-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1b97987788a7180e2ab2c9edf4646925fa691fd6..2741a218ce45377479ad47ec0141fa70e2b0acca 100644
+index 6de32e9e2f626eaa60b58bdeef8c6c194cbe918c..d44e5445cc9ea0346a1f6fc7f9c3f0b5a1ee8b4e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -868,12 +868,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0828-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0829-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0828-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0829-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0829-Guard-against-invalid-entity-positions.patch b/patches/server/0830-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0829-Guard-against-invalid-entity-positions.patch
rename to patches/server/0830-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0830-cache-resource-keys.patch b/patches/server/0831-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0830-cache-resource-keys.patch
rename to patches/server/0831-cache-resource-keys.patch
diff --git a/patches/server/0831-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0832-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 99%
rename from patches/server/0831-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0832-Allow-to-change-the-podium-for-the-EnderDragon.patch
index 2ba3eec3be..7a51205448 100644
--- a/patches/server/0831-Allow-to-change-the-podium-for-the-EnderDragon.patch
+++ b/patches/server/0832-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 d8c9beab9163820df949f6002bbb9224a044c6f3..84ee7c1d3c2923090445422f38880e5b59668288 100644
+index 3b14fd5d67716a5b3610c10e8105d29f93a1d7a9..5066688e26cb2d34b3eabb2cb56f9a4c712dfea7 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/0832-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0833-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0832-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0833-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0833-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0834-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0833-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0834-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0834-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0835-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 93%
rename from patches/server/0834-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0835-Prevent-tile-entity-copies-loading-chunks.patch
index 34137d1e65..ede2c6973f 100644
--- a/patches/server/0834-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0835-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 472f7c246542c08840ea7f18711c13d875e35608..40794142f7882b6f95e00ffe286b590a4f0bf62d 100644
+index cdfb47713c690dbdfb54e20f68c3f6361209de0b..16ae84c100b5548035b7b8b23a6480f47ae22646 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3284,7 +3284,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0835-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0836-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 92%
rename from patches/server/0835-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0836-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 3ec01796ea..a1f15a6b99 100644
--- a/patches/server/0835-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0836-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d9c1445fee611ebd3dbb19e1e60da3a8bb752d42..cb0d6f2eba67b0f45ce0ce0f6c6b76167a87de10 100644
+index e8d07180ce69602895b4e584932c4322d3791c27..809ddbfcf873b4695257f599b882803f7fcc34fa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1474,7 +1474,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0836-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0837-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0836-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0837-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0837-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0838-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0837-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0838-Pass-ServerLevel-for-gamerule-callbacks.patch
index 86864cbebc..1e42345f66 100644
--- a/patches/server/0837-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0838-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -18,7 +18,7 @@ index 5b46cabf4f2e2a1f7feaad378dd98d64aeef8671..51b3db0b6c2cede95b584268e035c0fb
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 40794142f7882b6f95e00ffe286b590a4f0bf62d..9133213a8a786f2293bc1a09a44be46b1a8bc011 100644
+index 16ae84c100b5548035b7b8b23a6480f47ae22646..acb4b6bb80b59af28ba3658c11096750dccb5056 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2875,7 +2875,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -158,7 +158,7 @@ index fa8cd4438c19a262272da47985a57f7e84654f1b..663c1d8c1611af915a1bae733920dd75
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 70fc51e5689dd1012afac8df40c2d1200baffd0e..2976b3469a7870611862c28ef555be974309ee34 100644
+index 56f1952a4595df2b2647dc9e6632cee44e8299ce..37a204d35979fb51cab9c228515e35c4b1049ab1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1898,7 +1898,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0838-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0839-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0838-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0839-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0839-WorldCreator-keepSpawnLoaded.patch b/patches/server/0840-WorldCreator-keepSpawnLoaded.patch
similarity index 91%
rename from patches/server/0839-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0840-WorldCreator-keepSpawnLoaded.patch
index c5a0760062..906f699fed 100644
--- a/patches/server/0839-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0840-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8c0ad5680e20b2a5109a3c5d2c8d46854438cc1c..85413bb569a3b60cb06fa80fabfaa279529c0071 100644
+index 67dc0c58988a502dea300cc471cfdc311208abf5..03cffc87cfc82f1f6f96e8cfc0e37472fc50d38b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1272,6 +1272,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 92%
rename from patches/server/0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch
index d33dabf6c9..30e24797d6 100644
--- a/patches/server/0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch
+++ b/patches/server/0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix NPE for BlockDataMeta#getBlockData
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index a8294bf057e03c5d866f6da31e6cdfa9edd3f146..3c4dadd0012c11191c873fe25a7625193563915d 100644
+index f31add9c60a18bbcea9b4944b0ab183acae84cab..90d7e8415f158c3176a705749f0aa36a729d3b38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1093,7 +1093,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0841-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0842-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0841-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0842-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0842-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0843-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0842-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0843-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0843-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0844-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0843-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0844-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0844-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0845-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0844-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0845-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0845-Add-PlayerStopUsingItemEvent.patch b/patches/server/0846-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0845-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0846-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0846-FallingBlock-auto-expire-setting.patch b/patches/server/0847-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0846-FallingBlock-auto-expire-setting.patch
rename to patches/server/0847-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0847-Don-t-tick-markers.patch b/patches/server/0848-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0847-Don-t-tick-markers.patch
rename to patches/server/0848-Don-t-tick-markers.patch
diff --git a/patches/server/0848-Do-not-accept-invalid-client-settings.patch b/patches/server/0849-Do-not-accept-invalid-client-settings.patch
similarity index 93%
rename from patches/server/0848-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0849-Do-not-accept-invalid-client-settings.patch
index 6e44c9388c..42958789ef 100644
--- a/patches/server/0848-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0849-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9133213a8a786f2293bc1a09a44be46b1a8bc011..1e4899e9f99c57a62330c82545157f38f9c3d26a 100644
+index acb4b6bb80b59af28ba3658c11096750dccb5056..29ba350b026f8bec0654ba1ee7f34d5aa5f1648b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3463,6 +3463,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0849-Add-support-for-Proxy-Protocol.patch b/patches/server/0850-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0849-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0850-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0850-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0851-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0850-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0851-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0851-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0852-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0851-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0852-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0852-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0853-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0852-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0853-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0853-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0854-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0853-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0854-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0854-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0855-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0854-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0855-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0855-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0856-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 95%
rename from patches/server/0855-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0856-Throw-exception-on-world-create-while-being-ticked.patch
index a9f48abed3..71518b7861 100644
--- a/patches/server/0855-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0856-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,7 +7,7 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cbdf2753fca41663185cbfc3b375516b40d238c1..7275c708a6a2ad138ded2eb6b3c4a57a9406883a 100644
+index a8b3f0e8be414c4ea92cc85c9811ecd42e5ce9c1..0e04083ff0598451c66731b1518b2eb6367ae36c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -308,6 +308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -45,7 +45,7 @@ index cbdf2753fca41663185cbfc3b375516b40d238c1..7275c708a6a2ad138ded2eb6b3c4a57a
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85413bb569a3b60cb06fa80fabfaa279529c0071..c94bb0fc7e96cb0e20e1527813b9f57394f69504 100644
+index 03cffc87cfc82f1f6f96e8cfc0e37472fc50d38b..d3b4fef3696c9999912fd37034ea7e1d6755c9ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -868,6 +868,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0856-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0857-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0856-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0857-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0857-Dont-resent-entity-on-art-update.patch b/patches/server/0858-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0857-Dont-resent-entity-on-art-update.patch
rename to patches/server/0858-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0858-Add-WardenAngerChangeEvent.patch b/patches/server/0859-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0858-Add-WardenAngerChangeEvent.patch
rename to patches/server/0859-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0860-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0861-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0860-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0861-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0861-Nameable-Banner-API.patch b/patches/server/0862-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0861-Nameable-Banner-API.patch
rename to patches/server/0862-Nameable-Banner-API.patch
diff --git a/patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 94%
rename from patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch
index c06d317988..42206f1a98 100644
--- a/patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't print component in resource pack rejection message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f20d862617d1c576dd8e802b979f5bd9c725a945..f93182fc575c9579991e31ec3cadde193294b9e3 100644
+index 29ba350b026f8bec0654ba1ee7f34d5aa5f1648b..0dde460f9b9400644081ac23dbfa2c9bfb8d1617 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2045,7 +2045,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0866-Add-Player-getFishHook.patch b/patches/server/0867-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0866-Add-Player-getFishHook.patch
rename to patches/server/0867-Add-Player-getFishHook.patch
diff --git a/patches/server/0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0868-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0869-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0868-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0869-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 94%
rename from patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch
index 91a89db7f4..be16e6c152 100644
--- a/patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add some minimal debug information to chat packet errors
 TODO: potentially add some kick leeway
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f93182fc575c9579991e31ec3cadde193294b9e3..0cfdef1c8400807349f3b2fba90111df31ed4f25 100644
+index 0dde460f9b9400644081ac23dbfa2c9bfb8d1617..5ac6de02ec3c6f77ec2fb71f17d5d74d8792d349 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2295,7 +2295,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0870-Fix-Bee-flower-NPE.patch b/patches/server/0871-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0870-Fix-Bee-flower-NPE.patch
rename to patches/server/0871-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index a5374d1663..d72dac8f05 100644
--- a/patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0cfdef1c8400807349f3b2fba90111df31ed4f25..9987bdf85726c8a91b6329f93d3a6197eaf00ec5 100644
+index 5ac6de02ec3c6f77ec2fb71f17d5d74d8792d349..b0b8698622f8fd48fe9e6004918927b286893900 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2540,7 +2540,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0872-More-Teleport-API.patch b/patches/server/0873-More-Teleport-API.patch
similarity index 99%
rename from patches/server/0872-More-Teleport-API.patch
rename to patches/server/0873-More-Teleport-API.patch
index eed297a5d2..a240d1d1ca 100644
--- a/patches/server/0872-More-Teleport-API.patch
+++ b/patches/server/0873-More-Teleport-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] More Teleport API
 public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9987bdf85726c8a91b6329f93d3a6197eaf00ec5..69bd16a0ba1dd6a7b5da49740bc3f5d4ad4fd34b 100644
+index b0b8698622f8fd48fe9e6004918927b286893900..731b3dfdee444c013f7650a4f3260d34aaaa5e74 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1722,11 +1722,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0873-Add-EntityPortalReadyEvent.patch b/patches/server/0874-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0873-Add-EntityPortalReadyEvent.patch
rename to patches/server/0874-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0874-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0875-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0874-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0875-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0875-Send-block-entities-after-destroy-prediction.patch b/patches/server/0876-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0875-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0876-Send-block-entities-after-destroy-prediction.patch
index 120101dddb..7355a13a6c 100644
--- a/patches/server/0875-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0876-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index 796d17f51496974cfdfed2593753b8c09b5c81c1..13031576c20bda3bb12c926f6cd938fa
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 69bd16a0ba1dd6a7b5da49740bc3f5d4ad4fd34b..ce9ed6aa7133239e3bbda1cb37c756164fee0159 100644
+index 731b3dfdee444c013f7650a4f3260d34aaaa5e74..d37829b0a310abf212fbb516a27ae70abc265f64 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1867,8 +1867,28 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0877-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0877-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0877-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0877-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0878-Add-missing-BlockFadeEvents.patch b/patches/server/0879-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0878-Add-missing-BlockFadeEvents.patch
rename to patches/server/0879-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0879-Collision-API.patch b/patches/server/0880-Collision-API.patch
similarity index 100%
rename from patches/server/0879-Collision-API.patch
rename to patches/server/0880-Collision-API.patch
diff --git a/patches/server/0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0881-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0882-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0881-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0882-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 91%
rename from patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 41f32eb3b6..6631d1348e 100644
--- a/patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/server/0883-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 b24676aaf4ea18cd3cd4e7eec8de544f20df37d6..5701955b0e7bdff1661844562cba3ea8f319400f 100644
+index 230c3629f5e6bf80422812e7684a9bb643b1a46d..f0b5acdae1cc0626339aca6b16aa26e291a661fa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1750,6 +1750,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0883-Block-Ticking-API.patch b/patches/server/0884-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0883-Block-Ticking-API.patch
rename to patches/server/0884-Block-Ticking-API.patch
diff --git a/patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 92%
rename from patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index b38e0c3b14..2f16b2a224 100644
--- a/patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0886-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 9c6473beae78cd6e173e28335e6b06f878b162a9..1de5252f038cfb26646df4f8b8acf2b0ddf21c57 100644
+index 56210ac6b9525b025b1091a4b42df0f0e99bd859..f3b340fc6be9878d677a76673450aac3e0b73d4b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -49,7 +49,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0886-Add-NamespacedKey-biome-methods.patch b/patches/server/0887-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0886-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0887-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0888-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0889-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 98%
rename from patches/server/0888-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0889-Workaround-for-client-lag-spikes-MC-162253.patch
index 358465ca88..334e7aa1f7 100644
--- a/patches/server/0888-Workaround-for-client-lag-spikes-MC-162253.patch
+++ b/patches/server/0889-Workaround-for-client-lag-spikes-MC-162253.patch
@@ -16,7 +16,7 @@ Co-authored-by: =?UTF-8?q?Dani=C3=ABl=20Goossens?= <daniel@goossens.ch>
 Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d1717ea6e3aa8912caeb3a5590b08b0113b83ec0..d6e7934d18f756388b01373e2a3466c37aaa0428 100644
+index 7f68b05b4d0789c308b5f90a5d626a633c80191f..2212f9f48636357265d8e44aba415ea4f09f1fe7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1363,6 +1363,46 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0889-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0890-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0889-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0890-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/server/0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0892-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0893-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0892-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0893-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0893-Missing-eating-regain-reason.patch b/patches/server/0894-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0893-Missing-eating-regain-reason.patch
rename to patches/server/0894-Missing-eating-regain-reason.patch
diff --git a/patches/server/0894-Missing-effect-cause.patch b/patches/server/0895-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0894-Missing-effect-cause.patch
rename to patches/server/0895-Missing-effect-cause.patch
diff --git a/patches/server/0895-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0896-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0895-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0896-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0897-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0898-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0897-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0898-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0898-Configurable-chat-thread-limit.patch b/patches/server/0899-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0898-Configurable-chat-thread-limit.patch
rename to patches/server/0899-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 100%
rename from patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0901-fix-Jigsaw-block-kicking-user.patch b/patches/server/0902-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0901-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0902-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0902-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0903-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0902-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0903-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0904-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0905-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0904-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0905-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0906-Fix-custom-piglin-loved-items.patch b/patches/server/0907-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0906-Fix-custom-piglin-loved-items.patch
rename to patches/server/0907-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0907-EntityPickupItemEvent-fixes.patch b/patches/server/0908-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0907-EntityPickupItemEvent-fixes.patch
rename to patches/server/0908-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0908-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0909-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0908-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0909-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0910-Elder-Guardian-appearance-API.patch b/patches/server/0911-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0910-Elder-Guardian-appearance-API.patch
rename to patches/server/0911-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0911-Allow-changing-bed-s-occupied-property.patch b/patches/server/0912-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0911-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0912-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0912-Add-entity-knockback-API.patch b/patches/server/0913-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0912-Add-entity-knockback-API.patch
rename to patches/server/0913-Add-entity-knockback-API.patch
diff --git a/patches/server/0913-Detect-headless-JREs.patch b/patches/server/0914-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0913-Detect-headless-JREs.patch
rename to patches/server/0914-Detect-headless-JREs.patch
diff --git a/patches/server/0914-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0915-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0914-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0915-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0915-optimized-dirt-and-snow-spreading.patch b/patches/server/0916-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0915-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0916-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0916-Added-EntityToggleSitEvent.patch b/patches/server/0917-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0916-Added-EntityToggleSitEvent.patch
rename to patches/server/0917-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0917-Add-fire-tick-delay-option.patch b/patches/server/0918-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0917-Add-fire-tick-delay-option.patch
rename to patches/server/0918-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0918-Add-Moving-Piston-API.patch b/patches/server/0919-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0918-Add-Moving-Piston-API.patch
rename to patches/server/0919-Add-Moving-Piston-API.patch
diff --git a/patches/server/0919-Ignore-impossible-spawn-tick.patch b/patches/server/0920-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0919-Ignore-impossible-spawn-tick.patch
rename to patches/server/0920-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0923-Prevent-compass-from-loading-chunks.patch b/patches/server/0924-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0923-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0924-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0924-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0925-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0924-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0925-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0925-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0926-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0925-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0926-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0926-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0927-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0926-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0927-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/server/0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
similarity index 100%
rename from patches/server/0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
rename to patches/server/0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
diff --git a/patches/server/0928-Fix-MC-121048.patch b/patches/server/0929-Fix-MC-121048.patch
similarity index 100%
rename from patches/server/0928-Fix-MC-121048.patch
rename to patches/server/0929-Fix-MC-121048.patch
diff --git a/patches/server/0929-Add-Player-Warden-Warning-API.patch b/patches/server/0930-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0929-Add-Player-Warden-Warning-API.patch
rename to patches/server/0930-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0930-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0931-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0930-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0931-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0931-Add-paper-dumplisteners-command.patch b/patches/server/0932-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0931-Add-paper-dumplisteners-command.patch
rename to patches/server/0932-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0932-check-global-player-list-where-appropriate.patch b/patches/server/0933-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0932-check-global-player-list-where-appropriate.patch
rename to patches/server/0933-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0933-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0934-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0933-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0934-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0934-ItemStack-damage-API.patch b/patches/server/0935-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0934-ItemStack-damage-API.patch
rename to patches/server/0935-ItemStack-damage-API.patch
diff --git a/patches/server/0935-Friction-API.patch b/patches/server/0936-Friction-API.patch
similarity index 100%
rename from patches/server/0935-Friction-API.patch
rename to patches/server/0936-Friction-API.patch
diff --git a/patches/server/0936-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0937-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0936-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0937-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0937-Fix-player-kick-on-shutdown.patch b/patches/server/0938-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0937-Fix-player-kick-on-shutdown.patch
rename to patches/server/0938-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0938-Sync-offhand-slot-in-menus.patch b/patches/server/0939-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0938-Sync-offhand-slot-in-menus.patch
rename to patches/server/0939-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0939-Player-Entity-Tracking-Events.patch b/patches/server/0940-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0939-Player-Entity-Tracking-Events.patch
rename to patches/server/0940-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0940-Limit-pet-look-distance.patch b/patches/server/0941-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0940-Limit-pet-look-distance.patch
rename to patches/server/0941-Limit-pet-look-distance.patch
diff --git a/patches/server/0941-Properly-resend-entities.patch b/patches/server/0942-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0941-Properly-resend-entities.patch
rename to patches/server/0942-Properly-resend-entities.patch
index 2cc6dfaafa..ca95be180f 100644
--- a/patches/server/0941-Properly-resend-entities.patch
+++ b/patches/server/0942-Properly-resend-entities.patch
@@ -66,7 +66,7 @@ index 755989780c955592e27cae2b4b5f0e90e13543b7..37e193f57938047c8b886ed7d2816411
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5701955b0e7bdff1661844562cba3ea8f319400f..5c56d848cbfac8b8a4a2d2fabc7f1f9e7d7eb1da 100644
+index f0b5acdae1cc0626339aca6b16aa26e291a661fa..0c2255b6e2fb7752f85b0f83d4f84732758bd14d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2774,7 +2774,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0942-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0943-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0942-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0943-Fixes-and-additions-to-the-SpawnReason-API.patch