From af4b5ee4f0aff27c38692c45617004d44d061383 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 8 Jun 2022 07:29:32 -0700
Subject: [PATCH] add back removed kelp modifier patch

---
 ...fier-changing-growth-for-other-crops.patch} | 18 +++++++++---------
 ...rOpenersCounter-openCount-from-going.patch} |  0
 ... 0796-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...=> 0797-Add-player-health-update-API.patch} |  0
 ...atch => 0798-Optimize-HashMapPalette.patch} |  0
 ...llow-delegation-to-vanilla-chunk-gen.patch} |  0
 ...single-and-multi-AABB-VoxelShapes-an.patch} |  0
 ...on-checking-in-player-move-packet-ha.patch} |  0
 ...tch => 0802-Actually-unload-POI-data.patch} |  0
 ...t-isSectionEmpty-int-and-optimize-Pa.patch} |  0
 ...ate-Log4j.patch => 0804-Update-Log4j.patch} |  0
 ....patch => 0805-Add-more-Campfire-API.patch} |  0
 ...-data-to-disk-if-it-serializes-witho.patch} |  0
 ...807-Fix-tripwire-state-inconsistency.patch} |  0
 ...luid-logging-on-Block-breakNaturally.patch} |  0
 ...ward-CraftEntity-in-teleport-command.patch} |  0
 ...h => 0810-Improve-scoreboard-entries.patch} |  0
 ...tch => 0811-Entity-powdered-snow-API.patch} |  0
 ... 0812-Add-API-for-item-entity-health.patch} |  0
 ...y-type-tags-suggestions-in-selectors.patch} |  0
 ...max-block-light-for-monster-spawning.patch} |  0
 ...-pistons-and-BlockPistonRetractEvent.patch} |  0
 ...mplifiers-greater-than-127-correctly.patch} |  0
 ...d-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ... => 0818-Fix-bees-aging-inside-hives.patch} |  0
 ...ble-API.patch => 0819-Bucketable-API.patch} |  0
 ...player-world-in-endPortalSoundRadius.patch} |  0
 ...mes.patch => 0821-Validate-usernames.patch} |  0
 ...ving-configs-with-more-long-comments.patch} |  0
 ...ter-animal-spawn-height-configurable.patch} |  0
 ...vanilla-BiomeProvider-from-WorldInfo.patch} |  0
 ...tion-for-worlds-affected-by-time-cmd.patch} |  0
 ...rload-to-PersistentDataContainer-has.patch} |  0
 ...27-Multiple-Entries-with-Scoreboards.patch} |  0
 ...0828-Reset-placed-block-on-exception.patch} |  0
 ...-configurable-height-for-slime-spawn.patch} |  2 +-
 ...Hostname-to-AsyncPlayerPreLoginEvent.patch} |  0
 ... 0831-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0832-Kick-on-main-for-illegal-chars.patch} |  0
 ...ulti-Block-Change-API-Implementation.patch} |  0
 ...I.patch => 0834-Freeze-Tick-Lock-API.patch} |  0
 ...olphin-API.patch => 0835-Dolphin-API.patch} |  0
 ...ch => 0836-More-PotionEffectType-API.patch} |  0
 ...-for-StructureTemplate.Pallete-cache.patch} |  0
 ...-command-sender-which-forwards-feedb.patch} |  2 +-
 ... 0839-Add-config-for-stronghold-seed.patch} |  6 +++---
 ...ch => 0840-Implement-regenerateChunk.patch} |  0
 ...ptions-thrown-during-chat-processing.patch} |  0
 ...elled-powdered-snow-bucket-placement.patch} |  0
 ...date-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...ags.patch => 0844-Add-GameEvent-tags.patch} |  2 +-
 ...sks-fairly-for-worlds-while-waiting-.patch} |  0
 ...0846-Replace-ticket-level-propagator.patch} |  0
 ...atch => 0847-Furnace-RecipesUsed-API.patch} |  0
 ...igurable-sculk-sensor-listener-range.patch} |  0
 ...dd-missing-block-data-mins-and-maxes.patch} |  0
 ...efault-CustomSpawners-in-custom-worl.patch} |  0
 ...o-worldlist-before-initing-the-world.patch} |  2 +-
 ...h => 0852-Fix-Entity-Position-Desync.patch} |  0
 ...es.patch => 0853-Custom-Potion-Mixes.patch} |  2 +-
 ... 0854-Fix-Fluid-tags-isTagged-method.patch} |  0
 ...855-Force-close-world-loading-screen.patch} |  0
 ...0856-Fix-falling-block-spawn-methods.patch} |  0
 ...-Expose-furnace-minecart-push-values.patch} |  0
 ...rojectileHitEvent-for-piercing-arrow.patch} |  0
 ...> 0859-Fix-save-problems-on-shutdown.patch} |  0
 ...PI.patch => 0860-More-Projectile-API.patch} |  0
 ...cle-movement-from-players-while-tele.patch} |  0
 ... 0862-Implement-getComputedBiome-API.patch} |  0
 ...=> 0863-Make-some-itemstacks-nonnull.patch} |  0
 ...valid-GameProfiles-on-skull-blocks-i.patch} |  0
 ...0865-Implement-enchantWithLevels-API.patch} |  0
 ...ch => 0866-Fix-saving-in-unloadWorld.patch} |  2 +-
 ...ch => 0867-Buffer-OOB-setBlock-calls.patch} |  0
 ...> 0868-Add-TameableDeathMessageEvent.patch} |  0
 ...ta-for-EntityChangeBlockEvent-when-s.patch} |  0
 ...ables-running-when-mob-loot-gamerule.patch} |  0
 ...assenger-world-matches-ridden-entity.patch} |  0
 ...ard-against-invalid-entity-positions.patch} |  0
 ...ys.patch => 0873-cache-resource-keys.patch} |  0
 ...hange-the-podium-for-the-EnderDragon.patch} |  0
 ...verriding-a-block-entity-during-worl.patch} |  0
 ...reGrowEvent-species-for-RED_MUSHROOM.patch} |  0
 ...nt-tile-entity-copies-loading-chunks.patch} |  0
 ...tead-of-display-name-in-PlayerList-g.patch} |  0
 ...rs-not-spawning-outside-slime-chunks.patch} |  2 +-
 ...s-ServerLevel-for-gamerule-callbacks.patch} |  0
 ...king-amount-to-PlayerItemDamageEvent.patch} |  0
 ...=> 0882-WorldCreator-keepSpawnLoaded.patch} |  2 +-
 ...x-NPE-for-BlockDataMeta-getBlockData.patch} |  0
 ..._destroyed-trigger-in-the-correct-pl.patch} |  0
 ...eEvent-and-CollarColorable-interface.patch} |  0
 ...-CauldronLevelChange-on-initial-fill.patch} |  0
 ...-snow-cauldrons-not-turning-to-water.patch} |  0
 ...patch => 0888-Sign-cleanup-filtering.patch} |  0
 ...=> 0889-Add-PlayerStopUsingItemEvent.patch} |  0
 ...890-FallingBlock-auto-expire-setting.patch} |  0
 ...ers.patch => 0891-Don-t-tick-markers.patch} |  0
 ...o-not-accept-invalid-client-settings.patch} |  0
 ... 0893-Add-support-for-Proxy-Protocol.patch} |  0
 ...ix-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...ntory-for-smokers-and-blast-furnaces.patch} |  0
 ...> 0896-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...entity-loading-causing-async-lookups.patch} |  0
 ...t-selector-resolving-in-books-by-def.patch} |  0
 ...n-on-world-create-while-being-ticked.patch} |  2 +-
 106 files changed, 21 insertions(+), 21 deletions(-)
 rename patches/{removed/1.19/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch => server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch} (89%)
 rename patches/server/{0794-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0795-Add-PlayerItemFrameChangeEvent.patch => 0796-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0796-Add-player-health-update-API.patch => 0797-Add-player-health-update-API.patch} (100%)
 rename patches/server/{0797-Optimize-HashMapPalette.patch => 0798-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0798-Allow-delegation-to-vanilla-chunk-gen.patch => 0799-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (100%)
 rename patches/server/{0800-Optimise-collision-checking-in-player-move-packet-ha.patch => 0801-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0801-Actually-unload-POI-data.patch => 0802-Actually-unload-POI-data.patch} (100%)
 rename patches/server/{0802-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0803-Update-Log4j.patch => 0804-Update-Log4j.patch} (100%)
 rename patches/server/{0804-Add-more-Campfire-API.patch => 0805-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0805-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0806-Fix-tripwire-state-inconsistency.patch => 0807-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0807-Fix-fluid-logging-on-Block-breakNaturally.patch => 0808-Fix-fluid-logging-on-Block-breakNaturally.patch} (100%)
 rename patches/server/{0808-Forward-CraftEntity-in-teleport-command.patch => 0809-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0809-Improve-scoreboard-entries.patch => 0810-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0810-Entity-powdered-snow-API.patch => 0811-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0811-Add-API-for-item-entity-health.patch => 0812-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0812-Fix-entity-type-tags-suggestions-in-selectors.patch => 0813-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0813-Configurable-max-block-light-for-monster-spawning.patch => 0814-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0814-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0815-Load-effect-amplifiers-greater-than-127-correctly.patch => 0816-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0816-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0817-Fix-bees-aging-inside-hives.patch => 0818-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0818-Bucketable-API.patch => 0819-Bucketable-API.patch} (100%)
 rename patches/server/{0819-Check-player-world-in-endPortalSoundRadius.patch => 0820-Check-player-world-in-endPortalSoundRadius.patch} (100%)
 rename patches/server/{0820-Validate-usernames.patch => 0821-Validate-usernames.patch} (100%)
 rename patches/server/{0821-Fix-saving-configs-with-more-long-comments.patch => 0822-Fix-saving-configs-with-more-long-comments.patch} (100%)
 rename patches/server/{0822-Make-water-animal-spawn-height-configurable.patch => 0823-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0823-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/server/{0824-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0825-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0825-Add-new-overload-to-PersistentDataContainer-has.patch => 0826-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0826-Multiple-Entries-with-Scoreboards.patch => 0827-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0827-Reset-placed-block-on-exception.patch => 0828-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0828-Add-configurable-height-for-slime-spawn.patch => 0829-Add-configurable-height-for-slime-spawn.patch} (97%)
 rename patches/server/{0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0830-Fix-xp-reward-for-baby-zombies.patch => 0831-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0831-Kick-on-main-for-illegal-chars.patch => 0832-Kick-on-main-for-illegal-chars.patch} (100%)
 rename patches/server/{0832-Multi-Block-Change-API-Implementation.patch => 0833-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0833-Freeze-Tick-Lock-API.patch => 0834-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0834-Dolphin-API.patch => 0835-Dolphin-API.patch} (100%)
 rename patches/server/{0835-More-PotionEffectType-API.patch => 0836-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0836-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0837-API-for-creating-command-sender-which-forwards-feedb.patch => 0838-API-for-creating-command-sender-which-forwards-feedb.patch} (98%)
 rename patches/server/{0838-Add-config-for-stronghold-seed.patch => 0839-Add-config-for-stronghold-seed.patch} (93%)
 rename patches/server/{0839-Implement-regenerateChunk.patch => 0840-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0840-Log-exceptions-thrown-during-chat-processing.patch => 0841-Log-exceptions-thrown-during-chat-processing.patch} (100%)
 rename patches/server/{0841-Fix-cancelled-powdered-snow-bucket-placement.patch => 0842-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0842-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0843-Add-GameEvent-tags.patch => 0844-Add-GameEvent-tags.patch} (97%)
 rename patches/server/{0844-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0845-Replace-ticket-level-propagator.patch => 0846-Replace-ticket-level-propagator.patch} (100%)
 rename patches/server/{0846-Furnace-RecipesUsed-API.patch => 0847-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0847-Configurable-sculk-sensor-listener-range.patch => 0848-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0848-Add-missing-block-data-mins-and-maxes.patch => 0849-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0849-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0850-Put-world-into-worldlist-before-initing-the-world.patch => 0851-Put-world-into-worldlist-before-initing-the-world.patch} (95%)
 rename patches/server/{0851-Fix-Entity-Position-Desync.patch => 0852-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0852-Custom-Potion-Mixes.patch => 0853-Custom-Potion-Mixes.patch} (99%)
 rename patches/server/{0853-Fix-Fluid-tags-isTagged-method.patch => 0854-Fix-Fluid-tags-isTagged-method.patch} (100%)
 rename patches/server/{0854-Force-close-world-loading-screen.patch => 0855-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0855-Fix-falling-block-spawn-methods.patch => 0856-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0856-Expose-furnace-minecart-push-values.patch => 0857-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0857-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0858-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0858-Fix-save-problems-on-shutdown.patch => 0859-Fix-save-problems-on-shutdown.patch} (100%)
 rename patches/server/{0859-More-Projectile-API.patch => 0860-More-Projectile-API.patch} (100%)
 rename patches/server/{0860-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0861-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0861-Implement-getComputedBiome-API.patch => 0862-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0862-Make-some-itemstacks-nonnull.patch => 0863-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0863-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch => 0864-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch} (100%)
 rename patches/server/{0864-Implement-enchantWithLevels-API.patch => 0865-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0865-Fix-saving-in-unloadWorld.patch => 0866-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0866-Buffer-OOB-setBlock-calls.patch => 0867-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0867-Add-TameableDeathMessageEvent.patch => 0868-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0868-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch => 0869-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch} (100%)
 rename patches/server/{0869-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0870-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0870-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0871-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0871-Guard-against-invalid-entity-positions.patch => 0872-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0872-cache-resource-keys.patch => 0873-cache-resource-keys.patch} (100%)
 rename patches/server/{0873-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0874-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0874-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0875-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0875-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0876-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0876-Prevent-tile-entity-copies-loading-chunks.patch => 0877-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0877-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0878-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0878-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0879-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (93%)
 rename patches/server/{0879-Pass-ServerLevel-for-gamerule-callbacks.patch => 0880-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0880-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0881-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0881-WorldCreator-keepSpawnLoaded.patch => 0882-WorldCreator-keepSpawnLoaded.patch} (90%)
 rename patches/server/{0882-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0883-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0883-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0884-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0884-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0885-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0885-Fire-CauldronLevelChange-on-initial-fill.patch => 0886-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0886-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0887-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0887-Sign-cleanup-filtering.patch => 0888-Sign-cleanup-filtering.patch} (100%)
 rename patches/server/{0888-Add-PlayerStopUsingItemEvent.patch => 0889-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0889-FallingBlock-auto-expire-setting.patch => 0890-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0890-Don-t-tick-markers.patch => 0891-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0891-Do-not-accept-invalid-client-settings.patch => 0892-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0892-Add-support-for-Proxy-Protocol.patch => 0893-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0893-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0894-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0894-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0895-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0895-Sanitize-Sent-BlockEntity-NBT.patch => 0896-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0896-Prevent-entity-loading-causing-async-lookups.patch => 0897-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0897-Disable-component-selector-resolving-in-books-by-def.patch => 0898-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0898-Throw-exception-on-world-create-while-being-ticked.patch => 0899-Throw-exception-on-world-create-while-being-ticked.patch} (96%)

diff --git a/patches/removed/1.19/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch
similarity index 89%
rename from patches/removed/1.19/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch
rename to patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index da0f208d4e..2cc76fc04c 100644
--- a/patches/removed/1.19/0802-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch
@@ -11,22 +11,22 @@ Also fix above-mentioned modifiers from having the reverse effect
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
-index 87dabe3c80b48bff52f2e3dbbaceb37a1a21e431..effee89e308c9a663938ac5b00a8c6512ce407c2 100644
+index 7d9056f9d841fbbdeaf1e323d818f2f1267b47e8..6659a96b3638265f128a352cc9f12629874bfb4b 100644
 --- a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java
 @@ -47,9 +47,17 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements Bonemealabl
  
      @Override
-     protected BlockState getGrowIntoState(BlockState state, Random random) {
+     protected BlockState getGrowIntoState(BlockState state, RandomSource random) {
 -        return (BlockState) super.getGrowIntoState(state, random).setValue(CaveVinesBlock.BERRIES, random.nextFloat() < 0.11F);
 +        // Paper start
 +        return this.getGrowIntoState(state, random, null);
      }
  
 +    @Override
-+    protected BlockState getGrowIntoState(BlockState state, Random random, Level level) {
-+        final boolean value = (level == null ? random.nextFloat() : random.nextFloat(100.00F / level.spigotConfig.glowBerryModifier)) < 0.11F;
-+        return super.getGrowIntoState(state, random).setValue(CaveVinesBlock.BERRIES, value);
++    protected BlockState getGrowIntoState(BlockState state, RandomSource random, @javax.annotation.Nullable Level level) {
++        final boolean value = random.nextFloat() < (level != null ? (0.11F * (level.spigotConfig.glowBerryModifier * 2)) : 0.11F);
++        return (BlockState) super.getGrowIntoState(state, random).setValue(CaveVinesBlock.BERRIES, value);
 +    }
 +    // Paper end
 +
@@ -34,13 +34,13 @@ index 87dabe3c80b48bff52f2e3dbbaceb37a1a21e431..effee89e308c9a663938ac5b00a8c651
      public ItemStack getCloneItemStack(BlockGetter world, BlockPos pos, BlockState state) {
          return new ItemStack(Items.GLOW_BERRIES);
 diff --git a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
-index def3b62feada5cebae4049883fa967b12f6f32b4..8e642ff6d387e05f900acfc3cf6cfa5975bf69e4 100644
+index ae9052efc48dc05c7b41cb18c4330d7e62839a07..4d1e1cf4c541793492a02681087a6242e7977acd 100644
 --- a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 @@ -40,16 +40,36 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
  
      @Override
-     public void randomTick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
+     public void randomTick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
 -        if ((Integer) state.getValue(GrowingPlantHeadBlock.AGE) < 25 && random.nextDouble() < (100.0D / world.spigotConfig.kelpModifier) * this.growPerTickProbability) { // Spigot
 +        // Paper start
 +        final int modifier;
@@ -68,12 +68,12 @@ index def3b62feada5cebae4049883fa967b12f6f32b4..8e642ff6d387e05f900acfc3cf6cfa59
      }
  
 +    // Paper start
-+    protected BlockState getGrowIntoState(BlockState state, Random random, Level level) {
++    protected BlockState getGrowIntoState(BlockState state, RandomSource random, @javax.annotation.Nullable Level level) {
 +        return this.getGrowIntoState(state, random);
 +    }
 +    // Paper end
 +
-     protected BlockState getGrowIntoState(BlockState state, Random random) {
+     protected BlockState getGrowIntoState(BlockState state, RandomSource random) {
          return (BlockState) state.cycle(GrowingPlantHeadBlock.AGE);
      }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
diff --git a/patches/server/0794-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0794-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0795-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0796-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0795-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0796-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0796-Add-player-health-update-API.patch b/patches/server/0797-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0796-Add-player-health-update-API.patch
rename to patches/server/0797-Add-player-health-update-API.patch
diff --git a/patches/server/0797-Optimize-HashMapPalette.patch b/patches/server/0798-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0797-Optimize-HashMapPalette.patch
rename to patches/server/0798-Optimize-HashMapPalette.patch
diff --git a/patches/server/0798-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0798-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0799-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0800-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0800-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0801-Actually-unload-POI-data.patch b/patches/server/0802-Actually-unload-POI-data.patch
similarity index 100%
rename from patches/server/0801-Actually-unload-POI-data.patch
rename to patches/server/0802-Actually-unload-POI-data.patch
diff --git a/patches/server/0802-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0802-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0803-Update-Log4j.patch b/patches/server/0804-Update-Log4j.patch
similarity index 100%
rename from patches/server/0803-Update-Log4j.patch
rename to patches/server/0804-Update-Log4j.patch
diff --git a/patches/server/0804-Add-more-Campfire-API.patch b/patches/server/0805-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0804-Add-more-Campfire-API.patch
rename to patches/server/0805-Add-more-Campfire-API.patch
diff --git a/patches/server/0805-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0805-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0806-Fix-tripwire-state-inconsistency.patch b/patches/server/0807-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0806-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0807-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0807-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0808-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0807-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0808-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0808-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0809-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0808-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0809-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0809-Improve-scoreboard-entries.patch b/patches/server/0810-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0809-Improve-scoreboard-entries.patch
rename to patches/server/0810-Improve-scoreboard-entries.patch
diff --git a/patches/server/0810-Entity-powdered-snow-API.patch b/patches/server/0811-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0810-Entity-powdered-snow-API.patch
rename to patches/server/0811-Entity-powdered-snow-API.patch
diff --git a/patches/server/0811-Add-API-for-item-entity-health.patch b/patches/server/0812-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0811-Add-API-for-item-entity-health.patch
rename to patches/server/0812-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0812-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0813-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0812-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0813-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0813-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0813-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0814-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0814-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0815-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0815-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0816-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0816-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0817-Fix-bees-aging-inside-hives.patch b/patches/server/0818-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0817-Fix-bees-aging-inside-hives.patch
rename to patches/server/0818-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0818-Bucketable-API.patch b/patches/server/0819-Bucketable-API.patch
similarity index 100%
rename from patches/server/0818-Bucketable-API.patch
rename to patches/server/0819-Bucketable-API.patch
diff --git a/patches/server/0819-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0820-Check-player-world-in-endPortalSoundRadius.patch
similarity index 100%
rename from patches/server/0819-Check-player-world-in-endPortalSoundRadius.patch
rename to patches/server/0820-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0820-Validate-usernames.patch b/patches/server/0821-Validate-usernames.patch
similarity index 100%
rename from patches/server/0820-Validate-usernames.patch
rename to patches/server/0821-Validate-usernames.patch
diff --git a/patches/server/0821-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0822-Fix-saving-configs-with-more-long-comments.patch
similarity index 100%
rename from patches/server/0821-Fix-saving-configs-with-more-long-comments.patch
rename to patches/server/0822-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0822-Make-water-animal-spawn-height-configurable.patch b/patches/server/0823-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0822-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0823-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0823-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0823-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0824-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0825-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0824-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0825-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0825-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0826-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0825-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0826-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0826-Multiple-Entries-with-Scoreboards.patch b/patches/server/0827-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0826-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0827-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0827-Reset-placed-block-on-exception.patch b/patches/server/0828-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0827-Reset-placed-block-on-exception.patch
rename to patches/server/0828-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0828-Add-configurable-height-for-slime-spawn.patch b/patches/server/0829-Add-configurable-height-for-slime-spawn.patch
similarity index 97%
rename from patches/server/0828-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0829-Add-configurable-height-for-slime-spawn.patch
index e05890ec44..cd55b20001 100644
--- a/patches/server/0828-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0829-Add-configurable-height-for-slime-spawn.patch
@@ -26,7 +26,7 @@ index 100de7e366c4ea8ce158b0fc0258e4db0ee83249..b13d4dc311f25f9d3132697381e52beb
      public int portalCreateRadius;
      public boolean portalSearchVanillaDimensionScaling;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index bdc6a7e6a9fcd467f653d53afd7ca2e33776fb06..e82bf53e1d31a5dd81713fe858d1e5d7b8f8c60d 100644
+index bdc6a7e6a9fcd467f653d53afd7ca2e33776fb06..7c17954fbd5ff4b8e6e57a5fd587f6e2d044b585 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -320,7 +320,11 @@ public class Slime extends Mob implements Enemy {
diff --git a/patches/server/0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0829-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0830-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0831-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0830-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0831-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0831-Kick-on-main-for-illegal-chars.patch b/patches/server/0832-Kick-on-main-for-illegal-chars.patch
similarity index 100%
rename from patches/server/0831-Kick-on-main-for-illegal-chars.patch
rename to patches/server/0832-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0832-Multi-Block-Change-API-Implementation.patch b/patches/server/0833-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0832-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0833-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0833-Freeze-Tick-Lock-API.patch b/patches/server/0834-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0833-Freeze-Tick-Lock-API.patch
rename to patches/server/0834-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0834-Dolphin-API.patch b/patches/server/0835-Dolphin-API.patch
similarity index 100%
rename from patches/server/0834-Dolphin-API.patch
rename to patches/server/0835-Dolphin-API.patch
diff --git a/patches/server/0835-More-PotionEffectType-API.patch b/patches/server/0836-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0835-More-PotionEffectType-API.patch
rename to patches/server/0836-More-PotionEffectType-API.patch
diff --git a/patches/server/0836-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0836-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0837-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0837-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0838-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0837-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0838-API-for-creating-command-sender-which-forwards-feedb.patch
index 63a2fb45a3..17126330a4 100644
--- a/patches/server/0837-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0838-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] API for creating command sender which forwards feedback
 
 diff --git a/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java b/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ed3d488c6581df5eac425d9cccb8e741a52e91d5
+index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bff3914292
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java
 @@ -0,0 +1,111 @@
diff --git a/patches/server/0838-Add-config-for-stronghold-seed.patch b/patches/server/0839-Add-config-for-stronghold-seed.patch
similarity index 93%
rename from patches/server/0838-Add-config-for-stronghold-seed.patch
rename to patches/server/0839-Add-config-for-stronghold-seed.patch
index 1242c13ff2..e0b55d4fdc 100644
--- a/patches/server/0838-Add-config-for-stronghold-seed.patch
+++ b/patches/server/0839-Add-config-for-stronghold-seed.patch
@@ -23,10 +23,10 @@ index 05c8b3f54ecb4221dcbf37574240401d93e14e7a..1af3570d080e8d2203434a52634e1eab
              int l = 0;
              int i1 = 0;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 32f8a6aed0f69ad07ab5b42fee38a3471a59d426..b7d8363a96aa4527d84a43060d7e0b567a570a15 100644
+index b498b027b127996976a394e9a86cfc90f8a8ed3b..31a447e6e156b7b244b2ac69a9c03c09c7ed388c 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -352,6 +352,7 @@ public class SpigotWorldConfig
+@@ -364,6 +364,7 @@ public class SpigotWorldConfig
      public int mansionSeed;
      public int fossilSeed;
      public int portalSeed;
@@ -34,7 +34,7 @@ index 32f8a6aed0f69ad07ab5b42fee38a3471a59d426..b7d8363a96aa4527d84a43060d7e0b56
      private void initWorldGenSeeds()
      {
          this.villageSeed = this.getInt( "seed-village", 10387312 );
-@@ -369,6 +370,10 @@ public class SpigotWorldConfig
+@@ -381,6 +382,10 @@ public class SpigotWorldConfig
          this.mansionSeed = this.getInt( "seed-mansion", 10387319 );
          this.fossilSeed = this.getInt( "seed-fossil", 14357921 );
          this.portalSeed = this.getInt( "seed-portal", 34222645 );
diff --git a/patches/server/0839-Implement-regenerateChunk.patch b/patches/server/0840-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0839-Implement-regenerateChunk.patch
rename to patches/server/0840-Implement-regenerateChunk.patch
diff --git a/patches/server/0840-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0841-Log-exceptions-thrown-during-chat-processing.patch
similarity index 100%
rename from patches/server/0840-Log-exceptions-thrown-during-chat-processing.patch
rename to patches/server/0841-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0841-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0842-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0841-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0842-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0842-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0842-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0843-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0843-Add-GameEvent-tags.patch b/patches/server/0844-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0843-Add-GameEvent-tags.patch
rename to patches/server/0844-Add-GameEvent-tags.patch
index df7d45d5a8..513b938e8b 100644
--- a/patches/server/0843-Add-GameEvent-tags.patch
+++ b/patches/server/0844-Add-GameEvent-tags.patch
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1d9fc45d3fcf8a704f9bb286daa13ba027215f0a..3795f867ff439a3bce293aa6ad3754a1e218e8a8 100644
+index 1d9fc45d3fcf8a704f9bb286daa13ba027215f0a..5706c8ded10f775c4834c1c9c3ed4be4c7afde55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2545,6 +2545,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0844-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0844-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0845-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0845-Replace-ticket-level-propagator.patch b/patches/server/0846-Replace-ticket-level-propagator.patch
similarity index 100%
rename from patches/server/0845-Replace-ticket-level-propagator.patch
rename to patches/server/0846-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0846-Furnace-RecipesUsed-API.patch b/patches/server/0847-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0846-Furnace-RecipesUsed-API.patch
rename to patches/server/0847-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0847-Configurable-sculk-sensor-listener-range.patch b/patches/server/0848-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0847-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0848-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0848-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0849-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0848-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0849-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0849-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0849-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0850-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0850-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0851-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 95%
rename from patches/server/0850-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0851-Put-world-into-worldlist-before-initing-the-world.patch
index 3ca98470de..baea967b75 100644
--- a/patches/server/0850-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0851-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index dc585e962033c991f323d41a8a34e791a7cebe80..5bc41ec40452a81659d80edb3e28a8a7
  
              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 3795f867ff439a3bce293aa6ad3754a1e218e8a8..93aa05cf65b4f31804b9b33081f181999be2a986 100644
+index 5706c8ded10f775c4834c1c9c3ed4be4c7afde55..cdf1530b2ddbaef1a27e872b6600987ce18cda2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1231,10 +1231,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0851-Fix-Entity-Position-Desync.patch b/patches/server/0852-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0851-Fix-Entity-Position-Desync.patch
rename to patches/server/0852-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0852-Custom-Potion-Mixes.patch b/patches/server/0853-Custom-Potion-Mixes.patch
similarity index 99%
rename from patches/server/0852-Custom-Potion-Mixes.patch
rename to patches/server/0853-Custom-Potion-Mixes.patch
index b57e54dee9..bc56dee79c 100644
--- a/patches/server/0852-Custom-Potion-Mixes.patch
+++ b/patches/server/0853-Custom-Potion-Mixes.patch
@@ -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 93aa05cf65b4f31804b9b33081f181999be2a986..1b4fcbbbbb9b006814bd4a43f1c0001b59c759ef 100644
+index cdf1530b2ddbaef1a27e872b6600987ce18cda2b..eb3b53c40fcb4a4b975b8bf43e4c4cf636c44395 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -279,6 +279,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0853-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0854-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0853-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0854-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0854-Force-close-world-loading-screen.patch b/patches/server/0855-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0854-Force-close-world-loading-screen.patch
rename to patches/server/0855-Force-close-world-loading-screen.patch
diff --git a/patches/server/0855-Fix-falling-block-spawn-methods.patch b/patches/server/0856-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0855-Fix-falling-block-spawn-methods.patch
rename to patches/server/0856-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0856-Expose-furnace-minecart-push-values.patch b/patches/server/0857-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0856-Expose-furnace-minecart-push-values.patch
rename to patches/server/0857-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0857-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0858-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0857-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0858-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0858-Fix-save-problems-on-shutdown.patch b/patches/server/0859-Fix-save-problems-on-shutdown.patch
similarity index 100%
rename from patches/server/0858-Fix-save-problems-on-shutdown.patch
rename to patches/server/0859-Fix-save-problems-on-shutdown.patch
diff --git a/patches/server/0859-More-Projectile-API.patch b/patches/server/0860-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0859-More-Projectile-API.patch
rename to patches/server/0860-More-Projectile-API.patch
diff --git a/patches/server/0860-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0861-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0860-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0861-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0861-Implement-getComputedBiome-API.patch b/patches/server/0862-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0861-Implement-getComputedBiome-API.patch
rename to patches/server/0862-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0862-Make-some-itemstacks-nonnull.patch b/patches/server/0863-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0862-Make-some-itemstacks-nonnull.patch
rename to patches/server/0863-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0863-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0864-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
similarity index 100%
rename from patches/server/0863-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
rename to patches/server/0864-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch
diff --git a/patches/server/0864-Implement-enchantWithLevels-API.patch b/patches/server/0865-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0864-Implement-enchantWithLevels-API.patch
rename to patches/server/0865-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0865-Fix-saving-in-unloadWorld.patch b/patches/server/0866-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0865-Fix-saving-in-unloadWorld.patch
rename to patches/server/0866-Fix-saving-in-unloadWorld.patch
index f7d49ec916..b2aba71902 100644
--- a/patches/server/0865-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0866-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 1b4fcbbbbb9b006814bd4a43f1c0001b59c759ef..678a611feec69125df9be047652fe48c0cb11a4d 100644
+index eb3b53c40fcb4a4b975b8bf43e4c4cf636c44395..05f79097ec240d5f58b38909bc31e90727f6d6b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1279,7 +1279,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0866-Buffer-OOB-setBlock-calls.patch b/patches/server/0867-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0866-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0867-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0867-Add-TameableDeathMessageEvent.patch b/patches/server/0868-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0867-Add-TameableDeathMessageEvent.patch
rename to patches/server/0868-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0868-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch b/patches/server/0869-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
similarity index 100%
rename from patches/server/0868-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
rename to patches/server/0869-Fix-new-block-data-for-EntityChangeBlockEvent-when-s.patch
diff --git a/patches/server/0869-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0870-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0869-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0870-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0870-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0871-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0870-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0871-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0871-Guard-against-invalid-entity-positions.patch b/patches/server/0872-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0871-Guard-against-invalid-entity-positions.patch
rename to patches/server/0872-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0872-cache-resource-keys.patch b/patches/server/0873-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0872-cache-resource-keys.patch
rename to patches/server/0873-cache-resource-keys.patch
diff --git a/patches/server/0873-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0874-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0873-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0874-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0874-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0875-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0874-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0875-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0875-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0876-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0875-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0876-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0876-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0877-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0876-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0877-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0877-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0878-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0877-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0878-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0878-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0879-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 93%
rename from patches/server/0878-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0879-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
index a370fcf8d2..206c5f2f39 100644
--- a/patches/server/0878-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
+++ b/patches/server/0879-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
@@ -7,7 +7,7 @@ Fixes MC-50647 by just checking if the spawn type is a SPAWNER
 and then bypassing the spawn check logic if on slimes if it is.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index e82bf53e1d31a5dd81713fe858d1e5d7b8f8c60d..012aae6ad413e7520d3ac9fe2a4aa1e0594f5dfd 100644
+index 7c17954fbd5ff4b8e6e57a5fd587f6e2d044b585..0c5ca7fabb7dc95587bae72d714d4712bdf0cc40 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -320,6 +320,11 @@ public class Slime extends Mob implements Enemy {
diff --git a/patches/server/0879-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0880-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0879-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0880-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0880-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0881-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0880-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0881-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0881-WorldCreator-keepSpawnLoaded.patch b/patches/server/0882-WorldCreator-keepSpawnLoaded.patch
similarity index 90%
rename from patches/server/0881-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0882-WorldCreator-keepSpawnLoaded.patch
index 8d25128b58..fe56fb49c3 100644
--- a/patches/server/0881-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0882-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 678a611feec69125df9be047652fe48c0cb11a4d..88eac456dbcd53484109692d9aa898e174bff145 100644
+index 05f79097ec240d5f58b38909bc31e90727f6d6b5..436f8faa37e5e19e053aab6739ecca33a8851527 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1238,6 +1238,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0882-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0883-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0882-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0883-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0883-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0884-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0883-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0884-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0884-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0885-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0884-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0885-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0885-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0886-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0885-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0886-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0886-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0887-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0886-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0887-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0887-Sign-cleanup-filtering.patch b/patches/server/0888-Sign-cleanup-filtering.patch
similarity index 100%
rename from patches/server/0887-Sign-cleanup-filtering.patch
rename to patches/server/0888-Sign-cleanup-filtering.patch
diff --git a/patches/server/0888-Add-PlayerStopUsingItemEvent.patch b/patches/server/0889-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0888-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0889-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0889-FallingBlock-auto-expire-setting.patch b/patches/server/0890-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0889-FallingBlock-auto-expire-setting.patch
rename to patches/server/0890-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0890-Don-t-tick-markers.patch b/patches/server/0891-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0890-Don-t-tick-markers.patch
rename to patches/server/0891-Don-t-tick-markers.patch
diff --git a/patches/server/0891-Do-not-accept-invalid-client-settings.patch b/patches/server/0892-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0891-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0892-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0892-Add-support-for-Proxy-Protocol.patch b/patches/server/0893-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0892-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0893-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0893-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0894-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0893-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0894-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0894-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0895-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0894-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0895-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0895-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0896-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0895-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0896-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0896-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0897-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0896-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0897-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0897-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0898-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0897-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0898-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0898-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0899-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 96%
rename from patches/server/0898-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0899-Throw-exception-on-world-create-while-being-ticked.patch
index a588923914..3d31035c10 100644
--- a/patches/server/0898-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0899-Throw-exception-on-world-create-while-being-ticked.patch
@@ -35,7 +35,7 @@ index 869e0b6c8588d751a9b38b713119f888778d3387..5a642dc7cd2fed59c3e5b6ff4ac9ea2f
          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 88eac456dbcd53484109692d9aa898e174bff145..e161d79ee33a4d1e6bd8182d4e8acefeb4e0ae6d 100644
+index 436f8faa37e5e19e053aab6739ecca33a8851527..406f236a658b591ad7db700ad24e580da3a588ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1129,6 +1129,7 @@ public final class CraftServer implements Server {