From f331ac28e0d24aac435dca09e08a91d939d4cb9c Mon Sep 17 00:00:00 2001
From: Jake <jake.m.potrebic@gmail.com>
Date: Wed, 24 Nov 2021 10:46:06 -0800
Subject: [PATCH] add back Optimize collision to not load chunks

---
 patches/server/0006-MC-Utils.patch            | 13 +--
 patches/server/0010-Timings-v2.patch          |  6 +-
 ...event-tile-entity-and-entity-crashes.patch |  4 +-
 .../0044-Disable-spigot-tick-limiters.patch   |  4 +-
 .../0056-Add-exception-reporting-event.patch  |  4 +-
 .../server/0067-Add-World-Util-Methods.patch  |  4 +-
 ...ckPhysicsEvent-if-a-plugin-has-a-lis.patch |  6 +-
 ...g-BlockPlaceEvent-triggering-physics.patch |  4 +-
 ...imize-World.isLoaded-BlockPosition-Z.patch |  4 +-
 ...65-Fix-MC-117075-TE-Unload-Lag-Spike.patch |  8 +-
 ...e-implementations-for-captured-block.patch |  8 +-
 ...t-armor-stands-from-doing-entity-loo.patch |  4 +-
 patches/server/0303-BlockDestroyEvent.patch   |  4 +-
 ...-Optimize-Captured-TileEntity-Lookup.patch |  4 +-
 ...opper-searches-if-there-are-no-items.patch |  4 +-
 ...timize-Collision-to-not-load-chunks.patch} | 92 ++++++++++---------
 ...ove-existing-players-to-world-spawn.patch} |  2 +-
 ...alSelector-Goal.Flag-Set-operations.patch} |  0
 ...h => 0393-Improved-Watchdog-Support.patch} |  6 +-
 ....patch => 0394-Optimize-Pathfinding.patch} |  0
 ...5-Reduce-Either-Optional-allocation.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...98-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  0
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...2-Broadcast-join-message-to-console.patch} |  2 +-
 ...Chunk-Post-Processing-deadlock-risk.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  2 +-
 ...oad-Chunks-for-Login-Asynchronously.patch} |  2 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  4 +-
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} | 12 +--
 ...patch => 0411-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  0
 ...n.patch => 0413-Expose-game-version.patch} |  0
 ...> 0414-Optimize-Voxel-Shape-Merging.patch} |  6 +-
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ....patch => 0416-misc-debugging-dumps.patch} |  0
 ...traces-in-log-messages-crash-report.patch} |  0
 ...atch => 0418-Implement-Mob-Goal-API.patch} |  0
 ...=> 0419-Add-villager-reputation-API.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ...tch => 0421-ExperienceOrbMergeEvent.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...API.patch => 0424-Potential-bed-API.patch} |  0
 ...ait-for-Async-Tasks-during-shutdown.patch} |  0
 ...er-respects-game-and-entity-rules-f.patch} |  0
 ...nd-End-Portal-Frames-from-being-des.patch} |  4 +-
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  0
 ...> 0430-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0433-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  0
 ...uping.patch => 0438-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0441-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...4-Add-permission-for-command-blocks.patch} |  0
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  8 +-
 ...d-Difficulty-Remembering-Difficulty.patch} |  0
 ...atch => 0447-Paper-dumpitem-command.patch} |  0
 ...48-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...e-operations-for-updating-light-dat.patch} |  0
 ...453-Support-old-UUID-format-for-NBT.patch} |  0
 ...p-duplicated-GameProfile-Properties.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...e-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...0459-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0461-Add-entity-liquid-API.patch} |  4 +-
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  2 +-
 ...atch => 0464-Add-PrepareResultEvent.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-5989.patch => 0471-Fix-SPIGOT-5989.patch} |  4 +-
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0479-Brand-support.patch} |  0
 ...patch => 0480-Add-setMaxPlayers-API.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0482-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0484-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0486-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0488-Buffer-joins-to-world.patch} |  0
 ...=> 0489-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0492-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0493-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0496-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  4 +-
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  4 +-
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0504-Entity-isTicking.patch} |  4 +-
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0509-Optimise-getType-calls.patch} |  0
 ....patch => 0510-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  2 +-
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0515-Player-elytra-boost-API.patch} |  0
 ...16-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0519-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  0
 ...> 0522-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...524-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0525-Add-API-for-quit-reason.patch} |  2 +-
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...ch => 0528-Expose-world-spawn-angle.patch} |  2 +-
 ...patch => 0529-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...31-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0532-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0533-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  4 +-
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0536-Add-PlayerShearBlockEvent.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  0
 ....patch => 0538-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0540-MC-4-Fix-item-position-desync.patch} |  4 +-
 ...541-Player-Chunk-Load-Unload-Events.patch} |  0
 ...2-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...-invalid-ingredient-lists-in-Villag.patch} |  0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |  0
 ...ch => 0547-Implement-TargetHitEvent.patch} |  0
 ...548-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0549-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0551-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  0
 ...h => 0556-Zombie-API-breaking-doors.patch} |  0
 ...557-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0558-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0559-Guardian-beam-workaround.patch} |  0
 ...0560-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...mplemented-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  0
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...I-to-expose-exact-interaction-point.patch} |  0
 ...OIs.patch => 0569-Remove-stale-POIs.patch} |  0
 ...h => 0570-Fix-villager-boat-exploit.patch} |  2 +-
 ...I.patch => 0571-Add-sendOpLevel-API.patch} |  6 +-
 ...ch => 0572-Add-StructureLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  4 +-
 ...leHitEvent-call-when-fireballs-dead.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...576-Make-schedule-command-per-world.patch} |  0
 ...577-Configurable-max-leash-distance.patch} |  0
 ...578-Implement-BlockPreDispenseEvent.patch} |  0
 204 files changed, 138 insertions(+), 133 deletions(-)
 rename patches/{removed/1.18/0393-Optimize-Collision-to-not-load-chunks.patch => server/0390-Optimize-Collision-to-not-load-chunks.patch} (63%)
 rename patches/server/{0390-Don-t-move-existing-players-to-world-spawn.patch => 0391-Don-t-move-existing-players-to-world-spawn.patch} (96%)
 rename patches/server/{0391-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0392-Improved-Watchdog-Support.patch => 0393-Improved-Watchdog-Support.patch} (99%)
 rename patches/server/{0393-Optimize-Pathfinding.patch => 0394-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0394-Reduce-Either-Optional-allocation.patch => 0395-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0395-Reduce-memory-footprint-of-NBTTagCompound.patch => 0396-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0396-Prevent-opening-inventories-when-frozen.patch => 0397-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename patches/server/{0397-Optimise-ArraySetSorted-removeIf.patch => 0398-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename patches/server/{0398-Don-t-run-entity-collision-code-if-not-needed.patch => 0399-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0399-Implement-Player-Client-Options-API.patch => 0400-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0400-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0401-Broadcast-join-message-to-console.patch => 0402-Broadcast-join-message-to-console.patch} (92%)
 rename patches/server/{0402-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0403-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename patches/server/{0403-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (98%)
 rename patches/server/{0404-Load-Chunks-for-Login-Asynchronously.patch => 0405-Load-Chunks-for-Login-Asynchronously.patch} (99%)
 rename patches/server/{0405-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (89%)
 rename patches/server/{0406-Add-PlayerAttackEntityCooldownResetEvent.patch => 0407-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0407-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0408-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0408-Add-phantom-creative-and-insomniac-controls.patch => 0409-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0409-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (94%)
 rename patches/server/{0410-Villager-Restocks-API.patch => 0411-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0411-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0412-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename patches/server/{0412-Expose-game-version.patch => 0413-Expose-game-version.patch} (100%)
 rename patches/server/{0413-Optimize-Voxel-Shape-Merging.patch => 0414-Optimize-Voxel-Shape-Merging.patch} (96%)
 rename patches/server/{0414-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0415-misc-debugging-dumps.patch => 0416-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0416-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (100%)
 rename patches/server/{0417-Implement-Mob-Goal-API.patch => 0418-Implement-Mob-Goal-API.patch} (100%)
 rename patches/server/{0418-Add-villager-reputation-API.patch => 0419-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0419-Option-for-maximum-exp-value-when-merging-orbs.patch => 0420-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0420-ExperienceOrbMergeEvent.patch => 0421-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0421-Fix-PotionEffect-ignores-icon-flag.patch => 0422-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0422-Optimize-brigadier-child-sorting-performance.patch => 0423-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0423-Potential-bed-API.patch => 0424-Potential-bed-API.patch} (100%)
 rename patches/server/{0424-Wait-for-Async-Tasks-during-shutdown.patch => 0425-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0425-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0426-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (98%)
 rename patches/server/{0427-Reduce-MutableInt-allocations-from-light-engine.patch => 0428-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0428-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename patches/server/{0429-Ensure-safe-gateway-teleport.patch => 0430-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0430-Add-option-for-console-having-all-permissions.patch => 0431-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0431-Fix-villager-trading-demand-MC-163962.patch => 0432-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0432-Maps-shouldn-t-load-chunks.patch => 0433-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0434-Fix-missing-chunks-due-to-integer-overflow.patch => 0435-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0435-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0436-Fix-piston-physics-inconsistency-MC-188840.patch => 0437-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0437-Fix-sand-duping.patch => 0438-Fix-sand-duping.patch} (100%)
 rename patches/server/{0438-Prevent-position-desync-in-playerconnection-causing-.patch => 0439-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename patches/server/{0439-Inventory-getHolder-method-without-block-snapshot.patch => 0440-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0440-Expose-Arrow-getItemStack.patch => 0441-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/server/{0441-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0442-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0442-Hide-sync-chunk-writes-behind-flag.patch => 0443-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0443-Add-permission-for-command-blocks.patch => 0444-Add-permission-for-command-blocks.patch} (100%)
 rename patches/server/{0444-Ensure-Entity-AABB-s-are-never-invalid.patch => 0445-Ensure-Entity-AABB-s-are-never-invalid.patch} (86%)
 rename patches/server/{0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)
 rename patches/server/{0446-Paper-dumpitem-command.patch => 0447-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0447-Don-t-allow-null-UUID-s-for-chat.patch => 0448-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0448-Improve-Legacy-Component-serialization-size.patch => 0449-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0449-Optimize-Bit-Operations-by-inlining.patch => 0450-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0451-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0452-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0452-Support-old-UUID-format-for-NBT.patch => 0453-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0453-Clean-up-duplicated-GameProfile-Properties.patch => 0454-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0454-Convert-legacy-attributes-in-Item-Meta.patch => 0455-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0455-Remove-some-streams-from-structures.patch => 0456-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0456-Remove-streams-from-classes-related-villager-gossip.patch => 0457-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0457-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0458-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename patches/server/{0458-Support-components-in-ItemMeta.patch => 0459-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0460-Add-entity-liquid-API.patch => 0461-Add-entity-liquid-API.patch} (92%)
 rename patches/server/{0461-Update-itemstack-legacy-name-and-lore.patch => 0462-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0462-Spawn-player-in-correct-world-on-login.patch => 0463-Spawn-player-in-correct-world-on-login.patch} (94%)
 rename patches/server/{0463-Add-PrepareResultEvent.patch => 0464-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0465-Optimize-NetworkManager-Exception-Handling.patch => 0466-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0466-Optimize-the-advancement-data-player-iteration-to-be.patch => 0467-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0467-Fix-arrows-never-despawning-MC-125757.patch => 0468-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0468-Thread-Safe-Vanilla-Command-permission-checking.patch => 0469-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0469-Move-range-check-for-block-placing-up.patch => 0470-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0470-Fix-SPIGOT-5989.patch => 0471-Fix-SPIGOT-5989.patch} (95%)
 rename patches/server/{0471-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0472-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0472-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0473-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0473-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0474-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0474-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0475-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0475-Fix-some-rails-connecting-improperly.patch => 0476-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0476-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0477-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0477-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0478-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0478-Brand-support.patch => 0479-Brand-support.patch} (100%)
 rename patches/server/{0479-Add-setMaxPlayers-API.patch => 0480-Add-setMaxPlayers-API.patch} (94%)
 rename patches/server/{0480-Add-playPickupItemAnimation-to-LivingEntity.patch => 0481-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0481-Don-t-require-FACING-data.patch => 0482-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0482-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0483-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0483-Add-moon-phase-API.patch => 0484-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0484-Prevent-headless-pistons-from-being-created.patch => 0485-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0485-Add-BellRingEvent.patch => 0486-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0486-Add-zombie-targets-turtle-egg-config.patch => 0487-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0487-Buffer-joins-to-world.patch => 0488-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0488-Optimize-redstone-algorithm.patch => 0489-Optimize-redstone-algorithm.patch} (100%)
 rename patches/server/{0489-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0490-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0490-PortalCreateEvent-needs-to-know-its-entity.patch => 0491-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0491-Fix-CraftTeam-null-check.patch => 0492-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0492-Add-more-Evoker-API.patch => 0493-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0493-Add-methods-to-get-translation-keys.patch => 0494-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0494-Create-HoverEvent-from-ItemStack-Entity.patch => 0495-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0495-Cache-block-data-strings.patch => 0496-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0496-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0497-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (97%)
 rename patches/server/{0497-Add-additional-open-container-api-to-HumanEntity.patch => 0498-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0498-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0499-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0499-Extend-block-drop-capture-to-capture-all-items-added.patch => 0500-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0500-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0501-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename patches/server/{0501-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0502-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (90%)
 rename patches/server/{0502-Lazily-track-plugin-scoreboards-by-default.patch => 0503-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0503-Entity-isTicking.patch => 0504-Entity-isTicking.patch} (91%)
 rename patches/server/{0504-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0505-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0505-Fix-Concurrency-issue-in-WeightedList.patch => 0506-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename patches/server/{0506-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0507-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0507-Fix-for-large-move-vectors-crashing-server.patch => 0508-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0508-Optimise-getType-calls.patch => 0509-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0509-Villager-resetOffers.patch => 0510-Villager-resetOffers.patch} (100%)
 rename patches/server/{0510-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0511-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0511-Retain-block-place-order-when-capturing-blockstates.patch => 0512-Retain-block-place-order-when-capturing-blockstates.patch} (93%)
 rename patches/server/{0512-Reduce-blockpos-allocation-from-pathfinding.patch => 0513-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0513-Fix-item-locations-dropped-from-campfires.patch => 0514-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0514-Player-elytra-boost-API.patch => 0515-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0515-Fixed-TileEntityBell-memory-leak.patch => 0516-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0516-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0517-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0517-Add-getOfflinePlayerIfCached-String.patch => 0518-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0518-Add-ignore-discounts-API.patch => 0519-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0519-Toggle-for-removing-existing-dragon.patch => 0520-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0520-Fix-client-lag-on-advancement-loading.patch => 0521-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0521-Item-no-age-no-player-pickup.patch => 0522-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0522-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0523-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0523-Beacon-API-custom-effect-ranges.patch => 0524-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0524-Add-API-for-quit-reason.patch => 0525-Add-API-for-quit-reason.patch} (98%)
 rename patches/server/{0525-Add-Wandering-Trader-spawn-rate-config-options.patch => 0526-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0526-Significantly-improve-performance-of-the-end-generat.patch => 0527-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0527-Expose-world-spawn-angle.patch => 0528-Expose-world-spawn-angle.patch} (95%)
 rename patches/server/{0528-Add-Destroy-Speed-API.patch => 0529-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0529-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0530-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0530-Add-LivingEntity-clearActiveItem.patch => 0531-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0531-Add-PlayerItemCooldownEvent.patch => 0532-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0532-More-lightning-API.patch => 0533-More-lightning-API.patch} (100%)
 rename patches/server/{0533-Climbing-should-not-bypass-cramming-gamerule.patch => 0534-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename patches/server/{0534-Added-missing-default-perms-for-commands.patch => 0535-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0535-Add-PlayerShearBlockEvent.patch => 0536-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0536-Fix-curing-zombie-villager-discount-exploit.patch => 0537-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0537-Limit-recipe-packets.patch => 0538-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0538-Fix-CraftSound-backwards-compatibility.patch => 0539-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0539-MC-4-Fix-item-position-desync.patch => 0540-MC-4-Fix-item-position-desync.patch} (95%)
 rename patches/server/{0540-Player-Chunk-Load-Unload-Events.patch => 0541-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0541-Optimize-Dynamic-get-Missing-Keys.patch => 0542-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0542-Expose-LivingEntity-hurt-direction.patch => 0543-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0543-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0544-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0544-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0545-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0545-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0546-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0546-Implement-TargetHitEvent.patch => 0547-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0547-Additional-Block-Material-API-s.patch => 0548-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0548-Fix-harming-potion-dupe.patch => 0549-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0549-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0550-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0550-Cache-burn-durations.patch => 0551-Cache-burn-durations.patch} (100%)
 rename patches/server/{0551-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0552-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0552-Fix-Not-a-string-Map-Conversion-spam.patch => 0553-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0553-Implement-PlayerFlowerPotManipulateEvent.patch => 0554-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0554-Fix-interact-event-not-being-called-in-adventure.patch => 0555-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0555-Zombie-API-breaking-doors.patch => 0556-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0556-Fix-nerfed-slime-when-splitting.patch => 0557-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0557-Add-EntityLoadCrossbowEvent.patch => 0558-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0558-Guardian-beam-workaround.patch => 0559-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0559-Added-WorldGameRuleChangeEvent.patch => 0560-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0560-Added-ServerResourcesReloadedEvent.patch => 0561-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0561-Added-world-settings-for-mobs-picking-up-loot.patch => 0562-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0562-Implemented-BlockFailedDispenseEvent.patch => 0563-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0563-Added-PlayerLecternPageChangeEvent.patch => 0564-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0564-Added-PlayerLoomPatternSelectEvent.patch => 0565-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0565-Configurable-door-breaking-difficulty.patch => 0566-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0566-Empty-commands-shall-not-be-dispatched.patch => 0567-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0567-Implement-API-to-expose-exact-interaction-point.patch => 0568-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0568-Remove-stale-POIs.patch => 0569-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0569-Fix-villager-boat-exploit.patch => 0570-Fix-villager-boat-exploit.patch} (93%)
 rename patches/server/{0570-Add-sendOpLevel-API.patch => 0571-Add-sendOpLevel-API.patch} (90%)
 rename patches/server/{0571-Add-StructureLocateEvent.patch => 0572-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0572-Collision-option-for-requiring-a-player-participant.patch => 0573-Collision-option-for-requiring-a-player-participant.patch} (96%)
 rename patches/server/{0573-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0574-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0574-Return-chat-component-with-empty-text-instead-of-thr.patch => 0575-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0575-Make-schedule-command-per-world.patch => 0576-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0576-Configurable-max-leash-distance.patch => 0577-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0577-Implement-BlockPreDispenseEvent.patch => 0578-Implement-BlockPreDispenseEvent.patch} (100%)

diff --git a/patches/server/0006-MC-Utils.patch b/patches/server/0006-MC-Utils.patch
index 2221c39a98..89a0dc4a61 100644
--- a/patches/server/0006-MC-Utils.patch
+++ b/patches/server/0006-MC-Utils.patch
@@ -6177,7 +6177,7 @@ index 208a713ec4b7b592801eb26860b7b81a2b3f7aa2..df787c12053f799b111c539d866ff8c7
      }
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 76251b5adf41f8e5bf2c07145abe3108fcde8669..03e0254813b977d0342171a37762fec9629afbad 100644
+index 76251b5adf41f8e5bf2c07145abe3108fcde8669..a60b8043540cacfa8cc3baba0872eefd4fc9464d 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
 @@ -9,10 +9,12 @@ import javax.annotation.Nullable;
@@ -6198,7 +6198,7 @@ index 76251b5adf41f8e5bf2c07145abe3108fcde8669..03e0254813b977d0342171a37762fec9
  
      BlockState getBlockState(BlockPos pos);
 +    // Paper start - if loaded util
-+    BlockState getTypeIfLoaded(BlockPos blockposition);
++    @Nullable BlockState getTypeIfLoaded(BlockPos blockposition);
 +    default Material getMaterialIfLoaded(BlockPos blockposition) {
 +        BlockState type = this.getTypeIfLoaded(blockposition);
 +        return type == null ? null : type.getMaterial();
@@ -6278,7 +6278,7 @@ index 3c707d6674b2594b09503b959a31c1f4ad3981e6..c7d499bfc22152e0a49f50a2a8133f31
      public BlockState getBlockState(BlockPos pos) {
          return Blocks.AIR.defaultBlockState();
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e2b9c20a82630f1991228c6194acef5ef6a7b8b0..d449516a2aafebe3cda9810b7d1ee97e61e8f399 100644
+index e2b9c20a82630f1991228c6194acef5ef6a7b8b0..8427d08ca3b61cce9d7bbdfdcf5946e1f459a21f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -85,6 +85,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -6289,7 +6289,7 @@ index e2b9c20a82630f1991228c6194acef5ef6a7b8b0..d449516a2aafebe3cda9810b7d1ee97e
  import org.bukkit.craftbukkit.block.data.CraftBlockData;
  import org.bukkit.craftbukkit.util.CraftNamespacedKey;
  import org.bukkit.event.block.BlockPhysicsEvent;
-@@ -271,18 +272,50 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -271,18 +272,51 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return y < -20000000 || y >= 20000000;
      }
  
@@ -6314,6 +6314,7 @@ index e2b9c20a82630f1991228c6194acef5ef6a7b8b0..d449516a2aafebe3cda9810b7d1ee97e
 +    }
 +
 +    @Override
++    @Nullable
 +    public final BlockState getTypeIfLoaded(BlockPos blockposition) {
 +        // CraftBukkit start - tree generation
 +        if (captureTreeGeneration) {
@@ -6344,7 +6345,7 @@ index e2b9c20a82630f1991228c6194acef5ef6a7b8b0..d449516a2aafebe3cda9810b7d1ee97e
          ChunkAccess ichunkaccess = this.getChunkSource().getChunk(chunkX, chunkZ, leastStatus, create);
  
          if (ichunkaccess == null && create) {
-@@ -293,7 +326,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -293,7 +327,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      @Override
@@ -6353,7 +6354,7 @@ index e2b9c20a82630f1991228c6194acef5ef6a7b8b0..d449516a2aafebe3cda9810b7d1ee97e
          return this.setBlock(pos, state, flags, 512);
      }
  
-@@ -598,7 +631,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -598,7 +632,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          if (this.isOutsideBuildHeight(pos)) {
              return Blocks.VOID_AIR.defaultBlockState();
          } else {
diff --git a/patches/server/0010-Timings-v2.patch b/patches/server/0010-Timings-v2.patch
index e5ba5bd258..0faf42c556 100644
--- a/patches/server/0010-Timings-v2.patch
+++ b/patches/server/0010-Timings-v2.patch
@@ -1041,7 +1041,7 @@ index 4dd57007af218ba1c0e666117a49939c5884f2c6..a6cb949b6f048455acc50c897fdd93d3
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 3f938d953daee7a5551a62df25f2e0fb487733ec..cab03a81a97d851db61e517cfe3a43fa8afd32b2 100644
+index 6e5a25db47b0de69303060ad172eae7c9b8b0905..66416d761cc71b2d57acb840b781870dc3180c46 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,8 +1,10 @@
@@ -1582,7 +1582,7 @@ index 010d7a0dc97c7bdd3fbafe974aa73f3dba106d4d..906c23068d1f5be76a6985b7255f6f15
          if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
              this.hurt(DamageSource.DROWN, 1.0F);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d449516a2aafebe3cda9810b7d1ee97e61e8f399..99685c3ad91ca0e3bf20fb6ca100466ec14b7a0f 100644
+index 8427d08ca3b61cce9d7bbdfdcf5946e1f459a21f..2bee54c8008e9c5a353b971c40d0a11722cd5eff 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -83,7 +83,6 @@ import org.bukkit.Bukkit;
@@ -1611,7 +1611,7 @@ index d449516a2aafebe3cda9810b7d1ee97e61e8f399..99685c3ad91ca0e3bf20fb6ca100466e
          this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
      }
-@@ -728,15 +727,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -729,15 +728,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
          timings.tileEntityTick.stopTiming(); // Spigot
          this.tickingBlockEntities = false;
diff --git a/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch b/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
index dfbfdb47ff..decf1c68a3 100644
--- a/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
+++ b/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e112598c854a2c93a8e6b6bda3cfdd4ee4091980..1195a4b79103d62ed4f8c91dd36ccd77fa561f01 100644
+index 0fa0bd695cc6d71eaba1565a408a2a0c257c3838..f5dd0965b8194aa6e6b82ac22238f7c78690110e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -737,11 +737,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -738,11 +738,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
diff --git a/patches/server/0044-Disable-spigot-tick-limiters.patch b/patches/server/0044-Disable-spigot-tick-limiters.patch
index 1020594c4b..9b3b125e8b 100644
--- a/patches/server/0044-Disable-spigot-tick-limiters.patch
+++ b/patches/server/0044-Disable-spigot-tick-limiters.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d8da1dfdc58726eda01e1bfb059c144e98ce7fe8..8e06ce1d838b9eaa71a699a999e91dcd5d596a7b 100644
+index 809f1ac0aca97d484e2f92ebf38a0303499f08ae..db226fe9515e904b8520a063b6dcde62b315a9b1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -703,9 +703,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -704,9 +704,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          // Spigot start
          // Iterator iterator = this.blockEntityTickers.iterator();
          int tilesThisCycle = 0;
diff --git a/patches/server/0056-Add-exception-reporting-event.patch b/patches/server/0056-Add-exception-reporting-event.patch
index 1f946f6d86..5f73823ca9 100644
--- a/patches/server/0056-Add-exception-reporting-event.patch
+++ b/patches/server/0056-Add-exception-reporting-event.patch
@@ -108,7 +108,7 @@ index 4cde8d630a0951f297622af4ef781f5b3fabf9af..7044d8c71e85551e11bf2d96b767e088
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8e06ce1d838b9eaa71a699a999e91dcd5d596a7b..79764895307139b34f2b018f3be86d6610503b64 100644
+index db226fe9515e904b8520a063b6dcde62b315a9b1..4060b72729609f66e5ad7b14f4aafa3c6a79a0e1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1,5 +1,10 @@
@@ -122,7 +122,7 @@ index 8e06ce1d838b9eaa71a699a999e91dcd5d596a7b..79764895307139b34f2b018f3be86d66
  import com.google.common.collect.Lists;
  import com.mojang.serialization.Codec;
  import java.io.IOException;
-@@ -739,6 +744,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -740,6 +745,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper start - Prevent tile entity and entity crashes
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level.getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
diff --git a/patches/server/0067-Add-World-Util-Methods.patch b/patches/server/0067-Add-World-Util-Methods.patch
index e7f968e350..9430808bab 100644
--- a/patches/server/0067-Add-World-Util-Methods.patch
+++ b/patches/server/0067-Add-World-Util-Methods.patch
@@ -19,10 +19,10 @@ index 032e1e08413f2d0f601cdc32fe12145e2c1fec5f..19c97a14cbf23130db2de80e3f7f6e0c
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 79764895307139b34f2b018f3be86d6610503b64..507d38a8e7b643712fe235c73f440c0a52b6d8b2 100644
+index 4060b72729609f66e5ad7b14f4aafa3c6a79a0e1..a4c0b2ee7a5c6a11ed2f93c63106570f1dfb2072 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -313,11 +313,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -314,11 +314,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      @Override
diff --git a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index f2fdc316ca..65ed294a10 100644
--- a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -30,10 +30,10 @@ index 9f7bbd602c19f317d05cd8b72453c2e37d8acff5..bd53d00db453767fb43ba0e50c0dc0a7
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b6f2be487720e31a548a3cee4cd73319f402f6ff..bb6083b40e211964730f88057df509f6d860bc11 100644
+index f652b3f04ee80b1bc8ac6873cb93e8ea34082cdc..2cc265cb984160047a44261ebbf5ff718bdf6b0c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -474,7 +474,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -475,7 +475,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
@@ -42,7 +42,7 @@ index b6f2be487720e31a548a3cee4cd73319f402f6ff..bb6083b40e211964730f88057df509f6
                      BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
                      this.getCraftServer().getPluginManager().callEvent(event);
  
-@@ -587,7 +587,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -588,7 +588,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              try {
                  // CraftBukkit start
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 93c4e20ede..0d7701d8e8 100644
--- a/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index bb6083b40e211964730f88057df509f6d860bc11..7c0437929964d95797c13b690a6167f2bce95736 100644
+index 2cc265cb984160047a44261ebbf5ff718bdf6b0c..2cec48979dafd3edf8c6744e2f5f65a922537b0f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -545,6 +545,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -546,6 +546,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public void setBlocksDirty(BlockPos pos, BlockState old, BlockState updated) {}
  
      public void updateNeighborsAt(BlockPos pos, Block block) {
diff --git a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
index 89f5a7fc9f..f9f3f4346b 100644
--- a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8142f6c2d3bd17aec313d46141910f0743c6345e..ca2e81b9eace4124b83588c604a88a0e5595c6e6 100644
+index 11cd3fc535717f074c20a39b4248d623176f7445..7a392ab56a95bba28aca33be6a738136a6803e0c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -320,6 +320,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -321,6 +321,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return chunk == null ? null : chunk.getFluidState(blockposition);
      }
  
diff --git a/patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index f08faba734..75e113d541 100644
--- a/patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/server/0165-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8fbf239cdc5bc2f1ec7b91eaee85d032e65f250f..8844a6d3e06d5a29013fdf78072109cc50819d71 100644
+index d6a7e8ea664143f0a85f977bcecc93de4681c39b..515ca01ac46df23399ff49ca53d336db68b5a898 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -731,6 +731,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -732,6 +732,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          // Spigot start
          // Iterator iterator = this.blockEntityTickers.iterator();
          int tilesThisCycle = 0;
@@ -17,7 +17,7 @@ index 8fbf239cdc5bc2f1ec7b91eaee85d032e65f250f..8844a6d3e06d5a29013fdf78072109cc
          for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
              this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
              TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
-@@ -738,7 +740,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -739,7 +741,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (tickingblockentity == null) {
                  this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
                  tilesThisCycle--;
@@ -25,7 +25,7 @@ index 8fbf239cdc5bc2f1ec7b91eaee85d032e65f250f..8844a6d3e06d5a29013fdf78072109cc
                  continue;
              }
              // Spigot end
-@@ -746,12 +747,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -747,12 +748,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (tickingblockentity.isRemoved()) {
                  // Spigot start
                  tilesThisCycle--;
diff --git a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
index 72f52e2755..d692d0ae00 100644
--- a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8844a6d3e06d5a29013fdf78072109cc50819d71..21491224a8383cef2d41b0da2e7de9362fe1d27f 100644
+index 515ca01ac46df23399ff49ca53d336db68b5a898..04d5c09def0901ad36bab682a333bc41278dadf9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -142,7 +142,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -30,7 +30,7 @@ index 8844a6d3e06d5a29013fdf78072109cc50819d71..21491224a8383cef2d41b0da2e7de936
      public Map<BlockPos, BlockEntity> capturedTileEntities = new HashMap<>();
      public List<ItemEntity> captureDrops;
      public long ticksPerAnimalSpawns;
-@@ -362,7 +362,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -363,7 +363,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
@@ -39,7 +39,7 @@ index 8844a6d3e06d5a29013fdf78072109cc50819d71..21491224a8383cef2d41b0da2e7de936
              if (blockstate == null) {
                  blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags);
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
-@@ -382,7 +382,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -383,7 +383,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // CraftBukkit start - capture blockstates
              boolean captured = false;
              if (this.captureBlockStates && !this.capturedBlockStates.containsKey(pos)) {
@@ -49,7 +49,7 @@ index 8844a6d3e06d5a29013fdf78072109cc50819d71..21491224a8383cef2d41b0da2e7de936
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
                  captured = true;
              }
-@@ -651,7 +652,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -652,7 +653,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public BlockState getBlockState(BlockPos pos) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
diff --git a/patches/server/0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 67cb895a2b..8e453cda28 100644
--- a/patches/server/0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0229-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -31,10 +31,10 @@ index 138422903dcb3056cd011a72e0625a1a225b4280..b92c2d5f9ad3936f619b51c79379983e
  
          for (int i = 0; i < list.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 21491224a8383cef2d41b0da2e7de9362fe1d27f..0e71e1cb15640d397b4da9a8cfef4fdf0a61ec51 100644
+index 04d5c09def0901ad36bab682a333bc41278dadf9..ee5ee37dd8445b4e1efb5484918ff8ed337808ed 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -775,6 +775,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -776,6 +776,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper end
          }
      }
diff --git a/patches/server/0303-BlockDestroyEvent.patch b/patches/server/0303-BlockDestroyEvent.patch
index bbdc9597a1..84cb2d239e 100644
--- a/patches/server/0303-BlockDestroyEvent.patch
+++ b/patches/server/0303-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0663aa74688104c551e8ef52b01947dacf95bb22..f7fccb4761e829a2a1d431f56cfb4288ae0bbd2d 100644
+index 2f77678e48b6b73d3fc13862623103d3ec61090f..bd81eea401b582447a1e03c76a8356d94b2891d6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -28,6 +28,7 @@ import net.minecraft.nbt.CompoundTag;
@@ -22,7 +22,7 @@ index 0663aa74688104c551e8ef52b01947dacf95bb22..f7fccb4761e829a2a1d431f56cfb4288
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.ChunkHolder;
  import net.minecraft.server.level.ServerLevel;
-@@ -564,8 +565,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -565,8 +566,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;
          } else {
              FluidState fluid = this.getFluidState(pos);
diff --git a/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
index fc6c60f76e..4ec603fd69 100644
--- a/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f7fccb4761e829a2a1d431f56cfb4288ae0bbd2d..faaa93e77523fbb942690491687410df48899ddb 100644
+index bd81eea401b582447a1e03c76a8356d94b2891d6..a3f6fd658b24c4c68644482bba2ac5dcdb1707ce 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -875,9 +875,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -876,9 +876,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
diff --git a/patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch
index 74dd4f230b..cc649c8b14 100644
--- a/patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -14,10 +14,10 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index de7abae207b0a565a25fa4ed2f66b94c6b0cdcf9..6ec5a6239b6144b2e3f9edcafdfd6fed6de6cbcd 100644
+index 04ef0245877ab7e6978149209549151e4f157920..de069f9f7af5ff3e346d68e254ae7138fb19f3f3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -984,7 +984,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -985,7 +985,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  }
              }
  
diff --git a/patches/removed/1.18/0393-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
similarity index 63%
rename from patches/removed/1.18/0393-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
index f26dcb563a..62bfb4a710 100644
--- a/patches/removed/1.18/0393-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
@@ -14,10 +14,10 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c0e8e863708ac794b7271765cdae99dc4df14caa..142e5bc63ede1593662ef1d502d05c0965c1a798 100644
+index 494b18a3dfa05b5e6ecbb9b99abf06bfe6e1d166..5c54bc74c668778161ae47c9160f8c4c9a566847 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -792,6 +792,7 @@ public abstract class PlayerList {
+@@ -791,6 +791,7 @@ public abstract class PlayerList {
          entityplayer1.forceSetPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
          // CraftBukkit end
  
@@ -26,10 +26,10 @@ index c0e8e863708ac794b7271765cdae99dc4df14caa..142e5bc63ede1593662ef1d502d05c09
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f8c611a6a55dd56e5231834c9481c61727b628e9..1164fc5915f0121b697ea10fac73919597902026 100644
+index c7581c1b306d9c6498e18456d67f5acd067357e6..82068b1ccc958fd9c1ba6887cf3ffad1c0660f07 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -172,6 +172,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -172,6 +172,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      // Paper end
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
@@ -37,76 +37,80 @@ index f8c611a6a55dd56e5231834c9481c61727b628e9..1164fc5915f0121b697ea10fac739195
      private CraftEntity bukkitEntity;
  
      public net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper
-diff --git a/src/main/java/net/minecraft/world/level/CollisionGetter.java b/src/main/java/net/minecraft/world/level/CollisionGetter.java
-index b980c26ab5cac02e03525177a9dc4fb0b6a2f9f6..2a784a8342e708e0813c7076a2ca8e429446ffd3 100644
---- a/src/main/java/net/minecraft/world/level/CollisionGetter.java
-+++ b/src/main/java/net/minecraft/world/level/CollisionGetter.java
-@@ -55,7 +55,9 @@ public interface CollisionGetter extends BlockGetter {
-     }
- 
-     default boolean noCollision(@Nullable Entity entity, AABB box, Predicate<Entity> filter) {
-+        try { if (entity != null) entity.collisionLoadChunks = true; // Paper
-         return this.getCollisions(entity, box, filter).allMatch(VoxelShape::isEmpty);
-+        } finally { if (entity != null) entity.collisionLoadChunks = false; } // Paper
-     }
- 
-     Stream<VoxelShape> getEntityCollisions(@Nullable Entity entity, AABB box, Predicate<Entity> predicate);
-diff --git a/src/main/java/net/minecraft/world/level/CollisionSpliterator.java b/src/main/java/net/minecraft/world/level/CollisionSpliterator.java
-index e6190bfb893de12e87e1da49001ebd963b3d6318..e4122469b839103f5c0fce38822d408a903dc0a5 100644
---- a/src/main/java/net/minecraft/world/level/CollisionSpliterator.java
-+++ b/src/main/java/net/minecraft/world/level/CollisionSpliterator.java
-@@ -64,21 +64,42 @@ public class CollisionSpliterator extends AbstractSpliterator<VoxelShape> {
-     boolean collisionCheck(Consumer<? super VoxelShape> action) {
+diff --git a/src/main/java/net/minecraft/world/level/BlockCollisions.java b/src/main/java/net/minecraft/world/level/BlockCollisions.java
+index 301b0545e40b95497e6f35ae0fbfdf72f63e4a1a..b0ac1457c61e8831da77a54030f124f4c2c1c8b9 100644
+--- a/src/main/java/net/minecraft/world/level/BlockCollisions.java
++++ b/src/main/java/net/minecraft/world/level/BlockCollisions.java
+@@ -66,22 +66,41 @@ public class BlockCollisions extends AbstractIterator<VoxelShape> {
+     protected VoxelShape computeNext() {
          while(true) {
              if (this.cursor.advance()) {
 -                int i = this.cursor.nextX();
 -                int j = this.cursor.nextY();
 -                int k = this.cursor.nextZ();
-+                int i = this.cursor.nextX(); final int x = i;
-+                int j = this.cursor.nextY(); final int y = j;
-+                int k = this.cursor.nextZ(); final int z = k;
++                int i = this.cursor.nextX(); final int x = i; // Paper
++                int j = this.cursor.nextY(); final int y = j; // Paper
++                int k = this.cursor.nextZ(); final int z = k; // Paper
                  int l = this.cursor.getNextType();
                  if (l == 3) {
                      continue;
                  }
++                // Paper start - ensure we don't load chunks
++                final @Nullable Entity source = this.context instanceof net.minecraft.world.phys.shapes.EntityCollisionContext entityContext ? entityContext.getEntity() : null;
++                boolean far = source != null && net.minecraft.server.MCUtil.distanceSq(source.getX(), y, source.getZ(), x, y, z) > 14;
++                this.pos.set(x, y, z);
  
 -                BlockGetter blockGetter = this.getChunk(i, k);
 -                if (blockGetter == null) {
-+                // Paper start - ensure we don't load chunks
-+                boolean far = this.source != null && net.minecraft.server.MCUtil.distanceSq(this.source.getX(), y, this.source.getZ(), x, y, z) > 14;
-+                this.pos.set(x, y, z);
-+
 +                BlockState blockState;
 +                if (this.collisionGetter instanceof net.minecraft.server.level.WorldGenRegion) {
-+                   BlockGetter blockGetter = this.getChunk(x, z);
-+                   if (blockGetter == null) {
++                    BlockGetter blockGetter = this.getChunk(x, z);
++                    if (blockGetter == null) {
 +                       continue;
-+                   }
-+                   blockState = blockGetter.getBlockState(this.pos);
-+                } else if ((!far && this.source instanceof net.minecraft.server.level.ServerPlayer) || (this.source != null && this.source.collisionLoadChunks)) {
++                    }
++                    blockState = blockGetter.getBlockState(this.pos);
++                } else if ((!far && source instanceof net.minecraft.server.level.ServerPlayer) || (source != null && source.collisionLoadChunks)) {
 +                    blockState = this.collisionGetter.getBlockState(this.pos);
 +                } else {
 +                    blockState = this.collisionGetter.getTypeIfLoaded(this.pos);
 +                }
 +
 +                if (blockState == null) {
-+                    if (!(this.source instanceof net.minecraft.server.level.ServerPlayer) || this.source.level.paperConfig.preventMovingIntoUnloadedChunks) {
-+                        VoxelShape voxelshape3 = Shapes.create(far ? this.source.getBoundingBox() : new AABB(new BlockPos(x, y, z)));
-+                        action.accept(voxelshape3);
-+                        return true;
++                    if (!(source instanceof net.minecraft.server.level.ServerPlayer) || source.level.paperConfig.preventMovingIntoUnloadedChunks) {
++                        return Shapes.create(far ? source.getBoundingBox() : new AABB(new BlockPos(x, y, z)));
 +                    }
++                    // Paper end
                      continue;
                  }
-+                // Paper - moved up
-+                // Paper end
  
 -                this.pos.set(i, j, k);
 -                BlockState blockState = blockGetter.getBlockState(this.pos);
-                 if (!this.predicate.test(blockState, this.pos) || l == 1 && !blockState.hasLargeCollisionShape() || l == 2 && !blockState.is(Blocks.MOVING_PISTON)) {
+-                if (this.onlySuffocatingBlocks && !blockState.isSuffocating(blockGetter, this.pos) || l == 1 && !blockState.hasLargeCollisionShape() || l == 2 && !blockState.is(Blocks.MOVING_PISTON)) {
++                // Paper - moved up
++                if (/*this.onlySuffocatingBlocks && (!blockState.isSuffocating(blockGetter, this.pos)) ||*/ l == 1 && !blockState.hasLargeCollisionShape() || l == 2 && !blockState.is(Blocks.MOVING_PISTON)) { // Paper - onlySuffocatingBlocks is only true on the client, so we don't care about it here
                      continue;
                  }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/CollisionGetter.java b/src/main/java/net/minecraft/world/level/CollisionGetter.java
+index 4c373d6c8ddd9f5db88888cd8dbbfc24eb5df793..56d94c94fb0d4dc468bb5d69be655ddd5c6b5360 100644
+--- a/src/main/java/net/minecraft/world/level/CollisionGetter.java
++++ b/src/main/java/net/minecraft/world/level/CollisionGetter.java
+@@ -44,11 +44,13 @@ public interface CollisionGetter extends BlockGetter {
+     }
+ 
+     default boolean noCollision(@Nullable Entity entity, AABB box) {
++        try { if (entity != null) entity.collisionLoadChunks = true; // Paper
+         for(VoxelShape voxelShape : this.getBlockCollisions(entity, box)) {
+             if (!voxelShape.isEmpty()) {
+                 return false;
+             }
+         }
++        } finally { if (entity != null) entity.collisionLoadChunks = false; } // Paper
+ 
+         if (!this.getEntityCollisions(entity, box).isEmpty()) {
+             return false;
 diff --git a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
-index 5af90e0f7222356cb0e905a9b6e0c4eac5617a41..ee5fa14d2232b145806aefcaffb5c6348a08058a 100644
+index 48812329969b7192acd948db974bb77bb546f979..5b1e0ea40dea6c7d787699ed25160c8b75ab3bf3 100644
 --- a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
 +++ b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
 @@ -237,7 +237,8 @@ public final class Shapes {
diff --git a/patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
similarity index 96%
rename from patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
index 9a479dbfce..e5f4afae42 100644
--- a/patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
@@ -32,7 +32,7 @@ index fd609c7b757b570206c17444867f786c1767aa69..d507adcb538933fcf36e9a4bfb561106
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 494b18a3dfa05b5e6ecbb9b99abf06bfe6e1d166..af93692bb5cc232397cec69ce2bd836a956550ef 100644
+index 5c54bc74c668778161ae47c9160f8c4c9a566847..8901bb31524613bf3fbec3cc5d3c228f8b3f43a4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -210,6 +210,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0391-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0391-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0392-Improved-Watchdog-Support.patch b/patches/server/0393-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0392-Improved-Watchdog-Support.patch
rename to patches/server/0393-Improved-Watchdog-Support.patch
index 9fa6d06322..e01da255e8 100644
--- a/patches/server/0392-Improved-Watchdog-Support.patch
+++ b/patches/server/0393-Improved-Watchdog-Support.patch
@@ -274,7 +274,7 @@ index 847d1b447e3796cc03e26df46b92815a76707b81..0758f0983c17e7e4b5b5aea64ea12e99
                  list.stream().map((playerchunk) -> {
                      CompletableFuture completablefuture;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index af93692bb5cc232397cec69ce2bd836a956550ef..fd0aea068fe4bec0bd02a372afd7475314ceb88a 100644
+index 8901bb31524613bf3fbec3cc5d3c228f8b3f43a4..4e26475bf0f541d6b2f8b6eccfeaeb9ee5b4b2b8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -512,7 +512,7 @@ public abstract class PlayerList {
@@ -299,10 +299,10 @@ index 7bf4bf5cb2c1b54a7e2733091f48f3a824336d36..dcce05d2f4ab16424db4ab103a12188e
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6ec5a6239b6144b2e3f9edcafdfd6fed6de6cbcd..46adef4de2f9e5888dce1e669619dd0386b90470 100644
+index de069f9f7af5ff3e346d68e254ae7138fb19f3f3..b74a92acd890e63d88d5841391f4ee56fca94676 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -830,6 +830,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -831,6 +831,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
diff --git a/patches/server/0393-Optimize-Pathfinding.patch b/patches/server/0394-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0393-Optimize-Pathfinding.patch
rename to patches/server/0394-Optimize-Pathfinding.patch
diff --git a/patches/server/0394-Reduce-Either-Optional-allocation.patch b/patches/server/0395-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0394-Reduce-Either-Optional-allocation.patch
rename to patches/server/0395-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0395-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0395-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0396-Prevent-opening-inventories-when-frozen.patch b/patches/server/0397-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0396-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0397-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0397-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0398-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0397-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0398-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0398-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0398-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0399-Implement-Player-Client-Options-API.patch b/patches/server/0400-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0399-Implement-Player-Client-Options-API.patch
rename to patches/server/0400-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0400-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0400-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0401-Broadcast-join-message-to-console.patch b/patches/server/0402-Broadcast-join-message-to-console.patch
similarity index 92%
rename from patches/server/0401-Broadcast-join-message-to-console.patch
rename to patches/server/0402-Broadcast-join-message-to-console.patch
index cf0692952f..52a54fe6ee 100644
--- a/patches/server/0401-Broadcast-join-message-to-console.patch
+++ b/patches/server/0402-Broadcast-join-message-to-console.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fd0aea068fe4bec0bd02a372afd7475314ceb88a..ccf03feb976d22f8c4ca4f60b6bc1d1d773c485f 100644
+index 4e26475bf0f541d6b2f8b6eccfeaeb9ee5b4b2b8..7889f6bb645694b715eb832eb0675f79d80f09e8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -293,7 +293,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0402-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/0402-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0403-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 98%
rename from patches/server/0403-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 98c94c646e..631f75894f 100644
--- a/patches/server/0403-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -52,7 +52,7 @@ index cdb0eb8e21299ca70ed7ed5c1195d07f44e47838..6d59a813aa752b4233dbe1894cfc8273
      // CraftBukkit end
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ccf03feb976d22f8c4ca4f60b6bc1d1d773c485f..492fc4e450b961e4d3421da88fcf8c1737bc3ded 100644
+index 7889f6bb645694b715eb832eb0675f79d80f09e8..792e2a4407dfcee691f53f1bc1342da2c2cebbb4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -276,6 +276,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0404-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
similarity index 99%
rename from patches/server/0404-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
index 69b6ebec18..7e7924a75c 100644
--- a/patches/server/0404-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
@@ -96,7 +96,7 @@ index bb767f5b626225e70a8af273384bb74dbd21430d..301042e7a0d372a914f27ec0988dd938
              try {
                  ServerPlayer entityplayer1 = this.server.getPlayerList().getPlayerForLogin(this.gameProfile, s); // CraftBukkit - add player reference
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 492fc4e450b961e4d3421da88fcf8c1737bc3ded..c2cc59f476a67224774503009439fec2ad1ec62d 100644
+index 792e2a4407dfcee691f53f1bc1342da2c2cebbb4..30fa9ac91be2ecc55efeee9222835cbedc53acff 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -39,6 +39,7 @@ import net.minecraft.network.protocol.Packet;
diff --git a/patches/server/0405-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 89%
rename from patches/server/0405-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 60ee483ddc..913a3842da 100644
--- a/patches/server/0405-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,10 +7,10 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c7581c1b306d9c6498e18456d67f5acd067357e6..5a26fe2b8c468063618dd02056da43f001173812 100644
+index 82068b1ccc958fd9c1ba6887cf3ffad1c0660f07..1bc7c52e8de4325315f9d2204400e3447cfe7f4f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2038,9 +2038,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2039,9 +2039,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                      bworld = server.getWorld(worldName);
                  }
  
diff --git a/patches/server/0406-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0406-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0407-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0407-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0408-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0408-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0409-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 94%
rename from patches/server/0409-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 81837f2c2c..65c7abd0a6 100644
--- a/patches/server/0409-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,10 +16,10 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5a26fe2b8c468063618dd02056da43f001173812..640ea4522419fe90a0a390c2cf0379aab8d060b2 100644
+index 1bc7c52e8de4325315f9d2204400e3447cfe7f4f..1e23785eb13082037b982886b27c460219f2cb0c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2188,11 +2188,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2189,11 +2189,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          } else {
              // CraftBukkit start - Capture drops for death event
              if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) {
@@ -34,7 +34,7 @@ index 5a26fe2b8c468063618dd02056da43f001173812..640ea4522419fe90a0a390c2cf0379aa
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
-@@ -2943,6 +2944,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2944,6 +2945,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      @Nullable
      public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
          // CraftBukkit end
@@ -47,7 +47,7 @@ index 5a26fe2b8c468063618dd02056da43f001173812..640ea4522419fe90a0a390c2cf0379aa
          if (this.level instanceof ServerLevel && !this.isRemoved()) {
              this.level.getProfiler().push("changeDimension");
              // CraftBukkit start
-@@ -2963,6 +2970,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2964,6 +2971,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  // CraftBukkit end
  
                  this.level.getProfiler().popPush("reloading");
@@ -59,7 +59,7 @@ index 5a26fe2b8c468063618dd02056da43f001173812..640ea4522419fe90a0a390c2cf0379aa
                  Entity entity = this.getType().create(worldserver);
  
                  if (entity != null) {
-@@ -2976,10 +2988,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -2977,10 +2989,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                      // CraftBukkit start - Forward the CraftEntity to the new entity
                      this.getBukkitEntity().setHandle(entity);
                      entity.bukkitEntity = this.getBukkitEntity();
@@ -70,7 +70,7 @@ index 5a26fe2b8c468063618dd02056da43f001173812..640ea4522419fe90a0a390c2cf0379aa
                      // CraftBukkit end
                  }
  
-@@ -3100,7 +3108,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3101,7 +3109,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public boolean canChangeDimensions() {
diff --git a/patches/server/0410-Villager-Restocks-API.patch b/patches/server/0411-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0410-Villager-Restocks-API.patch
rename to patches/server/0411-Villager-Restocks-API.patch
diff --git a/patches/server/0411-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0411-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0412-Expose-game-version.patch b/patches/server/0413-Expose-game-version.patch
similarity index 100%
rename from patches/server/0412-Expose-game-version.patch
rename to patches/server/0413-Expose-game-version.patch
diff --git a/patches/server/0413-Optimize-Voxel-Shape-Merging.patch b/patches/server/0414-Optimize-Voxel-Shape-Merging.patch
similarity index 96%
rename from patches/server/0413-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0414-Optimize-Voxel-Shape-Merging.patch
index 25915ad4d6..1e6eb75fe1 100644
--- a/patches/server/0413-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/0414-Optimize-Voxel-Shape-Merging.patch
@@ -68,10 +68,10 @@ index 9e0afab2329e560c4b2512548dd4b02dd1a2e69f..06662dbff8180751a8684841aa35f709
          this.firstIndices = new int[k];
          this.secondIndices = new int[k];
 diff --git a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
-index 48812329969b7192acd948db974bb77bb546f979..f7708920c62ea3040ba5c931d2141fa1d6ff613d 100644
+index 5b1e0ea40dea6c7d787699ed25160c8b75ab3bf3..e29ed24999ae483c7d3e358a1e86fef99d67ef0c 100644
 --- a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
 +++ b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java
-@@ -337,9 +337,21 @@ public final class Shapes {
+@@ -338,9 +338,21 @@ public final class Shapes {
      }
  
      @VisibleForTesting
@@ -94,7 +94,7 @@ index 48812329969b7192acd948db974bb77bb546f979..f7708920c62ea3040ba5c931d2141fa1
          if (first instanceof CubePointRange && second instanceof CubePointRange) {
              long l = lcm(i, j);
              if ((long)size * l <= 256L) {
-@@ -347,13 +359,22 @@ public final class Shapes {
+@@ -348,13 +360,22 @@ public final class Shapes {
              }
          }
  
diff --git a/patches/server/0414-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0414-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0415-misc-debugging-dumps.patch b/patches/server/0416-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0415-misc-debugging-dumps.patch
rename to patches/server/0416-misc-debugging-dumps.patch
diff --git a/patches/server/0416-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/0416-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0417-Implement-Mob-Goal-API.patch b/patches/server/0418-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0417-Implement-Mob-Goal-API.patch
rename to patches/server/0418-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0418-Add-villager-reputation-API.patch b/patches/server/0419-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0418-Add-villager-reputation-API.patch
rename to patches/server/0419-Add-villager-reputation-API.patch
diff --git a/patches/server/0419-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0420-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0419-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0420-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0420-ExperienceOrbMergeEvent.patch b/patches/server/0421-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0420-ExperienceOrbMergeEvent.patch
rename to patches/server/0421-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0421-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0422-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0421-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0422-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0422-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0423-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0422-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0423-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0423-Potential-bed-API.patch b/patches/server/0424-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0423-Potential-bed-API.patch
rename to patches/server/0424-Potential-bed-API.patch
diff --git a/patches/server/0424-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0425-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0424-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0425-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0425-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0425-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0426-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 98%
rename from patches/server/0426-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 6d19c5964a..fcb181734a 100644
--- a/patches/server/0426-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -54,10 +54,10 @@ index 548f103e648d9670d7434182c6598dc29ae77b57..f0c789d339fe8402c9c2a684d7e0415f
  
                      this.level.getProfiler().push("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 46adef4de2f9e5888dce1e669619dd0386b90470..9d628996437959e79348679e2c85e07bc138475e 100644
+index b74a92acd890e63d88d5841391f4ee56fca94676..4f97f11c248cbb06dbd604da0e88d9570e641af7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -413,6 +413,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -414,6 +414,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
diff --git a/patches/server/0427-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0428-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0427-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0428-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0428-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0428-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0429-Ensure-safe-gateway-teleport.patch b/patches/server/0430-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0429-Ensure-safe-gateway-teleport.patch
rename to patches/server/0430-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0430-Add-option-for-console-having-all-permissions.patch b/patches/server/0431-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0430-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0431-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0431-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0432-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0431-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0432-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0432-Maps-shouldn-t-load-chunks.patch b/patches/server/0433-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0432-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0433-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0435-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0435-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0436-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0436-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0437-Fix-sand-duping.patch b/patches/server/0438-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0437-Fix-sand-duping.patch
rename to patches/server/0438-Fix-sand-duping.patch
diff --git a/patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0439-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0439-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0440-Expose-Arrow-getItemStack.patch b/patches/server/0441-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0440-Expose-Arrow-getItemStack.patch
rename to patches/server/0441-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0442-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0442-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0443-Add-permission-for-command-blocks.patch b/patches/server/0444-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0443-Add-permission-for-command-blocks.patch
rename to patches/server/0444-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 86%
rename from patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch
index 72d5fa35d4..01374d2106 100644
--- a/patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 640ea4522419fe90a0a390c2cf0379aab8d060b2..4c506e2bf241ba9d6dd53b54def09be09303664b 100644
+index 1e23785eb13082037b982886b27c460219f2cb0c..7bf34e0fc2658d56c8515e7acd68c6f36692e451 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -555,8 +555,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -556,8 +556,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public void setPos(double x, double y, double z) {
@@ -19,7 +19,7 @@ index 640ea4522419fe90a0a390c2cf0379aab8d060b2..4c506e2bf241ba9d6dd53b54def09be0
      }
  
      protected AABB makeBoundingBox() {
-@@ -3770,6 +3770,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3771,6 +3771,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public final void setPosRaw(double x, double y, double z) {
@@ -31,7 +31,7 @@ index 640ea4522419fe90a0a390c2cf0379aab8d060b2..4c506e2bf241ba9d6dd53b54def09be0
          if (this.position.x != x || this.position.y != y || this.position.z != z) {
              this.position = new Vec3(x, y, z);
              int i = Mth.floor(x);
-@@ -3792,6 +3797,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3793,6 +3798,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
              }
          }
  
diff --git a/patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0446-Paper-dumpitem-command.patch b/patches/server/0447-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0446-Paper-dumpitem-command.patch
rename to patches/server/0447-Paper-dumpitem-command.patch
diff --git a/patches/server/0447-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0447-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0448-Improve-Legacy-Component-serialization-size.patch b/patches/server/0449-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0448-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0449-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0449-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0449-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0450-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0451-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0452-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0451-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0452-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0452-Support-old-UUID-format-for-NBT.patch b/patches/server/0453-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0452-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0453-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0453-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0454-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0453-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0454-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0454-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0454-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0455-Remove-some-streams-from-structures.patch b/patches/server/0456-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0455-Remove-some-streams-from-structures.patch
rename to patches/server/0456-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0456-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0457-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0456-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0457-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0457-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0458-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from patches/server/0457-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to patches/server/0458-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/patches/server/0458-Support-components-in-ItemMeta.patch b/patches/server/0459-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0458-Support-components-in-ItemMeta.patch
rename to patches/server/0459-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0460-Add-entity-liquid-API.patch b/patches/server/0461-Add-entity-liquid-API.patch
similarity index 92%
rename from patches/server/0460-Add-entity-liquid-API.patch
rename to patches/server/0461-Add-entity-liquid-API.patch
index 5610f8671a..c714cf7911 100644
--- a/patches/server/0460-Add-entity-liquid-API.patch
+++ b/patches/server/0461-Add-entity-liquid-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4c506e2bf241ba9d6dd53b54def09be09303664b..91e034f54deb2aa084527aaa001e48ddcc2e9cd1 100644
+index 7bf34e0fc2658d56c8515e7acd68c6f36692e451..e4dff1ee8329694ed42e4f3c66d896ea32f62747 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1359,7 +1359,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1360,7 +1360,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return this.isInWater() || this.isInRain();
      }
  
diff --git a/patches/server/0461-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0462-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0461-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0462-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0462-Spawn-player-in-correct-world-on-login.patch b/patches/server/0463-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from patches/server/0462-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0463-Spawn-player-in-correct-world-on-login.patch
index 62e6bab623..e91f9af4e9 100644
--- a/patches/server/0462-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0463-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c2cc59f476a67224774503009439fec2ad1ec62d..0ac5ba6bc7b582d1ab02a90c9418c9b899175d93 100644
+index 30fa9ac91be2ecc55efeee9222835cbedc53acff..4710c9d12feb12b75c497373c172ce0d4f4ab96e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -196,7 +196,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0463-Add-PrepareResultEvent.patch b/patches/server/0464-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0463-Add-PrepareResultEvent.patch
rename to patches/server/0464-Add-PrepareResultEvent.patch
diff --git a/patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0465-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0466-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0465-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0466-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0466-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0467-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0466-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0467-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0467-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0468-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0467-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0468-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0468-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0469-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0468-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0469-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0469-Move-range-check-for-block-placing-up.patch b/patches/server/0470-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0469-Move-range-check-for-block-placing-up.patch
rename to patches/server/0470-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0470-Fix-SPIGOT-5989.patch b/patches/server/0471-Fix-SPIGOT-5989.patch
similarity index 95%
rename from patches/server/0470-Fix-SPIGOT-5989.patch
rename to patches/server/0471-Fix-SPIGOT-5989.patch
index 2862a938ae..e1b03213b1 100644
--- a/patches/server/0470-Fix-SPIGOT-5989.patch
+++ b/patches/server/0471-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0ac5ba6bc7b582d1ab02a90c9418c9b899175d93..06a38986775b99faca2deddf1bcbea3c691c6521 100644
+index 4710c9d12feb12b75c497373c172ce0d4f4ab96e..724c503da333ac4dd8ed865ba48cac9dcb1a0da8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -78,6 +78,7 @@ import net.minecraft.world.level.GameRules;
@@ -52,7 +52,7 @@ index 0ac5ba6bc7b582d1ab02a90c9418c9b899175d93..06a38986775b99faca2deddf1bcbea3c
              if (!flag) entityplayer.reset(); // SPIGOT-4785
              isRespawn = true; // Paper
          } else {
-@@ -919,8 +926,12 @@ public abstract class PlayerList {
+@@ -920,8 +927,12 @@ public abstract class PlayerList {
          }
          // entityplayer1.initInventoryMenu();
          entityplayer1.setHealth(entityplayer1.getHealth());
diff --git a/patches/server/0471-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0472-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0471-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0472-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0472-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0473-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0472-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0473-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0473-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0474-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0473-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0474-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0474-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0475-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0474-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0475-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0475-Fix-some-rails-connecting-improperly.patch b/patches/server/0476-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0475-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0476-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0476-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0477-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0476-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0477-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0477-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0478-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0477-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0478-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0478-Brand-support.patch b/patches/server/0479-Brand-support.patch
similarity index 100%
rename from patches/server/0478-Brand-support.patch
rename to patches/server/0479-Brand-support.patch
diff --git a/patches/server/0479-Add-setMaxPlayers-API.patch b/patches/server/0480-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0479-Add-setMaxPlayers-API.patch
rename to patches/server/0480-Add-setMaxPlayers-API.patch
index 54c081f57a..aec64524fd 100644
--- a/patches/server/0479-Add-setMaxPlayers-API.patch
+++ b/patches/server/0480-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 06a38986775b99faca2deddf1bcbea3c691c6521..9cec325fdcfd8b66bbeccb973cbe75ebd423fec4 100644
+index 724c503da333ac4dd8ed865ba48cac9dcb1a0da8..b797b41c55d4a96fecd50b4bd0cde47b0a2b29a7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -144,7 +144,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0480-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0481-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0480-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0481-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0481-Don-t-require-FACING-data.patch b/patches/server/0482-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0481-Don-t-require-FACING-data.patch
rename to patches/server/0482-Don-t-require-FACING-data.patch
diff --git a/patches/server/0482-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0483-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0482-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0483-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0483-Add-moon-phase-API.patch b/patches/server/0484-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0483-Add-moon-phase-API.patch
rename to patches/server/0484-Add-moon-phase-API.patch
diff --git a/patches/server/0484-Prevent-headless-pistons-from-being-created.patch b/patches/server/0485-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0484-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0485-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0485-Add-BellRingEvent.patch b/patches/server/0486-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0485-Add-BellRingEvent.patch
rename to patches/server/0486-Add-BellRingEvent.patch
diff --git a/patches/server/0486-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0487-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0486-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0487-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0487-Buffer-joins-to-world.patch b/patches/server/0488-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0487-Buffer-joins-to-world.patch
rename to patches/server/0488-Buffer-joins-to-world.patch
diff --git a/patches/server/0488-Optimize-redstone-algorithm.patch b/patches/server/0489-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0488-Optimize-redstone-algorithm.patch
rename to patches/server/0489-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0489-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0490-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0489-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0490-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0490-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0491-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0490-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0491-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0491-Fix-CraftTeam-null-check.patch b/patches/server/0492-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0491-Fix-CraftTeam-null-check.patch
rename to patches/server/0492-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0492-Add-more-Evoker-API.patch b/patches/server/0493-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0492-Add-more-Evoker-API.patch
rename to patches/server/0493-Add-more-Evoker-API.patch
diff --git a/patches/server/0493-Add-methods-to-get-translation-keys.patch b/patches/server/0494-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0493-Add-methods-to-get-translation-keys.patch
rename to patches/server/0494-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0494-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0495-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0494-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0495-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0495-Cache-block-data-strings.patch b/patches/server/0496-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0495-Cache-block-data-strings.patch
rename to patches/server/0496-Cache-block-data-strings.patch
diff --git a/patches/server/0496-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0497-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 97%
rename from patches/server/0496-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0497-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 9065669c7b..56273fd7a7 100644
--- a/patches/server/0496-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0497-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index c5fc4a2470093202f38472df84355ba0404645c5..2074760beee6fdc2e94bb0f5dcfbae7b
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 91e034f54deb2aa084527aaa001e48ddcc2e9cd1..8ec3e8056b0a4f3994e27f9bb1dc5ccfb7ebfa52 100644
+index e4dff1ee8329694ed42e4f3c66d896ea32f62747..8ec0a2ca0e1aa2e31c73df6ddb6b626d386797d8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -151,6 +151,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -42,7 +42,7 @@ index 91e034f54deb2aa084527aaa001e48ddcc2e9cd1..8ec3e8056b0a4f3994e27f9bb1dc5ccf
      static boolean isLevelAtLeast(CompoundTag tag, int level) {
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -1562,6 +1563,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1563,6 +1564,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public void moveTo(double x, double y, double z, float yaw, float pitch) {
diff --git a/patches/server/0497-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0498-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0497-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0498-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0498-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0499-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0498-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0499-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0500-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0499-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0500-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0500-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0501-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0500-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0501-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0501-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0502-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 90%
rename from patches/server/0501-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0502-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 20bcb9ab00..97e91ff12d 100644
--- a/patches/server/0501-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0502-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8ec3e8056b0a4f3994e27f9bb1dc5ccfb7ebfa52..d7403f6a2fc2574768c2751e5bfa816b87906117 100644
+index 8ec0a2ca0e1aa2e31c73df6ddb6b626d386797d8..41acc6d9e5b01526a2f0d5fa68b2913eb2e97cc2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3970,4 +3970,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3971,4 +3971,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0502-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0503-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0502-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0503-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0503-Entity-isTicking.patch b/patches/server/0504-Entity-isTicking.patch
similarity index 91%
rename from patches/server/0503-Entity-isTicking.patch
rename to patches/server/0504-Entity-isTicking.patch
index 15efeefd1f..7ff91b0975 100644
--- a/patches/server/0503-Entity-isTicking.patch
+++ b/patches/server/0504-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d7403f6a2fc2574768c2751e5bfa816b87906117..2da1f5611d4c515107895692b9456e0800fb3cd3 100644
+index 41acc6d9e5b01526a2f0d5fa68b2913eb2e97cc2..00b179d9d1a0fb1f081dd0e6f160641ce1c1caa4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -52,6 +52,7 @@ import net.minecraft.network.syncher.SynchedEntityData;
@@ -16,7 +16,7 @@ index d7403f6a2fc2574768c2751e5bfa816b87906117..2da1f5611d4c515107895692b9456e08
  import net.minecraft.server.level.ServerLevel;
  import net.minecraft.server.level.ServerPlayer;
  import net.minecraft.server.level.TicketType;
-@@ -3975,5 +3976,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3976,5 +3977,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/server/0504-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0505-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0504-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0505-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0505-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0506-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0505-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0506-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0506-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0507-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0506-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0507-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0507-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0508-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0507-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0508-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0508-Optimise-getType-calls.patch b/patches/server/0509-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0508-Optimise-getType-calls.patch
rename to patches/server/0509-Optimise-getType-calls.patch
diff --git a/patches/server/0509-Villager-resetOffers.patch b/patches/server/0510-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0509-Villager-resetOffers.patch
rename to patches/server/0510-Villager-resetOffers.patch
diff --git a/patches/server/0510-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0511-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0510-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0511-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0511-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0512-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0511-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0512-Retain-block-place-order-when-capturing-blockstates.patch
index bd424a356a..3b82a22694 100644
--- a/patches/server/0511-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0512-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9d628996437959e79348679e2c85e07bc138475e..8830f1cf93969a3c74b208227fbc264bede709aa 100644
+index 4f97f11c248cbb06dbd604da0e88d9570e641af7..c68cb2ee352325d3f0ef98827df04b0c7bf1b293 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -149,7 +149,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0512-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0513-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0512-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0513-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0513-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0514-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0513-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0514-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0514-Player-elytra-boost-API.patch b/patches/server/0515-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0514-Player-elytra-boost-API.patch
rename to patches/server/0515-Player-elytra-boost-API.patch
diff --git a/patches/server/0515-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0516-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0515-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0516-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0516-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0517-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0516-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0517-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0517-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0518-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0517-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0518-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0518-Add-ignore-discounts-API.patch b/patches/server/0519-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0518-Add-ignore-discounts-API.patch
rename to patches/server/0519-Add-ignore-discounts-API.patch
diff --git a/patches/server/0519-Toggle-for-removing-existing-dragon.patch b/patches/server/0520-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0519-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0520-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0520-Fix-client-lag-on-advancement-loading.patch b/patches/server/0521-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0520-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0521-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0521-Item-no-age-no-player-pickup.patch b/patches/server/0522-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0521-Item-no-age-no-player-pickup.patch
rename to patches/server/0522-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0522-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0523-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0522-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0523-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0523-Beacon-API-custom-effect-ranges.patch b/patches/server/0524-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0523-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0524-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0524-Add-API-for-quit-reason.patch b/patches/server/0525-Add-API-for-quit-reason.patch
similarity index 98%
rename from patches/server/0524-Add-API-for-quit-reason.patch
rename to patches/server/0525-Add-API-for-quit-reason.patch
index dd9103fc8a..a50d4fd29b 100644
--- a/patches/server/0524-Add-API-for-quit-reason.patch
+++ b/patches/server/0525-Add-API-for-quit-reason.patch
@@ -49,7 +49,7 @@ index 2dd47eab63cf9322a5844e748709e220272a8cfe..c0a685cfe62aeda3583763ecc1e4fa12
              this.connection.disconnect(ichatbasecomponent);
          });
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9cec325fdcfd8b66bbeccb973cbe75ebd423fec4..7b14ca5806afc83f5ba608ec26874244aa3420fd 100644
+index b797b41c55d4a96fecd50b4bd0cde47b0a2b29a7..d637f092f6e615bedf8fb206e172302052547566 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -594,7 +594,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0525-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0526-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0525-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0526-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0526-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0527-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0526-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0527-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0527-Expose-world-spawn-angle.patch b/patches/server/0528-Expose-world-spawn-angle.patch
similarity index 95%
rename from patches/server/0527-Expose-world-spawn-angle.patch
rename to patches/server/0528-Expose-world-spawn-angle.patch
index da38c20783..d51dbea4a1 100644
--- a/patches/server/0527-Expose-world-spawn-angle.patch
+++ b/patches/server/0528-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7b14ca5806afc83f5ba608ec26874244aa3420fd..1d7e5d0f155dd92015dcf287b8a21d0337fc2af7 100644
+index d637f092f6e615bedf8fb206e172302052547566..d0c90c15a068a17dcafd5df9962e84ef27e021b5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -872,7 +872,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0528-Add-Destroy-Speed-API.patch b/patches/server/0529-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0528-Add-Destroy-Speed-API.patch
rename to patches/server/0529-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0529-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0530-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0529-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0530-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0530-Add-LivingEntity-clearActiveItem.patch b/patches/server/0531-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0530-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0531-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0531-Add-PlayerItemCooldownEvent.patch b/patches/server/0532-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0531-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0532-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0532-More-lightning-API.patch b/patches/server/0533-More-lightning-API.patch
similarity index 100%
rename from patches/server/0532-More-lightning-API.patch
rename to patches/server/0533-More-lightning-API.patch
diff --git a/patches/server/0533-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0534-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0533-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0534-Climbing-should-not-bypass-cramming-gamerule.patch
index 713fc1b9ba..b39c79a1eb 100644
--- a/patches/server/0533-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0534-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -21,10 +21,10 @@ index 5c22b8993385c1e6c72fe1fbd5f14c76253eec74..0759b9dbd37ca640b7fe410e0ecb6519
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2da1f5611d4c515107895692b9456e0800fb3cd3..11cb360e71b3f2e3d6821162af91d6752e8d17c0 100644
+index 00b179d9d1a0fb1f081dd0e6f160641ce1c1caa4..12d9316863b6298960aedeecd08366f2e80c0acc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1743,6 +1743,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1744,6 +1744,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public boolean isPushable() {
diff --git a/patches/server/0534-Added-missing-default-perms-for-commands.patch b/patches/server/0535-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0534-Added-missing-default-perms-for-commands.patch
rename to patches/server/0535-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0535-Add-PlayerShearBlockEvent.patch b/patches/server/0536-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0535-Add-PlayerShearBlockEvent.patch
rename to patches/server/0536-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0536-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0537-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0536-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0537-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0537-Limit-recipe-packets.patch b/patches/server/0538-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0537-Limit-recipe-packets.patch
rename to patches/server/0538-Limit-recipe-packets.patch
diff --git a/patches/server/0538-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0539-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0538-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0539-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0539-MC-4-Fix-item-position-desync.patch b/patches/server/0540-MC-4-Fix-item-position-desync.patch
similarity index 95%
rename from patches/server/0539-MC-4-Fix-item-position-desync.patch
rename to patches/server/0540-MC-4-Fix-item-position-desync.patch
index 14c203a60a..b6a7a22c50 100644
--- a/patches/server/0539-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0540-MC-4-Fix-item-position-desync.patch
@@ -43,10 +43,10 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9
  
      public Vec3 updateEntityPosition(Vec3 orig) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 11cb360e71b3f2e3d6821162af91d6752e8d17c0..a6ef4b05daaa93ef333647cc00f8a708d466aaba 100644
+index 12d9316863b6298960aedeecd08366f2e80c0acc..edd4246bf40a881f117b60d632f2e5f7937331e0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3789,6 +3789,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -3790,6 +3790,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
      public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
          // Paper end
diff --git a/patches/server/0540-Player-Chunk-Load-Unload-Events.patch b/patches/server/0541-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0540-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0541-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0541-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0542-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0541-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0542-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0542-Expose-LivingEntity-hurt-direction.patch b/patches/server/0543-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0542-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0543-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0543-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0544-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0543-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0544-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0544-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0545-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0544-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0545-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0545-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0546-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0545-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0546-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0546-Implement-TargetHitEvent.patch b/patches/server/0547-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0546-Implement-TargetHitEvent.patch
rename to patches/server/0547-Implement-TargetHitEvent.patch
diff --git a/patches/server/0547-Additional-Block-Material-API-s.patch b/patches/server/0548-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0547-Additional-Block-Material-API-s.patch
rename to patches/server/0548-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0548-Fix-harming-potion-dupe.patch b/patches/server/0549-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0548-Fix-harming-potion-dupe.patch
rename to patches/server/0549-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0549-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0550-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0549-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0550-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0550-Cache-burn-durations.patch b/patches/server/0551-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0550-Cache-burn-durations.patch
rename to patches/server/0551-Cache-burn-durations.patch
diff --git a/patches/server/0551-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0552-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0551-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0552-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0552-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0553-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0552-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0553-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0553-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0554-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0553-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0554-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0554-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0555-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0554-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0555-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0555-Zombie-API-breaking-doors.patch b/patches/server/0556-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0555-Zombie-API-breaking-doors.patch
rename to patches/server/0556-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0556-Fix-nerfed-slime-when-splitting.patch b/patches/server/0557-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0556-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0557-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0557-Add-EntityLoadCrossbowEvent.patch b/patches/server/0558-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0557-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0558-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0558-Guardian-beam-workaround.patch b/patches/server/0559-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0558-Guardian-beam-workaround.patch
rename to patches/server/0559-Guardian-beam-workaround.patch
diff --git a/patches/server/0559-Added-WorldGameRuleChangeEvent.patch b/patches/server/0560-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0559-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0560-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0560-Added-ServerResourcesReloadedEvent.patch b/patches/server/0561-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0560-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0561-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0561-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0562-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0561-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0562-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0562-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0563-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0562-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0563-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0563-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0564-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0563-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0564-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0564-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0565-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0564-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0565-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0565-Configurable-door-breaking-difficulty.patch b/patches/server/0566-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0565-Configurable-door-breaking-difficulty.patch
rename to patches/server/0566-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0566-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0567-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0566-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0567-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0567-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0568-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0567-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0568-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0568-Remove-stale-POIs.patch b/patches/server/0569-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0568-Remove-stale-POIs.patch
rename to patches/server/0569-Remove-stale-POIs.patch
diff --git a/patches/server/0569-Fix-villager-boat-exploit.patch b/patches/server/0570-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0569-Fix-villager-boat-exploit.patch
rename to patches/server/0570-Fix-villager-boat-exploit.patch
index 6921029fef..c453000b71 100644
--- a/patches/server/0569-Fix-villager-boat-exploit.patch
+++ b/patches/server/0570-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1d7e5d0f155dd92015dcf287b8a21d0337fc2af7..1c150913d4752d51d51640e0a5cf6d67182356b7 100644
+index d0c90c15a068a17dcafd5df9962e84ef27e021b5..f3b29cfe6e07fda6aeb36e5f13711e562524c8b1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -619,6 +619,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0570-Add-sendOpLevel-API.patch b/patches/server/0571-Add-sendOpLevel-API.patch
similarity index 90%
rename from patches/server/0570-Add-sendOpLevel-API.patch
rename to patches/server/0571-Add-sendOpLevel-API.patch
index cfb2eba9ff..2831aee156 100644
--- a/patches/server/0570-Add-sendOpLevel-API.patch
+++ b/patches/server/0571-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1c150913d4752d51d51640e0a5cf6d67182356b7..d300fc577a363e7884d1a176b6c282fe87008a8b 100644
+index f3b29cfe6e07fda6aeb36e5f13711e562524c8b1..7057f7aa02b819e32f2067d3c1c7c0eefb082fce 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1116,6 +1116,11 @@ public abstract class PlayerList {
+@@ -1117,6 +1117,11 @@ public abstract class PlayerList {
      }
  
      private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
@@ -20,7 +20,7 @@ index 1c150913d4752d51d51640e0a5cf6d67182356b7..d300fc577a363e7884d1a176b6c282fe
          if (player.connection != null) {
              byte b0;
  
-@@ -1130,8 +1135,10 @@ public abstract class PlayerList {
+@@ -1131,8 +1136,10 @@ public abstract class PlayerList {
              player.connection.send(new ClientboundEntityEventPacket(player, b0));
          }
  
diff --git a/patches/server/0571-Add-StructureLocateEvent.patch b/patches/server/0572-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0571-Add-StructureLocateEvent.patch
rename to patches/server/0572-Add-StructureLocateEvent.patch
diff --git a/patches/server/0572-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0573-Collision-option-for-requiring-a-player-participant.patch
similarity index 96%
rename from patches/server/0572-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0573-Collision-option-for-requiring-a-player-participant.patch
index a7d76f831b..9c60d0dedd 100644
--- a/patches/server/0572-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0573-Collision-option-for-requiring-a-player-participant.patch
@@ -28,10 +28,10 @@ index 4d723f5327a64cd8257bab502ae59a35b4a35cc1..e8f5ad4925b4d02bf79f9f56d0dac3f0
      public int wanderingTraderSpawnDayTicks = 24000;
      public int wanderingTraderSpawnChanceFailureIncrement = 25;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a6ef4b05daaa93ef333647cc00f8a708d466aaba..8725f949d643d21339caab19a914dc26eb515658 100644
+index edd4246bf40a881f117b60d632f2e5f7937331e0..dd0ae211bff6edce71a37280f2f916892dbda49a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1626,6 +1626,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+@@ -1627,6 +1627,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      public void push(Entity entity) {
          if (!this.isPassengerOfSameVehicle(entity)) {
              if (!entity.noPhysics && !this.noPhysics) {
diff --git a/patches/server/0573-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0574-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0573-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0574-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0574-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0575-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0574-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0575-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0575-Make-schedule-command-per-world.patch b/patches/server/0576-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0575-Make-schedule-command-per-world.patch
rename to patches/server/0576-Make-schedule-command-per-world.patch
diff --git a/patches/server/0576-Configurable-max-leash-distance.patch b/patches/server/0577-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0576-Configurable-max-leash-distance.patch
rename to patches/server/0577-Configurable-max-leash-distance.patch
diff --git a/patches/server/0577-Implement-BlockPreDispenseEvent.patch b/patches/server/0578-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0577-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0578-Implement-BlockPreDispenseEvent.patch