From 66437d059facd545209b2d508c9ea459bff50196 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 14 Dec 2022 19:37:16 -0800
Subject: [PATCH] Add more breakNaturally functionality (#7379)

---
 ...185-Improve-Block-breakNaturally-API.patch | 68 +++++++++++++
 ...-Add-effect-to-block-break-naturally.patch | 37 --------
 ...ayerDeathEvent-shouldDropExperience.patch} |  2 +-
 ...-Add-methods-to-get-translation-keys.patch |  4 +-
 patches/api/0234-Add-Destroy-Speed-API.patch  |  2 +-
 patches/api/0391-Block-Ticking-API.patch      |  6 +-
 ...-Add-effect-to-block-break-naturally.patch | 37 --------
 ...=> 0342-Entity-Activation-Range-2.0.patch} |  0
 ...h => 0343-Increase-Light-Queue-Size.patch} |  2 +-
 ...5-Anti-Xray.patch => 0344-Anti-Xray.patch} |  0
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...=> 0346-Tracking-Range-Improvements.patch} |  2 +-
 ...-items-vanishing-through-end-portal.patch} |  0
 ...ment-optional-per-player-mob-spawns.patch} |  4 +-
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...350-Improve-Block-breakNaturally-API.patch | 95 +++++++++++++++++++
 ...-Add-methods-to-get-translation-keys.patch |  4 +-
 .../server/0507-Add-Destroy-Speed-API.patch   |  4 +-
 .../server/0584-Add-Block-isValidTool.patch   |  4 +-
 ...-of-Block-applyBoneMeal-always-being.patch |  4 +-
 ...luid-logging-on-Block-breakNaturally.patch | 29 ------
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0771-Improve-scoreboard-entries.patch} |  0
 ...ch => 0772-Entity-powdered-snow-API.patch} |  0
 ...0773-Add-API-for-item-entity-health.patch} |  0
 ...-type-tags-suggestions-in-selectors.patch} |  0
 ...ax-block-light-for-monster-spawning.patch} |  0
 ...pistons-and-BlockPistonRetractEvent.patch} |  0
 ...plifiers-greater-than-127-correctly.patch} |  0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...=> 0779-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0780-Bucketable-API.patch} |  0
 ...es.patch => 0781-Validate-usernames.patch} |  0
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  2 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...6-Multiple-Entries-with-Scoreboards.patch} |  0
 ...787-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...0790-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0791-Kick-on-main-for-illegal-chat.patch} |  2 +-
 ...lti-Block-Change-API-Implementation.patch} |  0
 ...ent.patch => 0793-Fix-NotePlayEvent.patch} |  0
 ....patch => 0794-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0795-Dolphin-API.patch} |  0
 ...h => 0796-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  0
 ...-missing-structure-set-seed-configs.patch} |  0
 ...h => 0800-Implement-regenerateChunk.patch} |  2 +-
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0803-Add-GameEvent-tags.patch} |  0
 ...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} |  0
 ... => 0810-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0811-Custom-Potion-Mixes.patch} |  0
 ...0812-Fix-Fluid-tags-isTagged-method.patch} |  0
 ...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} |  2 +-
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  2 +-
 ...0820-Implement-getComputedBiome-API.patch} |  2 +-
 ...> 0821-Make-some-itemstacks-nonnull.patch} |  0
 ...822-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0823-Fix-saving-in-unloadWorld.patch} |  0
 ...h => 0824-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0825-Add-TameableDeathMessageEvent.patch} |  0
 ...ock-data-for-EntityChangeBlockEvent.patch} |  0
 ...bles-running-when-mob-loot-gamerule.patch} |  0
 ...ssenger-world-matches-ridden-entity.patch} |  0
 ...rd-against-invalid-entity-positions.patch} |  0
 ...s.patch => 0830-cache-resource-keys.patch} |  2 +-
 ...ange-the-podium-for-the-EnderDragon.patch} |  0
 ...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} |  0
 ...s-not-spawning-outside-slime-chunks.patch} |  0
 ...-ServerLevel-for-gamerule-callbacks.patch} |  4 +-
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  0
 ...> 0839-WorldCreator-keepSpawnLoaded.patch} |  0
 ...-NPE-for-BlockDataMeta-getBlockData.patch} |  0
 ...destroyed-trigger-in-the-correct-pl.patch} |  0
 ...Event-and-CollarColorable-interface.patch} |  0
 ...CauldronLevelChange-on-initial-fill.patch} |  0
 ...snow-cauldrons-not-turning-to-water.patch} |  0
 ...> 0845-Add-PlayerStopUsingItemEvent.patch} |  0
 ...46-FallingBlock-auto-expire-setting.patch} |  0
 ...rs.patch => 0847-Don-t-tick-markers.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  2 +-
 ...0849-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0852-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  0
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...-on-world-create-while-being-ticked.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...57-Dont-resent-entity-on-art-update.patch} |  0
 ... => 0858-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  0
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0861-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 => 0866-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 => 0870-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  2 +-
 ...API.patch => 0872-More-Teleport-API.patch} |  2 +-
 ... => 0873-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
 ...=> 0878-Add-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0879-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...-invalid-signature-login-stacktrace.patch} |  2 +-
 ...-to-PlayerConnection-internalTelepo.patch} |  2 +-
 ...API.patch => 0883-Block-Ticking-API.patch} |  4 +-
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...andom-in-ServerLoginPacketListenerI.patch} |  0
 ...886-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  2 +-
 ...und-for-client-lag-spikes-MC-162253.patch} |  0
 ...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
 ...> 0893-Missing-eating-regain-reason.patch} |  0
 ....patch => 0894-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...7-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0898-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  0
 ...re-player-sending-on-dimension-chan.patch} |  0
 ... 0901-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ...lockState-and-isPreferredTool-to-Bl.patch} |  0
 ...=> 0904-Fix-a-bunch-of-vanilla-bugs.patch} |  0
 ...y-onTrackingStart-during-navigation.patch} |  0
 ... 0906-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0907-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  0
 ... 0910-Elder-Guardian-appearance-API.patch} |  0
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0912-Add-entity-knockback-API.patch} |  0
 ....patch => 0913-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...5-optimized-dirt-and-snow-spreading.patch} |  0
 ... => 0916-Added-EntityToggleSitEvent.patch} |  0
 ... => 0917-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0918-Add-Moving-Piston-API.patch} |  0
 ...> 0919-Ignore-impossible-spawn-tick.patch} |  0
 ...source-for-fireworks-from-dispenser.patch} |  2 +-
 ...t-suggestion-permissions-to-align-w.patch} |  0
 ...Event-cancellation-cant-fully-preve.patch} |  0
 ...Prevent-compass-from-loading-chunks.patch} |  0
 ...0924-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
 ... 0928-Add-Player-Warden-Warning-API.patch} |  0
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...930-Add-paper-dumplisteners-command.patch} |  0
 ...lobal-player-list-where-appropriate.patch} |  0
 ...sync-entity-add-due-to-fungus-trees.patch} |  0
 ....patch => 0933-ItemStack-damage-API.patch} |  0
 ...tion-API.patch => 0934-Friction-API.patch} |  0
 ...trol-player-s-insomnia-and-phantoms.patch} |  0
 ...=> 0936-Fix-player-kick-on-shutdown.patch} |  0
 ... => 0937-Sync-offhand-slot-in-menus.patch} |  0
 ... 0938-Player-Entity-Tracking-Events.patch} |  0
 ...tch => 0939-Limit-pet-look-distance.patch} |  0
 ...ch => 0940-Properly-resend-entities.patch} |  2 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |  0
 ...ments.patch => 0942-fix-Instruments.patch} |  0
 ...943-Fix-chunk-snapshot-biome-getter.patch} |  0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |  0
 ...-MapLike-Codec-missing-key-selector.patch} |  0
 ...es-in-dispense-events-regarding-sta.patch} |  0
 198 files changed, 206 insertions(+), 146 deletions(-)
 create mode 100644 patches/api/0185-Improve-Block-breakNaturally-API.patch
 delete mode 100644 patches/api/0186-Add-effect-to-block-break-naturally.patch
 rename patches/api/{0185-PlayerDeathEvent-shouldDropExperience.patch => 0186-PlayerDeathEvent-shouldDropExperience.patch} (97%)
 delete mode 100644 patches/server/0342-Add-effect-to-block-break-naturally.patch
 rename patches/server/{0343-Entity-Activation-Range-2.0.patch => 0342-Entity-Activation-Range-2.0.patch} (100%)
 rename patches/server/{0344-Increase-Light-Queue-Size.patch => 0343-Increase-Light-Queue-Size.patch} (93%)
 rename patches/server/{0345-Anti-Xray.patch => 0344-Anti-Xray.patch} (100%)
 rename patches/server/{0346-Implement-alternative-item-despawn-rate.patch => 0345-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0347-Tracking-Range-Improvements.patch => 0346-Tracking-Range-Improvements.patch} (97%)
 rename patches/server/{0348-Fix-items-vanishing-through-end-portal.patch => 0347-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename patches/server/{0349-implement-optional-per-player-mob-spawns.patch => 0348-implement-optional-per-player-mob-spawns.patch} (99%)
 rename patches/server/{0350-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 create mode 100644 patches/server/0350-Improve-Block-breakNaturally-API.patch
 delete mode 100644 patches/server/0770-Fix-fluid-logging-on-Block-breakNaturally.patch
 rename patches/server/{0771-Forward-CraftEntity-in-teleport-command.patch => 0770-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0772-Improve-scoreboard-entries.patch => 0771-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0773-Entity-powdered-snow-API.patch => 0772-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0774-Add-API-for-item-entity-health.patch => 0773-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0775-Fix-entity-type-tags-suggestions-in-selectors.patch => 0774-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0776-Configurable-max-block-light-for-monster-spawning.patch => 0775-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0777-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0776-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0778-Load-effect-amplifiers-greater-than-127-correctly.patch => 0777-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0779-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0778-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0780-Fix-bees-aging-inside-hives.patch => 0779-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0781-Bucketable-API.patch => 0780-Bucketable-API.patch} (100%)
 rename patches/server/{0782-Validate-usernames.patch => 0781-Validate-usernames.patch} (100%)
 rename patches/server/{0783-Make-water-animal-spawn-height-configurable.patch => 0782-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0784-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (98%)
 rename patches/server/{0785-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0784-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0786-Add-new-overload-to-PersistentDataContainer-has.patch => 0785-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0787-Multiple-Entries-with-Scoreboards.patch => 0786-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0788-Reset-placed-block-on-exception.patch => 0787-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0789-Add-configurable-height-for-slime-spawn.patch => 0788-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0790-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0789-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0791-Fix-xp-reward-for-baby-zombies.patch => 0790-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0792-Kick-on-main-for-illegal-chat.patch => 0791-Kick-on-main-for-illegal-chat.patch} (97%)
 rename patches/server/{0793-Multi-Block-Change-API-Implementation.patch => 0792-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0794-Fix-NotePlayEvent.patch => 0793-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0795-Freeze-Tick-Lock-API.patch => 0794-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0796-Dolphin-API.patch => 0795-Dolphin-API.patch} (100%)
 rename patches/server/{0797-More-PotionEffectType-API.patch => 0796-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0798-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0797-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0799-API-for-creating-command-sender-which-forwards-feedb.patch => 0798-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0800-Add-missing-structure-set-seed-configs.patch => 0799-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0801-Implement-regenerateChunk.patch => 0800-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0802-Fix-cancelled-powdered-snow-bucket-placement.patch => 0801-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0803-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0804-Add-GameEvent-tags.patch => 0803-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0805-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0804-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0806-Furnace-RecipesUsed-API.patch => 0805-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0807-Configurable-sculk-sensor-listener-range.patch => 0806-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0808-Add-missing-block-data-mins-and-maxes.patch => 0807-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0809-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0808-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0810-Put-world-into-worldlist-before-initing-the-world.patch => 0809-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0811-Fix-Entity-Position-Desync.patch => 0810-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0812-Custom-Potion-Mixes.patch => 0811-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0813-Fix-Fluid-tags-isTagged-method.patch => 0812-Fix-Fluid-tags-isTagged-method.patch} (100%)
 rename patches/server/{0814-Force-close-world-loading-screen.patch => 0813-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0815-Fix-falling-block-spawn-methods.patch => 0814-Fix-falling-block-spawn-methods.patch} (97%)
 rename patches/server/{0816-Expose-furnace-minecart-push-values.patch => 0815-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0817-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0818-More-Projectile-API.patch => 0817-More-Projectile-API.patch} (99%)
 rename patches/server/{0819-Fix-swamp-hut-cat-generation-deadlock.patch => 0818-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0820-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/{0821-Implement-getComputedBiome-API.patch => 0820-Implement-getComputedBiome-API.patch} (97%)
 rename patches/server/{0822-Make-some-itemstacks-nonnull.patch => 0821-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0823-Implement-enchantWithLevels-API.patch => 0822-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0824-Fix-saving-in-unloadWorld.patch => 0823-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0825-Buffer-OOB-setBlock-calls.patch => 0824-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0826-Add-TameableDeathMessageEvent.patch => 0825-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0827-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0826-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0828-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0827-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0829-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0828-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0830-Guard-against-invalid-entity-positions.patch => 0829-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0831-cache-resource-keys.patch => 0830-cache-resource-keys.patch} (97%)
 rename patches/server/{0832-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0831-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0833-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0832-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0834-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0833-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0835-Prevent-tile-entity-copies-loading-chunks.patch => 0834-Prevent-tile-entity-copies-loading-chunks.patch} (93%)
 rename patches/server/{0836-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0835-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0837-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0836-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0838-Pass-ServerLevel-for-gamerule-callbacks.patch => 0837-Pass-ServerLevel-for-gamerule-callbacks.patch} (98%)
 rename patches/server/{0839-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0838-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0840-WorldCreator-keepSpawnLoaded.patch => 0839-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0842-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0841-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0843-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0842-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0844-Fire-CauldronLevelChange-on-initial-fill.patch => 0843-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0845-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0844-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0846-Add-PlayerStopUsingItemEvent.patch => 0845-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0847-FallingBlock-auto-expire-setting.patch => 0846-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0848-Don-t-tick-markers.patch => 0847-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0849-Do-not-accept-invalid-client-settings.patch => 0848-Do-not-accept-invalid-client-settings.patch} (93%)
 rename patches/server/{0850-Add-support-for-Proxy-Protocol.patch => 0849-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0851-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0850-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0852-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0851-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0853-Sanitize-Sent-BlockEntity-NBT.patch => 0852-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0854-Prevent-entity-loading-causing-async-lookups.patch => 0853-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0855-Disable-component-selector-resolving-in-books-by-def.patch => 0854-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0856-Throw-exception-on-world-create-while-being-ticked.patch => 0855-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0857-Add-Alternate-Current-redstone-implementation.patch => 0856-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0858-Dont-resent-entity-on-art-update.patch => 0857-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0859-Add-WardenAngerChangeEvent.patch => 0858-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0860-Add-option-for-strict-advancement-dimension-checks.patch => 0859-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0861-Add-missing-important-BlockStateListPopulator-method.patch => 0860-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0862-Nameable-Banner-API.patch => 0861-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0863-Don-t-broadcast-messages-to-command-blocks.patch => 0862-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0864-Prevent-empty-items-from-being-added-to-world.patch => 0863-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0866-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0865-Don-t-print-component-in-resource-pack-rejection-mes.patch} (94%)
 rename patches/server/{0867-Add-Player-getFishHook.patch => 0866-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0869-Add-various-missing-EntityDropItemEvent-calls.patch => 0868-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0870-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0869-Add-some-minimal-debug-information-to-chat-packet-er.patch} (94%)
 rename patches/server/{0871-Fix-Bee-flower-NPE.patch => 0870-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (92%)
 rename patches/server/{0873-More-Teleport-API.patch => 0872-More-Teleport-API.patch} (99%)
 rename patches/server/{0874-Add-EntityPortalReadyEvent.patch => 0873-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0875-Don-t-use-level-random-in-entity-constructors.patch => 0874-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0876-Send-block-entities-after-destroy-prediction.patch => 0875-Send-block-entities-after-destroy-prediction.patch} (98%)
 rename patches/server/{0877-Warn-on-plugins-accessing-faraway-chunks.patch => 0876-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0878-Custom-Chat-Completion-Suggestions-API.patch => 0877-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0879-Add-missing-BlockFadeEvents.patch => 0878-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0880-Collision-API.patch => 0879-Collision-API.patch} (100%)
 rename patches/server/{0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0882-Remove-invalid-signature-login-stacktrace.patch => 0881-Remove-invalid-signature-login-stacktrace.patch} (93%)
 rename patches/server/{0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (91%)
 rename patches/server/{0884-Block-Ticking-API.patch => 0883-Block-Ticking-API.patch} (92%)
 rename patches/server/{0885-Add-Velocity-IP-Forwarding-Support.patch => 0884-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0887-Add-NamespacedKey-biome-methods.patch => 0886-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0888-Fix-plugin-loggers-on-server-shutdown.patch => 0887-Fix-plugin-loggers-on-server-shutdown.patch} (96%)
 rename patches/server/{0889-Workaround-for-client-lag-spikes-MC-162253.patch => 0888-Workaround-for-client-lag-spikes-MC-162253.patch} (100%)
 rename patches/server/{0890-Stop-large-look-changes-from-crashing-the-server.patch => 0889-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (100%)
 rename patches/server/{0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch => 0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch} (100%)
 rename patches/server/{0893-Fire-EntityChangeBlockEvent-in-more-places.patch => 0892-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0894-Missing-eating-regain-reason.patch => 0893-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0895-Missing-effect-cause.patch => 0894-Missing-effect-cause.patch} (100%)
 rename patches/server/{0896-Added-byte-array-serialization-deserialization-for-P.patch => 0895-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0898-Call-BlockPhysicsEvent-more-often.patch => 0897-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0899-Configurable-chat-thread-limit.patch => 0898-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0901-Set-position-before-player-sending-on-dimension-chan.patch => 0900-Set-position-before-player-sending-on-dimension-chan.patch} (100%)
 rename patches/server/{0902-fix-Jigsaw-block-kicking-user.patch => 0901-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0903-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0902-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%)
 rename patches/server/{0905-Fix-a-bunch-of-vanilla-bugs.patch => 0904-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0906-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0905-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0907-Fix-custom-piglin-loved-items.patch => 0906-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0908-EntityPickupItemEvent-fixes.patch => 0907-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0909-Correctly-handle-interactions-with-items-on-cooldown.patch => 0908-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0910-Add-PlayerInventorySlotChangeEvent.patch => 0909-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0911-Elder-Guardian-appearance-API.patch => 0910-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0912-Allow-changing-bed-s-occupied-property.patch => 0911-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0913-Add-entity-knockback-API.patch => 0912-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0914-Detect-headless-JREs.patch => 0913-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0915-fixed-entity-vehicle-collision-event-not-called.patch => 0914-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0916-optimized-dirt-and-snow-spreading.patch => 0915-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0917-Added-EntityToggleSitEvent.patch => 0916-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0918-Add-fire-tick-delay-option.patch => 0917-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0919-Add-Moving-Piston-API.patch => 0918-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0920-Ignore-impossible-spawn-tick.patch => 0919-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0921-Track-projectile-source-for-fireworks-from-dispenser.patch => 0920-Track-projectile-source-for-fireworks-from-dispenser.patch} (93%)
 rename patches/server/{0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0924-Prevent-compass-from-loading-chunks.patch => 0923-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0925-Add-PrePlayerAttackEntityEvent.patch => 0924-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0926-ensure-reset-EnderDragon-boss-event-name.patch => 0925-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0927-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0926-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch => 0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch} (100%)
 rename patches/server/{0929-Add-Player-Warden-Warning-API.patch => 0928-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0930-More-vanilla-friendly-methods-to-update-trades.patch => 0929-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0931-Add-paper-dumplisteners-command.patch => 0930-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0932-check-global-player-list-where-appropriate.patch => 0931-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0933-Fix-async-entity-add-due-to-fungus-trees.patch => 0932-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0934-ItemStack-damage-API.patch => 0933-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0935-Friction-API.patch => 0934-Friction-API.patch} (100%)
 rename patches/server/{0936-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0935-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0937-Fix-player-kick-on-shutdown.patch => 0936-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0938-Sync-offhand-slot-in-menus.patch => 0937-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0939-Player-Entity-Tracking-Events.patch => 0938-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0940-Limit-pet-look-distance.patch => 0939-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0941-Properly-resend-entities.patch => 0940-Properly-resend-entities.patch} (98%)
 rename patches/server/{0942-Fixes-and-additions-to-the-SpawnReason-API.patch => 0941-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0943-fix-Instruments.patch => 0942-fix-Instruments.patch} (100%)
 rename patches/server/{0944-Fix-chunk-snapshot-biome-getter.patch => 0943-Fix-chunk-snapshot-biome-getter.patch} (100%)
 rename patches/server/{0945-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0944-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0946-Fix-MapLike-Codec-missing-key-selector.patch => 0945-Fix-MapLike-Codec-missing-key-selector.patch} (100%)
 rename patches/server/{0947-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0946-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)

diff --git a/patches/api/0185-Improve-Block-breakNaturally-API.patch b/patches/api/0185-Improve-Block-breakNaturally-API.patch
new file mode 100644
index 0000000000..8bf4a34007
--- /dev/null
+++ b/patches/api/0185-Improve-Block-breakNaturally-API.patch
@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Thu, 2 Jan 2020 12:25:16 -0600
+Subject: [PATCH] Improve Block#breakNaturally API
+
+Adds bool param to trigger world particle effects
+
+Adds bool param to trigger exp drops for blocks
+
+Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com>
+
+diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
+index db441e463b02ee734f85c855f5538cd41041dbae..af705e45204975a342e1454156ba143ed52cecdc 100644
+--- a/src/main/java/org/bukkit/block/Block.java
++++ b/src/main/java/org/bukkit/block/Block.java
+@@ -480,6 +480,52 @@ public interface Block extends Metadatable {
+      */
+     boolean breakNaturally(@Nullable ItemStack tool);
+ 
++    // Paper start
++    /**
++     * Breaks the block and spawns item drops as if a player had broken it
++     *
++     * @param triggerEffect Play the block break particle effect and sound
++     * @return true if the block was destroyed
++     * @see #breakNaturally(boolean, boolean) to trigger exp drops
++     */
++    default boolean breakNaturally(boolean triggerEffect) {
++        return this.breakNaturally(triggerEffect, false);
++    }
++
++    /**
++     * Breaks the block and spawns item drops as if a player had broken it
++     *
++     * @param triggerEffect Play the block break particle effect and sound
++     * @param dropExperience drop exp if the block normally does so
++     * @return true if the block was destroyed
++     */
++    boolean breakNaturally(boolean triggerEffect, boolean dropExperience);
++
++    /**
++     * Breaks the block and spawns item drops as if a player had broken it
++     * with a specific tool
++     *
++     * @param tool The tool or item in hand used for digging
++     * @param triggerEffect Play the block break particle effect and sound
++     * @return true if the block was destroyed
++     * @see #breakNaturally(ItemStack, boolean, boolean) to trigger exp drops
++     */
++    default boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect) {
++        return this.breakNaturally(tool, triggerEffect, false);
++    }
++
++    /**
++     * Breaks the block and spawns item drops as if a player had broken it
++     * with a specific tool
++     *
++     * @param tool The tool or item in hand used for digging
++     * @param triggerEffect Play the block break particle effect and sound
++     * @param dropExperience drop exp if the block normally does so
++     * @return true if the block was destroyed
++     */
++    boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect, boolean dropExperience);
++    // Paper end
++
+     /**
+      * Simulate bone meal application to this block (if possible).
+      *
diff --git a/patches/api/0186-Add-effect-to-block-break-naturally.patch b/patches/api/0186-Add-effect-to-block-break-naturally.patch
deleted file mode 100644
index 81c136c000..0000000000
--- a/patches/api/0186-Add-effect-to-block-break-naturally.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 2 Jan 2020 12:25:16 -0600
-Subject: [PATCH] Add effect to block break naturally
-
-
-diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index db441e463b02ee734f85c855f5538cd41041dbae..1e7ee68e56f8d4399c2cbf26aa45bf8b599b3b02 100644
---- a/src/main/java/org/bukkit/block/Block.java
-+++ b/src/main/java/org/bukkit/block/Block.java
-@@ -480,6 +480,26 @@ public interface Block extends Metadatable {
-      */
-     boolean breakNaturally(@Nullable ItemStack tool);
- 
-+    // Paper start
-+    /**
-+     * Breaks the block and spawns item drops as if a player had broken it
-+     *
-+     * @param triggerEffect Play the block break particle effect and sound
-+     * @return true if the block was destroyed
-+     */
-+    boolean breakNaturally(boolean triggerEffect);
-+
-+    /**
-+     * Breaks the block and spawns item drops as if a player had broken it
-+     * with a specific tool
-+     *
-+     * @param tool The tool or item in hand used for digging
-+     * @param triggerEffect Play the block break particle effect and sound
-+     * @return true if the block was destroyed
-+     */
-+    boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect);
-+    // Paper end
-+
-     /**
-      * Simulate bone meal application to this block (if possible).
-      *
diff --git a/patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch
similarity index 97%
rename from patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch
index 0561046520..71a39f4f71 100644
--- a/patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
-index 5f7d0d08be8bca06c9aa89659b7865a7b5a547f8..9d95218b49895ab76b00fe9524d9b25ea9f9b8c2 100644
+index bfd3654c02e8ad906c620a86165a38c65a31b62b..d5eeb37d331e205826aa6199bd481cb0db40d721 100644
 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java
 @@ -1,6 +1,8 @@
diff --git a/patches/api/0221-Add-methods-to-get-translation-keys.patch b/patches/api/0221-Add-methods-to-get-translation-keys.patch
index c9a54f742e..bfeb3be141 100644
--- a/patches/api/0221-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0221-Add-methods-to-get-translation-keys.patch
@@ -269,7 +269,7 @@ index 02c5fcbc76b2db6bf4eb7580456b5658c08272b4..d56e1b50dd7da18f40278cec4bfdc941
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 1e7ee68e56f8d4399c2cbf26aa45bf8b599b3b02..2c837ea822f3b0c4ec312f0c956fe1b778cbd5e9 100644
+index af705e45204975a342e1454156ba143ed52cecdc..ce3b81c5d83c9747ea0e3410c932460d11bf5c55 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
@@ -281,7 +281,7 @@ index 1e7ee68e56f8d4399c2cbf26aa45bf8b599b3b02..2c837ea822f3b0c4ec312f0c956fe1b7
  
      /**
       * Gets the metadata for this block
-@@ -646,5 +646,15 @@ public interface Block extends Metadatable {
+@@ -672,5 +672,15 @@ public interface Block extends Metadatable {
       * @return the sound group for this block
       */
      @NotNull org.bukkit.SoundGroup getBlockSoundGroup();
diff --git a/patches/api/0234-Add-Destroy-Speed-API.patch b/patches/api/0234-Add-Destroy-Speed-API.patch
index dbca343b9b..a7835cadaa 100644
--- a/patches/api/0234-Add-Destroy-Speed-API.patch
+++ b/patches/api/0234-Add-Destroy-Speed-API.patch
@@ -9,7 +9,7 @@ diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukki
 index 2c837ea822f3b0c4ec312f0c956fe1b778cbd5e9..4a408361ac86b8c490942686c2709817338f4f59 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -656,5 +656,29 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
+@@ -682,5 +682,29 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
      @NotNull
      @Deprecated
      String getTranslationKey();
diff --git a/patches/api/0391-Block-Ticking-API.patch b/patches/api/0391-Block-Ticking-API.patch
index 7c077405ca..01e89b8a66 100644
--- a/patches/api/0391-Block-Ticking-API.patch
+++ b/patches/api/0391-Block-Ticking-API.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Block Ticking API
 
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index e405c279f6135c94c775a856ab88fd3cace6bd5c..9930ebe7a23d306c602840fd43652fbdaba481b3 100644
+index 0b02bfce9ee01c6beb14348129ab86c751c01e54..aba40431c5a1ae43106a678445483e0653e130d1 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -562,6 +562,21 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
+@@ -588,6 +588,21 @@ public interface Block extends Metadatable, net.kyori.adventure.translation.Tran
       * @return true if the block was destroyed
       */
-     boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect);
+     boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect, boolean dropExperience);
 +
 +    /**
 +     * Causes the block to be ticked, this is different from {@link Block#randomTick()},
diff --git a/patches/server/0342-Add-effect-to-block-break-naturally.patch b/patches/server/0342-Add-effect-to-block-break-naturally.patch
deleted file mode 100644
index 89bf132208..0000000000
--- a/patches/server/0342-Add-effect-to-block-break-naturally.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 2 Jan 2020 12:25:07 -0600
-Subject: [PATCH] Add effect to block break naturally
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 2e3b675dca8cec906d533141e158e5db6ae87042..7e97b09376b1e9000511f56f3406dba550ba2612 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -477,6 +477,18 @@ public class CraftBlock implements Block {
- 
-     @Override
-     public boolean breakNaturally(ItemStack item) {
-+        // Paper start
-+        return breakNaturally(item, false);
-+    }
-+
-+    @Override
-+    public boolean breakNaturally(boolean triggerEffect) {
-+        return breakNaturally(null, triggerEffect);
-+    }
-+
-+    @Override
-+    public boolean breakNaturally(ItemStack item, boolean triggerEffect) {
-+        // Paper end
-         // Order matters here, need to drop before setting to air so skulls can get their data
-         net.minecraft.world.level.block.state.BlockState iblockdata = this.getNMS();
-         net.minecraft.world.level.block.Block block = iblockdata.getBlock();
-@@ -486,6 +498,7 @@ public class CraftBlock implements Block {
-         // Modelled off EntityHuman#hasBlock
-         if (block != Blocks.AIR && (item == null || !iblockdata.requiresCorrectToolForDrops() || nmsItem.isCorrectToolForDrops(iblockdata))) {
-             net.minecraft.world.level.block.Block.dropResources(iblockdata, this.world.getMinecraftWorld(), position, this.world.getBlockEntity(position), null, nmsItem);
-+            if (triggerEffect) world.levelEvent(org.bukkit.Effect.STEP_SOUND.getId(), position, net.minecraft.world.level.block.Block.getId(block.defaultBlockState())); // Paper
-             result = true;
-         }
- 
diff --git a/patches/server/0343-Entity-Activation-Range-2.0.patch b/patches/server/0342-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0343-Entity-Activation-Range-2.0.patch
rename to patches/server/0342-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0344-Increase-Light-Queue-Size.patch b/patches/server/0343-Increase-Light-Queue-Size.patch
similarity index 93%
rename from patches/server/0344-Increase-Light-Queue-Size.patch
rename to patches/server/0343-Increase-Light-Queue-Size.patch
index 8857921723..00d8f5f9af 100644
--- a/patches/server/0344-Increase-Light-Queue-Size.patch
+++ b/patches/server/0343-Increase-Light-Queue-Size.patch
@@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ea1ad3dad6bc9c7603d5dd0bdaec0d4563e90f16..867e7186764057507f6f92b52ea6afc4d08774b4 100644
+index c277ccc012bd5011e31d746b08ace1ae5238c937..023119624c0534bedb248099d0e12c76622a363a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -788,7 +788,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0345-Anti-Xray.patch b/patches/server/0344-Anti-Xray.patch
similarity index 100%
rename from patches/server/0345-Anti-Xray.patch
rename to patches/server/0344-Anti-Xray.patch
diff --git a/patches/server/0346-Implement-alternative-item-despawn-rate.patch b/patches/server/0345-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0346-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0345-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0347-Tracking-Range-Improvements.patch b/patches/server/0346-Tracking-Range-Improvements.patch
similarity index 97%
rename from patches/server/0347-Tracking-Range-Improvements.patch
rename to patches/server/0346-Tracking-Range-Improvements.patch
index b732776aa1..e5d7b78254 100644
--- a/patches/server/0347-Tracking-Range-Improvements.patch
+++ b/patches/server/0346-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 750b1f0793efc2e45846d6f6f03852f2d11d949a..e88ee89fba41911da4895e9fa024335f06887690 100644
+index 710017f52ad1a0d338bb0a49e44a26cfc09f8b94..381bc42e760c2b652b2b45237587cebd4ae31c47 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1320,6 +1320,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0348-Fix-items-vanishing-through-end-portal.patch b/patches/server/0347-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/0348-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0347-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0349-implement-optional-per-player-mob-spawns.patch b/patches/server/0348-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from patches/server/0349-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0348-implement-optional-per-player-mob-spawns.patch
index 5bfea8aa86..257f0c8a51 100644
--- a/patches/server/0349-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0348-implement-optional-per-player-mob-spawns.patch
@@ -252,7 +252,7 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc
 +    }
 +} 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5ecd6a2027f6c0f11d10ca63cd63f0663f05347c..543b42a6f527cb93611781867b5d7c2c63fc6b54 100644
+index 381bc42e760c2b652b2b45237587cebd4ae31c47..fcdd8a8570d07e8bd3339275c7b6999be3f726b3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -149,6 +149,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -362,7 +362,7 @@ index c021733342c09adb04ce3f675209543f84ac4bda..d137aa95f670aab516e9e08272f33b21
  
              this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ecb81ad7ab281eaad7d5b3f9dc30082595824408..33fee57bcd3d82bed27f5e42e2e0f4b0299a1790 100644
+index 20861571e8026c3c4fa40b7f8f14a2df0ebcc208..5da6530580c1d0ce298498782e8e7eb8bbf3cb3c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -240,6 +240,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0350-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0350-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0349-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0350-Improve-Block-breakNaturally-API.patch b/patches/server/0350-Improve-Block-breakNaturally-API.patch
new file mode 100644
index 0000000000..8dd927a9b1
--- /dev/null
+++ b/patches/server/0350-Improve-Block-breakNaturally-API.patch
@@ -0,0 +1,95 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Thu, 2 Jan 2020 12:25:07 -0600
+Subject: [PATCH] Improve Block#breakNaturally API
+
+Adds bool parameter to play world effect on block break
+
+Adds bool parameter to drop xp from blocks
+
+Fixes fluid-logged blocks not leaving fluid behind if
+broken
+
+Handles special cases for ice and turtle eggs
+
+== AT ==
+public net.minecraft.world.level.block.TurtleEggBlock decreaseEggs(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V
+
+Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com>
+
+diff --git a/src/main/java/net/minecraft/world/level/block/IceBlock.java b/src/main/java/net/minecraft/world/level/block/IceBlock.java
+index 0afadbc8515d448b0ef817f4f0f53b1bb0abde43..64206d94a5bf210116d208f9678618b905a61428 100644
+--- a/src/main/java/net/minecraft/world/level/block/IceBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/IceBlock.java
+@@ -25,6 +25,11 @@ public class IceBlock extends HalfTransparentBlock {
+     @Override
+     public void playerDestroy(Level world, Player player, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, ItemStack stack) {
+         super.playerDestroy(world, player, pos, state, blockEntity, stack);
++        // Paper start
++        this.afterDestroy(world, pos, stack);
++    }
++    public void afterDestroy(Level world, BlockPos pos, ItemStack stack) {
++        // Paper end
+         if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, stack) == 0) {
+             if (world.dimensionType().ultraWarm()) {
+                 world.removeBlock(pos, false);
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+index 2e3b675dca8cec906d533141e158e5db6ae87042..3123a8d52236757c3e7ca3b099cc664485cb3c72 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+@@ -477,6 +477,18 @@ public class CraftBlock implements Block {
+ 
+     @Override
+     public boolean breakNaturally(ItemStack item) {
++        // Paper start
++        return this.breakNaturally(item, false);
++    }
++
++    @Override
++    public boolean breakNaturally(boolean triggerEffect, boolean dropExperience) {
++        return this.breakNaturally(null, triggerEffect, dropExperience);
++    }
++
++    @Override
++    public boolean breakNaturally(ItemStack item, boolean triggerEffect, boolean dropExperience) {
++        // Paper end
+         // Order matters here, need to drop before setting to air so skulls can get their data
+         net.minecraft.world.level.block.state.BlockState iblockdata = this.getNMS();
+         net.minecraft.world.level.block.Block block = iblockdata.getBlock();
+@@ -486,11 +498,35 @@ public class CraftBlock implements Block {
+         // Modelled off EntityHuman#hasBlock
+         if (block != Blocks.AIR && (item == null || !iblockdata.requiresCorrectToolForDrops() || nmsItem.isCorrectToolForDrops(iblockdata))) {
+             net.minecraft.world.level.block.Block.dropResources(iblockdata, this.world.getMinecraftWorld(), position, this.world.getBlockEntity(position), null, nmsItem);
++            // Paper start - improve Block#breanNaturally
++            if (triggerEffect) {
++                if (iblockdata.getBlock() instanceof net.minecraft.world.level.block.BaseFireBlock) {
++                    this.world.levelEvent(net.minecraft.world.level.block.LevelEvent.SOUND_EXTINGUISH_FIRE, this.position, 0);
++                } else {
++                    this.world.levelEvent(net.minecraft.world.level.block.LevelEvent.PARTICLES_DESTROY_BLOCK, this.position, net.minecraft.world.level.block.Block.getId(iblockdata));
++                }
++            }
++            if (dropExperience) block.popExperience(this.world.getMinecraftWorld(), this.position, block.getExpDrop(iblockdata, this.world.getMinecraftWorld(), this.position, nmsItem, true));
++            // Paper end
+             result = true;
+         }
+ 
+         // SPIGOT-6778: Directly call setBlock instead of setTypeAndData, so that the tile entiy is not removed and custom remove logic is run.
+-        return this.world.setBlock(position, Blocks.AIR.defaultBlockState(), 3) && result;
++        // Paper start - improve breakNaturally
++        boolean destroyed = this.world.removeBlock(this.position, false);
++        if (destroyed) {
++            block.destroy(this.world, this.position, iblockdata);
++        }
++        if (result) {
++            // special cases
++            if (block instanceof net.minecraft.world.level.block.IceBlock iceBlock) {
++                iceBlock.afterDestroy(this.world.getMinecraftWorld(), this.position, nmsItem);
++            } else if (block instanceof net.minecraft.world.level.block.TurtleEggBlock turtleEggBlock) {
++                turtleEggBlock.decreaseEggs(this.world.getMinecraftWorld(), this.position, iblockdata);
++            }
++        }
++        return destroyed && result;
++        // Paper end
+     }
+ 
+     @Override
diff --git a/patches/server/0475-Add-methods-to-get-translation-keys.patch b/patches/server/0475-Add-methods-to-get-translation-keys.patch
index 6f42dd91d1..a68bd43412 100644
--- a/patches/server/0475-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0475-Add-methods-to-get-translation-keys.patch
@@ -10,10 +10,10 @@ public org.bukkit.craftbukkit.inventory.CraftMetaFirework getNBT(Lorg/bukkit/Fir
 Co-authored-by: MeFisto94 <MeFisto94@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 7e97b09376b1e9000511f56f3406dba550ba2612..89b8abc3e7e946aae2ab3d2c870f2d2c95f9671d 100644
+index 3123a8d52236757c3e7ca3b099cc664485cb3c72..eba015c33dcf63ff85569eb7ee7e6b3def2b05ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -670,5 +670,15 @@ public class CraftBlock implements Block {
+@@ -693,5 +693,15 @@ public class CraftBlock implements Block {
      public org.bukkit.SoundGroup getBlockSoundGroup() {
          return org.bukkit.craftbukkit.CraftSoundGroup.getSoundGroup(this.getNMS().getSoundType());
      }
diff --git a/patches/server/0507-Add-Destroy-Speed-API.patch b/patches/server/0507-Add-Destroy-Speed-API.patch
index fc98d03d3d..503c7fb25f 100644
--- a/patches/server/0507-Add-Destroy-Speed-API.patch
+++ b/patches/server/0507-Add-Destroy-Speed-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 6d9cddb20a069cada6d20e5f61a2ca2ab2c308a0..9a191f16a4d80cde2b2801526fe386abba6e5302 100644
+index 01827f2398cec6e18ab490e664360beed9dbca83..ac831b22930ad02951186b6326b0c542de4c9881 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -680,5 +680,26 @@ public class CraftBlock implements Block {
+@@ -703,5 +703,26 @@ public class CraftBlock implements Block {
      public String translationKey() {
          return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
      }
diff --git a/patches/server/0584-Add-Block-isValidTool.patch b/patches/server/0584-Add-Block-isValidTool.patch
index f7df2710ac..7ec4cf1dcf 100644
--- a/patches/server/0584-Add-Block-isValidTool.patch
+++ b/patches/server/0584-Add-Block-isValidTool.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Block#isValidTool
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 1def5d8c61d78c1d9ccacafdbf8a16072cf75c6a..8c5f9f2bb0c200a5ef7ad09b27afa6dad057c6f8 100644
+index 30b5a78a93405f3a03624ed1331670770aaa3765..974ab329f92f488aba0999cef25e3b8e7e062209 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -720,5 +720,9 @@ public class CraftBlock implements Block {
+@@ -743,5 +743,9 @@ public class CraftBlock implements Block {
          }
          return speed;
      }
diff --git a/patches/server/0653-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0653-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index 8cb3e43344..e88c33e4f7 100644
--- a/patches/server/0653-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0653-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix return value of Block#applyBoneMeal always being false
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 8c5f9f2bb0c200a5ef7ad09b27afa6dad057c6f8..6ec8ebdd702424d94821180f65f6344be1a0527a 100644
+index 974ab329f92f488aba0999cef25e3b8e7e062209..60aa47a78b9d5921dffd1e205c0b69f453a94851 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -560,7 +560,7 @@ public class CraftBlock implements Block {
+@@ -583,7 +583,7 @@ public class CraftBlock implements Block {
              }
          }
  
diff --git a/patches/server/0770-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0770-Fix-fluid-logging-on-Block-breakNaturally.patch
deleted file mode 100644
index d86bd2dae1..0000000000
--- a/patches/server/0770-Fix-fluid-logging-on-Block-breakNaturally.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Tue, 21 Dec 2021 16:28:17 -0800
-Subject: [PATCH] Fix fluid-logging on Block#breakNaturally
-
-Leaves fluid if the block broken was fluid-logged which is what
-happens if a player breaks a fluid-logged block
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 016f58f452e19a00d72a277d41bcbbb107e4232b..2f5b9083a3d11834fca74d11d6ba10d325a7f7c3 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -517,6 +517,7 @@ public class CraftBlock implements Block {
-         net.minecraft.world.level.block.state.BlockState iblockdata = this.getNMS();
-         net.minecraft.world.level.block.Block block = iblockdata.getBlock();
-         net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
-+        net.minecraft.world.level.material.FluidState fluidState = this.world.getFluidState(this.position); // Paper
-         boolean result = false;
- 
-         // Modelled off EntityHuman#hasBlock
-@@ -527,7 +528,7 @@ public class CraftBlock implements Block {
-         }
- 
-         // SPIGOT-6778: Directly call setBlock instead of setTypeAndData, so that the tile entiy is not removed and custom remove logic is run.
--        return this.world.setBlock(position, Blocks.AIR.defaultBlockState(), 3) && result;
-+        return this.world.setBlock(position, fluidState.createLegacyBlock(), 3) && result; // Paper - leave liquid if waterlogged
-     }
- 
-     @Override
diff --git a/patches/server/0771-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0770-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0771-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0770-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0772-Improve-scoreboard-entries.patch b/patches/server/0771-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0772-Improve-scoreboard-entries.patch
rename to patches/server/0771-Improve-scoreboard-entries.patch
diff --git a/patches/server/0773-Entity-powdered-snow-API.patch b/patches/server/0772-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0773-Entity-powdered-snow-API.patch
rename to patches/server/0772-Entity-powdered-snow-API.patch
diff --git a/patches/server/0774-Add-API-for-item-entity-health.patch b/patches/server/0773-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0774-Add-API-for-item-entity-health.patch
rename to patches/server/0773-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0775-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0774-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0775-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0774-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0776-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0775-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0776-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0775-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0777-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0776-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0777-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0776-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0778-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0777-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0778-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0777-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0779-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0778-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0779-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0778-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0780-Fix-bees-aging-inside-hives.patch b/patches/server/0779-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0780-Fix-bees-aging-inside-hives.patch
rename to patches/server/0779-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0781-Bucketable-API.patch b/patches/server/0780-Bucketable-API.patch
similarity index 100%
rename from patches/server/0781-Bucketable-API.patch
rename to patches/server/0780-Bucketable-API.patch
diff --git a/patches/server/0782-Validate-usernames.patch b/patches/server/0781-Validate-usernames.patch
similarity index 100%
rename from patches/server/0782-Validate-usernames.patch
rename to patches/server/0781-Validate-usernames.patch
diff --git a/patches/server/0783-Make-water-animal-spawn-height-configurable.patch b/patches/server/0782-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0783-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0782-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0784-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0784-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 93c850f0d3..d8fd175237 100644
--- a/patches/server/0784-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -31,7 +31,7 @@ index 037cc496670c08fbee3fda1ca192758a7cad577c..ae5421fd85de55eecad2db4041c6552e
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index aaba757b605405e08da7b359bc1fc87252114252..04b4c2f4796046828a73d3911da880ccd3fdf349 100644
+index cb7c070c190e63644160ddd9855628547fd37ee1..2cee0f5a746d37fa5b3fbe0ca3af2632af6f5735 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -199,6 +199,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0785-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0784-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0785-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0784-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0786-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0785-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0786-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0785-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0787-Multiple-Entries-with-Scoreboards.patch b/patches/server/0786-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0787-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0786-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0788-Reset-placed-block-on-exception.patch b/patches/server/0787-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0788-Reset-placed-block-on-exception.patch
rename to patches/server/0787-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0789-Add-configurable-height-for-slime-spawn.patch b/patches/server/0788-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0789-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0788-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0790-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0789-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0790-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0789-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0791-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0790-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0791-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0790-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0792-Kick-on-main-for-illegal-chat.patch b/patches/server/0791-Kick-on-main-for-illegal-chat.patch
similarity index 97%
rename from patches/server/0792-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0791-Kick-on-main-for-illegal-chat.patch
index f35de0effd..713e5f9cf8 100644
--- a/patches/server/0792-Kick-on-main-for-illegal-chat.patch
+++ b/patches/server/0791-Kick-on-main-for-illegal-chat.patch
@@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for
 illegal characters or chat out-of-order errors.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7dff3cff9ec9c87fea7be838a6a34c02f2eeb3b1..25b2bdca86b62e0c76059d87da9214c0bb41fe51 100644
+index 6d64870e3142c5114166f9e27206a20aa900e83b..d5bb89bd4948f1aff24c4725def980e6bcbdae84 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2172,7 +2172,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0793-Multi-Block-Change-API-Implementation.patch b/patches/server/0792-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0793-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0792-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0794-Fix-NotePlayEvent.patch b/patches/server/0793-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0794-Fix-NotePlayEvent.patch
rename to patches/server/0793-Fix-NotePlayEvent.patch
diff --git a/patches/server/0795-Freeze-Tick-Lock-API.patch b/patches/server/0794-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0795-Freeze-Tick-Lock-API.patch
rename to patches/server/0794-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0796-Dolphin-API.patch b/patches/server/0795-Dolphin-API.patch
similarity index 100%
rename from patches/server/0796-Dolphin-API.patch
rename to patches/server/0795-Dolphin-API.patch
diff --git a/patches/server/0797-More-PotionEffectType-API.patch b/patches/server/0796-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0797-More-PotionEffectType-API.patch
rename to patches/server/0796-More-PotionEffectType-API.patch
diff --git a/patches/server/0798-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0797-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0798-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0797-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0799-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0798-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0799-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0798-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0800-Add-missing-structure-set-seed-configs.patch b/patches/server/0799-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0800-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0799-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0801-Implement-regenerateChunk.patch b/patches/server/0800-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0801-Implement-regenerateChunk.patch
rename to patches/server/0800-Implement-regenerateChunk.patch
index c1683dc486..a9643269e1 100644
--- a/patches/server/0801-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 04b4c2f4796046828a73d3911da880ccd3fdf349..a71886568581f39f91e3b06eada560aa60cf0c93 100644
+index 2cee0f5a746d37fa5b3fbe0ca3af2632af6f5735..498d8e2782d28db0fd35b737d548c1ffba238177 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/0802-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/0802-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0801-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0803-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0803-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0804-Add-GameEvent-tags.patch b/patches/server/0803-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0804-Add-GameEvent-tags.patch
rename to patches/server/0803-Add-GameEvent-tags.patch
diff --git a/patches/server/0805-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/0805-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/0806-Furnace-RecipesUsed-API.patch b/patches/server/0805-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0806-Furnace-RecipesUsed-API.patch
rename to patches/server/0805-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0807-Configurable-sculk-sensor-listener-range.patch b/patches/server/0806-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0807-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0806-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0808-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/0808-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/0809-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/0809-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/0810-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0810-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0811-Fix-Entity-Position-Desync.patch b/patches/server/0810-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0811-Fix-Entity-Position-Desync.patch
rename to patches/server/0810-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0812-Custom-Potion-Mixes.patch b/patches/server/0811-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0812-Custom-Potion-Mixes.patch
rename to patches/server/0811-Custom-Potion-Mixes.patch
diff --git a/patches/server/0813-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0812-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0813-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0812-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0814-Force-close-world-loading-screen.patch b/patches/server/0813-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0814-Force-close-world-loading-screen.patch
rename to patches/server/0813-Force-close-world-loading-screen.patch
diff --git a/patches/server/0815-Fix-falling-block-spawn-methods.patch b/patches/server/0814-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0815-Fix-falling-block-spawn-methods.patch
rename to patches/server/0814-Fix-falling-block-spawn-methods.patch
index 6980488fd9..1a6d6b70ec 100644
--- a/patches/server/0815-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 a71886568581f39f91e3b06eada560aa60cf0c93..56f1952a4595df2b2647dc9e6632cee44e8299ce 100644
+index 498d8e2782d28db0fd35b737d548c1ffba238177..63dff3a4426470cede26fcb03424f8cf63757214 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/0816-Expose-furnace-minecart-push-values.patch b/patches/server/0815-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0816-Expose-furnace-minecart-push-values.patch
rename to patches/server/0815-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0817-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/0817-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0818-More-Projectile-API.patch b/patches/server/0817-More-Projectile-API.patch
similarity index 99%
rename from patches/server/0818-More-Projectile-API.patch
rename to patches/server/0817-More-Projectile-API.patch
index 5c5c20465f..5cd7d6bb11 100644
--- a/patches/server/0818-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 1eec7926627d7956ffdd33f76247829453af3bf2..e41f99bdef9f779b3d039bfe7a4e560e9daed9f5 100644
+index 740ff3fed9c8d637527fda8544eba2b9d7d7280a..1f1519c1b33d16eba59546c86f20a099486441d7 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
diff --git a/patches/server/0819-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/0819-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0818-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0820-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/0820-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 c3410f10dd..e3a7190b21 100644
--- a/patches/server/0820-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 25b2bdca86b62e0c76059d87da9214c0bb41fe51..cdfb47713c690dbdfb54e20f68c3f6361209de0b 100644
+index d5bb89bd4948f1aff24c4725def980e6bcbdae84..f4a7ca4a525c4c573992b3ec38f5ad77a9cc04a5 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/0821-Implement-getComputedBiome-API.patch b/patches/server/0820-Implement-getComputedBiome-API.patch
similarity index 97%
rename from patches/server/0821-Implement-getComputedBiome-API.patch
rename to patches/server/0820-Implement-getComputedBiome-API.patch
index 0ec7d7dcf1..917fd0fc05 100644
--- a/patches/server/0821-Implement-getComputedBiome-API.patch
+++ b/patches/server/0820-Implement-getComputedBiome-API.patch
@@ -23,7 +23,7 @@ index e365081bf532488f2b41b22deb2fb2346d4f2322..446657577aa843e6ebc5143b6c511f33
      public void setBiome(Location location, Biome biome) {
          this.setBiome(location.getBlockX(), location.getBlockY(), location.getBlockZ(), biome);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 2f5b9083a3d11834fca74d11d6ba10d325a7f7c3..38408e37cd3d8742a5cbf6711d48b9c7a35159a1 100644
+index d6d8929c5332ddd315e67ebceb14f10c447f0f53..cd8ffcbcda3497e79d5e4a5d699ed6e28995571a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -343,6 +343,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0822-Make-some-itemstacks-nonnull.patch b/patches/server/0821-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0822-Make-some-itemstacks-nonnull.patch
rename to patches/server/0821-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0823-Implement-enchantWithLevels-API.patch b/patches/server/0822-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0823-Implement-enchantWithLevels-API.patch
rename to patches/server/0822-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0824-Fix-saving-in-unloadWorld.patch b/patches/server/0823-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0824-Fix-saving-in-unloadWorld.patch
rename to patches/server/0823-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0825-Buffer-OOB-setBlock-calls.patch b/patches/server/0824-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0825-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0824-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0826-Add-TameableDeathMessageEvent.patch b/patches/server/0825-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0826-Add-TameableDeathMessageEvent.patch
rename to patches/server/0825-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0827-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0826-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0827-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0826-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0828-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0827-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0828-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0827-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0829-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0828-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0829-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0828-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0830-Guard-against-invalid-entity-positions.patch b/patches/server/0829-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0830-Guard-against-invalid-entity-positions.patch
rename to patches/server/0829-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0831-cache-resource-keys.patch b/patches/server/0830-cache-resource-keys.patch
similarity index 97%
rename from patches/server/0831-cache-resource-keys.patch
rename to patches/server/0830-cache-resource-keys.patch
index 6fb99347f9..83011e9594 100644
--- a/patches/server/0831-cache-resource-keys.patch
+++ b/patches/server/0830-cache-resource-keys.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] cache resource keys
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 38408e37cd3d8742a5cbf6711d48b9c7a35159a1..47ee348a7042a8e0705bc7d2c4077c0f270a8239 100644
+index cd8ffcbcda3497e79d5e4a5d699ed6e28995571a..b6bf79b571c3a82df92e41810f68cdc1d3ec05ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -368,12 +368,13 @@ public class CraftBlock implements Block {
diff --git a/patches/server/0832-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0831-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0832-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0831-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0833-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0832-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0833-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0832-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0834-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0833-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0834-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0833-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0835-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0834-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 93%
rename from patches/server/0835-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0834-Prevent-tile-entity-copies-loading-chunks.patch
index ede2c6973f..345c65a5aa 100644
--- a/patches/server/0835-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0834-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 cdfb47713c690dbdfb54e20f68c3f6361209de0b..16ae84c100b5548035b7b8b23a6480f47ae22646 100644
+index f4a7ca4a525c4c573992b3ec38f5ad77a9cc04a5..84ec466ee96c7ad68f48109e816314827102d7b1 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/0836-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0835-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0836-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0835-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0837-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0836-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0837-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0836-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0838-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0837-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0838-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0837-Pass-ServerLevel-for-gamerule-callbacks.patch
index 1e42345f66..cd94fa55f3 100644
--- a/patches/server/0838-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0837-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 16ae84c100b5548035b7b8b23a6480f47ae22646..acb4b6bb80b59af28ba3658c11096750dccb5056 100644
+index 84ec466ee96c7ad68f48109e816314827102d7b1..f63e29b0783d53a30e0fa16ff2566020c057e4bb 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 56f1952a4595df2b2647dc9e6632cee44e8299ce..37a204d35979fb51cab9c228515e35c4b1049ab1 100644
+index 63dff3a4426470cede26fcb03424f8cf63757214..01ccb54fb94fc5c03865b12bde63a2cb5a46e0f5 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/0839-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0838-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0839-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0838-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0840-WorldCreator-keepSpawnLoaded.patch b/patches/server/0839-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0840-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0839-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0840-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0842-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0841-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0842-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0841-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0843-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0842-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0843-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0842-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0844-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0843-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0844-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0843-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0845-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0844-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0845-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0844-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0846-Add-PlayerStopUsingItemEvent.patch b/patches/server/0845-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0846-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0845-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0847-FallingBlock-auto-expire-setting.patch b/patches/server/0846-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0847-FallingBlock-auto-expire-setting.patch
rename to patches/server/0846-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0848-Don-t-tick-markers.patch b/patches/server/0847-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0848-Don-t-tick-markers.patch
rename to patches/server/0847-Don-t-tick-markers.patch
diff --git a/patches/server/0849-Do-not-accept-invalid-client-settings.patch b/patches/server/0848-Do-not-accept-invalid-client-settings.patch
similarity index 93%
rename from patches/server/0849-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0848-Do-not-accept-invalid-client-settings.patch
index 42958789ef..5aaa5f3578 100644
--- a/patches/server/0849-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0848-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 acb4b6bb80b59af28ba3658c11096750dccb5056..29ba350b026f8bec0654ba1ee7f34d5aa5f1648b 100644
+index f63e29b0783d53a30e0fa16ff2566020c057e4bb..b0b4c53cea08153f4d64da848fecced46424fea6 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/0850-Add-support-for-Proxy-Protocol.patch b/patches/server/0849-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0850-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0849-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0851-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0850-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0851-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0850-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0852-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0851-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0852-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0851-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0853-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0852-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0853-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0852-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0854-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0853-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0854-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0853-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0855-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0854-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0855-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0854-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0856-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0855-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0856-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0855-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0857-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0856-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0857-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0856-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0858-Dont-resent-entity-on-art-update.patch b/patches/server/0857-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0858-Dont-resent-entity-on-art-update.patch
rename to patches/server/0857-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0859-Add-WardenAngerChangeEvent.patch b/patches/server/0858-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0859-Add-WardenAngerChangeEvent.patch
rename to patches/server/0858-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0859-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0861-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0860-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0861-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0860-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0862-Nameable-Banner-API.patch b/patches/server/0861-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0862-Nameable-Banner-API.patch
rename to patches/server/0861-Nameable-Banner-API.patch
diff --git a/patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0862-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0863-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0864-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 94%
rename from patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0865-Don-t-print-component-in-resource-pack-rejection-mes.patch
index 42206f1a98..b1e570ae49 100644
--- a/patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch
+++ b/patches/server/0865-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 29ba350b026f8bec0654ba1ee7f34d5aa5f1648b..0dde460f9b9400644081ac23dbfa2c9bfb8d1617 100644
+index b0b4c53cea08153f4d64da848fecced46424fea6..9f416f1bb9b8233cf5ce19d5165981741bdc2c47 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/0867-Add-Player-getFishHook.patch b/patches/server/0866-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0867-Add-Player-getFishHook.patch
rename to patches/server/0866-Add-Player-getFishHook.patch
diff --git a/patches/server/0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0867-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0869-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0868-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0869-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0868-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 94%
rename from patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0869-Add-some-minimal-debug-information-to-chat-packet-er.patch
index be16e6c152..837b057e39 100644
--- a/patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch
+++ b/patches/server/0869-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 0dde460f9b9400644081ac23dbfa2c9bfb8d1617..5ac6de02ec3c6f77ec2fb71f17d5d74d8792d349 100644
+index 9f416f1bb9b8233cf5ce19d5165981741bdc2c47..194ec47011185c4ef8af2d8dc0f3bb6368490cde 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/0871-Fix-Bee-flower-NPE.patch b/patches/server/0870-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0871-Fix-Bee-flower-NPE.patch
rename to patches/server/0870-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0871-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index d72dac8f05..026a671200 100644
--- a/patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0871-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 5ac6de02ec3c6f77ec2fb71f17d5d74d8792d349..b0b8698622f8fd48fe9e6004918927b286893900 100644
+index 194ec47011185c4ef8af2d8dc0f3bb6368490cde..28ea0332f9ac492fcbaa07812d0ebd2baf738e43 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/0873-More-Teleport-API.patch b/patches/server/0872-More-Teleport-API.patch
similarity index 99%
rename from patches/server/0873-More-Teleport-API.patch
rename to patches/server/0872-More-Teleport-API.patch
index 198f69e0d3..0ede8d6919 100644
--- a/patches/server/0873-More-Teleport-API.patch
+++ b/patches/server/0872-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 b0b8698622f8fd48fe9e6004918927b286893900..731b3dfdee444c013f7650a4f3260d34aaaa5e74 100644
+index 28ea0332f9ac492fcbaa07812d0ebd2baf738e43..a00c686f0ffdc77f590e2451d531bc40e7a1d508 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/0874-Add-EntityPortalReadyEvent.patch b/patches/server/0873-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0874-Add-EntityPortalReadyEvent.patch
rename to patches/server/0873-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0875-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0874-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0875-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0874-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0876-Send-block-entities-after-destroy-prediction.patch b/patches/server/0875-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0876-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0875-Send-block-entities-after-destroy-prediction.patch
index 7355a13a6c..6e1204f798 100644
--- a/patches/server/0876-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0875-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 731b3dfdee444c013f7650a4f3260d34aaaa5e74..d37829b0a310abf212fbb516a27ae70abc265f64 100644
+index a00c686f0ffdc77f590e2451d531bc40e7a1d508..f31b1419762e5d41051a6ee76280357e73d8ff13 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/0877-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0877-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0876-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0877-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0877-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0879-Add-missing-BlockFadeEvents.patch b/patches/server/0878-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0879-Add-missing-BlockFadeEvents.patch
rename to patches/server/0878-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0880-Collision-API.patch b/patches/server/0879-Collision-API.patch
similarity index 100%
rename from patches/server/0880-Collision-API.patch
rename to patches/server/0879-Collision-API.patch
diff --git a/patches/server/0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0880-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0882-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0881-Remove-invalid-signature-login-stacktrace.patch
similarity index 93%
rename from patches/server/0882-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0881-Remove-invalid-signature-login-stacktrace.patch
index bdd4aae878..5ce447af88 100644
--- a/patches/server/0882-Remove-invalid-signature-login-stacktrace.patch
+++ b/patches/server/0881-Remove-invalid-signature-login-stacktrace.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid signature login stacktrace
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d37829b0a310abf212fbb516a27ae70abc265f64..230c3629f5e6bf80422812e7684a9bb643b1a46d 100644
+index f31b1419762e5d41051a6ee76280357e73d8ff13..9eaf25aa2100559dd9c9c92917dccafa9f976686 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3593,7 +3593,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 91%
rename from patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0882-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
index 6631d1348e..74b8885c99 100644
--- a/patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
+++ b/patches/server/0882-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 230c3629f5e6bf80422812e7684a9bb643b1a46d..f0b5acdae1cc0626339aca6b16aa26e291a661fa 100644
+index 9eaf25aa2100559dd9c9c92917dccafa9f976686..d0e964b59643a3f793a6a62ebb1c6eebe2e61377 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/0884-Block-Ticking-API.patch b/patches/server/0883-Block-Ticking-API.patch
similarity index 92%
rename from patches/server/0884-Block-Ticking-API.patch
rename to patches/server/0883-Block-Ticking-API.patch
index f1300b0a84..5827f7c67d 100644
--- a/patches/server/0884-Block-Ticking-API.patch
+++ b/patches/server/0883-Block-Ticking-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Block Ticking API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 47ee348a7042a8e0705bc7d2c4077c0f270a8239..2b78bdd5773872405690084fea5a92bc40894fe9 100644
+index 87dfc2fd1e2ff9e9449f1ce00dfb63e3e88839cd..350cbf64c17938021002d5fd67176c44b398231e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -738,5 +738,21 @@ public class CraftBlock implements Block {
+@@ -760,5 +760,21 @@ public class CraftBlock implements Block {
      public boolean isValidTool(ItemStack itemStack) {
          return getDrops(itemStack).size() != 0;
      }
diff --git a/patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0884-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0885-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0887-Add-NamespacedKey-biome-methods.patch b/patches/server/0886-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0887-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0886-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 96%
rename from patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch
index ce7032033d..950e47ed3e 100644
--- a/patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0887-Fix-plugin-loggers-on-server-shutdown.patch
@@ -49,7 +49,7 @@ index 0e04083ff0598451c66731b1518b2eb6367ae36c..710ca7d3a5659953f64bc6dccdd93b43
          // Paper end
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6a9485f1c3743562700779930282285c6ad1067a..e072a5475a64d110f25ebcc871aa7703c2fc1e70 100644
+index 1176f77c79c2cbd727f1f6867e956fb698936349..119d9bb5e41038704654e248bf168d22af246b7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,12 @@ public class Main {
diff --git a/patches/server/0889-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0888-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 100%
rename from patches/server/0889-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0888-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0890-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0889-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0890-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0889-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0890-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0891-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0893-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0892-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0893-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0892-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0894-Missing-eating-regain-reason.patch b/patches/server/0893-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0894-Missing-eating-regain-reason.patch
rename to patches/server/0893-Missing-eating-regain-reason.patch
diff --git a/patches/server/0895-Missing-effect-cause.patch b/patches/server/0894-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0895-Missing-effect-cause.patch
rename to patches/server/0894-Missing-effect-cause.patch
diff --git a/patches/server/0896-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0895-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0896-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0895-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0896-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0898-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0897-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0898-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0897-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0899-Configurable-chat-thread-limit.patch b/patches/server/0898-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0899-Configurable-chat-thread-limit.patch
rename to patches/server/0898-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0899-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 100%
rename from patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0900-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0902-fix-Jigsaw-block-kicking-user.patch b/patches/server/0901-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0902-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0901-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0903-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0902-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0903-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0902-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0903-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0905-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0904-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0905-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0904-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0905-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0907-Fix-custom-piglin-loved-items.patch b/patches/server/0906-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0907-Fix-custom-piglin-loved-items.patch
rename to patches/server/0906-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0908-EntityPickupItemEvent-fixes.patch b/patches/server/0907-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0908-EntityPickupItemEvent-fixes.patch
rename to patches/server/0907-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0909-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0908-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0909-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0908-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0909-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0911-Elder-Guardian-appearance-API.patch b/patches/server/0910-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0911-Elder-Guardian-appearance-API.patch
rename to patches/server/0910-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0912-Allow-changing-bed-s-occupied-property.patch b/patches/server/0911-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0912-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0911-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0913-Add-entity-knockback-API.patch b/patches/server/0912-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0913-Add-entity-knockback-API.patch
rename to patches/server/0912-Add-entity-knockback-API.patch
diff --git a/patches/server/0914-Detect-headless-JREs.patch b/patches/server/0913-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0914-Detect-headless-JREs.patch
rename to patches/server/0913-Detect-headless-JREs.patch
diff --git a/patches/server/0915-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0914-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0915-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0914-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0916-optimized-dirt-and-snow-spreading.patch b/patches/server/0915-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0916-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0915-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0917-Added-EntityToggleSitEvent.patch b/patches/server/0916-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0917-Added-EntityToggleSitEvent.patch
rename to patches/server/0916-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0918-Add-fire-tick-delay-option.patch b/patches/server/0917-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0918-Add-fire-tick-delay-option.patch
rename to patches/server/0917-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0919-Add-Moving-Piston-API.patch b/patches/server/0918-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0919-Add-Moving-Piston-API.patch
rename to patches/server/0918-Add-Moving-Piston-API.patch
diff --git a/patches/server/0920-Ignore-impossible-spawn-tick.patch b/patches/server/0919-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0920-Ignore-impossible-spawn-tick.patch
rename to patches/server/0919-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 93%
rename from patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch
index 5e59692203..1b04b06e26 100644
--- a/patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0920-Track-projectile-source-for-fireworks-from-dispenser.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Track projectile source for fireworks from dispensers
 
 
 diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
-index c0c31a5d356d0754b478d84f0cef87fc84c4fea1..a548d09fa7646254c34f41d30fbc1300e7cef3c1 100644
+index 3c2ed8e7cf54ab5e32df713010b948d568aab9b0..7ebe73921d197da4f992ddb92cbd4ac7211bd6cf 100644
 --- a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 +++ b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
 @@ -512,6 +512,7 @@ public interface DispenseItemBehavior {
diff --git a/patches/server/0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0921-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0922-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0924-Prevent-compass-from-loading-chunks.patch b/patches/server/0923-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0924-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0923-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0925-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0924-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0925-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0924-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0926-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0925-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0926-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0925-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0927-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0926-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0927-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0926-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/server/0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
similarity index 100%
rename from patches/server/0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
rename to patches/server/0927-Reorder-bukkit-damage-source-entity-for-explosion-to.patch
diff --git a/patches/server/0929-Add-Player-Warden-Warning-API.patch b/patches/server/0928-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0929-Add-Player-Warden-Warning-API.patch
rename to patches/server/0928-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0930-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0929-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/0929-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0931-Add-paper-dumplisteners-command.patch b/patches/server/0930-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0931-Add-paper-dumplisteners-command.patch
rename to patches/server/0930-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0932-check-global-player-list-where-appropriate.patch b/patches/server/0931-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/0931-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/0932-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/0932-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0934-ItemStack-damage-API.patch b/patches/server/0933-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0934-ItemStack-damage-API.patch
rename to patches/server/0933-ItemStack-damage-API.patch
diff --git a/patches/server/0935-Friction-API.patch b/patches/server/0934-Friction-API.patch
similarity index 100%
rename from patches/server/0935-Friction-API.patch
rename to patches/server/0934-Friction-API.patch
diff --git a/patches/server/0936-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0935-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/0935-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0937-Fix-player-kick-on-shutdown.patch b/patches/server/0936-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0937-Fix-player-kick-on-shutdown.patch
rename to patches/server/0936-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0938-Sync-offhand-slot-in-menus.patch b/patches/server/0937-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0938-Sync-offhand-slot-in-menus.patch
rename to patches/server/0937-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0939-Player-Entity-Tracking-Events.patch b/patches/server/0938-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0939-Player-Entity-Tracking-Events.patch
rename to patches/server/0938-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0940-Limit-pet-look-distance.patch b/patches/server/0939-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0940-Limit-pet-look-distance.patch
rename to patches/server/0939-Limit-pet-look-distance.patch
diff --git a/patches/server/0941-Properly-resend-entities.patch b/patches/server/0940-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0941-Properly-resend-entities.patch
rename to patches/server/0940-Properly-resend-entities.patch
index ca95be180f..a49fd461d4 100644
--- a/patches/server/0941-Properly-resend-entities.patch
+++ b/patches/server/0940-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 f0b5acdae1cc0626339aca6b16aa26e291a661fa..0c2255b6e2fb7752f85b0f83d4f84732758bd14d 100644
+index d0e964b59643a3f793a6a62ebb1c6eebe2e61377..57a62a5d6e05b6e05214b5aef96c5f2411e9f424 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/0941-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/0941-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0943-fix-Instruments.patch b/patches/server/0942-fix-Instruments.patch
similarity index 100%
rename from patches/server/0943-fix-Instruments.patch
rename to patches/server/0942-fix-Instruments.patch
diff --git a/patches/server/0944-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0943-Fix-chunk-snapshot-biome-getter.patch
similarity index 100%
rename from patches/server/0944-Fix-chunk-snapshot-biome-getter.patch
rename to patches/server/0943-Fix-chunk-snapshot-biome-getter.patch
diff --git a/patches/server/0945-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0944-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0945-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0944-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0946-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0945-Fix-MapLike-Codec-missing-key-selector.patch
similarity index 100%
rename from patches/server/0946-Fix-MapLike-Codec-missing-key-selector.patch
rename to patches/server/0945-Fix-MapLike-Codec-missing-key-selector.patch
diff --git a/patches/server/0947-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0946-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0947-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0946-Fix-inconsistencies-in-dispense-events-regarding-sta.patch