From 82c64790f43239051625385e3e72b26fe17626e1 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 8 Jun 2023 21:29:58 -0700
Subject: [PATCH] Add back Anti-Xray patch (#9283)

---
 .../server/0343-Anti-Xray.patch               | 177 +++++++++---------
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |   0
 ...45-Improve-Block-breakNaturally-API.patch} |   0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |   0
 ...0347-Add-debug-for-sync-chunk-loads.patch} |   2 +-
 ...8-Remove-garbage-Java-version-check.patch} |   0
 ...tch => 0349-Add-ThrownEggHatchEvent.patch} |   0
 ...p-API.patch => 0350-Entity-Jump-API.patch} |   0
 ...-to-nerf-pigmen-from-nether-portals.patch} |   0
 ... => 0352-Make-the-GUI-graph-fancier.patch} |   0
 ...53-add-hand-to-BlockMultiPlaceEvent.patch} |   0
 ...ipwire-hook-placement-before-update.patch} |   0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |   0
 ...chance-of-villager-zombie-infection.patch} |   0
 ...tch => 0357-Optimise-Chunk-getFluid.patch} |   6 +-
 ...rbose-world-setting-to-false-by-def.patch} |   0
 ...Add-tick-times-API-and-mspt-command.patch} |   2 +-
 ...60-Expose-MinecraftServer-isRunning.patch} |   2 +-
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |   0
 ...pawn-settings-and-per-player-option.patch} |   0
 ...nections-shouldn-t-hold-up-shutdown.patch} |   0
 ...ow-bees-to-load-chunks-for-beehives.patch} |   0
 ...PlayerChunkMap-adds-crashing-server.patch} |   4 +-
 ...tch => 0366-Don-t-tick-dead-players.patch} |   0
 ...-Player-s-shouldn-t-be-able-to-move.patch} |   0
 ...timize-Collision-to-not-load-chunks.patch} |   0
 ...ove-existing-players-to-world-spawn.patch} |   0
 ...alSelector-Goal.Flag-Set-operations.patch} |   0
 ...h => 0371-Improved-Watchdog-Support.patch} |   6 +-
 ....patch => 0372-Optimize-Pathfinding.patch} |   0
 ...3-Reduce-Either-Optional-allocation.patch} |   0
 ...-memory-footprint-of-NBTTagCompound.patch} |   0
 ...ent-opening-inventories-when-frozen.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
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |   2 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |   0
 ...layerAttackEntityCooldownResetEvent.patch} |   0
 ...-fire-BlockFade-on-worldgen-threads.patch} |   0
 ...tom-creative-and-insomniac-controls.patch} |   0
 ...-duplication-issues-and-teleport-is.patch} |   0
 ...patch => 0385-Villager-Restocks-API.patch} |   0
 ...ickItem-Packet-and-kick-for-invalid.patch} |   0
 ...n.patch => 0387-Expose-game-version.patch} |   2 +-
 ...> 0388-Optimize-Voxel-Shape-Merging.patch} |   0
 ...per-thread-native-byte-buffer-cache.patch} |   0
 ....patch => 0390-misc-debugging-dumps.patch} |   2 +-
 ...1-Prevent-teleporting-dead-entities.patch} |   0
 ...traces-in-log-messages-crash-report.patch} |   4 +-
 ...atch => 0393-Implement-Mob-Goal-API.patch} |   2 +-
 ...=> 0394-Add-villager-reputation-API.patch} |   0
 ...maximum-exp-value-when-merging-orbs.patch} |   0
 ...tch => 0396-ExperienceOrbMergeEvent.patch} |   0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |   0
 ...brigadier-child-sorting-performance.patch} |   0
 ...API.patch => 0399-Potential-bed-API.patch} |   0
 ...ait-for-Async-Tasks-during-shutdown.patch} |   2 +-
 ...er-respects-game-and-entity-rules-f.patch} |   0
 ...nd-End-Portal-Frames-from-being-des.patch} |   4 +-
 ...location-of-Vec3D-by-entity-tracker.patch} |   4 +-
 ...> 0404-Ensure-safe-gateway-teleport.patch} |   0
 ...-for-console-having-all-permissions.patch} |   0
 ...x-villager-trading-demand-MC-163962.patch} |   0
 ... => 0407-Maps-shouldn-t-load-chunks.patch} |   0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |   0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |   0
 ...ton-physics-inconsistency-MC-188840.patch} |   0
 ...uping.patch => 0411-Fix-sand-duping.patch} |   0
 ...sing-chunks-due-to-integer-overflow.patch} |   0
 ...desync-in-playerconnection-causing-.patch} |   0
 ...ance-map-to-optimise-entity-tracker.patch} |  10 +-
 ...older-method-without-block-snapshot.patch} |   0
 ...API.patch => 0416-Improve-Arrow-API.patch} |   0
 ...mplement-PlayerRecipeBookClickEvent.patch} |   0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |   0
 ...9-Add-permission-for-command-blocks.patch} |   4 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |   0
 ...d-Difficulty-Remembering-Difficulty.patch} |   6 +-
 ...atch => 0422-Paper-dumpitem-command.patch} |   0
 ...Legacy-Component-serialization-size.patch} |   0
 ...Optimize-Bit-Operations-by-inlining.patch} |   0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  12 +-
 ...incremental-chunk-and-player-saving.patch} |   2 +-
 ...427-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
 ...0432-Support-components-in-ItemMeta.patch} |   0
 ...e-fix-EntityTargetLivingEntityEvent.patch} |   0
 ...patch => 0434-Add-entity-liquid-API.patch} |   0
 ...date-itemstack-legacy-name-and-lore.patch} |   0
 ...wn-player-in-correct-world-on-login.patch} |   0
 ...atch => 0437-Add-PrepareResultEvent.patch} |   0
 ...-for-portal-on-world-gen-entity-add.patch} |   0
 ...e-NetworkManager-Exception-Handling.patch} |   0
 ...x-arrows-never-despawning-MC-125757.patch} |   0
 ...Vanilla-Command-permission-checking.patch} |   0
 ...-5989.patch => 0442-Fix-SPIGOT-5989.patch} |   0
 ...-Bukkit-world-container-is-not-used.patch} |   0
 ...5885-Unable-to-disable-advancements.patch} |   0
 ...taPlayer-leak-due-from-quitting-ear.patch} |   0
 ...ix-some-rails-connecting-improperly.patch} |   0
 ...stake-in-CB-NBT-int-deserialization.patch} |   0
 ...rver-load-chunks-from-newer-version.patch} |   2 +-
 ...support.patch => 0449-Brand-support.patch} |   0
 ...patch => 0450-Add-setMaxPlayers-API.patch} |   2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |   0
 ...h => 0452-Don-t-require-FACING-data.patch} |   0
 ...eEvent-not-firing-for-all-use-cases.patch} |   4 +-
 ...PI.patch => 0454-Add-moon-phase-API.patch} |   0
 ...headless-pistons-from-being-created.patch} |   0
 ...ent.patch => 0456-Add-BellRingEvent.patch} |   0
 ...dd-zombie-targets-turtle-egg-config.patch} |   0
 ...patch => 0458-Buffer-joins-to-world.patch} |   0
 ...-Eigencraft-redstone-implementation.patch} |   0
 ...s-not-working-in-some-kick-messages.patch} |   0
 ...reateEvent-needs-to-know-its-entity.patch} |   0
 ...ch => 0462-Fix-CraftTeam-null-check.patch} |   0
 ...I.patch => 0463-Add-more-Evoker-API.patch} |   0
 ...Add-methods-to-get-translation-keys.patch} |   0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |   0
 ...ch => 0466-Cache-block-data-strings.patch} |   0
 ...rtation-and-cancel-velocity-if-tele.patch} |   0
 ...l-open-container-api-to-HumanEntity.patch} |   0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |   0
 ...-capture-to-capture-all-items-added.patch} |   6 +-
 ...-Counter-to-allow-plugins-to-use-va.patch} |   0
 ...track-plugin-scoreboards-by-default.patch} |   0
 ...king.patch => 0473-Entity-isTicking.patch} |   0
 ...non-whitelisted-player-when-white-l.patch} |   0
 ...-Concurrency-issue-in-ShufflingList.patch} |   0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |   0
 ...-large-move-vectors-crashing-server.patch} |   0
 ...atch => 0478-Optimise-getType-calls.patch} |   0
 ....patch => 0479-Villager-resetOffers.patch} |   0
 ...ce-order-when-capturing-blockstates.patch} |   2 +-
 ...lockpos-allocation-from-pathfinding.patch} |   0
 ...em-locations-dropped-from-campfires.patch} |   0
 ...tch => 0483-Player-elytra-boost-API.patch} |   0
 ...84-Fixed-TileEntityBell-memory-leak.patch} |   0
 ...ing-up-when-item-stack-is-empty-in-.patch} |   0
 ...Add-getOfflinePlayerIfCached-String.patch} |   2 +-
 ...ch => 0487-Add-ignore-discounts-API.patch} |   0
 ...Toggle-for-removing-existing-dragon.patch} |   0
 ...x-client-lag-on-advancement-loading.patch} |   0
 ...> 0490-Item-no-age-no-player-pickup.patch} |   0
 ...er-Remove-Streams-Optimized-collect.patch} |   0
 ...492-Beacon-API-custom-effect-ranges.patch} |   0
 ...tch => 0493-Add-API-for-quit-reason.patch} |   0
 ...ng-Trader-spawn-rate-config-options.patch} |   0
 ...ch => 0495-Expose-world-spawn-angle.patch} |   0
 ...patch => 0496-Add-Destroy-Speed-API.patch} |   0
 ...-spawnParticle-x-y-z-precision-loss.patch} |   0
 ...98-Add-LivingEntity-clearActiveItem.patch} |   0
 ...=> 0499-Add-PlayerItemCooldownEvent.patch} |   0
 ...rove-performance-of-the-end-generat.patch} |   0
 ...PI.patch => 0501-More-lightning-API.patch} |   0
 ...should-not-bypass-cramming-gamerule.patch} |   0
 ...-missing-default-perms-for-commands.patch} |   0
 ...h => 0504-Add-PlayerShearBlockEvent.patch} |   0
 ...ng-zombie-villager-discount-exploit.patch} |   0
 ....patch => 0506-Limit-recipe-packets.patch} |   0
 ...-CraftSound-backwards-compatibility.patch} |   0
 ...508-Player-Chunk-Load-Unload-Events.patch} |   0
 ...9-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 => 0514-Implement-TargetHitEvent.patch} |   0
 ... 0515-MC-4-Fix-item-position-desync.patch} |   0
 ...516-Additional-Block-Material-API-s.patch} |   0
 ...tch => 0517-Fix-harming-potion-dupe.patch} |   0
 ...get-Material-from-Boats-and-Minecar.patch} |   0
 ....patch => 0519-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 => 0524-Zombie-API-breaking-doors.patch} |   0
 ...525-Fix-nerfed-slime-when-splitting.patch} |   0
 ...=> 0526-Add-EntityLoadCrossbowEvent.patch} |   0
 ...0527-Added-WorldGameRuleChangeEvent.patch} |   6 +-
 ...-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} |   4 +-
 ...OIs.patch => 0536-Remove-stale-POIs.patch} |   2 +-
 ...h => 0537-Fix-villager-boat-exploit.patch} |   0
 ...I.patch => 0538-Add-sendOpLevel-API.patch} |   0
 ...0539-TODO-Registry-Modification-API.patch} |   0
 ...h => 0540-Add-StructuresLocateEvent.patch} |   0
 ...-for-requiring-a-player-participant.patch} |   0
 ...leHitEvent-call-when-fireballs-dead.patch} |   0
 ...nent-with-empty-text-instead-of-thr.patch} |   0
 ...544-Make-schedule-command-per-world.patch} |   0
 ...545-Configurable-max-leash-distance.patch} |   0
 ...546-Implement-BlockPreDispenseEvent.patch} |   0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |   0
 ...e-for-always-placing-the-dragon-egg.patch} |   0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |   0
 ...eash-variable-to-EntityUnleashEvent.patch} |   0
 ...shield-blocking-on-dimension-change.patch} |   0
 ...atch => 0552-add-DragonEggFormEvent.patch} |   0
 ...Event.patch => 0553-EntityMoveEvent.patch} |   2 +-
 ...isable-pathfinding-updates-on-block.patch} |   2 +-
 ... 0555-Inline-shift-direction-fields.patch} |   0
 ...-adding-items-to-BlockDropItemEvent.patch} |   0
 ...inThreadExecutor-to-BukkitScheduler.patch} |   0
 ...entity-allow-attribute-registration.patch} |   0
 ...ix-dead-slime-setSize-invincibility.patch} |   0
 ...pes-should-return-an-immutable-list.patch} |   0
 ...port-for-hex-color-codes-in-console.patch} |   0
 ...atch => 0562-Expose-Tracked-Players.patch} |   0
 ...3-Remove-streams-from-SensorNearest.patch} |   0
 ...er-exception-on-empty-JsonList-file.patch} |   0
 ...GUI.patch => 0565-Improve-ServerGUI.patch} |   0
 ...566-fix-converting-txt-to-json-file.patch} |   0
 ...atch => 0567-Add-worldborder-events.patch} |   0
 ...=> 0568-added-PlayerNameEntityEvent.patch} |   0
 ...grindstones-from-overstacking-items.patch} |   0
 ...h => 0570-Add-recipe-to-cook-events.patch} |   0
 ...patch => 0571-Add-Block-isValidTool.patch} |   0
 ...using-signs-inside-spawn-protection.patch} |   0
 ....patch => 0573-Expand-world-key-API.patch} |   2 +-
 ...ternative-constructor-for-Rotations.patch} |   0
 ...y-API.patch => 0575-Item-Rarity-API.patch} |   0
 ...d-item-when-player-has-disconnected.patch} |   0
 ...elist-use-configurable-kick-message.patch} |   0
 ...gnore-result-of-PlayerEditBookEvent.patch} |   0
 ...tch => 0579-Expose-protocol-version.patch} |   0
 ...ab-completions-for-brigadier-comman.patch} |   0
 ...temConsumeEvent-cancelling-properly.patch} |   0
 ...patch => 0582-Add-bypass-host-check.patch} |   0
 ...0583-Set-area-affect-cloud-rotation.patch} |   0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |   0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |   0
 ...-set-drop-chance-to-EntityEquipment.patch} |   0
 ...ix-PigZombieAngerEvent-cancellation.patch} |   0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |   0
 ... => 0589-Added-PlayerDeepSleepEvent.patch} |   0
 ...ld-API.patch => 0590-More-World-API.patch} |   4 +-
 ... 0591-Added-PlayerBedFailEnterEvent.patch} |   0
 ...92-Entity-load-save-limit-per-chunk.patch} |   0
 ...-to-convert-between-Component-and-B.patch} |   0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |   0
 ...acon-activation-deactivation-events.patch} |   0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |   0
 ...dd-Channel-initialization-listeners.patch} |   0
 ...mands-if-tab-completion-is-disabled.patch} |   0
 ...> 0599-Add-more-WanderingTrader-API.patch} |   0
 ...dd-EntityBlockStorage-clearEntities.patch} |   0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |   0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...close.patch => 0603-Inventory-close.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...=> 0605-Fix-CraftPotionBrewer-cache.patch} |   0
 ...atch => 0606-Add-basic-Datapack-API.patch} |   2 +-
 ...ment-variable-to-disable-server-gui.patch} |   0
 ...itions-to-PlayerGameModeChangeEvent.patch} |   2 +-
 ... => 0609-ItemStack-repair-check-API.patch} |   0
 ....patch => 0610-More-Enchantment-API.patch} |   0
 ...ve-range-check-for-block-placing-up.patch} |   0
 ...-and-optimise-world-force-upgrading.patch} |   6 +-
 ...PI.patch => 0613-Add-Mob-lookAt-API.patch} |   0
 ...0614-Add-Unix-domain-socket-support.patch} |   0
 ... => 0615-Add-EntityInsideBlockEvent.patch} |   0
 ...16-Attributes-API-for-item-defaults.patch} |   0
 ...ause-to-Weather-ThunderChangeEvents.patch} |   8 +-
 ...patch => 0618-More-Lidded-Block-API.patch} |   0
 ...19-Limit-item-frame-cursors-on-maps.patch} |   0
 ... => 0620-Add-PlayerKickEvent-causes.patch} |   0
 ...0621-Add-PufferFishStateChangeEvent.patch} |   0
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...tedContainer-instead-of-ThreadingDe.patch} |  32 ++--
 ...-to-fix-items-merging-through-walls.patch} |   0
 ...h => 0625-Add-BellRevealRaiderEvent.patch} |   0
 ... 0626-Fix-invulnerable-end-crystals.patch} |   0
 ...27-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...0628-Fix-dangerous-end-portal-logic.patch} |   0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...-Make-item-validations-configurable.patch} |   0
 ...patch => 0631-Line-Of-Sight-Changes.patch} |   0
 ... => 0632-add-per-world-spawn-limits.patch} |   2 +-
 ...h => 0633-Fix-potions-splash-events.patch} |   0
 ... => 0634-Add-more-LimitedRegion-API.patch} |   0
 ...layerDropItemEvent-using-wrong-item.patch} |   0
 ...=> 0636-Missing-Entity-Behavior-API.patch} |   0
 ...ect-for-book-edit-is-called-on-main.patch} |   0
 ...of-Block-applyBoneMeal-always-being.patch} |   0
 ...tChunkIfLoadedImmediately-in-places.patch} |   8 +-
 ...rom-signs-not-firing-command-events.patch} |   0
 ...ch => 0641-Adds-PlayerArmSwingEvent.patch} |   0
 ...-event-leave-message-not-being-sent.patch} |   0
 ...-for-mobs-immune-to-default-effects.patch} |   0
 ...correct-message-for-outdated-client.patch} |   0
 ...-t-apply-cramming-damage-to-players.patch} |   0
 ...d-timings-for-sensors-and-behaviors.patch} |   0
 ...-bunch-of-missing-forceDrop-toggles.patch} |   0
 ...inger-API.patch => 0648-Stinger-API.patch} |   0
 ...cy-issue-with-empty-map-items-in-CB.patch} |   0
 ... => 0650-Add-System.out-err-catcher.patch} |   2 +-
 ... => 0651-Fix-test-not-bootstrapping.patch} |   0
 ...-to-contain-the-source-jars-in-stac.patch} |   0
 ...-Improve-boat-collision-performance.patch} |   0
 ...AFK-kick-while-watching-end-credits.patch} |   0
 ...iting-of-comments-to-server.propert.patch} |   0
 ...tch => 0656-Add-PlayerSetSpawnEvent.patch} |   0
 ...rs-respect-inventory-max-stack-size.patch} |   0
 ...ize-entity-tracker-passenger-checks.patch} |   0
 ...-option-for-Piglins-guarding-chests.patch} |   0
 ...=> 0660-Added-EntityDamageItemEvent.patch} |   0
 ...timize-indirect-passenger-iteration.patch} |   0
 ...em-frame-map-cursor-update-interval.patch} |   0
 ...Make-EntityUnleashEvent-cancellable.patch} |   0
 ...664-Clear-bucket-NBT-after-dispense.patch} |   0
 ...arget-without-changing-other-things.patch} |   0
 ...ch => 0666-Add-BlockBreakBlockEvent.patch} |   0
 ...revent-NBT-copy-in-smithing-recipes.patch} |   0
 ...patch => 0668-More-CommandBlock-API.patch} |   0
 ...-missing-team-sidebar-display-slots.patch} |   0
 ...0670-Add-back-EntityPortalExitEvent.patch} |   0
 ...-find-targets-for-lightning-strikes.patch} |   6 +-
 ... 0672-Get-entity-default-attributes.patch} |   0
 ...d-API.patch => 0673-Left-handed-API.patch} |   0
 ...ch => 0674-Add-more-advancement-API.patch} |   0
 ...675-Add-ItemFactory-getSpawnEgg-API.patch} |   0
 ...tch => 0676-Add-critical-damage-API.patch} |   0
 ...0677-Fix-issues-with-mob-conversion.patch} |   0
 ...ollidable-methods-to-various-places.patch} |   0
 ...-ram-API.patch => 0679-Goat-ram-API.patch} |   0
 ...dd-API-for-resetting-a-single-score.patch} |   0
 ...1-Add-Raw-Byte-Entity-Serialization.patch} |   0
 ...82-Vanilla-command-permission-fixes.patch} |   0
 ...logic-for-inventories-on-chunk-unlo.patch} |   2 +-
 ...84-Fix-GameProfileCache-concurrency.patch} |   0
 ...685-Improve-and-expand-AsyncCatcher.patch} |   0
 ...per-mobcaps-and-paper-playermobcaps.patch} |   6 +-
 ...tize-ResourceLocation-error-logging.patch} |   0
 ...rolled-flushing-for-network-manager.patch} |   0
 ...=> 0689-Optimise-general-POI-access.patch} |   0
 ...rCloseEnoughForSpawning-to-use-dist.patch} |   2 +-
 ... 0691-Optimise-chunk-tick-iteration.patch} |   2 +-
 ...> 0692-Execute-chunk-tasks-mid-tick.patch} |   8 +-
 ...ulate-regionfile-header-if-it-is-co.patch} |   6 +-
 ...ementation-for-blockstate-state-loo.patch} |   0
 ...-more-information-in-watchdog-dumps.patch} |   2 +-
 ...lly-inline-methods-in-BlockPosition.patch} |   0
 ... 0697-Distance-manager-tick-timings.patch} |   0
 ...ler-threads-according-to-the-plugin.patch} |   0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |   4 +-
 ...h => 0700-Add-packet-limiter-config.patch} |   0
 ...our-chunk-data-off-disk-when-conver.patch} |   0
 ...sh-calls-for-entity-tracker-packets.patch} |   0
 ...-lookup-fluid-state-when-raytracing.patch} |   0
 ...atch => 0704-Time-scoreboard-search.patch} |   0
 ...packets-for-hard-colliding-entities.patch} |   0
 ...6-Do-not-run-raytrace-logic-for-AIR.patch} |   0
 ...rimise-map-impl-for-tracked-players.patch} |   4 +-
 ...imise-BlockSoil-nearby-water-lookup.patch} |   0
 ... 0709-Optimise-random-block-ticking.patch} |  22 +--
 ...0-Optimise-non-flush-packet-sending.patch} |   0
 ...0711-Optimise-nearby-player-lookups.patch} |  10 +-
 ...0712-Remove-streams-for-villager-AI.patch} |   0
 ...city-compression-and-cipher-natives.patch} |   0
 ...hread-worker-count-for-low-core-cou.patch} |   0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |   0
 ...ntory-not-closing-on-entity-removal.patch} |   2 +-
 ...rement-before-suggesting-root-nodes.patch} |   0
 ...ServerboundCommandSuggestionPacket-.patch} |   0
 ...nColor-on-tropical-fish-bucket-meta.patch} |   0
 ...=> 0720-Ensure-valid-vehicle-status.patch} |   0
 ...ftlocked-end-exit-portal-generation.patch} |   0
 ...r-causing-a-crash-when-trying-to-ge.patch} |   0
 ...-t-log-debug-logging-being-disabled.patch} |   0
 ...ous-menus-with-empty-level-accesses.patch} |   0
 ...h => 0725-Preserve-overstacked-loot.patch} |   0
 ...ate-head-rotation-in-missing-places.patch} |   0
 ...unintended-light-block-manipulation.patch} |   0
 ...0728-Fix-CraftCriteria-defaults-map.patch} |   0
 ...Fix-upstreams-block-state-factories.patch} |   0
 ...ion-for-logging-player-ip-addresses.patch} |   0
 ... => 0731-Configurable-feature-seeds.patch} |   0
 ...pper-didnt-account-for-entity-sende.patch} |   0
 ... 0733-Add-root-admin-user-detection.patch} |   0
 ...ays-allow-item-changing-in-Fireball.patch} |   0
 ...t-attempt-to-teleport-dead-entities.patch} |   0
 ...ive-velocity-through-repeated-crits.patch} |   0
 ...e-code-using-deprecated-for-removal.patch} |   0
 ...emoving-recipes-from-RecipeIterator.patch} |   0
 ...versized-item-data-in-equipment-and.patch} |   0
 ...e-unnecessary-itemmeta-from-clients.patch} |   0
 ...=> 0741-Fix-Spigot-growth-modifiers.patch} |   0
 ...OpenersCounter-openCount-from-going.patch} |   0
 ...0743-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...> 0744-Add-player-health-update-API.patch} |   0
 ...tch => 0745-Optimize-HashMapPalette.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   8 +-
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  12 +-
 ...n-checking-in-player-move-packet-ha.patch} |   0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |   2 +-
 ...patch => 0750-Add-more-Campfire-API.patch} |   0
 ...data-to-disk-if-it-serializes-witho.patch} |   0
 ...52-Fix-tripwire-state-inconsistency.patch} |   0
 ...ard-CraftEntity-in-teleport-command.patch} |   0
 ... => 0754-Improve-scoreboard-entries.patch} |   0
 ...ch => 0755-Entity-powdered-snow-API.patch} |   0
 ...0756-Add-API-for-item-entity-health.patch} |   0
 ...-type-tags-suggestions-in-selectors.patch} |   0
 ...ax-block-light-for-monster-spawning.patch} |   0
 ...pistons-and-BlockPistonRetractEvent.patch} |   0
 ...plifiers-greater-than-127-correctly.patch} |   0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |   0
 ...=> 0762-Fix-bees-aging-inside-hives.patch} |   0
 ...le-API.patch => 0763-Bucketable-API.patch} |   0
 ...es.patch => 0764-Validate-usernames.patch} |   0
 ...er-animal-spawn-height-configurable.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   4 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |   0
 ...load-to-PersistentDataContainer-has.patch} |   0
 ...9-Multiple-Entries-with-Scoreboards.patch} |   0
 ...770-Reset-placed-block-on-exception.patch} |   0
 ...configurable-height-for-slime-spawn.patch} |   0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |   0
 ...0773-Fix-xp-reward-for-baby-zombies.patch} |   0
 ... 0774-Kick-on-main-for-illegal-chat.patch} |   0
 ...lti-Block-Change-API-Implementation.patch} |   0
 ...ent.patch => 0776-Fix-NotePlayEvent.patch} |   0
 ....patch => 0777-Freeze-Tick-Lock-API.patch} |   0
 ...lphin-API.patch => 0778-Dolphin-API.patch} |   0
 ...h => 0779-More-PotionEffectType-API.patch} |   0
 ...for-StructureTemplate.Pallete-cache.patch} |   0
 ...command-sender-which-forwards-feedb.patch} |   2 +-
 ...-missing-structure-set-seed-configs.patch} |   0
 ...h => 0783-Implement-regenerateChunk.patch} |   2 +-
 ...lled-powdered-snow-bucket-placement.patch} |   0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   2 +-
 ...gs.patch => 0786-Add-GameEvent-tags.patch} |   2 +-
 ...ks-fairly-for-worlds-while-waiting-.patch} |   0
 ...tch => 0788-Furnace-RecipesUsed-API.patch} |   0
 ...gurable-sculk-sensor-listener-range.patch} |   0
 ...d-missing-block-data-mins-and-maxes.patch} |   0
 ...fault-CustomSpawners-in-custom-worl.patch} |   0
 ...-worldlist-before-initing-the-world.patch} |   2 +-
 ... => 0793-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0794-Custom-Potion-Mixes.patch} |   2 +-
 ...95-Force-close-world-loading-screen.patch} |   4 +-
 ...796-Fix-falling-block-spawn-methods.patch} |   6 +-
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0799-More-Projectile-API.patch} |   0
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   0
 ...0802-Implement-getComputedBiome-API.patch} |   0
 ...> 0803-Make-some-itemstacks-nonnull.patch} |   0
 ...804-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0805-Fix-saving-in-unloadWorld.patch} |   2 +-
 ...h => 0806-Buffer-OOB-setBlock-calls.patch} |   0
 ... 0807-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   0
 ...bles-running-when-mob-loot-gamerule.patch} |   0
 ...ssenger-world-matches-ridden-entity.patch} |   0
 ...rd-against-invalid-entity-positions.patch} |   0
 ...s.patch => 0812-cache-resource-keys.patch} |   0
 ...ange-the-podium-for-the-EnderDragon.patch} |   0
 ...erriding-a-block-entity-during-worl.patch} |   0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |   0
 ...t-tile-entity-copies-loading-chunks.patch} |   0
 ...ead-of-display-name-in-PlayerList-g.patch} |   2 +-
 ...s-not-spawning-outside-slime-chunks.patch} |   0
 ...-ServerLevel-for-gamerule-callbacks.patch} |   6 +-
 ...ing-amount-to-PlayerItemDamageEvent.patch} |   0
 ...> 0821-WorldCreator-keepSpawnLoaded.patch} |   2 +-
 ...destroyed-trigger-in-the-correct-pl.patch} |   6 +-
 ...Event-and-CollarColorable-interface.patch} |   0
 ...CauldronLevelChange-on-initial-fill.patch} |   0
 ...snow-cauldrons-not-turning-to-water.patch} |   0
 ...> 0826-Add-PlayerStopUsingItemEvent.patch} |   0
 ...27-FallingBlock-auto-expire-setting.patch} |   0
 ...rs.patch => 0828-Don-t-tick-markers.patch} |   2 +-
 ...-not-accept-invalid-client-settings.patch} |   0
 ...0830-Add-support-for-Proxy-Protocol.patch} |   0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0833-Sanitize-Sent-BlockEntity-NBT.patch} |   4 +-
 ...-selector-resolving-in-books-by-def.patch} |   0
 ...ntity-loading-causing-async-lookups.patch} |   0
 ...-on-world-create-while-being-ticked.patch} |   2 +-
 ...ate-Current-redstone-implementation.patch} |   6 +-
 ...38-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0839-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   0
 ...tant-BlockStateListPopulator-method.patch} |   0
 ...I.patch => 0842-Nameable-Banner-API.patch} |   0
 ...roadcast-messages-to-command-blocks.patch} |   2 +-
 ...pty-items-from-being-added-to-world.patch} |   2 +-
 ...hPotion-and-LingeringPotion-spawnin.patch} |   0
 ...nent-in-resource-pack-rejection-mes.patch} |   0
 ...atch => 0847-Add-Player-getFishHook.patch} |   0
 ...chunk-for-dynamic-game-event-listen.patch} |   0
 ...s-missing-EntityDropItemEvent-calls.patch} |   0
 ...debug-information-to-chat-packet-er.patch} |   0
 ...PE.patch => 0851-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   0
 ...API.patch => 0853-More-Teleport-API.patch} |   0
 ... => 0854-Add-EntityPortalReadyEvent.patch} |   0
 ...level-random-in-entity-constructors.patch} |   0
 ...k-entities-after-destroy-prediction.patch} |   4 +-
 ...on-plugins-accessing-faraway-chunks.patch} |  16 +-
 ...tom-Chat-Completion-Suggestions-API.patch} |   0
 ...=> 0859-Add-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0860-Collision-API.patch} |   0
 ...nd-message-for-brigadier-syntax-exc.patch} |   0
 ...-invalid-signature-login-stacktrace.patch} |   0
 ...API.patch => 0863-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   2 +-
 ...andom-in-ServerLoginPacketListenerI.patch} |   0
 ...866-Add-NamespacedKey-biome-methods.patch} |   0
 ...x-plugin-loggers-on-server-shutdown.patch} |   0
 ...ok-changes-from-crashing-the-server.patch} |   0
 ...tityChangeBlockEvent-in-more-places.patch} |   0
 ...> 0870-Missing-eating-regain-reason.patch} |   0
 ....patch => 0871-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...4-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0875-Configurable-chat-thread-limit.patch} |   0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ... 0877-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ... => 0879-Add-getDrops-to-BlockState.patch} |   0
 ...=> 0880-Fix-a-bunch-of-vanilla-bugs.patch} |   4 +-
 ...y-onTrackingStart-during-navigation.patch} |   2 +-
 ... 0882-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0883-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   6 +-
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   0
 ... 0886-Elder-Guardian-appearance-API.patch} |   0
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0888-Add-entity-knockback-API.patch} |   0
 ....patch => 0889-Detect-headless-JREs.patch} |   0
 ...-vehicle-collision-event-not-called.patch} |   0
 ...1-optimized-dirt-and-snow-spreading.patch} |   0
 ... => 0892-Added-EntityToggleSitEvent.patch} |   0
 ... => 0893-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0894-Add-Moving-Piston-API.patch} |   0
 ...> 0895-Ignore-impossible-spawn-tick.patch} |   0
 ...source-for-fireworks-from-dispenser.patch} |   0
 ...t-suggestion-permissions-to-align-w.patch} |   0
 ...Event-cancellation-cant-fully-preve.patch} |   0
 ...Prevent-compass-from-loading-chunks.patch} |   0
 ...0900-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ... 0903-Add-Player-Warden-Warning-API.patch} |   0
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...905-Add-paper-dumplisteners-command.patch} |   0
 ...lobal-player-list-where-appropriate.patch} |   2 +-
 ...sync-entity-add-due-to-fungus-trees.patch} |   0
 ....patch => 0908-ItemStack-damage-API.patch} |   0
 ...tion-API.patch => 0909-Friction-API.patch} |   0
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...=> 0911-Fix-player-kick-on-shutdown.patch} |   0
 ... => 0912-Sync-offhand-slot-in-menus.patch} |   0
 ... 0913-Player-Entity-Tracking-Events.patch} |   0
 ...tch => 0914-Limit-pet-look-distance.patch} |   0
 ...ch => 0915-Properly-resend-entities.patch} |   2 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |   0
 ...ments.patch => 0917-fix-Instruments.patch} |   0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |   0
 ...es-in-dispense-events-regarding-sta.patch} |   0
 ... => 0920-Improve-logging-and-errors.patch} |   0
 ...tch => 0921-Add-BlockLockCheckEvent.patch} |   0
 ... 0922-Add-Sneaking-API-for-Entities.patch} |   0
 ....patch => 0923-Improve-PortalEvents.patch} |   0
 ...ion-for-spider-worldborder-climbing.patch} |   0
 ...sing-SpigotConfig-logCommands-check.patch} |   0
 ...Allay-stopDancing-while-not-dancing.patch} |   0
 ...ge.patch => 0927-Flying-Fall-Damage.patch} |   0
 ...ed-block-state-to-BlockExplodeEvent.patch} |   0
 ...ion-moving-velocity-to-VehicleBlock.patch} |   0
 ...onfig-for-disabling-entity-tag-tags.patch} |   0
 ...e-player-info-update-packet-on-join.patch} |   2 +-
 ...k-items-during-EntityResurrectEvent.patch} |   0
 ...en-API.patch => 0933-Win-Screen-API.patch} |   0
 ...ItemStack-setAmount-null-assignment.patch} |   0
 ...ix-force-opening-enchantment-tables.patch} |   0
 ...tch => 0936-Add-Entity-Body-Yaw-API.patch} |   0
 ...vent-sleeping-villagers-moving-towa.patch} |   0
 ...hen-a-captured-block-state-is-outda.patch} |   4 +-
 ...=> 0939-Add-EntityFertilizeEggEvent.patch} |   0
 ...ty-drop-not-updating-the-client-inv.patch} |   0
 ...temEvent-and-EntityCompostItemEvent.patch} |   0
 ...ctly-handle-ArmorStand-invisibility.patch} |   0
 ...ancement-triggers-for-entity-damage.patch} |   0
 ...944-Fix-text-display-error-on-spawn.patch} |   0
 ...nventories-returning-null-Locations.patch} |   0
 ...API.patch => 0946-Add-Shearable-API.patch} |   0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |   0
 ...kshelf-and-jukebox-setItem-with-air.patch} |   0
 ...pers.patch => 0949-Optimize-Hoppers.patch} |   0
 ...ives-generating-from-using-bonemeal.patch} |   0
 ...=> 0951-Fix-api-checking-banned-ips.patch} |   0
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |   0
 ...ence-violations-like-they-should-be.patch} |   0
 ...uplicate-animate-packet-for-records.patch} |   0
 ...xpired-keys-from-impacting-new-join.patch} |   0
 ...ts-being-fired-from-unloaded-chunks.patch} |   2 +-
 ...0957-Use-array-for-gamerule-storage.patch} |   0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |   0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |   0
 ... 0960-Add-Mob-Experience-reward-API.patch} |   0
 ...redstone-on-top-of-trap-doors-early.patch} |   0
 ...-Fix-DamageCause-for-Falling-Blocks.patch} |   0
 ...Lazy-Initialization-for-Enum-Fields.patch} |   0
 ...64-More-accurate-isInOpenWater-impl.patch} |   0
 ...ccess-to-lookups-field-in-RegistryO.patch} |   0
 ...ecalcBlockCounts-for-empty-sections.patch} |   6 +-
 ...ehive-without-any-players-nearby-th.patch} |   0
 ... => 0968-Expand-PlayerItemMendEvent.patch} |   0
 ...sh-ProjectileSource-for-projectiles.patch} |   0
 ... => 0970-Add-transient-modifier-API.patch} |   0
 ...patch => 0971-Fix-block-place-logic.patch} |   0
 ...nd-playing-for-BlockItem-ItemStacks.patch} |   0
 630 files changed, 285 insertions(+), 284 deletions(-)
 rename patches/{unapplied => }/server/0343-Anti-Xray.patch (92%)
 rename patches/server/{0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0344-Improve-Block-breakNaturally-API.patch => 0345-Improve-Block-breakNaturally-API.patch} (100%)
 rename patches/server/{0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename patches/server/{0346-Add-debug-for-sync-chunk-loads.patch => 0347-Add-debug-for-sync-chunk-loads.patch} (99%)
 rename patches/server/{0347-Remove-garbage-Java-version-check.patch => 0348-Remove-garbage-Java-version-check.patch} (100%)
 rename patches/server/{0348-Add-ThrownEggHatchEvent.patch => 0349-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0349-Entity-Jump-API.patch => 0350-Entity-Jump-API.patch} (100%)
 rename patches/server/{0350-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0351-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename patches/server/{0351-Make-the-GUI-graph-fancier.patch => 0352-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0352-add-hand-to-BlockMultiPlaceEvent.patch => 0353-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0353-Validate-tripwire-hook-placement-before-update.patch => 0354-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0355-Configurable-chance-of-villager-zombie-infection.patch => 0356-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0356-Optimise-Chunk-getFluid.patch => 0357-Optimise-Chunk-getFluid.patch} (92%)
 rename patches/server/{0357-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0358-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0358-Add-tick-times-API-and-mspt-command.patch => 0359-Add-tick-times-API-and-mspt-command.patch} (98%)
 rename patches/server/{0359-Expose-MinecraftServer-isRunning.patch => 0360-Expose-MinecraftServer-isRunning.patch} (90%)
 rename patches/server/{0360-Add-Raw-Byte-ItemStack-Serialization.patch => 0361-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0361-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0362-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename patches/server/{0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (93%)
 rename patches/server/{0365-Don-t-tick-dead-players.patch => 0366-Don-t-tick-dead-players.patch} (100%)
 rename patches/server/{0366-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0367-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0367-Optimize-Collision-to-not-load-chunks.patch => 0368-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename patches/server/{0368-Don-t-move-existing-players-to-world-spawn.patch => 0369-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename patches/server/{0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0370-Improved-Watchdog-Support.patch => 0371-Improved-Watchdog-Support.patch} (99%)
 rename patches/server/{0371-Optimize-Pathfinding.patch => 0372-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0372-Reduce-Either-Optional-allocation.patch => 0373-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0373-Reduce-memory-footprint-of-NBTTagCompound.patch => 0374-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0374-Prevent-opening-inventories-when-frozen.patch => 0375-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename patches/server/{0375-Don-t-run-entity-collision-code-if-not-needed.patch => 0376-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0376-Implement-Player-Client-Options-API.patch => 0377-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (98%)
 rename patches/server/{0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename patches/server/{0380-Add-PlayerAttackEntityCooldownResetEvent.patch => 0381-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0381-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0382-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0382-Add-phantom-creative-and-insomniac-controls.patch => 0383-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename patches/server/{0384-Villager-Restocks-API.patch => 0385-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0385-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0386-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename patches/server/{0386-Expose-game-version.patch => 0387-Expose-game-version.patch} (89%)
 rename patches/server/{0387-Optimize-Voxel-Shape-Merging.patch => 0388-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0389-misc-debugging-dumps.patch => 0390-misc-debugging-dumps.patch} (98%)
 rename patches/server/{0390-Prevent-teleporting-dead-entities.patch => 0391-Prevent-teleporting-dead-entities.patch} (100%)
 rename patches/server/{0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (99%)
 rename patches/server/{0392-Implement-Mob-Goal-API.patch => 0393-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0393-Add-villager-reputation-API.patch => 0394-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0394-Option-for-maximum-exp-value-when-merging-orbs.patch => 0395-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0395-ExperienceOrbMergeEvent.patch => 0396-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0396-Fix-PotionEffect-ignores-icon-flag.patch => 0397-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0397-Optimize-brigadier-child-sorting-performance.patch => 0398-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0398-Potential-bed-API.patch => 0399-Potential-bed-API.patch} (100%)
 rename patches/server/{0399-Wait-for-Async-Tasks-during-shutdown.patch => 0400-Wait-for-Async-Tasks-during-shutdown.patch} (96%)
 rename patches/server/{0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (98%)
 rename patches/server/{0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (95%)
 rename patches/server/{0403-Ensure-safe-gateway-teleport.patch => 0404-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0404-Add-option-for-console-having-all-permissions.patch => 0405-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0405-Fix-villager-trading-demand-MC-163962.patch => 0406-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0406-Maps-shouldn-t-load-chunks.patch => 0407-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0408-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0409-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0409-Fix-piston-physics-inconsistency-MC-188840.patch => 0410-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0410-Fix-sand-duping.patch => 0411-Fix-sand-duping.patch} (100%)
 rename patches/server/{0411-Fix-missing-chunks-due-to-integer-overflow.patch => 0412-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0412-Prevent-position-desync-in-playerconnection-causing-.patch => 0413-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename patches/server/{0413-Use-distance-map-to-optimise-entity-tracker.patch => 0414-Use-distance-map-to-optimise-entity-tracker.patch} (98%)
 rename patches/server/{0414-Inventory-getHolder-method-without-block-snapshot.patch => 0415-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0415-Improve-Arrow-API.patch => 0416-Improve-Arrow-API.patch} (100%)
 rename patches/server/{0416-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0417-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0417-Hide-sync-chunk-writes-behind-flag.patch => 0418-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0418-Add-permission-for-command-blocks.patch => 0419-Add-permission-for-command-blocks.patch} (97%)
 rename patches/server/{0419-Ensure-Entity-AABB-s-are-never-invalid.patch => 0420-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (97%)
 rename patches/server/{0421-Paper-dumpitem-command.patch => 0422-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0422-Improve-Legacy-Component-serialization-size.patch => 0423-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0423-Optimize-Bit-Operations-by-inlining.patch => 0424-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (94%)
 rename patches/server/{0425-incremental-chunk-and-player-saving.patch => 0426-incremental-chunk-and-player-saving.patch} (98%)
 rename patches/server/{0426-Support-old-UUID-format-for-NBT.patch => 0427-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0427-Clean-up-duplicated-GameProfile-Properties.patch => 0428-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0428-Convert-legacy-attributes-in-Item-Meta.patch => 0429-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0429-Remove-some-streams-from-structures.patch => 0430-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0430-Remove-streams-from-classes-related-villager-gossip.patch => 0431-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0431-Support-components-in-ItemMeta.patch => 0432-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0432-Improve-fix-EntityTargetLivingEntityEvent.patch => 0433-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%)
 rename patches/server/{0433-Add-entity-liquid-API.patch => 0434-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0434-Update-itemstack-legacy-name-and-lore.patch => 0435-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0435-Spawn-player-in-correct-world-on-login.patch => 0436-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename patches/server/{0436-Add-PrepareResultEvent.patch => 0437-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0438-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0438-Optimize-NetworkManager-Exception-Handling.patch => 0439-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0439-Fix-arrows-never-despawning-MC-125757.patch => 0440-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0440-Thread-Safe-Vanilla-Command-permission-checking.patch => 0441-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0441-Fix-SPIGOT-5989.patch => 0442-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0443-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0444-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0445-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0445-Fix-some-rails-connecting-improperly.patch => 0446-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0447-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0447-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0448-Do-not-let-the-server-load-chunks-from-newer-version.patch} (95%)
 rename patches/server/{0448-Brand-support.patch => 0449-Brand-support.patch} (100%)
 rename patches/server/{0449-Add-setMaxPlayers-API.patch => 0450-Add-setMaxPlayers-API.patch} (94%)
 rename patches/server/{0450-Add-playPickupItemAnimation-to-LivingEntity.patch => 0451-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0451-Don-t-require-FACING-data.patch => 0452-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0453-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (93%)
 rename patches/server/{0453-Add-moon-phase-API.patch => 0454-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0454-Prevent-headless-pistons-from-being-created.patch => 0455-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0455-Add-BellRingEvent.patch => 0456-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0456-Add-zombie-targets-turtle-egg-config.patch => 0457-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0457-Buffer-joins-to-world.patch => 0458-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0458-Eigencraft-redstone-implementation.patch => 0459-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0459-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0460-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0460-PortalCreateEvent-needs-to-know-its-entity.patch => 0461-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0461-Fix-CraftTeam-null-check.patch => 0462-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0462-Add-more-Evoker-API.patch => 0463-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0463-Add-methods-to-get-translation-keys.patch => 0464-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0464-Create-HoverEvent-from-ItemStack-Entity.patch => 0465-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0465-Cache-block-data-strings.patch => 0466-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0466-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0467-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename patches/server/{0467-Add-additional-open-container-api-to-HumanEntity.patch => 0468-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0468-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0469-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0469-Extend-block-drop-capture-to-capture-all-items-added.patch => 0470-Extend-block-drop-capture-to-capture-all-items-added.patch} (91%)
 rename patches/server/{0470-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0471-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0471-Lazily-track-plugin-scoreboards-by-default.patch => 0472-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0472-Entity-isTicking.patch => 0473-Entity-isTicking.patch} (100%)
 rename patches/server/{0473-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0474-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0474-Fix-Concurrency-issue-in-ShufflingList.patch => 0475-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/server/{0475-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0476-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0476-Fix-for-large-move-vectors-crashing-server.patch => 0477-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0477-Optimise-getType-calls.patch => 0478-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0478-Villager-resetOffers.patch => 0479-Villager-resetOffers.patch} (100%)
 rename patches/server/{0479-Retain-block-place-order-when-capturing-blockstates.patch => 0480-Retain-block-place-order-when-capturing-blockstates.patch} (93%)
 rename patches/server/{0480-Reduce-blockpos-allocation-from-pathfinding.patch => 0481-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0481-Fix-item-locations-dropped-from-campfires.patch => 0482-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0482-Player-elytra-boost-API.patch => 0483-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0483-Fixed-TileEntityBell-memory-leak.patch => 0484-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0484-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0485-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0485-Add-getOfflinePlayerIfCached-String.patch => 0486-Add-getOfflinePlayerIfCached-String.patch} (93%)
 rename patches/server/{0486-Add-ignore-discounts-API.patch => 0487-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0487-Toggle-for-removing-existing-dragon.patch => 0488-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0488-Fix-client-lag-on-advancement-loading.patch => 0489-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0489-Item-no-age-no-player-pickup.patch => 0490-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0490-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0491-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0491-Beacon-API-custom-effect-ranges.patch => 0492-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0492-Add-API-for-quit-reason.patch => 0493-Add-API-for-quit-reason.patch} (100%)
 rename patches/server/{0493-Add-Wandering-Trader-spawn-rate-config-options.patch => 0494-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0494-Expose-world-spawn-angle.patch => 0495-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0495-Add-Destroy-Speed-API.patch => 0496-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0496-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0497-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0497-Add-LivingEntity-clearActiveItem.patch => 0498-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0498-Add-PlayerItemCooldownEvent.patch => 0499-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0499-Significantly-improve-performance-of-the-end-generat.patch => 0500-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0500-More-lightning-API.patch => 0501-More-lightning-API.patch} (100%)
 rename patches/server/{0501-Climbing-should-not-bypass-cramming-gamerule.patch => 0502-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename patches/server/{0502-Added-missing-default-perms-for-commands.patch => 0503-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0503-Add-PlayerShearBlockEvent.patch => 0504-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0504-Fix-curing-zombie-villager-discount-exploit.patch => 0505-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0505-Limit-recipe-packets.patch => 0506-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0506-Fix-CraftSound-backwards-compatibility.patch => 0507-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0507-Player-Chunk-Load-Unload-Events.patch => 0508-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0508-Optimize-Dynamic-get-Missing-Keys.patch => 0509-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0509-Expose-LivingEntity-hurt-direction.patch => 0510-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0510-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0511-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0511-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0512-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0512-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0513-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0513-Implement-TargetHitEvent.patch => 0514-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0514-MC-4-Fix-item-position-desync.patch => 0515-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0515-Additional-Block-Material-API-s.patch => 0516-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0516-Fix-harming-potion-dupe.patch => 0517-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0517-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0518-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0518-Cache-burn-durations.patch => 0519-Cache-burn-durations.patch} (100%)
 rename patches/server/{0519-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0520-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0520-Fix-Not-a-string-Map-Conversion-spam.patch => 0521-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0521-Implement-PlayerFlowerPotManipulateEvent.patch => 0522-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0522-Fix-interact-event-not-being-called-in-adventure.patch => 0523-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0523-Zombie-API-breaking-doors.patch => 0524-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0524-Fix-nerfed-slime-when-splitting.patch => 0525-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0525-Add-EntityLoadCrossbowEvent.patch => 0526-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0526-Added-WorldGameRuleChangeEvent.patch => 0527-Added-WorldGameRuleChangeEvent.patch} (96%)
 rename patches/server/{0527-Added-ServerResourcesReloadedEvent.patch => 0528-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0528-Added-world-settings-for-mobs-picking-up-loot.patch => 0529-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0529-Implemented-BlockFailedDispenseEvent.patch => 0530-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0530-Added-PlayerLecternPageChangeEvent.patch => 0531-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0531-Added-PlayerLoomPatternSelectEvent.patch => 0532-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0532-Configurable-door-breaking-difficulty.patch => 0533-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0533-Empty-commands-shall-not-be-dispatched.patch => 0534-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0534-Implement-API-to-expose-exact-interaction-point.patch => 0535-Implement-API-to-expose-exact-interaction-point.patch} (96%)
 rename patches/server/{0535-Remove-stale-POIs.patch => 0536-Remove-stale-POIs.patch} (91%)
 rename patches/server/{0536-Fix-villager-boat-exploit.patch => 0537-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0537-Add-sendOpLevel-API.patch => 0538-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0538-TODO-Registry-Modification-API.patch => 0539-TODO-Registry-Modification-API.patch} (100%)
 rename patches/server/{0539-Add-StructuresLocateEvent.patch => 0540-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0540-Collision-option-for-requiring-a-player-participant.patch => 0541-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0541-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0542-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0542-Return-chat-component-with-empty-text-instead-of-thr.patch => 0543-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0543-Make-schedule-command-per-world.patch => 0544-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0544-Configurable-max-leash-distance.patch => 0545-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0545-Implement-BlockPreDispenseEvent.patch => 0546-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0546-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0547-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0547-Add-toggle-for-always-placing-the-dragon-egg.patch => 0548-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0548-Added-PlayerStonecutterRecipeSelectEvent.patch => 0549-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0549-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0550-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0550-Reset-shield-blocking-on-dimension-change.patch => 0551-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0551-add-DragonEggFormEvent.patch => 0552-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0552-EntityMoveEvent.patch => 0553-EntityMoveEvent.patch} (97%)
 rename patches/server/{0553-added-option-to-disable-pathfinding-updates-on-block.patch => 0554-added-option-to-disable-pathfinding-updates-on-block.patch} (91%)
 rename patches/server/{0554-Inline-shift-direction-fields.patch => 0555-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0555-Allow-adding-items-to-BlockDropItemEvent.patch => 0556-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0556-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0557-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0557-living-entity-allow-attribute-registration.patch => 0558-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0558-fix-dead-slime-setSize-invincibility.patch => 0559-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0559-Merchant-getRecipes-should-return-an-immutable-list.patch => 0560-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0560-Add-support-for-hex-color-codes-in-console.patch => 0561-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0561-Expose-Tracked-Players.patch => 0562-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0562-Remove-streams-from-SensorNearest.patch => 0563-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0563-Throw-proper-exception-on-empty-JsonList-file.patch => 0564-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0564-Improve-ServerGUI.patch => 0565-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0565-fix-converting-txt-to-json-file.patch => 0566-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0566-Add-worldborder-events.patch => 0567-Add-worldborder-events.patch} (100%)
 rename patches/server/{0567-added-PlayerNameEntityEvent.patch => 0568-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0568-Prevent-grindstones-from-overstacking-items.patch => 0569-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0569-Add-recipe-to-cook-events.patch => 0570-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0570-Add-Block-isValidTool.patch => 0571-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0571-Allow-using-signs-inside-spawn-protection.patch => 0572-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0572-Expand-world-key-API.patch => 0573-Expand-world-key-API.patch} (97%)
 rename patches/server/{0573-Add-fast-alternative-constructor-for-Rotations.patch => 0574-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0574-Item-Rarity-API.patch => 0575-Item-Rarity-API.patch} (100%)
 rename patches/server/{0575-Drop-carried-item-when-player-has-disconnected.patch => 0576-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0576-forced-whitelist-use-configurable-kick-message.patch => 0577-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0577-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0578-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0578-Expose-protocol-version.patch => 0579-Expose-protocol-version.patch} (100%)
 rename patches/server/{0579-Enhance-console-tab-completions-for-brigadier-comman.patch => 0580-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0580-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0581-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0581-Add-bypass-host-check.patch => 0582-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0582-Set-area-affect-cloud-rotation.patch => 0583-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0583-add-isDeeplySleeping-to-HumanEntity.patch => 0584-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0584-add-consumeFuel-to-FurnaceBurnEvent.patch => 0585-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0585-add-get-set-drop-chance-to-EntityEquipment.patch => 0586-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0586-fix-PigZombieAngerEvent-cancellation.patch => 0587-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0587-fix-PlayerItemHeldEvent-firing-twice.patch => 0588-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0588-Added-PlayerDeepSleepEvent.patch => 0589-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0589-More-World-API.patch => 0590-More-World-API.patch} (96%)
 rename patches/server/{0590-Added-PlayerBedFailEnterEvent.patch => 0591-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0591-Entity-load-save-limit-per-chunk.patch => 0592-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0592-Implement-methods-to-convert-between-Component-and-B.patch => 0593-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0593-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0594-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0594-Introduce-beacon-activation-deactivation-events.patch => 0595-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0595-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0596-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0596-Add-Channel-initialization-listeners.patch => 0597-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0597-Send-empty-commands-if-tab-completion-is-disabled.patch => 0598-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0598-Add-more-WanderingTrader-API.patch => 0599-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0599-Add-EntityBlockStorage-clearEntities.patch => 0600-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0600-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0601-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0601-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0602-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0602-Inventory-close.patch => 0603-Inventory-close.patch} (100%)
 rename patches/server/{0603-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0604-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0604-Fix-CraftPotionBrewer-cache.patch => 0605-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0605-Add-basic-Datapack-API.patch => 0606-Add-basic-Datapack-API.patch} (98%)
 rename patches/server/{0606-Add-environment-variable-to-disable-server-gui.patch => 0607-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0607-additions-to-PlayerGameModeChangeEvent.patch => 0608-additions-to-PlayerGameModeChangeEvent.patch} (99%)
 rename patches/server/{0608-ItemStack-repair-check-API.patch => 0609-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0609-More-Enchantment-API.patch => 0610-More-Enchantment-API.patch} (100%)
 rename patches/server/{0610-Move-range-check-for-block-placing-up.patch => 0611-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0611-Fix-and-optimise-world-force-upgrading.patch => 0612-Fix-and-optimise-world-force-upgrading.patch} (98%)
 rename patches/server/{0612-Add-Mob-lookAt-API.patch => 0613-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0613-Add-Unix-domain-socket-support.patch => 0614-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0614-Add-EntityInsideBlockEvent.patch => 0615-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0615-Attributes-API-for-item-defaults.patch => 0616-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0616-Add-cause-to-Weather-ThunderChangeEvents.patch => 0617-Add-cause-to-Weather-ThunderChangeEvents.patch} (95%)
 rename patches/server/{0617-More-Lidded-Block-API.patch => 0618-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0618-Limit-item-frame-cursors-on-maps.patch => 0619-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0619-Add-PlayerKickEvent-causes.patch => 0620-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0620-Add-PufferFishStateChangeEvent.patch => 0621-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0621-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0622-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0622-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0623-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (71%)
 rename patches/server/{0623-Add-option-to-fix-items-merging-through-walls.patch => 0624-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0624-Add-BellRevealRaiderEvent.patch => 0625-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0625-Fix-invulnerable-end-crystals.patch => 0626-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0626-Add-ElderGuardianAppearanceEvent.patch => 0627-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0627-Fix-dangerous-end-portal-logic.patch => 0628-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0628-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0629-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0629-Make-item-validations-configurable.patch => 0630-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0630-Line-Of-Sight-Changes.patch => 0631-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0631-add-per-world-spawn-limits.patch => 0632-add-per-world-spawn-limits.patch} (91%)
 rename patches/server/{0632-Fix-potions-splash-events.patch => 0633-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0633-Add-more-LimitedRegion-API.patch => 0634-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0634-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0635-Fix-PlayerDropItemEvent-using-wrong-item.patch} (100%)
 rename patches/server/{0635-Missing-Entity-Behavior-API.patch => 0636-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/server/{0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0637-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0637-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0638-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0638-Use-getChunkIfLoadedImmediately-in-places.patch => 0639-Use-getChunkIfLoadedImmediately-in-places.patch} (88%)
 rename patches/server/{0639-Fix-commands-from-signs-not-firing-command-events.patch => 0640-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0640-Adds-PlayerArmSwingEvent.patch => 0641-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0641-Fixes-kick-event-leave-message-not-being-sent.patch => 0642-Fixes-kick-event-leave-message-not-being-sent.patch} (100%)
 rename patches/server/{0642-Add-config-for-mobs-immune-to-default-effects.patch => 0643-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0643-Fix-incorrect-message-for-outdated-client.patch => 0644-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0644-Don-t-apply-cramming-damage-to-players.patch => 0645-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0645-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0646-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0646-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0647-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0647-Stinger-API.patch => 0648-Stinger-API.patch} (100%)
 rename patches/server/{0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0649-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0649-Add-System.out-err-catcher.patch => 0650-Add-System.out-err-catcher.patch} (98%)
 rename patches/server/{0650-Fix-test-not-bootstrapping.patch => 0651-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0652-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0652-Improve-boat-collision-performance.patch => 0653-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0653-Prevent-AFK-kick-while-watching-end-credits.patch => 0654-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0654-Allow-skipping-writing-of-comments-to-server.propert.patch => 0655-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0655-Add-PlayerSetSpawnEvent.patch => 0656-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/server/{0656-Make-hoppers-respect-inventory-max-stack-size.patch => 0657-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0657-Optimize-entity-tracker-passenger-checks.patch => 0658-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0658-Config-option-for-Piglins-guarding-chests.patch => 0659-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0659-Added-EntityDamageItemEvent.patch => 0660-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0660-Optimize-indirect-passenger-iteration.patch => 0661-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0661-Configurable-item-frame-map-cursor-update-interval.patch => 0662-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0662-Make-EntityUnleashEvent-cancellable.patch => 0663-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0663-Clear-bucket-NBT-after-dispense.patch => 0664-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0664-Change-EnderEye-target-without-changing-other-things.patch => 0665-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0665-Add-BlockBreakBlockEvent.patch => 0666-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0667-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0667-More-CommandBlock-API.patch => 0668-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0668-Add-missing-team-sidebar-display-slots.patch => 0669-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0669-Add-back-EntityPortalExitEvent.patch => 0670-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0670-Add-methods-to-find-targets-for-lightning-strikes.patch => 0671-Add-methods-to-find-targets-for-lightning-strikes.patch} (91%)
 rename patches/server/{0671-Get-entity-default-attributes.patch => 0672-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0672-Left-handed-API.patch => 0673-Left-handed-API.patch} (100%)
 rename patches/server/{0673-Add-more-advancement-API.patch => 0674-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0674-Add-ItemFactory-getSpawnEgg-API.patch => 0675-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0675-Add-critical-damage-API.patch => 0676-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0676-Fix-issues-with-mob-conversion.patch => 0677-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0677-Add-isCollidable-methods-to-various-places.patch => 0678-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0678-Goat-ram-API.patch => 0679-Goat-ram-API.patch} (100%)
 rename patches/server/{0679-Add-API-for-resetting-a-single-score.patch => 0680-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0680-Add-Raw-Byte-Entity-Serialization.patch => 0681-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0681-Vanilla-command-permission-fixes.patch => 0682-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0683-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (97%)
 rename patches/server/{0683-Fix-GameProfileCache-concurrency.patch => 0684-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0684-Improve-and-expand-AsyncCatcher.patch => 0685-Improve-and-expand-AsyncCatcher.patch} (100%)
 rename patches/server/{0685-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0686-Add-paper-mobcaps-and-paper-playermobcaps.patch} (98%)
 rename patches/server/{0686-Sanitize-ResourceLocation-error-logging.patch => 0687-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0687-Allow-controlled-flushing-for-network-manager.patch => 0688-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0688-Optimise-general-POI-access.patch => 0689-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch => 0690-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch} (99%)
 rename patches/server/{0690-Optimise-chunk-tick-iteration.patch => 0691-Optimise-chunk-tick-iteration.patch} (99%)
 rename patches/server/{0691-Execute-chunk-tasks-mid-tick.patch => 0692-Execute-chunk-tasks-mid-tick.patch} (96%)
 rename patches/server/{0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (99%)
 rename patches/server/{0693-Custom-table-implementation-for-blockstate-state-loo.patch => 0694-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0694-Detail-more-information-in-watchdog-dumps.patch => 0695-Detail-more-information-in-watchdog-dumps.patch} (99%)
 rename patches/server/{0695-Manually-inline-methods-in-BlockPosition.patch => 0696-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0696-Distance-manager-tick-timings.patch => 0697-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0697-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0698-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0698-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0699-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (90%)
 rename patches/server/{0699-Add-packet-limiter-config.patch => 0700-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0700-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0701-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0701-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0702-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0702-Don-t-lookup-fluid-state-when-raytracing.patch => 0703-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0703-Time-scoreboard-search.patch => 0704-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0704-Send-full-pos-packets-for-hard-colliding-entities.patch => 0705-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0705-Do-not-run-raytrace-logic-for-AIR.patch => 0706-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0706-Oprimise-map-impl-for-tracked-players.patch => 0707-Oprimise-map-impl-for-tracked-players.patch} (87%)
 rename patches/server/{0707-Optimise-BlockSoil-nearby-water-lookup.patch => 0708-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0708-Optimise-random-block-ticking.patch => 0709-Optimise-random-block-ticking.patch} (96%)
 rename patches/server/{0709-Optimise-non-flush-packet-sending.patch => 0710-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0710-Optimise-nearby-player-lookups.patch => 0711-Optimise-nearby-player-lookups.patch} (98%)
 rename patches/server/{0711-Remove-streams-for-villager-AI.patch => 0712-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0712-Use-Velocity-compression-and-cipher-natives.patch => 0713-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{0713-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0714-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0714-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0715-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0715-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0716-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (94%)
 rename patches/server/{0716-Check-requirement-before-suggesting-root-nodes.patch => 0717-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0718-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0718-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0719-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0719-Ensure-valid-vehicle-status.patch => 0720-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0720-Prevent-softlocked-end-exit-portal-generation.patch => 0721-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0721-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0722-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0722-Don-t-log-debug-logging-being-disabled.patch => 0723-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0723-fix-various-menus-with-empty-level-accesses.patch => 0724-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0724-Preserve-overstacked-loot.patch => 0725-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0725-Update-head-rotation-in-missing-places.patch => 0726-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0726-prevent-unintended-light-block-manipulation.patch => 0727-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0727-Fix-CraftCriteria-defaults-map.patch => 0728-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0728-Fix-upstreams-block-state-factories.patch => 0729-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0729-Add-config-option-for-logging-player-ip-addresses.patch => 0730-Add-config-option-for-logging-player-ip-addresses.patch} (100%)
 rename patches/server/{0730-Configurable-feature-seeds.patch => 0731-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0731-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0732-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0732-Add-root-admin-user-detection.patch => 0733-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0733-Always-allow-item-changing-in-Fireball.patch => 0734-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0734-don-t-attempt-to-teleport-dead-entities.patch => 0735-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0735-Prevent-excessive-velocity-through-repeated-crits.patch => 0736-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0736-Remove-client-side-code-using-deprecated-for-removal.patch => 0737-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0737-Fix-removing-recipes-from-RecipeIterator.patch => 0738-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0738-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0739-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0739-Hide-unnecessary-itemmeta-from-clients.patch => 0740-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0740-Fix-Spigot-growth-modifiers.patch => 0741-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0741-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0742-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0742-Add-PlayerItemFrameChangeEvent.patch => 0743-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0743-Add-player-health-update-API.patch => 0744-Add-player-health-update-API.patch} (100%)
 rename patches/server/{0744-Optimize-HashMapPalette.patch => 0745-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0745-Allow-delegation-to-vanilla-chunk-gen.patch => 0746-Allow-delegation-to-vanilla-chunk-gen.patch} (95%)
 rename patches/server/{0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0747-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (99%)
 rename patches/server/{0747-Optimise-collision-checking-in-player-move-packet-ha.patch => 0748-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0748-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0749-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (96%)
 rename patches/server/{0749-Add-more-Campfire-API.patch => 0750-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0750-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0751-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0751-Fix-tripwire-state-inconsistency.patch => 0752-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0752-Forward-CraftEntity-in-teleport-command.patch => 0753-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0753-Improve-scoreboard-entries.patch => 0754-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0754-Entity-powdered-snow-API.patch => 0755-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0755-Add-API-for-item-entity-health.patch => 0756-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0756-Fix-entity-type-tags-suggestions-in-selectors.patch => 0757-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0757-Configurable-max-block-light-for-monster-spawning.patch => 0758-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0758-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0759-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0759-Load-effect-amplifiers-greater-than-127-correctly.patch => 0760-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0760-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0761-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0761-Fix-bees-aging-inside-hives.patch => 0762-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0762-Bucketable-API.patch => 0763-Bucketable-API.patch} (100%)
 rename patches/server/{0763-Validate-usernames.patch => 0764-Validate-usernames.patch} (100%)
 rename patches/server/{0764-Make-water-animal-spawn-height-configurable.patch => 0765-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0765-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0766-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (97%)
 rename patches/server/{0766-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0767-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0767-Add-new-overload-to-PersistentDataContainer-has.patch => 0768-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0768-Multiple-Entries-with-Scoreboards.patch => 0769-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0769-Reset-placed-block-on-exception.patch => 0770-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0770-Add-configurable-height-for-slime-spawn.patch => 0771-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0771-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0772-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0772-Fix-xp-reward-for-baby-zombies.patch => 0773-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0773-Kick-on-main-for-illegal-chat.patch => 0774-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0774-Multi-Block-Change-API-Implementation.patch => 0775-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0775-Fix-NotePlayEvent.patch => 0776-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0776-Freeze-Tick-Lock-API.patch => 0777-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0777-Dolphin-API.patch => 0778-Dolphin-API.patch} (100%)
 rename patches/server/{0778-More-PotionEffectType-API.patch => 0779-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0779-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0780-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0780-API-for-creating-command-sender-which-forwards-feedb.patch => 0781-API-for-creating-command-sender-which-forwards-feedb.patch} (98%)
 rename patches/server/{0781-Add-missing-structure-set-seed-configs.patch => 0782-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0782-Implement-regenerateChunk.patch => 0783-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0783-Fix-cancelled-powdered-snow-bucket-placement.patch => 0784-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0784-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0785-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (91%)
 rename patches/server/{0785-Add-GameEvent-tags.patch => 0786-Add-GameEvent-tags.patch} (97%)
 rename patches/server/{0786-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0787-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0787-Furnace-RecipesUsed-API.patch => 0788-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0788-Configurable-sculk-sensor-listener-range.patch => 0789-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0789-Add-missing-block-data-mins-and-maxes.patch => 0790-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0790-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0791-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0791-Put-world-into-worldlist-before-initing-the-world.patch => 0792-Put-world-into-worldlist-before-initing-the-world.patch} (95%)
 rename patches/server/{0792-Fix-Entity-Position-Desync.patch => 0793-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0793-Custom-Potion-Mixes.patch => 0794-Custom-Potion-Mixes.patch} (99%)
 rename patches/server/{0794-Force-close-world-loading-screen.patch => 0795-Force-close-world-loading-screen.patch} (92%)
 rename patches/server/{0795-Fix-falling-block-spawn-methods.patch => 0796-Fix-falling-block-spawn-methods.patch} (93%)
 rename patches/server/{0796-Expose-furnace-minecart-push-values.patch => 0797-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0797-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0798-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0798-More-Projectile-API.patch => 0799-More-Projectile-API.patch} (100%)
 rename patches/server/{0799-Fix-swamp-hut-cat-generation-deadlock.patch => 0800-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0801-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0801-Implement-getComputedBiome-API.patch => 0802-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0802-Make-some-itemstacks-nonnull.patch => 0803-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0803-Implement-enchantWithLevels-API.patch => 0804-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0804-Fix-saving-in-unloadWorld.patch => 0805-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0805-Buffer-OOB-setBlock-calls.patch => 0806-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0806-Add-TameableDeathMessageEvent.patch => 0807-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0807-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0808-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0808-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0809-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0809-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0810-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0810-Guard-against-invalid-entity-positions.patch => 0811-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0811-cache-resource-keys.patch => 0812-cache-resource-keys.patch} (100%)
 rename patches/server/{0812-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0813-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0813-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0814-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0814-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0815-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0815-Prevent-tile-entity-copies-loading-chunks.patch => 0816-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0816-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0817-Use-username-instead-of-display-name-in-PlayerList-g.patch} (92%)
 rename patches/server/{0817-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0818-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0818-Pass-ServerLevel-for-gamerule-callbacks.patch => 0819-Pass-ServerLevel-for-gamerule-callbacks.patch} (98%)
 rename patches/server/{0819-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0820-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0820-WorldCreator-keepSpawnLoaded.patch => 0821-WorldCreator-keepSpawnLoaded.patch} (91%)
 rename patches/server/{0821-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0822-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (93%)
 rename patches/server/{0822-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0823-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0823-Fire-CauldronLevelChange-on-initial-fill.patch => 0824-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0824-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0825-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0825-Add-PlayerStopUsingItemEvent.patch => 0826-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0826-FallingBlock-auto-expire-setting.patch => 0827-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0827-Don-t-tick-markers.patch => 0828-Don-t-tick-markers.patch} (97%)
 rename patches/server/{0828-Do-not-accept-invalid-client-settings.patch => 0829-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0829-Add-support-for-Proxy-Protocol.patch => 0830-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0830-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0831-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0831-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0832-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0832-Sanitize-Sent-BlockEntity-NBT.patch => 0833-Sanitize-Sent-BlockEntity-NBT.patch} (94%)
 rename patches/server/{0833-Disable-component-selector-resolving-in-books-by-def.patch => 0834-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0834-Prevent-entity-loading-causing-async-lookups.patch => 0835-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0835-Throw-exception-on-world-create-while-being-ticked.patch => 0836-Throw-exception-on-world-create-while-being-ticked.patch} (97%)
 rename patches/server/{0836-Add-Alternate-Current-redstone-implementation.patch => 0837-Add-Alternate-Current-redstone-implementation.patch} (99%)
 rename patches/server/{0837-Dont-resent-entity-on-art-update.patch => 0838-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0838-Add-WardenAngerChangeEvent.patch => 0839-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0839-Add-option-for-strict-advancement-dimension-checks.patch => 0840-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0840-Add-missing-important-BlockStateListPopulator-method.patch => 0841-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0841-Nameable-Banner-API.patch => 0842-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0842-Don-t-broadcast-messages-to-command-blocks.patch => 0843-Don-t-broadcast-messages-to-command-blocks.patch} (95%)
 rename patches/server/{0843-Prevent-empty-items-from-being-added-to-world.patch => 0844-Prevent-empty-items-from-being-added-to-world.patch} (96%)
 rename patches/server/{0844-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0845-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0845-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0846-Don-t-print-component-in-resource-pack-rejection-mes.patch} (100%)
 rename patches/server/{0846-Add-Player-getFishHook.patch => 0847-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0847-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0848-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0848-Add-various-missing-EntityDropItemEvent-calls.patch => 0849-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0849-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0850-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0850-Fix-Bee-flower-NPE.patch => 0851-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0852-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0852-More-Teleport-API.patch => 0853-More-Teleport-API.patch} (100%)
 rename patches/server/{0853-Add-EntityPortalReadyEvent.patch => 0854-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0854-Don-t-use-level-random-in-entity-constructors.patch => 0855-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0855-Send-block-entities-after-destroy-prediction.patch => 0856-Send-block-entities-after-destroy-prediction.patch} (97%)
 rename patches/server/{0856-Warn-on-plugins-accessing-faraway-chunks.patch => 0857-Warn-on-plugins-accessing-faraway-chunks.patch} (89%)
 rename patches/server/{0857-Custom-Chat-Completion-Suggestions-API.patch => 0858-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0858-Add-missing-BlockFadeEvents.patch => 0859-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0859-Collision-API.patch => 0860-Collision-API.patch} (100%)
 rename patches/server/{0860-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0861-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0861-Remove-invalid-signature-login-stacktrace.patch => 0862-Remove-invalid-signature-login-stacktrace.patch} (100%)
 rename patches/server/{0862-Block-Ticking-API.patch => 0863-Block-Ticking-API.patch} (100%)
 rename patches/server/{0863-Add-Velocity-IP-Forwarding-Support.patch => 0864-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename patches/server/{0864-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0865-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0865-Add-NamespacedKey-biome-methods.patch => 0866-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0866-Fix-plugin-loggers-on-server-shutdown.patch => 0867-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0867-Stop-large-look-changes-from-crashing-the-server.patch => 0868-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0868-Fire-EntityChangeBlockEvent-in-more-places.patch => 0869-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0869-Missing-eating-regain-reason.patch => 0870-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0870-Missing-effect-cause.patch => 0871-Missing-effect-cause.patch} (100%)
 rename patches/server/{0871-Added-byte-array-serialization-deserialization-for-P.patch => 0872-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0872-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0873-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0873-Call-BlockPhysicsEvent-more-often.patch => 0874-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0874-Configurable-chat-thread-limit.patch => 0875-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0876-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0876-fix-Jigsaw-block-kicking-user.patch => 0877-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0877-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0878-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0878-Add-getDrops-to-BlockState.patch => 0879-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0879-Fix-a-bunch-of-vanilla-bugs.patch => 0880-Fix-a-bunch-of-vanilla-bugs.patch} (98%)
 rename patches/server/{0880-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0881-Remove-unnecessary-onTrackingStart-during-navigation.patch} (94%)
 rename patches/server/{0881-Fix-custom-piglin-loved-items.patch => 0882-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0882-EntityPickupItemEvent-fixes.patch => 0883-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0883-Correctly-handle-interactions-with-items-on-cooldown.patch => 0884-Correctly-handle-interactions-with-items-on-cooldown.patch} (94%)
 rename patches/server/{0884-Add-PlayerInventorySlotChangeEvent.patch => 0885-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0885-Elder-Guardian-appearance-API.patch => 0886-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0886-Allow-changing-bed-s-occupied-property.patch => 0887-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0887-Add-entity-knockback-API.patch => 0888-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0888-Detect-headless-JREs.patch => 0889-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0889-fixed-entity-vehicle-collision-event-not-called.patch => 0890-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0890-optimized-dirt-and-snow-spreading.patch => 0891-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0891-Added-EntityToggleSitEvent.patch => 0892-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0892-Add-fire-tick-delay-option.patch => 0893-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0893-Add-Moving-Piston-API.patch => 0894-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0894-Ignore-impossible-spawn-tick.patch => 0895-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0895-Track-projectile-source-for-fireworks-from-dispenser.patch => 0896-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0896-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0897-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0898-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0898-Prevent-compass-from-loading-chunks.patch => 0899-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0899-Add-PrePlayerAttackEntityEvent.patch => 0900-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0900-ensure-reset-EnderDragon-boss-event-name.patch => 0901-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0901-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0902-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0902-Add-Player-Warden-Warning-API.patch => 0903-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0903-More-vanilla-friendly-methods-to-update-trades.patch => 0904-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0904-Add-paper-dumplisteners-command.patch => 0905-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0905-check-global-player-list-where-appropriate.patch => 0906-check-global-player-list-where-appropriate.patch} (97%)
 rename patches/server/{0906-Fix-async-entity-add-due-to-fungus-trees.patch => 0907-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0907-ItemStack-damage-API.patch => 0908-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0908-Friction-API.patch => 0909-Friction-API.patch} (100%)
 rename patches/server/{0909-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0910-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0910-Fix-player-kick-on-shutdown.patch => 0911-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0911-Sync-offhand-slot-in-menus.patch => 0912-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0912-Player-Entity-Tracking-Events.patch => 0913-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0913-Limit-pet-look-distance.patch => 0914-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0914-Properly-resend-entities.patch => 0915-Properly-resend-entities.patch} (98%)
 rename patches/server/{0915-Fixes-and-additions-to-the-SpawnReason-API.patch => 0916-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0916-fix-Instruments.patch => 0917-fix-Instruments.patch} (100%)
 rename patches/server/{0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0918-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0919-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0919-Improve-logging-and-errors.patch => 0920-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0920-Add-BlockLockCheckEvent.patch => 0921-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0921-Add-Sneaking-API-for-Entities.patch => 0922-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0922-Improve-PortalEvents.patch => 0923-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0923-Add-config-option-for-spider-worldborder-climbing.patch => 0924-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0924-Add-missing-SpigotConfig-logCommands-check.patch => 0925-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0926-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0926-Flying-Fall-Damage.patch => 0927-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0927-Add-exploded-block-state-to-BlockExplodeEvent.patch => 0928-Add-exploded-block-state-to-BlockExplodeEvent.patch} (100%)
 rename patches/server/{0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0929-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0929-config-for-disabling-entity-tag-tags.patch => 0930-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0930-Use-single-player-info-update-packet-on-join.patch => 0931-Use-single-player-info-update-packet-on-join.patch} (97%)
 rename patches/server/{0931-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0932-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0932-Win-Screen-API.patch => 0933-Win-Screen-API.patch} (100%)
 rename patches/server/{0933-Remove-CraftItemStack-setAmount-null-assignment.patch => 0934-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0934-Fix-force-opening-enchantment-tables.patch => 0935-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0935-Add-Entity-Body-Yaw-API.patch => 0936-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0937-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0937-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0938-Update-the-flag-when-a-captured-block-state-is-outda.patch} (83%)
 rename patches/server/{0938-Add-EntityFertilizeEggEvent.patch => 0939-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/server/{0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0940-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0941-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0941-Correctly-handle-ArmorStand-invisibility.patch => 0942-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0942-Fix-advancement-triggers-for-entity-damage.patch => 0943-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0943-Fix-text-display-error-on-spawn.patch => 0944-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0944-Fix-certain-inventories-returning-null-Locations.patch => 0945-Fix-certain-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0945-Add-Shearable-API.patch => 0946-Add-Shearable-API.patch} (100%)
 rename patches/server/{0946-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0947-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch => 0948-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch} (100%)
 rename patches/server/{0948-Optimize-Hoppers.patch => 0949-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0949-Fix-beehives-generating-from-using-bonemeal.patch => 0950-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0950-Fix-api-checking-banned-ips.patch => 0951-Fix-api-checking-banned-ips.patch} (100%)
 rename patches/server/{0951-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0952-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0952-Treat-sequence-violations-like-they-should-be.patch => 0953-Treat-sequence-violations-like-they-should-be.patch} (100%)
 rename patches/server/{0953-remove-duplicate-animate-packet-for-records.patch => 0954-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0954-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0955-Prevent-causing-expired-keys-from-impacting-new-join.patch} (100%)
 rename patches/server/{0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0956-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (90%)
 rename patches/server/{0956-Use-array-for-gamerule-storage.patch => 0957-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0957-Fix-a-couple-of-upstream-bed-issues.patch => 0958-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0958-Fix-demo-flag-not-enabling-demo-mode.patch => 0959-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0959-Add-Mob-Experience-reward-API.patch => 0960-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0960-Break-redstone-on-top-of-trap-doors-early.patch => 0961-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0961-Fix-DamageCause-for-Falling-Blocks.patch => 0962-Fix-DamageCause-for-Falling-Blocks.patch} (100%)
 rename patches/server/{0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0963-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0963-More-accurate-isInOpenWater-impl.patch => 0964-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0965-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0965-Optimise-recalcBlockCounts-for-empty-sections.patch => 0966-Optimise-recalcBlockCounts-for-empty-sections.patch} (89%)
 rename patches/server/{0966-Fix-destroying-beehive-without-any-players-nearby-th.patch => 0967-Fix-destroying-beehive-without-any-players-nearby-th.patch} (100%)
 rename patches/server/{0967-Expand-PlayerItemMendEvent.patch => 0968-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/server/{0968-Refresh-ProjectileSource-for-projectiles.patch => 0969-Refresh-ProjectileSource-for-projectiles.patch} (100%)
 rename patches/server/{0969-Add-transient-modifier-API.patch => 0970-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0970-Fix-block-place-logic.patch => 0971-Fix-block-place-logic.patch} (100%)
 rename patches/server/{0971-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0972-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)

diff --git a/patches/unapplied/server/0343-Anti-Xray.patch b/patches/server/0343-Anti-Xray.patch
similarity index 92%
rename from patches/unapplied/server/0343-Anti-Xray.patch
rename to patches/server/0343-Anti-Xray.patch
index 702db2972e..0b0c374f76 100644
--- a/patches/unapplied/server/0343-Anti-Xray.patch
+++ b/patches/server/0343-Anti-Xray.patch
@@ -148,7 +148,7 @@ index 0000000000000000000000000000000000000000..e4540ea278f2dc871cb6a3cb8897559b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bd86dc2ad2f87969da4add06de2a629f69d4b5de
+index 0000000000000000000000000000000000000000..52d2e2b744f91914802506e52a07161729bbcf3a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockController.java
 @@ -0,0 +1,45 @@
@@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..bd86dc2ad2f87969da4add06de2a629f
 +
 +    }
 +
-+    public BlockState[] getPresetBlockStates(Level level, ChunkPos chunkPos, int bottomBlockY) {
++    public BlockState[] getPresetBlockStates(Level level, ChunkPos chunkPos, int chunkSectionY) {
 +        return null;
 +    }
 +
@@ -199,10 +199,10 @@ index 0000000000000000000000000000000000000000..bd86dc2ad2f87969da4add06de2a629f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..cab91880a08c6fdc545804911d295e0f24f4d983
+index 0000000000000000000000000000000000000000..42fdce97d99618a53f2e9c51804ff2205b574f69
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-@@ -0,0 +1,670 @@
+@@ -0,0 +1,672 @@
 +package com.destroystokyo.paper.antixray;
 +
 +import io.papermc.paper.configuration.WorldConfiguration;
@@ -349,8 +349,10 @@ index 0000000000000000000000000000000000000000..cab91880a08c6fdc545804911d295e0f
 +    }
 +
 +    @Override
-+    public BlockState[] getPresetBlockStates(Level level, ChunkPos chunkPos, int bottomBlockY) {
++    public BlockState[] getPresetBlockStates(Level level, ChunkPos chunkPos, int chunkSectionY) {
 +        // Return the block states to be added to the paletted containers so that they can be used for obfuscation
++        int bottomBlockY = chunkSectionY << 4;
++
 +        if (bottomBlockY < maxBlockHeight) {
 +            if (engineMode == EngineMode.HIDE) {
 +                return switch (level.getWorld().getEnvironment()) {
@@ -995,20 +997,23 @@ index 0000000000000000000000000000000000000000..80a2dfb266ae1221680a7b24fee2f7e2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundChunksBiomesPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundChunksBiomesPacket.java
-index 6cff1a98dc7cf33947ec760dbc3d3d0ec5db5f6c..b6df60322ec6f034d5a6d0fbe184d244a0b7b379 100644
+index 6cff1a98dc7cf33947ec760dbc3d3d0ec5db5f6c..51f647de153255c919b1440338cf1b3e2d6b5dbf 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundChunksBiomesPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundChunksBiomesPacket.java
-@@ -64,7 +64,7 @@ public record ClientboundChunksBiomesPacket(List<ClientboundChunksBiomesPacket.C
+@@ -63,8 +63,10 @@ public record ClientboundChunksBiomesPacket(List<ClientboundChunksBiomesPacket.C
+         }
  
          public static void extractChunkData(FriendlyByteBuf buf, LevelChunk chunk) {
++            int chunkSectionIndex = 0; // Paper - Anti-Xray
              for(LevelChunkSection levelChunkSection : chunk.getSections()) {
 -                levelChunkSection.getBiomes().write(buf);
-+                levelChunkSection.getBiomes().write(buf, null, levelChunkSection.bottomBlockY()); // Paper - Anti-Xray
++                levelChunkSection.getBiomes().write(buf, null, chunkSectionIndex); // Paper - Anti-Xray
++                chunkSectionIndex++; // Paper - Anti-Xray
              }
  
          }
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 0ef3e9b472e35bd2572b04722781abf7d4a1094b..40a42a632540d497c1393b112731c41c6e448228 100644
+index 0ef3e9b472e35bd2572b04722781abf7d4a1094b..c08440826d84f97412e2587cb98daae04e1bdd32 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -33,7 +33,10 @@ public class ClientboundLevelChunkPacketData {
@@ -1039,7 +1044,7 @@ index 0ef3e9b472e35bd2572b04722781abf7d4a1094b..40a42a632540d497c1393b112731c41c
          this.blockEntitiesData = Lists.newArrayList();
          int totalTileEntities = 0; // Paper
  
-@@ -103,9 +113,12 @@ public class ClientboundLevelChunkPacketData {
+@@ -103,9 +113,15 @@ public class ClientboundLevelChunkPacketData {
          return byteBuf;
      }
  
@@ -1047,15 +1052,18 @@ index 0ef3e9b472e35bd2572b04722781abf7d4a1094b..40a42a632540d497c1393b112731c41c
 +    // Paper start - Anti-Xray - Add chunk packet info
 +    @Deprecated @io.papermc.paper.annotation.DoNotUse public static void extractChunkData(FriendlyByteBuf buf, LevelChunk chunk) { ClientboundLevelChunkPacketData.extractChunkData(buf, chunk, null); }
 +    public static void extractChunkData(FriendlyByteBuf buf, LevelChunk chunk, com.destroystokyo.paper.antixray.ChunkPacketInfo<net.minecraft.world.level.block.state.BlockState> chunkPacketInfo) {
++        int chunkSectionIndex = 0;
++
          for(LevelChunkSection levelChunkSection : chunk.getSections()) {
 -            levelChunkSection.write(buf);
-+            levelChunkSection.write(buf, chunkPacketInfo);
++            levelChunkSection.write(buf, chunkPacketInfo, chunkSectionIndex);
++            chunkSectionIndex++;
 +            // Paper end
          }
  
      }
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
-index 7825d6f0fdcfda6212cff8033ec55fb7db236154..000853110c7a89f2d0403a7a2737025a5ac28240 100644
+index ff42a3e76500ad6e087b7f1cd6ec45acde124180..978fc83b209ae831ba1d6315cad1adeefe58a98c 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java
 @@ -13,13 +13,30 @@ public class ClientboundLevelChunkWithLightPacket implements Packet<ClientGamePa
@@ -1065,7 +1073,7 @@ index 7825d6f0fdcfda6212cff8033ec55fb7db236154..000853110c7a89f2d0403a7a2737025a
 +    // Paper start - Async-Anti-Xray - Ready flag for the connection
 +    private volatile boolean ready;
  
--    public ClientboundLevelChunkWithLightPacket(LevelChunk chunk, LevelLightEngine lightProvider, @Nullable BitSet skyBits, @Nullable BitSet blockBits, boolean nonEdge) {
+-    public ClientboundLevelChunkWithLightPacket(LevelChunk chunk, LevelLightEngine lightProvider, @Nullable BitSet skyBits, @Nullable BitSet blockBits) {
 +    @Override
 +    public boolean isReady() {
 +        return this.ready;
@@ -1077,8 +1085,8 @@ index 7825d6f0fdcfda6212cff8033ec55fb7db236154..000853110c7a89f2d0403a7a2737025a
 +    // Paper end
 +
 +    // Paper start - Anti-Xray - Add chunk packet info
-+    @Deprecated @io.papermc.paper.annotation.DoNotUse public ClientboundLevelChunkWithLightPacket(LevelChunk chunk, LevelLightEngine lightProvider, @Nullable BitSet skyBits, @Nullable BitSet blockBits, boolean nonEdge) { this(chunk, lightProvider, skyBits, blockBits, nonEdge, true); }
-+    public ClientboundLevelChunkWithLightPacket(LevelChunk chunk, LevelLightEngine lightProvider, @Nullable BitSet skyBits, @Nullable BitSet blockBits, boolean nonEdge, boolean modifyBlocks) {
++    @Deprecated @io.papermc.paper.annotation.DoNotUse public ClientboundLevelChunkWithLightPacket(LevelChunk chunk, LevelLightEngine lightProvider, @Nullable BitSet skyBits, @Nullable BitSet blockBits) { this(chunk, lightProvider, skyBits, blockBits, true); }
++    public ClientboundLevelChunkWithLightPacket(LevelChunk chunk, LevelLightEngine lightProvider, @Nullable BitSet skyBits, @Nullable BitSet blockBits, boolean modifyBlocks) {
          ChunkPos chunkPos = chunk.getPos();
          this.x = chunkPos.x;
          this.z = chunkPos.z;
@@ -1086,31 +1094,31 @@ index 7825d6f0fdcfda6212cff8033ec55fb7db236154..000853110c7a89f2d0403a7a2737025a
 +        com.destroystokyo.paper.antixray.ChunkPacketInfo<net.minecraft.world.level.block.state.BlockState> chunkPacketInfo = modifyBlocks ? chunk.getLevel().chunkPacketBlockController.getChunkPacketInfo(this, chunk) : null;
 +        this.chunkData = new ClientboundLevelChunkPacketData(chunk, chunkPacketInfo);
 +        // Paper end
-         this.lightData = new ClientboundLightUpdatePacketData(chunkPos, lightProvider, skyBits, blockBits, nonEdge);
+         this.lightData = new ClientboundLightUpdatePacketData(chunkPos, lightProvider, skyBits, blockBits);
 +        chunk.getLevel().chunkPacketBlockController.modifyBlocks(this, chunkPacketInfo); // Paper - Anti-Xray - Modify blocks
      }
  
      public ClientboundLevelChunkWithLightPacket(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 430be10a2b0487dc26f21793592ca08d01a39e53..bba77d5001638307fe640b2e656df0a2b3cb4c43 100644
+index 5cc0a39622a265e42e6b7d20e81144d1acce59b7..e0c9b9b61fa718d81d6e4438d7c12a833dfd7b64 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -633,7 +633,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -677,7 +677,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      }
  
 -    public void updateChunkTracking(ServerPlayer player, ChunkPos pos, MutableObject<ClientboundLevelChunkWithLightPacket> packet, boolean oldWithinViewDistance, boolean newWithinViewDistance) { // Paper - public
 +    public void updateChunkTracking(ServerPlayer player, ChunkPos pos, MutableObject<java.util.Map<Object, ClientboundLevelChunkWithLightPacket>> packet, boolean oldWithinViewDistance, boolean newWithinViewDistance) { // Paper - public // Paper - Anti-Xray - Bypass
-         if (player.level == this.level) {
-             if (newWithinViewDistance && !oldWithinViewDistance) {
-                 ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos.toLong());
-@@ -1145,12 +1145,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         io.papermc.paper.util.TickThread.ensureTickThread(this.level, pos, "May not update chunk tracking for chunk async"); // Paper - replace chunk loader system
+         io.papermc.paper.util.TickThread.ensureTickThread(player, "May not update chunk tracking for player async"); // Paper - replace chunk loader system
+         if (player.level() == this.level) {
+@@ -1185,12 +1185,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          });
      }
  
 -    private void playerLoadedChunk(ServerPlayer player, MutableObject<ClientboundLevelChunkWithLightPacket> cachedDataPacket, LevelChunk chunk) {
 -        if (cachedDataPacket.getValue() == null) {
--            cachedDataPacket.setValue(new ClientboundLevelChunkWithLightPacket(chunk, this.lightEngine, (BitSet) null, (BitSet) null, true));
+-            cachedDataPacket.setValue(new ClientboundLevelChunkWithLightPacket(chunk, this.lightEngine, (BitSet) null, (BitSet) null));
 +    // Paper start - Anti-Xray - Bypass
 +    private void playerLoadedChunk(ServerPlayer player, MutableObject<java.util.Map<Object, ClientboundLevelChunkWithLightPacket>> cachedDataPackets, LevelChunk chunk) {
 +        if (cachedDataPackets.getValue() == null) {
@@ -1120,17 +1128,17 @@ index 430be10a2b0487dc26f21793592ca08d01a39e53..bba77d5001638307fe640b2e656df0a2
 -        player.trackChunk(chunk.getPos(), (Packet) cachedDataPacket.getValue());
 +        Boolean shouldModify = chunk.getLevel().chunkPacketBlockController.shouldModify(player, chunk);
 +        player.trackChunk(chunk.getPos(), (Packet) cachedDataPackets.getValue().computeIfAbsent(shouldModify, (s) -> {
-+            return new ClientboundLevelChunkWithLightPacket(chunk, this.lightEngine, (BitSet) null, (BitSet) null, true, (Boolean) s);
++            return new ClientboundLevelChunkWithLightPacket(chunk, this.lightEngine, (BitSet) null, (BitSet) null, (Boolean) s);
 +        }));
 +        // Paper end
          DebugPackets.sendPoiPacketsForChunk(this.level, chunk.getPos());
          List<Entity> list = Lists.newArrayList();
          List<Entity> list1 = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5ad746ae673ef09f5581cf9fbbf1c9afa0ff0cd9..5ae321dc30d48f838c49322b5beef89bcbc952bc 100644
+index b12e9da3eebda396769b30f4b7e37a78f3bcb060..62ea2bb2fdd1f2de31b08c88193887989fbd3ece 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -438,7 +438,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -564,7 +564,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
  
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
@@ -1140,7 +1148,7 @@ index 5ad746ae673ef09f5581cf9fbbf1c9afa0ff0cd9..5ae321dc30d48f838c49322b5beef89b
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 618888eac8381b174850e351577601f1d881528d..051cbce8394c7a629a7ea8ac422308d96bbad6a6 100644
+index 562534d15f6f70ff286be90fb512b807e00ad807..84ffc86e2eba089d0200183847e879d638e8460d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
@@ -1162,10 +1170,10 @@ index 618888eac8381b174850e351577601f1d881528d..051cbce8394c7a629a7ea8ac422308d9
  
      public void destroyAndAck(BlockPos pos, int sequence, String reason) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 48aef158ace14d3ca1f05ba2c6e5681e3ef9be59..637092303bbce94fd37f193367264d51b855847d 100644
+index 9d1c3859e54af9b42665e7ca2fc50e83e7784148..09a572a054bd4cf1014e11a51caa68c6fa4bb384 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -176,6 +176,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -175,6 +175,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
      // Paper end
  
@@ -1173,7 +1181,7 @@ index 48aef158ace14d3ca1f05ba2c6e5681e3ef9be59..637092303bbce94fd37f193367264d51
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -194,7 +195,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -193,7 +194,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
@@ -1182,7 +1190,7 @@ index 48aef158ace14d3ca1f05ba2c6e5681e3ef9be59..637092303bbce94fd37f193367264d51
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
          this.generator = gen;
-@@ -280,6 +281,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -279,6 +280,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper
          this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
@@ -1190,7 +1198,7 @@ index 48aef158ace14d3ca1f05ba2c6e5681e3ef9be59..637092303bbce94fd37f193367264d51
      }
  
      // Paper start
-@@ -461,6 +463,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -460,6 +462,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // CraftBukkit end
  
              BlockState iblockdata1 = chunk.setBlockState(pos, state, (flags & 64) != 0, (flags & 1024) == 0); // CraftBukkit custom NO_PLACE flag
@@ -1199,37 +1207,35 @@ index 48aef158ace14d3ca1f05ba2c6e5681e3ef9be59..637092303bbce94fd37f193367264d51
              if (iblockdata1 == null) {
                  // CraftBukkit start - remove blockstate if failed (or the same)
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-index 508c2fff8d8e0c6f37b6c4e3b72ba772c2ab2ee5..e254b2d04e4fc1dc76c26f61ea38aeb27755143f 100644
+index 525c89bc926f13af6f94fc46c897525e37477eca..8b96d1b7548d354fbcabe6d1b5e9d6c3e2a5cb9d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-@@ -140,17 +140,19 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
+@@ -146,17 +146,17 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
              }
          }
  
--        ChunkAccess.replaceMissingSections(heightLimitView, biome, this.sections);
-+        ChunkAccess.replaceMissingSections(heightLimitView, biome, this.sections, pos); // Paper - Anti-Xray - Add parameters
+-        ChunkAccess.replaceMissingSections(biomeRegistry, this.sections);
++        this.replaceMissingSections(biomeRegistry, this.sections); // Paper - Anti-Xray - make it a non-static method
          // CraftBukkit start
-         this.biomeRegistry = biome;
+         this.biomeRegistry = biomeRegistry;
      }
      public final Registry<Biome> biomeRegistry;
      // CraftBukkit end
  
--    private static void replaceMissingSections(LevelHeightAccessor world, Registry<Biome> biome, LevelChunkSection[] sectionArray) {
-+    // Paper start - Anti-Xray - Add parameters
-+    private static void replaceMissingSections(LevelHeightAccessor world, Registry<Biome> biome, LevelChunkSection[] sectionArray, ChunkPos pos) {
+-    private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelChunkSection[] sectionArray) {
++    private void replaceMissingSections(Registry<Biome> biomeRegistry, LevelChunkSection[] sectionArray) { // Paper - Anti-Xray - static -> non-static
          for (int i = 0; i < sectionArray.length; ++i) {
              if (sectionArray[i] == null) {
--                sectionArray[i] = new LevelChunkSection(world.getSectionYFromSectionIndex(i), biome);
-+                sectionArray[i] = new LevelChunkSection(world.getSectionYFromSectionIndex(i), biome, pos, world instanceof net.minecraft.world.level.Level ? (net.minecraft.world.level.Level) world : null);
-+                // Paper end
+-                sectionArray[i] = new LevelChunkSection(biomeRegistry);
++                sectionArray[i] = new LevelChunkSection(biomeRegistry, this.levelHeightAccessor instanceof net.minecraft.world.level.Level ? (net.minecraft.world.level.Level) this.levelHeightAccessor : null, this.chunkPos, this.levelHeightAccessor.getSectionYFromSectionIndex(i)); // Paper start - Anti-Xray - Add parameters
              }
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index f5dcd970fc2828a4ba9ff2c0d495aa8d8cd4ed74..b1471b43392863ce1f2861d07baddbd711e761dc 100644
+index 704f0500649acdbff2caf94f702a6685ecf4c986..24a1d04d01d01262facbac9c3683c21b7f54fd6d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -93,7 +93,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -90,7 +90,7 @@ public class LevelChunk extends ChunkAccess {
      }
  
      public LevelChunk(Level world, ChunkPos pos, UpgradeData upgradeData, LevelChunkTicks<Block> blockTickScheduler, LevelChunkTicks<Fluid> fluidTickScheduler, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable LevelChunk.PostLoadProcessor entityLoader, @Nullable BlendingData blendingData) {
@@ -1239,45 +1245,44 @@ index f5dcd970fc2828a4ba9ff2c0d495aa8d8cd4ed74..b1471b43392863ce1f2861d07baddbd7
          this.setBlockNibbles(ca.spottedleaf.starlight.common.light.StarLightEngine.getFilledEmptyLight(world));
          this.setSkyNibbles(ca.spottedleaf.starlight.common.light.StarLightEngine.getFilledEmptyLight(world));
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index becc4c101e40d9b11e5e89a69e25dc0160bfaa32..8823751cde27bf195177282e99e9a69888441e35 100644
+index 2c3ea88bac229df67bd742e16d2106d80bcc8889..4eeb719b40ff1c18a7cdda7ecc6b135dbedd626e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -36,10 +36,13 @@ public class LevelChunkSection {
+@@ -33,9 +33,12 @@ public class LevelChunkSection {
          this.recalcBlockCounts();
      }
  
--    public LevelChunkSection(int chunkPos, Registry<Biome> biomeRegistry) {
-+    // Paper start - Anti-Xray - Add parameters
-+    @Deprecated @io.papermc.paper.annotation.DoNotUse public LevelChunkSection(int chunkPos, Registry<Biome> biomeRegistry) { this(chunkPos, biomeRegistry, null, null); }
-+    public LevelChunkSection(int chunkPos, Registry<Biome> biomeRegistry, net.minecraft.world.level.ChunkPos pos, net.minecraft.world.level.Level level) {
-+        // Paper end
-         this.bottomBlockY = LevelChunkSection.getBottomBlockY(chunkPos);
+-    public LevelChunkSection(Registry<Biome> biomeRegistry) {
 -        this.states = new PalettedContainer<>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
 -        this.biomes = new PalettedContainer<>(biomeRegistry.asHolderIdMap(), biomeRegistry.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-+        this.states = new PalettedContainer<>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES, level == null || level.chunkPacketBlockController == null ? null : level.chunkPacketBlockController.getPresetBlockStates(level, pos, this.bottomBlockY())); // Paper - Anti-Xray - Add preset block states
++    // Paper start - Anti-Xray - Add parameters
++    @Deprecated @io.papermc.paper.annotation.DoNotUse public LevelChunkSection(Registry<Biome> biomeRegistry) { this(biomeRegistry, null, null, 0); }
++    public LevelChunkSection(Registry<Biome> biomeRegistry, net.minecraft.world.level.Level level, net.minecraft.world.level.ChunkPos chunkPos, int chunkSectionY) {
++        // Paper end
++        this.states = new PalettedContainer<>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES, level == null || level.chunkPacketBlockController == null ? null : level.chunkPacketBlockController.getPresetBlockStates(level, chunkPos, chunkSectionY)); // Paper - Anti-Xray - Add preset block states
 +        this.biomes = new PalettedContainer<>(biomeRegistry.asHolderIdMap(), biomeRegistry.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES, null); // Paper - Anti-Xray - Add preset biomes
      }
  
-     public static int getBottomBlockY(int chunkPos) {
-@@ -184,10 +187,13 @@ public class LevelChunkSection {
+     public BlockState getBlockState(int x, int y, int z) {
+@@ -172,10 +175,13 @@ public class LevelChunkSection {
          this.biomes = datapaletteblock;
      }
  
 -    public void write(FriendlyByteBuf buf) {
 +    // Paper start - Anti-Xray - Add chunk packet info
-+    @Deprecated @io.papermc.paper.annotation.DoNotUse public void write(FriendlyByteBuf buf) { this.write(buf, null); }
-+    public void write(FriendlyByteBuf buf, com.destroystokyo.paper.antixray.ChunkPacketInfo<BlockState> chunkPacketInfo) {
++    @Deprecated @io.papermc.paper.annotation.DoNotUse public void write(FriendlyByteBuf buf) { this.write(buf, null, 0); }
++    public void write(FriendlyByteBuf buf, com.destroystokyo.paper.antixray.ChunkPacketInfo<BlockState> chunkPacketInfo, int chunkSectionIndex) {
          buf.writeShort(this.nonEmptyBlockCount);
 -        this.states.write(buf);
 -        this.biomes.write(buf);
-+        this.states.write(buf, chunkPacketInfo, this.bottomBlockY());
-+        this.biomes.write(buf, null, this.bottomBlockY());
++        this.states.write(buf, chunkPacketInfo, chunkSectionIndex);
++        this.biomes.write(buf, null, chunkSectionIndex);
 +        // Paper end
      }
  
      public int getSerializedSize() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index cd82985b0aa821dccc0484f328407381d58ec81f..34804dc42c7a18108126c14c1b5f3d5a9a46f83d 100644
+index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0f1fe0860 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -29,6 +29,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
@@ -1402,7 +1407,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..34804dc42c7a18108126c14c1b5f3d5a
  
      public T getAndSet(int x, int y, int z, T value) {
          this.acquire();
-@@ -166,25 +227,36 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -166,25 +227,34 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
              data.palette.read(buf);
              buf.readLongArray(data.storage.getRaw());
              this.data = data;
@@ -1418,16 +1423,14 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..34804dc42c7a18108126c14c1b5f3d5a
 +    @Deprecated @io.papermc.paper.annotation.DoNotUse public void write(FriendlyByteBuf buf) { this.write(buf, null, 0); }
      @Override
 -    public void write(FriendlyByteBuf buf) {
-+    public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) {
++    public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int chunkSectionIndex) {
          this.acquire();
  
          try {
 -            this.data.write(buf);
-+            this.data.write(buf, chunkPacketInfo, bottomBlockY);
++            this.data.write(buf, chunkPacketInfo, chunkSectionIndex);
 +
 +            if (chunkPacketInfo != null) {
-+                // Bottom block to 0 based chunk section index
-+                int chunkSectionIndex = (bottomBlockY >> 4) - chunkPacketInfo.getChunk().getMinSection();
 +                chunkPacketInfo.setPresetValues(chunkSectionIndex, this.presetValues);
 +            }
 +            // Paper end
@@ -1442,7 +1445,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..34804dc42c7a18108126c14c1b5f3d5a
          List<T> list = serialized.paletteEntries();
          int i = paletteProvider.size();
          int j = paletteProvider.calculateBitsForSerialization(idList, list.size());
-@@ -224,7 +296,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -224,7 +294,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
              }
          }
  
@@ -1451,7 +1454,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..34804dc42c7a18108126c14c1b5f3d5a
      }
  
      @Override
-@@ -284,12 +356,12 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -284,12 +354,12 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
      }
  
      public PalettedContainer<T> copy() {
@@ -1466,19 +1469,17 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..34804dc42c7a18108126c14c1b5f3d5a
      }
  
      @Override
-@@ -333,9 +405,20 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -333,9 +403,18 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
              return 1 + this.palette.getSerializedSize() + FriendlyByteBuf.getVarIntSize(this.storage.getSize()) + this.storage.getRaw().length * 8;
          }
  
 -        public void write(FriendlyByteBuf buf) {
 +        // Paper start - Anti-Xray - Add chunk packet info
-+        public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) {
++        public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int chunkSectionIndex) {
              buf.writeByte(this.storage.getBits());
              this.palette.write(buf);
 +
 +            if (chunkPacketInfo != null) {
-+                // Bottom block to 0 based chunk section index
-+                int chunkSectionIndex = (bottomBlockY >> 4) - chunkPacketInfo.getChunk().getMinSection();
 +                chunkPacketInfo.setBits(chunkSectionIndex, this.configuration.bits());
 +                chunkPacketInfo.setPalette(chunkSectionIndex, this.palette);
 +                chunkPacketInfo.setIndex(chunkSectionIndex, buf.writerIndex() + FriendlyByteBuf.getVarIntSize(this.storage.getRaw().length));
@@ -1489,7 +1490,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..34804dc42c7a18108126c14c1b5f3d5a
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainerRO.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainerRO.java
-index 9a2bf744abd8916d492e901be889223591bac3fd..a27fce0f1af9776a713bf1b5277869ed5d3e0c8e 100644
+index 9a2bf744abd8916d492e901be889223591bac3fd..1dd415c96d17eff8e7555c33d3c52e57f2559fa5 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainerRO.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainerRO.java
 @@ -14,7 +14,10 @@ public interface PalettedContainerRO<T> {
@@ -1499,13 +1500,13 @@ index 9a2bf744abd8916d492e901be889223591bac3fd..a27fce0f1af9776a713bf1b5277869ed
 -    void write(FriendlyByteBuf buf);
 +    // Paper start - Anti-Xray - Add chunk packet info
 +    @Deprecated @io.papermc.paper.annotation.DoNotUse void write(FriendlyByteBuf buf);
-+    void write(FriendlyByteBuf buf, @javax.annotation.Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY);
++    void write(FriendlyByteBuf buf, @javax.annotation.Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int chunkSectionIndex);
 +    // Paper end
  
      int getSerializedSize();
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index b1c5e5ecf2488d1a6f0a5261d4ba8958de9659ae..4138ba8bdf6f359327dfc86d3402b787ae58c818 100644
+index 0d8cfc0808a8f204d57cec40929b489099eca815..dec862552b08e6b9f9ad1f88db1e07dcc43d7fa3 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -71,7 +71,7 @@ import org.slf4j.Logger;
@@ -1517,12 +1518,12 @@ index b1c5e5ecf2488d1a6f0a5261d4ba8958de9659ae..4138ba8bdf6f359327dfc86d3402b787
      private static final Logger LOGGER = LogUtils.getLogger();
      private static final String TAG_UPGRADE_DATA = "UpgradeData";
      private static final String BLOCK_TICKS_TAG = "block_ticks";
-@@ -166,16 +166,20 @@ public class ChunkSerializer {
+@@ -162,16 +162,20 @@ public class ChunkSerializer {
              if (k >= 0 && k < achunksection.length) {
                  Logger logger;
                  PalettedContainer datapaletteblock;
 +                // Paper start - Anti-Xray - Add preset block states
-+                BlockState[] presetBlockStates = world.chunkPacketBlockController.getPresetBlockStates(world, chunkPos, b0 << 4);
++                BlockState[] presetBlockStates = world.chunkPacketBlockController.getPresetBlockStates(world, chunkPos, b0);
  
                  if (nbttagcompound1.contains("block_states", 10)) {
 -                    dataresult = ChunkSerializer.BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, nbttagcompound1.getCompound("block_states")).promotePartial((s) -> {
@@ -1540,7 +1541,7 @@ index b1c5e5ecf2488d1a6f0a5261d4ba8958de9659ae..4138ba8bdf6f359327dfc86d3402b787
                  }
  
                  PalettedContainer object; // CraftBukkit - read/write
-@@ -188,7 +192,7 @@ public class ChunkSerializer {
+@@ -184,7 +188,7 @@ public class ChunkSerializer {
                      Objects.requireNonNull(logger);
                      object = ((DataResult<PalettedContainer<Holder<Biome>>>) dataresult).getOrThrow(false, logger::error); // CraftBukkit - decompile error
                  } else {
@@ -1548,8 +1549,8 @@ index b1c5e5ecf2488d1a6f0a5261d4ba8958de9659ae..4138ba8bdf6f359327dfc86d3402b787
 +                    object = new PalettedContainer<>(iregistry.asHolderIdMap(), iregistry.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES, null); // Paper - Anti-Xray - Add preset biomes
                  }
  
-                 LevelChunkSection chunksection = new LevelChunkSection(b0, datapaletteblock, (PalettedContainer) object); // CraftBukkit - read/write
-@@ -446,7 +450,7 @@ public class ChunkSerializer {
+                 LevelChunkSection chunksection = new LevelChunkSection(datapaletteblock, (PalettedContainer) object); // CraftBukkit - read/write
+@@ -412,7 +416,7 @@ public class ChunkSerializer {
  
      // CraftBukkit start - read/write
      private static Codec<PalettedContainer<Holder<Biome>>> makeBiomeCodecRW(Registry<Biome> iregistry) {
@@ -1572,10 +1573,10 @@ index b738e1f7debac7d70910d5ac908ca9d4f60640d5..269ebe8e8826a0c89e471cb59b503900
  
      public CraftChunk(net.minecraft.world.level.chunk.LevelChunk chunk) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ca20401d795af96f6d8b9f1c10c854e8355e6899..456bb6cf7278a1418b39b9b2094abad3137bb508 100644
+index a0976fd1b142ac7f26da71720ce40b303e1daabe..d7fe84932e25a76105aa7637247fd4d034985efe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2266,7 +2266,7 @@ public final class CraftServer implements Server {
+@@ -2264,7 +2264,7 @@ public final class CraftServer implements Server {
      public ChunkGenerator.ChunkData createChunkData(World world) {
          Validate.notNull(world, "World cannot be null");
          ServerLevel handle = ((CraftWorld) world).getHandle();
@@ -1585,14 +1586,14 @@ index ca20401d795af96f6d8b9f1c10c854e8355e6899..456bb6cf7278a1418b39b9b2094abad3
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 87efc9c4d63b7c413b37f1a1a58100bf17615509..ec934c2cb6f183c43c06ba9c4d015890d5992934 100644
+index f16ab24c0ff5b51432a8cbf9b5e7274c6b99ede6..62a3e2819510a056707dadf79a8e4fc5a9772fd9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -419,11 +419,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
                  List<ServerPlayer> playersInRange = playerChunk.playerProvider.getPlayers(playerChunk.getPos(), false);
                  if (playersInRange.isEmpty()) return true; // Paper - rewrite player chunk loader
  
--                ClientboundLevelChunkWithLightPacket refreshPacket = new ClientboundLevelChunkWithLightPacket(chunk, this.world.getLightEngine(), null, null, true);
+-                ClientboundLevelChunkWithLightPacket refreshPacket = new ClientboundLevelChunkWithLightPacket(chunk, this.world.getLightEngine(), null, null);
 +                // Paper start - Anti-Xray - Bypass
 +                Map<Object, ClientboundLevelChunkWithLightPacket> refreshPackets = new HashMap<>();
                  for (ServerPlayer player : playersInRange) {
@@ -1601,14 +1602,14 @@ index 87efc9c4d63b7c413b37f1a1a58100bf17615509..ec934c2cb6f183c43c06ba9c4d015890
 -                    player.connection.send(refreshPacket);
 +                    Boolean shouldModify = chunk.getLevel().chunkPacketBlockController.shouldModify(player, chunk);
 +                    player.connection.send(refreshPackets.computeIfAbsent(shouldModify, s -> { // Use connection to prevent creating firing event
-+                        return new ClientboundLevelChunkWithLightPacket(chunk, this.world.getLightEngine(), null, null, true, (Boolean) s);
++                        return new ClientboundLevelChunkWithLightPacket(chunk, this.world.getLightEngine(), null, null, (Boolean) s);
 +                    }));
 +                    // Paper end
                  }
          // Paper - rewrite player chunk loader
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
-index 960405935e395a31c0300773c41413801cf0d290..4a23d03757e1735b9ebb8c003adcc0374a7d672d 100644
+index c23ce88cb9693291fec81a99e3a5bcb2615bb897..a9700b750f124b5367c91ac071ee5194e9f7f8d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
 @@ -27,8 +27,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
@@ -1630,8 +1631,8 @@ index 960405935e395a31c0300773c41413801cf0d290..4a23d03757e1735b9ebb8c003adcc037
          int offset = (y - this.minHeight) >> 4;
          LevelChunkSection section = this.sections[offset];
          if (create && section == null) {
--            this.sections[offset] = section = new LevelChunkSection(offset + (this.minHeight >> 4), this.biomes);
-+            this.sections[offset] = section = new LevelChunkSection(offset + (this.minHeight >> 4), this.biomes, null, this.world instanceof org.bukkit.craftbukkit.CraftWorld ? ((org.bukkit.craftbukkit.CraftWorld) this.world).getHandle() : null); // Paper - Anti-Xray - Add parameters
+-            this.sections[offset] = section = new LevelChunkSection(this.biomes);
++            this.sections[offset] = section = new LevelChunkSection(this.biomes, this.world instanceof org.bukkit.craftbukkit.CraftWorld ? ((org.bukkit.craftbukkit.CraftWorld) this.world).getHandle() : null, null, offset + (this.minHeight >> 4)); // Paper - Anti-Xray - Add parameters
          }
          return section;
      }
diff --git a/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0344-Improve-Block-breakNaturally-API.patch b/patches/server/0345-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0344-Improve-Block-breakNaturally-API.patch
rename to patches/server/0345-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0346-Add-debug-for-sync-chunk-loads.patch b/patches/server/0347-Add-debug-for-sync-chunk-loads.patch
similarity index 99%
rename from patches/server/0346-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0347-Add-debug-for-sync-chunk-loads.patch
index 8aefa1cb4a..f8e0482a0b 100644
--- a/patches/server/0346-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0347-Add-debug-for-sync-chunk-loads.patch
@@ -312,7 +312,7 @@ index 603f9d1f501a18214f11a6e401f2c43d9c3cf8eb..1c327067d488cc916d082a797b161cb7
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b12e9da3eebda396769b30f4b7e37a78f3bcb060..e61781d7ac9ec8828b4968e6e3824f5212bf6dea 100644
+index 62ea2bb2fdd1f2de31b08c88193887989fbd3ece..fc6cf61664b4c64c9319c61b447a02e2cc38558f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -651,6 +651,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0347-Remove-garbage-Java-version-check.patch b/patches/server/0348-Remove-garbage-Java-version-check.patch
similarity index 100%
rename from patches/server/0347-Remove-garbage-Java-version-check.patch
rename to patches/server/0348-Remove-garbage-Java-version-check.patch
diff --git a/patches/server/0348-Add-ThrownEggHatchEvent.patch b/patches/server/0349-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0348-Add-ThrownEggHatchEvent.patch
rename to patches/server/0349-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0349-Entity-Jump-API.patch b/patches/server/0350-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0349-Entity-Jump-API.patch
rename to patches/server/0350-Entity-Jump-API.patch
diff --git a/patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0351-Make-the-GUI-graph-fancier.patch b/patches/server/0352-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0351-Make-the-GUI-graph-fancier.patch
rename to patches/server/0352-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0353-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0354-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0353-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0354-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0356-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0356-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0356-Optimise-Chunk-getFluid.patch b/patches/server/0357-Optimise-Chunk-getFluid.patch
similarity index 92%
rename from patches/server/0356-Optimise-Chunk-getFluid.patch
rename to patches/server/0357-Optimise-Chunk-getFluid.patch
index ebc45ec318..cd3ac36a01 100644
--- a/patches/server/0356-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0357-Optimise-Chunk-getFluid.patch
@@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
 easier to inline due to code size
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 704f0500649acdbff2caf94f702a6685ecf4c986..8d6e3c60035ba2e7e05d081aec66274bdeedf3ea 100644
+index 24a1d04d01d01262facbac9c3683c21b7f54fd6d..c3760f22fcc56ccb25e3315823054416c2172386 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -380,18 +380,20 @@ public class LevelChunk extends ChunkAccess {
@@ -47,10 +47,10 @@ index 704f0500649acdbff2caf94f702a6685ecf4c986..8d6e3c60035ba2e7e05d081aec66274b
  
      // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index 2c3ea88bac229df67bd742e16d2106d80bcc8889..789664d53584c7d958572c63db22f904fb411a58 100644
+index 4eeb719b40ff1c18a7cdda7ecc6b135dbedd626e..b8fee4f8a0cfe32b9ef7f3f3cf818cbaec0d3fca 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -43,7 +43,7 @@ public class LevelChunkSection {
+@@ -46,7 +46,7 @@ public class LevelChunkSection {
      }
  
      public FluidState getFluidState(int x, int y, int z) {
diff --git a/patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0358-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0358-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch b/patches/server/0359-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/server/0358-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0359-Add-tick-times-API-and-mspt-command.patch
index 2501fe1c78..ee4a71dad9 100644
--- a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0359-Add-tick-times-API-and-mspt-command.patch
@@ -184,7 +184,7 @@ index 798a9083d78d49bc7c9e1d3dfb70c30e63e79a48..b2b7f5f30b3967a9f8a32e27557639da
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a0976fd1b142ac7f26da71720ce40b303e1daabe..aabd79ef5cc502b5b1b1e5bb6f6427f1224026fd 100644
+index d7fe84932e25a76105aa7637247fd4d034985efe..fb422d7f6639aa66cc6bd2d458eb3797d3dba702 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2514,6 +2514,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0359-Expose-MinecraftServer-isRunning.patch b/patches/server/0360-Expose-MinecraftServer-isRunning.patch
similarity index 90%
rename from patches/server/0359-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0360-Expose-MinecraftServer-isRunning.patch
index a50356e1ff..920fa2794b 100644
--- a/patches/server/0359-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0360-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aabd79ef5cc502b5b1b1e5bb6f6427f1224026fd..2f7e8c0926aabc373479edc46d8fb160fa653980 100644
+index fb422d7f6639aa66cc6bd2d458eb3797d3dba702..db67c80e5e42a71aee4a53ba7486031a7b1e6498 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2745,5 +2745,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 93%
rename from patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index b007a41f50..9f99a65494 100644
--- a/patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5cc0a39622a265e42e6b7d20e81144d1acce59b7..f1a6827a8a23795f810279597b8eefb948d4fcff 100644
+index e0c9b9b61fa718d81d6e4438d7c12a833dfd7b64..a8c4c7298e127e5b60a3b43ad168976d29901bc5 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1031,6 +1031,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -25,7 +25,7 @@ index 5cc0a39622a265e42e6b7d20e81144d1acce59b7..f1a6827a8a23795f810279597b8eefb9
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e61781d7ac9ec8828b4968e6e3824f5212bf6dea..faba22ba5b45fbd9463ed2172f5aa9096ed84ba0 100644
+index fc6cf61664b4c64c9319c61b447a02e2cc38558f..2838e035204e95defce0d7488248b2e57bf71fab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2473,7 +2473,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0365-Don-t-tick-dead-players.patch b/patches/server/0366-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0365-Don-t-tick-dead-players.patch
rename to patches/server/0366-Don-t-tick-dead-players.patch
diff --git a/patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0367-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0367-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0367-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0368-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0367-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0368-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0370-Improved-Watchdog-Support.patch b/patches/server/0371-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0370-Improved-Watchdog-Support.patch
rename to patches/server/0371-Improved-Watchdog-Support.patch
index f8e0975ee3..055c9e74e8 100644
--- a/patches/server/0370-Improved-Watchdog-Support.patch
+++ b/patches/server/0371-Improved-Watchdog-Support.patch
@@ -295,10 +295,10 @@ index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb89
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9d1c3859e54af9b42665e7ca2fc50e83e7784148..904ffb532ecfa45ef8dfc318d7672d19e99934cd 100644
+index 09a572a054bd4cf1014e11a51caa68c6fa4bb384..fd4de9ace0cce48b7c73bbe1d351db4053915a9a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -817,6 +817,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -820,6 +820,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
@@ -307,7 +307,7 @@ index 9d1c3859e54af9b42665e7ca2fc50e83e7784148..904ffb532ecfa45ef8dfc318d7672d19
              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/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 8d6e3c60035ba2e7e05d081aec66274bdeedf3ea..f1c9dd86f62243ece7e81e820d1dbcae72d2598c 100644
+index c3760f22fcc56ccb25e3315823054416c2172386..246606164117e8140ab0892ec1326503b414a1ab 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1180,6 +1180,7 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0371-Optimize-Pathfinding.patch b/patches/server/0372-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0371-Optimize-Pathfinding.patch
rename to patches/server/0372-Optimize-Pathfinding.patch
diff --git a/patches/server/0372-Reduce-Either-Optional-allocation.patch b/patches/server/0373-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0372-Reduce-Either-Optional-allocation.patch
rename to patches/server/0373-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0374-Prevent-opening-inventories-when-frozen.patch b/patches/server/0375-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0374-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0375-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0376-Implement-Player-Client-Options-API.patch b/patches/server/0377-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0376-Implement-Player-Client-Options-API.patch
rename to patches/server/0377-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 98%
rename from patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 4cdb1d403e..db0c03d70f 100644
--- a/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -31,7 +31,7 @@ delays anymore.
 public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f1a6827a8a23795f810279597b8eefb948d4fcff..6ad8b10e47e33221513f57c424431793177fc140 100644
+index a8c4c7298e127e5b60a3b43ad168976d29901bc5..48586780da5d260894fe59efaa97cb1facfe73fe 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1037,6 +1037,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0382-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0382-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0384-Villager-Restocks-API.patch b/patches/server/0385-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0384-Villager-Restocks-API.patch
rename to patches/server/0385-Villager-Restocks-API.patch
diff --git a/patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0386-Expose-game-version.patch b/patches/server/0387-Expose-game-version.patch
similarity index 89%
rename from patches/server/0386-Expose-game-version.patch
rename to patches/server/0387-Expose-game-version.patch
index 31361de28e..5c1a5c2389 100644
--- a/patches/server/0386-Expose-game-version.patch
+++ b/patches/server/0387-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2f7e8c0926aabc373479edc46d8fb160fa653980..8a05200d5758b04d805352c156c01fa1d8c7509c 100644
+index db67c80e5e42a71aee4a53ba7486031a7b1e6498..387dd679057b4968a3b6288e52d812ba9eefd1eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -577,6 +577,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0387-Optimize-Voxel-Shape-Merging.patch b/patches/server/0388-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0387-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0388-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0389-misc-debugging-dumps.patch b/patches/server/0390-misc-debugging-dumps.patch
similarity index 98%
rename from patches/server/0389-misc-debugging-dumps.patch
rename to patches/server/0390-misc-debugging-dumps.patch
index 462bef2ab4..1a8bb916a1 100644
--- a/patches/server/0389-misc-debugging-dumps.patch
+++ b/patches/server/0390-misc-debugging-dumps.patch
@@ -74,7 +74,7 @@ index 0c7f280bae81bbb492d5780a43e5ffda0f58756a..238a7bc87ab49da1f0fa3c733dd512fd
                  this.connection.send(new ClientboundDisconnectPacket(ichatmutablecomponent));
                  this.connection.disconnect(ichatmutablecomponent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8a05200d5758b04d805352c156c01fa1d8c7509c..c36946f68f8e595650c6cbae0c353987799c08dd 100644
+index 387dd679057b4968a3b6288e52d812ba9eefd1eb..ec0d03aedac540f67552a5a8371518d673519d87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1015,6 +1015,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0390-Prevent-teleporting-dead-entities.patch b/patches/server/0391-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0390-Prevent-teleporting-dead-entities.patch
rename to patches/server/0391-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 6db1739574..2be0b10356 100644
--- a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -516,7 +516,7 @@ index 71b395db734c257a64ec3297eebbe52883ea4cc7..072888f891c8e25a2b4daaf561e12493
          paperConfigurations.initializeWorldDefaultsConfiguration();
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index faba22ba5b45fbd9463ed2172f5aa9096ed84ba0..345db2f58f52a465d04f46e43403ced57a1bae34 100644
+index 2838e035204e95defce0d7488248b2e57bf71fab..e96890be7f03b7cc846fe850d4169e09b5d40eab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,7 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -592,7 +592,7 @@ index 6599f874d9f97e9ef4862039ecad7277bbc5fd91..7edd4b88eb0476f0630630bc4681e859
                              }
                         }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index f1c9dd86f62243ece7e81e820d1dbcae72d2598c..b90697fbf292f73fc661c46edcc71c1bbce99d94 100644
+index 246606164117e8140ab0892ec1326503b414a1ab..4d052f4cde791100f04b822899f0f436feaa23ea 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -603,7 +603,7 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0392-Implement-Mob-Goal-API.patch b/patches/server/0393-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0392-Implement-Mob-Goal-API.patch
rename to patches/server/0393-Implement-Mob-Goal-API.patch
index 150d041b4b..b8706e49a0 100644
--- a/patches/server/0392-Implement-Mob-Goal-API.patch
+++ b/patches/server/0393-Implement-Mob-Goal-API.patch
@@ -792,7 +792,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c36946f68f8e595650c6cbae0c353987799c08dd..33cc7f55bd4a2b8d6ed0844c21009737d01be82d 100644
+index ec0d03aedac540f67552a5a8371518d673519d87..095ee082f73c24a8b1d311e15eed49048c6646d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2758,5 +2758,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0393-Add-villager-reputation-API.patch b/patches/server/0394-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0393-Add-villager-reputation-API.patch
rename to patches/server/0394-Add-villager-reputation-API.patch
diff --git a/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0395-ExperienceOrbMergeEvent.patch b/patches/server/0396-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0395-ExperienceOrbMergeEvent.patch
rename to patches/server/0396-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0397-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0398-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0397-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0398-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0398-Potential-bed-API.patch b/patches/server/0399-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0398-Potential-bed-API.patch
rename to patches/server/0399-Potential-bed-API.patch
diff --git a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 96%
rename from patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch
index 8c05b83290..59a602c961 100644
--- a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index 56574a625fb4378997bcc79915dbb083e2c59f70..f6b8426ddc50363991c78ae731898d1a
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 33cc7f55bd4a2b8d6ed0844c21009737d01be82d..7181e0df497d09e8d3d7a336e50a99506af4eb53 100644
+index 095ee082f73c24a8b1d311e15eed49048c6646d9..4971e0d7254807a27123721dad24a7985b32cf87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1025,6 +1025,31 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 98%
rename from patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 0e4c212249..e511be120e 100644
--- a/patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -34,10 +34,10 @@ index 75d827f1eecb24f7ab985bdea2bbf65b8478fc8c..d646660f988994d4fdb05901349c5946
  
                      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 904ffb532ecfa45ef8dfc318d7672d19e99934cd..2a11411a66ab3e17aec174dc0ff2435ccfc0abfd 100644
+index fd4de9ace0cce48b7c73bbe1d351db4053915a9a..7dc9b87c50590422e9912e4385c9983bcac343b8 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -432,6 +432,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -434,6 +434,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/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 95%
rename from patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 0995f1d045..3995f55aad 100644
--- a/patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0403-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,10 +18,10 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..5ca3ad7b3d7606accd0a58b3c708fadb
      @VisibleForTesting
      static long encode(double value) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 6ad8b10e47e33221513f57c424431793177fc140..f3bbafb3475ea080826c5c795c37bc21db5622c7 100644
+index 48586780da5d260894fe59efaa97cb1facfe73fe..dadf403ac91887f0fae87889170deb6d5732cbc1 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1343,9 +1343,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1348,9 +1348,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          public void updatePlayer(ServerPlayer player) {
              org.spigotmc.AsyncCatcher.catchOp("player tracker update"); // Spigot
              if (player != this.entity) {
diff --git a/patches/server/0403-Ensure-safe-gateway-teleport.patch b/patches/server/0404-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0403-Ensure-safe-gateway-teleport.patch
rename to patches/server/0404-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0404-Add-option-for-console-having-all-permissions.patch b/patches/server/0405-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0404-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0405-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0405-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0406-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0405-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0406-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0406-Maps-shouldn-t-load-chunks.patch b/patches/server/0407-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0406-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0407-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0408-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0408-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0409-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0409-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0410-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0410-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0410-Fix-sand-duping.patch b/patches/server/0411-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0410-Fix-sand-duping.patch
rename to patches/server/0411-Fix-sand-duping.patch
diff --git a/patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0412-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0412-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0413-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 98%
rename from patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
index ff9a7172dd..c295c91a7e 100644
--- a/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f3bbafb3475ea080826c5c795c37bc21db5622c7..897205c326f9c8d37e0320c59e09dcc40fa38711 100644
+index dadf403ac91887f0fae87889170deb6d5732cbc1..93dea79180ebaef3ffb6abffd47f0026a91406cd 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -157,6 +157,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -187,9 +187,9 @@ index f3bbafb3475ea080826c5c795c37bc21db5622c7..897205c326f9c8d37e0320c59e09dcc4
          List<ServerPlayer> list = Lists.newArrayList();
          List<ServerPlayer> list1 = this.level.players();
          ObjectIterator objectiterator = this.entityMap.values().iterator();
-@@ -1200,46 +1297,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
- 
-         player.trackChunk(chunk.getPos(), (Packet) cachedDataPacket.getValue());
+@@ -1205,46 +1302,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         }));
+         // Paper end
          DebugPackets.sendPoiPacketsForChunk(this.level, chunk.getPos());
 -        List<Entity> list = Lists.newArrayList();
 -        List<Entity> list1 = Lists.newArrayList();
@@ -235,7 +235,7 @@ index f3bbafb3475ea080826c5c795c37bc21db5622c7..897205c326f9c8d37e0320c59e09dcc4
  
      }
  
-@@ -1294,6 +1352,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1299,6 +1357,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.lastSectionPos = SectionPos.of((EntityAccess) entity);
          }
  
diff --git a/patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0415-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0414-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0415-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0415-Improve-Arrow-API.patch b/patches/server/0416-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0415-Improve-Arrow-API.patch
rename to patches/server/0416-Improve-Arrow-API.patch
diff --git a/patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0417-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0416-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0417-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0417-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0418-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0417-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0418-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0418-Add-permission-for-command-blocks.patch b/patches/server/0419-Add-permission-for-command-blocks.patch
similarity index 97%
rename from patches/server/0418-Add-permission-for-command-blocks.patch
rename to patches/server/0419-Add-permission-for-command-blocks.patch
index 1bb97d0bdd..72df584e4a 100644
--- a/patches/server/0418-Add-permission-for-command-blocks.patch
+++ b/patches/server/0419-Add-permission-for-command-blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for command blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 562534d15f6f70ff286be90fb512b807e00ad807..c185083abf2b4527a7fe046d83c64cd2cc5b5bb9 100644
+index 84ffc86e2eba089d0200183847e879d638e8460d..6a45cd61d2590aa25b9cb38028d2dcf3d93952fe 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -402,7 +402,7 @@ public class ServerPlayerGameMode {
+@@ -404,7 +404,7 @@ public class ServerPlayerGameMode {
              BlockEntity tileentity = this.level.getBlockEntity(pos);
              Block block = iblockdata.getBlock();
  
diff --git a/patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0420-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0419-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0420-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 97%
rename from patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index ff4c2ad333..0b50c2a29f 100644
--- a/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0421-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -102,7 +102,7 @@ index 04a9cef0a80aaa401ce0ed560a16f3ada6e6a953..391eed0b5631732d799c858d35f0c31b
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7181e0df497d09e8d3d7a336e50a99506af4eb53..639babbdaf9bf00edfa9d835f845cd3a0d95c088 100644
+index 4971e0d7254807a27123721dad24a7985b32cf87..07368f2156c46654b72205cea27c20fd5e0a105b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -964,8 +964,8 @@ public final class CraftServer implements Server {
@@ -117,10 +117,10 @@ index 7181e0df497d09e8d3d7a336e50a99506af4eb53..639babbdaf9bf00edfa9d835f845cd3a
              for (SpawnCategory spawnCategory : SpawnCategory.values()) {
                  if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f16ab24c0ff5b51432a8cbf9b5e7274c6b99ede6..58c9fa9fa6fab3eddb232b48602463d9d67701fc 100644
+index 62a3e2819510a056707dadf79a8e4fc5a9772fd9..6fc18bdcaa181b72f4b73041a4eb71757413a204 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1140,7 +1140,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1145,7 +1145,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setDifficulty(Difficulty difficulty) {
diff --git a/patches/server/0421-Paper-dumpitem-command.patch b/patches/server/0422-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0421-Paper-dumpitem-command.patch
rename to patches/server/0422-Paper-dumpitem-command.patch
diff --git a/patches/server/0422-Improve-Legacy-Component-serialization-size.patch b/patches/server/0423-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0422-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0423-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0423-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0424-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0423-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0424-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 94%
rename from patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index a42c3b857a..6b1cf57dd0 100644
--- a/patches/server/0424-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0425-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 639babbdaf9bf00edfa9d835f845cd3a0d95c088..a71b5269354fcf5074aa2b018abf9e173bce79ae 100644
+index 07368f2156c46654b72205cea27c20fd5e0a105b..5cb5b71894597eb59201cfd1d5489d516cb7dbd0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -377,7 +377,7 @@ public final class CraftServer implements Server {
@@ -44,7 +44,7 @@ index 639babbdaf9bf00edfa9d835f845cd3a0d95c088..a71b5269354fcf5074aa2b018abf9e17
          this.printSaveWarning = false;
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 58c9fa9fa6fab3eddb232b48602463d9d67701fc..5200c13f33761b4e6a072b324d804d6766bad80b 100644
+index 6fc18bdcaa181b72f4b73041a4eb71757413a204..a70ba15318f70798e5c3d1c458d52ca13193acee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -280,7 +280,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -84,7 +84,7 @@ index 58c9fa9fa6fab3eddb232b48602463d9d67701fc..5200c13f33761b4e6a072b324d804d67
          }
  
          return true;
-@@ -440,9 +452,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -445,9 +457,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
          // Paper start - Optimize this method
          ChunkPos chunkPos = new ChunkPos(x, z);
@@ -98,7 +98,7 @@ index 58c9fa9fa6fab3eddb232b48602463d9d67701fc..5200c13f33761b4e6a072b324d804d67
              if (immediate == null) {
                  immediate = world.getChunkSource().chunkMap.getUnloadingChunk(x, z);
              }
-@@ -450,7 +465,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -455,7 +470,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
                  if (!(immediate instanceof ImposterProtoChunk) && !(immediate instanceof net.minecraft.world.level.chunk.LevelChunk)) {
                      return false; // not full status
                  }
@@ -107,7 +107,7 @@ index 58c9fa9fa6fab3eddb232b48602463d9d67701fc..5200c13f33761b4e6a072b324d804d67
                  world.getChunk(x, z); // make sure we're at ticket level 32 or lower
                  return true;
              }
-@@ -476,7 +491,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -481,7 +496,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
              // we do this so we do not re-read the chunk data on disk
          }
  
@@ -116,7 +116,7 @@ index 58c9fa9fa6fab3eddb232b48602463d9d67701fc..5200c13f33761b4e6a072b324d804d67
          world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
          return true;
          // Paper end
-@@ -2196,6 +2211,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2201,6 +2216,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> {
              net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
                  net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)c;
diff --git a/patches/server/0425-incremental-chunk-and-player-saving.patch b/patches/server/0426-incremental-chunk-and-player-saving.patch
similarity index 98%
rename from patches/server/0425-incremental-chunk-and-player-saving.patch
rename to patches/server/0426-incremental-chunk-and-player-saving.patch
index 848791076b..e6627af798 100644
--- a/patches/server/0425-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0426-incremental-chunk-and-player-saving.patch
@@ -73,7 +73,7 @@ index 1c327067d488cc916d082a797b161cb7836ffa2e..3f5d572994bc8b3f1e106105dc0bb202
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 345db2f58f52a465d04f46e43403ced57a1bae34..d02f9030d47764f8f3f71f27f133b676b42efe59 100644
+index e96890be7f03b7cc846fe850d4169e09b5d40eab..02ba7e25c649832aba2e742cb76be9d2b6b6f954 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1281,6 +1281,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0426-Support-old-UUID-format-for-NBT.patch b/patches/server/0427-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0426-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0427-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0428-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0427-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0428-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0429-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0428-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0429-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0429-Remove-some-streams-from-structures.patch b/patches/server/0430-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0429-Remove-some-streams-from-structures.patch
rename to patches/server/0430-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0431-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0430-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0431-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0431-Support-components-in-ItemMeta.patch b/patches/server/0432-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0431-Support-components-in-ItemMeta.patch
rename to patches/server/0432-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0433-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0432-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0433-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0433-Add-entity-liquid-API.patch b/patches/server/0434-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0433-Add-entity-liquid-API.patch
rename to patches/server/0434-Add-entity-liquid-API.patch
diff --git a/patches/server/0434-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0435-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0434-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0435-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0435-Spawn-player-in-correct-world-on-login.patch b/patches/server/0436-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0435-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0436-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0436-Add-PrepareResultEvent.patch b/patches/server/0437-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0436-Add-PrepareResultEvent.patch
rename to patches/server/0437-Add-PrepareResultEvent.patch
diff --git a/patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0438-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0437-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0438-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0439-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0438-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0439-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0440-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0439-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0440-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0441-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0440-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0441-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0441-Fix-SPIGOT-5989.patch b/patches/server/0442-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0441-Fix-SPIGOT-5989.patch
rename to patches/server/0442-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0443-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0442-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0443-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0444-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0443-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0444-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0445-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0444-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0445-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0445-Fix-some-rails-connecting-improperly.patch b/patches/server/0446-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0445-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0446-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0447-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0446-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0447-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 95%
rename from patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch
index a8ed7c9f94..4057fb500c 100644
--- a/patches/server/0447-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch
@@ -9,7 +9,7 @@ the game, immediately stop the server to prevent data corruption.
 You can override this functionality at your own peril.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 0d8cfc0808a8f204d57cec40929b489099eca815..40372e47f33d2e6ff164a00d964e8d965f1fd323 100644
+index dec862552b08e6b9f9ad1f88db1e07dcc43d7fa3..fce679e2b72d2ce1c8e75710041937c2c0566044 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -124,8 +124,20 @@ public class ChunkSerializer {
diff --git a/patches/server/0448-Brand-support.patch b/patches/server/0449-Brand-support.patch
similarity index 100%
rename from patches/server/0448-Brand-support.patch
rename to patches/server/0449-Brand-support.patch
diff --git a/patches/server/0449-Add-setMaxPlayers-API.patch b/patches/server/0450-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0449-Add-setMaxPlayers-API.patch
rename to patches/server/0450-Add-setMaxPlayers-API.patch
index a0c6803af4..d9d32089c2 100644
--- a/patches/server/0449-Add-setMaxPlayers-API.patch
+++ b/patches/server/0450-Add-setMaxPlayers-API.patch
@@ -18,7 +18,7 @@ index 36715e8bc9047962a2ced70d6838672159665771..b810ae5536cc1a64d44266f2158db0f6
      private int simulationDistance;
      private boolean allowCheatsForAllPlayers;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a71b5269354fcf5074aa2b018abf9e173bce79ae..1cc0c17d5211ae7ecf18c901cccbe55b655be561 100644
+index 5cb5b71894597eb59201cfd1d5489d516cb7dbd0..371b3af8cb76b9fffecf0a38dbf3687ac1bdf826 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -672,6 +672,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0450-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0451-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0450-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0451-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0451-Don-t-require-FACING-data.patch b/patches/server/0452-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0451-Don-t-require-FACING-data.patch
rename to patches/server/0452-Don-t-require-FACING-data.patch
diff --git a/patches/server/0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0453-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 93%
rename from patches/server/0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0453-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 19083aa14b..92c638424c 100644
--- a/patches/server/0452-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0453-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d02f9030d47764f8f3f71f27f133b676b42efe59..4fc75299b65b2d298f6f8397e56c44221ed4c3e9 100644
+index 02ba7e25c649832aba2e742cb76be9d2b6b6f954..babc90ed1a85756545ac2b7631853d09f37125f2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2003,9 +2003,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index d02f9030d47764f8f3f71f27f133b676b42efe59..4fc75299b65b2d298f6f8397e56c4422
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5200c13f33761b4e6a072b324d804d6766bad80b..32e86de4fc083d8d160892144705c46558c31c67 100644
+index a70ba15318f70798e5c3d1c458d52ca13193acee..7fc85b00fa2c9caa832247e2e95de231e8377ec2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -260,12 +260,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0453-Add-moon-phase-API.patch b/patches/server/0454-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0453-Add-moon-phase-API.patch
rename to patches/server/0454-Add-moon-phase-API.patch
diff --git a/patches/server/0454-Prevent-headless-pistons-from-being-created.patch b/patches/server/0455-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0454-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0455-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0455-Add-BellRingEvent.patch b/patches/server/0456-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0455-Add-BellRingEvent.patch
rename to patches/server/0456-Add-BellRingEvent.patch
diff --git a/patches/server/0456-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0457-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0456-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0457-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0457-Buffer-joins-to-world.patch b/patches/server/0458-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0457-Buffer-joins-to-world.patch
rename to patches/server/0458-Buffer-joins-to-world.patch
diff --git a/patches/server/0458-Eigencraft-redstone-implementation.patch b/patches/server/0459-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0458-Eigencraft-redstone-implementation.patch
rename to patches/server/0459-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0459-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0460-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0459-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0460-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0460-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0461-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0460-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0461-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0461-Fix-CraftTeam-null-check.patch b/patches/server/0462-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0461-Fix-CraftTeam-null-check.patch
rename to patches/server/0462-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0462-Add-more-Evoker-API.patch b/patches/server/0463-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0462-Add-more-Evoker-API.patch
rename to patches/server/0463-Add-more-Evoker-API.patch
diff --git a/patches/server/0463-Add-methods-to-get-translation-keys.patch b/patches/server/0464-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0463-Add-methods-to-get-translation-keys.patch
rename to patches/server/0464-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0464-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0465-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0464-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0465-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0465-Cache-block-data-strings.patch b/patches/server/0466-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0465-Cache-block-data-strings.patch
rename to patches/server/0466-Cache-block-data-strings.patch
diff --git a/patches/server/0466-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0467-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0466-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0467-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0467-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0468-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0467-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0468-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0468-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0469-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0468-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0469-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0469-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0470-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 91%
rename from patches/server/0469-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0470-Extend-block-drop-capture-to-capture-all-items-added.patch
index 82cf373acb..5ae40c5c45 100644
--- a/patches/server/0469-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0470-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4fc75299b65b2d298f6f8397e56c44221ed4c3e9..9b7a87b0ba537d1e92d0c02149f97dc41975c53f 100644
+index babc90ed1a85756545ac2b7631853d09f37125f2..838907e8ae95d72797d01188836a05bff01d8a14 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1507,6 +1507,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -23,10 +23,10 @@ index 4fc75299b65b2d298f6f8397e56c44221ed4c3e9..9b7a87b0ba537d1e92d0c02149f97dc4
              if (spawnReason != null && !CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index c185083abf2b4527a7fe046d83c64cd2cc5b5bb9..7c713c98201c816a70ac999e86685b1c6bbd372d 100644
+index 6a45cd61d2590aa25b9cb38028d2dcf3d93952fe..180dc7ec0202fd6c24682631dedc066976f17fa4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -434,10 +434,12 @@ public class ServerPlayerGameMode {
+@@ -436,10 +436,12 @@ public class ServerPlayerGameMode {
                      // return true; // CraftBukkit
                  }
                  // CraftBukkit start
diff --git a/patches/server/0470-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0471-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0470-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0471-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0471-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0472-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0471-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0472-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0472-Entity-isTicking.patch b/patches/server/0473-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0472-Entity-isTicking.patch
rename to patches/server/0473-Entity-isTicking.patch
diff --git a/patches/server/0473-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0474-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0473-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0474-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0474-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0475-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0474-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0475-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0475-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0476-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0475-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0476-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0476-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0477-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0476-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0477-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0477-Optimise-getType-calls.patch b/patches/server/0478-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0477-Optimise-getType-calls.patch
rename to patches/server/0478-Optimise-getType-calls.patch
diff --git a/patches/server/0478-Villager-resetOffers.patch b/patches/server/0479-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0478-Villager-resetOffers.patch
rename to patches/server/0479-Villager-resetOffers.patch
diff --git a/patches/server/0479-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0480-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0479-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0480-Retain-block-place-order-when-capturing-blockstates.patch
index 647633baa2..006d8e60ad 100644
--- a/patches/server/0479-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0480-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 2a11411a66ab3e17aec174dc0ff2435ccfc0abfd..5ead2ca853983ee3d63c4c55f50d166707795af6 100644
+index 7dc9b87c50590422e9912e4385c9983bcac343b8..3548afeef265c21156c1dab90d1758fc47a56b51 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -157,7 +157,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0480-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0481-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0480-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0481-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0481-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0482-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0481-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0482-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0482-Player-elytra-boost-API.patch b/patches/server/0483-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0482-Player-elytra-boost-API.patch
rename to patches/server/0483-Player-elytra-boost-API.patch
diff --git a/patches/server/0483-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0484-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0483-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0484-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0484-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0485-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0484-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0485-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0485-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0486-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0485-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0486-Add-getOfflinePlayerIfCached-String.patch
index a2757cbbac..178aad452d 100644
--- a/patches/server/0485-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0486-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1cc0c17d5211ae7ecf18c901cccbe55b655be561..dde6226a370b036f230b920ce367cdbb45e1d62d 100644
+index 371b3af8cb76b9fffecf0a38dbf3687ac1bdf826..faa073683fae16578aaa83eefc447cd2740a3491 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1829,6 +1829,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0486-Add-ignore-discounts-API.patch b/patches/server/0487-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0486-Add-ignore-discounts-API.patch
rename to patches/server/0487-Add-ignore-discounts-API.patch
diff --git a/patches/server/0487-Toggle-for-removing-existing-dragon.patch b/patches/server/0488-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0487-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0488-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0488-Fix-client-lag-on-advancement-loading.patch b/patches/server/0489-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0488-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0489-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0489-Item-no-age-no-player-pickup.patch b/patches/server/0490-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0489-Item-no-age-no-player-pickup.patch
rename to patches/server/0490-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0490-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0491-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0490-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0491-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0491-Beacon-API-custom-effect-ranges.patch b/patches/server/0492-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0491-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0492-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0492-Add-API-for-quit-reason.patch b/patches/server/0493-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0492-Add-API-for-quit-reason.patch
rename to patches/server/0493-Add-API-for-quit-reason.patch
diff --git a/patches/server/0493-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0494-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0493-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0494-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0494-Expose-world-spawn-angle.patch b/patches/server/0495-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0494-Expose-world-spawn-angle.patch
rename to patches/server/0495-Expose-world-spawn-angle.patch
diff --git a/patches/server/0495-Add-Destroy-Speed-API.patch b/patches/server/0496-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0495-Add-Destroy-Speed-API.patch
rename to patches/server/0496-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0496-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0497-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0496-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0497-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0497-Add-LivingEntity-clearActiveItem.patch b/patches/server/0498-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0497-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0498-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0498-Add-PlayerItemCooldownEvent.patch b/patches/server/0499-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0498-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0499-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0499-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0500-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0499-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0500-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0500-More-lightning-API.patch b/patches/server/0501-More-lightning-API.patch
similarity index 100%
rename from patches/server/0500-More-lightning-API.patch
rename to patches/server/0501-More-lightning-API.patch
diff --git a/patches/server/0501-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0502-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0501-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0502-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0502-Added-missing-default-perms-for-commands.patch b/patches/server/0503-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0502-Added-missing-default-perms-for-commands.patch
rename to patches/server/0503-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0503-Add-PlayerShearBlockEvent.patch b/patches/server/0504-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0503-Add-PlayerShearBlockEvent.patch
rename to patches/server/0504-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0504-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0505-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0504-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0505-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0505-Limit-recipe-packets.patch b/patches/server/0506-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0505-Limit-recipe-packets.patch
rename to patches/server/0506-Limit-recipe-packets.patch
diff --git a/patches/server/0506-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0507-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0506-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0507-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0507-Player-Chunk-Load-Unload-Events.patch b/patches/server/0508-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0507-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0508-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0508-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0509-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0508-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0509-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0509-Expose-LivingEntity-hurt-direction.patch b/patches/server/0510-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0509-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0510-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0510-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0511-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0510-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0511-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0511-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0512-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0511-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0512-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0512-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0513-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0512-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0513-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0513-Implement-TargetHitEvent.patch b/patches/server/0514-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0513-Implement-TargetHitEvent.patch
rename to patches/server/0514-Implement-TargetHitEvent.patch
diff --git a/patches/server/0514-MC-4-Fix-item-position-desync.patch b/patches/server/0515-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0514-MC-4-Fix-item-position-desync.patch
rename to patches/server/0515-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0515-Additional-Block-Material-API-s.patch b/patches/server/0516-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0515-Additional-Block-Material-API-s.patch
rename to patches/server/0516-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0516-Fix-harming-potion-dupe.patch b/patches/server/0517-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0516-Fix-harming-potion-dupe.patch
rename to patches/server/0517-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0517-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0518-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0517-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0518-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0518-Cache-burn-durations.patch b/patches/server/0519-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0518-Cache-burn-durations.patch
rename to patches/server/0519-Cache-burn-durations.patch
diff --git a/patches/server/0519-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0520-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0519-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0520-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0520-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0521-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0520-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0521-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0521-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0522-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0521-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0522-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0522-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0523-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0522-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0523-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0523-Zombie-API-breaking-doors.patch b/patches/server/0524-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0523-Zombie-API-breaking-doors.patch
rename to patches/server/0524-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0524-Fix-nerfed-slime-when-splitting.patch b/patches/server/0525-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0524-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0525-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0525-Add-EntityLoadCrossbowEvent.patch b/patches/server/0526-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0525-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0526-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0526-Added-WorldGameRuleChangeEvent.patch b/patches/server/0527-Added-WorldGameRuleChangeEvent.patch
similarity index 96%
rename from patches/server/0526-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0527-Added-WorldGameRuleChangeEvent.patch
index 7f1ff95a5a..9427b774ac 100644
--- a/patches/server/0526-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0527-Added-WorldGameRuleChangeEvent.patch
@@ -64,10 +64,10 @@ index 4a0321f56ef80aa4991e61f586ddd3f6b45e499b..de713f1ca1d61a6b1fca2b66de916255
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 32e86de4fc083d8d160892144705c46558c31c67..08137e8c55048eedadcf1a583d04a752ea0f8da6 100644
+index 7fc85b00fa2c9caa832247e2e95de231e8377ec2..fea9f11cf6f665eba86d2ffde7b241910300a516 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1834,8 +1834,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1839,8 +1839,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule)) return false;
  
@@ -82,7 +82,7 @@ index 32e86de4fc083d8d160892144705c46558c31c67..08137e8c55048eedadcf1a583d04a752
          handle.onChanged(this.getHandle().getServer());
          return true;
      }
-@@ -1870,8 +1875,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1875,8 +1880,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule.getName())) return false;
  
diff --git a/patches/server/0527-Added-ServerResourcesReloadedEvent.patch b/patches/server/0528-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0527-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0528-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0528-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0529-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0528-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0529-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0529-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0530-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0529-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0530-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0530-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0531-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0530-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0531-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0531-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0532-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0531-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0532-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0532-Configurable-door-breaking-difficulty.patch b/patches/server/0533-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0532-Configurable-door-breaking-difficulty.patch
rename to patches/server/0533-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0533-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0534-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0533-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0534-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0534-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0535-Implement-API-to-expose-exact-interaction-point.patch
similarity index 96%
rename from patches/server/0534-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0535-Implement-API-to-expose-exact-interaction-point.patch
index 8dd6e49aca..74eee6a06f 100644
--- a/patches/server/0534-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0535-Implement-API-to-expose-exact-interaction-point.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement API to expose exact interaction point
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 7c713c98201c816a70ac999e86685b1c6bbd372d..95173754148848bf1772a0426173dcea89e6b9b8 100644
+index 180dc7ec0202fd6c24682631dedc066976f17fa4..43221bf57fb4eeb70823c12b48f4df0bb817eb0b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -515,7 +515,7 @@ public class ServerPlayerGameMode {
+@@ -517,7 +517,7 @@ public class ServerPlayerGameMode {
              cancelledBlock = true;
          }
  
diff --git a/patches/server/0535-Remove-stale-POIs.patch b/patches/server/0536-Remove-stale-POIs.patch
similarity index 91%
rename from patches/server/0535-Remove-stale-POIs.patch
rename to patches/server/0536-Remove-stale-POIs.patch
index 7c4674cb50..1d7cd63079 100644
--- a/patches/server/0535-Remove-stale-POIs.patch
+++ b/patches/server/0536-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9b7a87b0ba537d1e92d0c02149f97dc41975c53f..7cb5dc1d0badba864705386d70b69dc3a6790284 100644
+index 838907e8ae95d72797d01188836a05bff01d8a14..fb256e7c60f4e82b028f6768f591098882e27dd1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2072,6 +2072,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0536-Fix-villager-boat-exploit.patch b/patches/server/0537-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0536-Fix-villager-boat-exploit.patch
rename to patches/server/0537-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0537-Add-sendOpLevel-API.patch b/patches/server/0538-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0537-Add-sendOpLevel-API.patch
rename to patches/server/0538-Add-sendOpLevel-API.patch
diff --git a/patches/server/0538-TODO-Registry-Modification-API.patch b/patches/server/0539-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0538-TODO-Registry-Modification-API.patch
rename to patches/server/0539-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0539-Add-StructuresLocateEvent.patch b/patches/server/0540-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0539-Add-StructuresLocateEvent.patch
rename to patches/server/0540-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0540-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0541-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0540-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0541-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0541-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0542-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0541-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0542-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0542-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0543-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0542-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0543-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0543-Make-schedule-command-per-world.patch b/patches/server/0544-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0543-Make-schedule-command-per-world.patch
rename to patches/server/0544-Make-schedule-command-per-world.patch
diff --git a/patches/server/0544-Configurable-max-leash-distance.patch b/patches/server/0545-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0544-Configurable-max-leash-distance.patch
rename to patches/server/0545-Configurable-max-leash-distance.patch
diff --git a/patches/server/0545-Implement-BlockPreDispenseEvent.patch b/patches/server/0546-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0545-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0546-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0546-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0547-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0546-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0547-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0547-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0548-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0547-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0548-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0548-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0549-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0548-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0549-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0549-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0550-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0549-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0550-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0550-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0551-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0550-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0551-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0551-add-DragonEggFormEvent.patch b/patches/server/0552-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0551-add-DragonEggFormEvent.patch
rename to patches/server/0552-add-DragonEggFormEvent.patch
diff --git a/patches/server/0552-EntityMoveEvent.patch b/patches/server/0553-EntityMoveEvent.patch
similarity index 97%
rename from patches/server/0552-EntityMoveEvent.patch
rename to patches/server/0553-EntityMoveEvent.patch
index 0439d42bdd..2d7a7c2367 100644
--- a/patches/server/0552-EntityMoveEvent.patch
+++ b/patches/server/0553-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index 0ed954f83a7a045c964930247ea393cbaafcbf12..5ac5937c72286d96c394a4da90cbc443
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7cb5dc1d0badba864705386d70b69dc3a6790284..896168b532cf42cae4911a35c0d5d6dd5e37f128 100644
+index fb256e7c60f4e82b028f6768f591098882e27dd1..cfd0e75ac4e7edbd219cc0f5fb802e37737cc4ba 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0553-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0554-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 91%
rename from patches/server/0553-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0554-added-option-to-disable-pathfinding-updates-on-block.patch
index 43fe6bb9e4..9b9906d86e 100644
--- a/patches/server/0553-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0554-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 896168b532cf42cae4911a35c0d5d6dd5e37f128..02723e2d34804d911dcf093a3a6fd6af7ce4c14b 100644
+index cfd0e75ac4e7edbd219cc0f5fb802e37737cc4ba..6fc54777e15cebaef7e30702f8537a9a337ad2ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1652,6 +1652,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0554-Inline-shift-direction-fields.patch b/patches/server/0555-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0554-Inline-shift-direction-fields.patch
rename to patches/server/0555-Inline-shift-direction-fields.patch
diff --git a/patches/server/0555-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0556-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0555-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0556-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0556-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0557-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0556-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0557-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0557-living-entity-allow-attribute-registration.patch b/patches/server/0558-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0557-living-entity-allow-attribute-registration.patch
rename to patches/server/0558-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0558-fix-dead-slime-setSize-invincibility.patch b/patches/server/0559-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0558-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0559-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0559-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0560-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0559-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0560-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0560-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0561-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0560-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0561-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0561-Expose-Tracked-Players.patch b/patches/server/0562-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0561-Expose-Tracked-Players.patch
rename to patches/server/0562-Expose-Tracked-Players.patch
diff --git a/patches/server/0562-Remove-streams-from-SensorNearest.patch b/patches/server/0563-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0562-Remove-streams-from-SensorNearest.patch
rename to patches/server/0563-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0563-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0564-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0563-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0564-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0564-Improve-ServerGUI.patch b/patches/server/0565-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0564-Improve-ServerGUI.patch
rename to patches/server/0565-Improve-ServerGUI.patch
diff --git a/patches/server/0565-fix-converting-txt-to-json-file.patch b/patches/server/0566-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0565-fix-converting-txt-to-json-file.patch
rename to patches/server/0566-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0566-Add-worldborder-events.patch b/patches/server/0567-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0566-Add-worldborder-events.patch
rename to patches/server/0567-Add-worldborder-events.patch
diff --git a/patches/server/0567-added-PlayerNameEntityEvent.patch b/patches/server/0568-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0567-added-PlayerNameEntityEvent.patch
rename to patches/server/0568-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0568-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0569-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0568-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0569-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0569-Add-recipe-to-cook-events.patch b/patches/server/0570-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0569-Add-recipe-to-cook-events.patch
rename to patches/server/0570-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0570-Add-Block-isValidTool.patch b/patches/server/0571-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0570-Add-Block-isValidTool.patch
rename to patches/server/0571-Add-Block-isValidTool.patch
diff --git a/patches/server/0571-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0572-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0571-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0572-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0572-Expand-world-key-API.patch b/patches/server/0573-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0572-Expand-world-key-API.patch
rename to patches/server/0573-Expand-world-key-API.patch
index dbff40c174..f86cd7dd43 100644
--- a/patches/server/0572-Expand-world-key-API.patch
+++ b/patches/server/0573-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index 5f9c3c237b65986f8c425bbc691ac301f8fdebbc..cb7ceaaaf4e8deec78962660298fa531
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dde6226a370b036f230b920ce367cdbb45e1d62d..a64bc34f1ada4f3e5bdb2fb6cf5d5b84699234d2 100644
+index faa073683fae16578aaa83eefc447cd2740a3491..8b9b433dd1e835abc78ca074dbfe688f834625a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1153,9 +1153,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0573-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0574-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0573-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0574-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0574-Item-Rarity-API.patch b/patches/server/0575-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0574-Item-Rarity-API.patch
rename to patches/server/0575-Item-Rarity-API.patch
diff --git a/patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0576-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0576-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0576-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0577-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0576-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0577-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0577-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0578-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0577-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0578-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0578-Expose-protocol-version.patch b/patches/server/0579-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0578-Expose-protocol-version.patch
rename to patches/server/0579-Expose-protocol-version.patch
diff --git a/patches/server/0579-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0580-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0579-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0580-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0580-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0581-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0580-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0581-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0581-Add-bypass-host-check.patch b/patches/server/0582-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0581-Add-bypass-host-check.patch
rename to patches/server/0582-Add-bypass-host-check.patch
diff --git a/patches/server/0582-Set-area-affect-cloud-rotation.patch b/patches/server/0583-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0582-Set-area-affect-cloud-rotation.patch
rename to patches/server/0583-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0583-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0584-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0583-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0584-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0584-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0585-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0584-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0585-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0585-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0586-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0585-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0586-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0586-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0587-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0586-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0587-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0587-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0588-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0587-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0588-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0588-Added-PlayerDeepSleepEvent.patch b/patches/server/0589-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0588-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0589-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0589-More-World-API.patch b/patches/server/0590-More-World-API.patch
similarity index 96%
rename from patches/server/0589-More-World-API.patch
rename to patches/server/0590-More-World-API.patch
index 8b87146b11..f57028fb31 100644
--- a/patches/server/0589-More-World-API.patch
+++ b/patches/server/0590-More-World-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 08137e8c55048eedadcf1a583d04a752ea0f8da6..4176671381862d45eb004c6738ae9663bf8dd1b6 100644
+index fea9f11cf6f665eba86d2ffde7b241910300a516..a38eac88ef3099ba92273ed3818ddf742588552c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2076,6 +2076,69 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2081,6 +2081,69 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value(), this.getHandle().registryAccess()), CraftLocation.toBukkit(found.getFirst(), this));
      }
  
diff --git a/patches/server/0590-Added-PlayerBedFailEnterEvent.patch b/patches/server/0591-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0590-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0591-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0591-Entity-load-save-limit-per-chunk.patch b/patches/server/0592-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0591-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0592-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0592-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0593-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0592-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0593-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0593-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0594-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0593-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0594-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0594-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0595-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0594-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0595-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0595-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0596-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0595-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0596-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0596-Add-Channel-initialization-listeners.patch b/patches/server/0597-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0596-Add-Channel-initialization-listeners.patch
rename to patches/server/0597-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0597-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0598-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0597-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0598-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0598-Add-more-WanderingTrader-API.patch b/patches/server/0599-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0598-Add-more-WanderingTrader-API.patch
rename to patches/server/0599-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0599-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0600-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0599-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0600-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0600-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0601-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0600-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0601-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0601-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0602-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0601-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0602-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0602-Inventory-close.patch b/patches/server/0603-Inventory-close.patch
similarity index 100%
rename from patches/server/0602-Inventory-close.patch
rename to patches/server/0603-Inventory-close.patch
diff --git a/patches/server/0603-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0604-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0603-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0604-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0604-Fix-CraftPotionBrewer-cache.patch b/patches/server/0605-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0604-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0605-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0605-Add-basic-Datapack-API.patch b/patches/server/0606-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0605-Add-basic-Datapack-API.patch
rename to patches/server/0606-Add-basic-Datapack-API.patch
index b7b3c6d39b..28ec4ee721 100644
--- a/patches/server/0605-Add-basic-Datapack-API.patch
+++ b/patches/server/0606-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a64bc34f1ada4f3e5bdb2fb6cf5d5b84699234d2..5375a0eba1662dc72d1d31a48e64d080776c9c09 100644
+index 8b9b433dd1e835abc78ca074dbfe688f834625a9..912795bad8e64d98a4a13a6224ae653e049be62a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -298,6 +298,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0606-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0607-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0606-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0607-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0608-additions-to-PlayerGameModeChangeEvent.patch
similarity index 99%
rename from patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0608-additions-to-PlayerGameModeChangeEvent.patch
index 7a7e2e0521..895e7265f1 100644
--- a/patches/server/0607-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0608-additions-to-PlayerGameModeChangeEvent.patch
@@ -94,7 +94,7 @@ index b0b1f5022455e9ab0aa8ba3ddd0d4762f1e3eb81..c126bdaf557ae4a95e7111e0cc8a7f97
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 95173754148848bf1772a0426173dcea89e6b9b8..34def52e9380a4587c5008f1d133a07e72621f56 100644
+index 43221bf57fb4eeb70823c12b48f4df0bb817eb0b..e903371b370034f6447c5f23562fe5c9d2b48dbe 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -73,21 +73,28 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0608-ItemStack-repair-check-API.patch b/patches/server/0609-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0608-ItemStack-repair-check-API.patch
rename to patches/server/0609-ItemStack-repair-check-API.patch
diff --git a/patches/server/0609-More-Enchantment-API.patch b/patches/server/0610-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0609-More-Enchantment-API.patch
rename to patches/server/0610-More-Enchantment-API.patch
diff --git a/patches/server/0610-Move-range-check-for-block-placing-up.patch b/patches/server/0611-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0610-Move-range-check-for-block-placing-up.patch
rename to patches/server/0611-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0611-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0612-Fix-and-optimise-world-force-upgrading.patch
similarity index 98%
rename from patches/server/0611-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0612-Fix-and-optimise-world-force-upgrading.patch
index 04838a3a67..460f947bcf 100644
--- a/patches/server/0611-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0612-Fix-and-optimise-world-force-upgrading.patch
@@ -306,10 +306,10 @@ index cd531eff22742cff16ce4888853cba53861792dd..e1ca7910cb7c605e8aa175ff6b978e90
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5ead2ca853983ee3d63c4c55f50d166707795af6..b953fa1bec2bd017b97a8a8b966fa79086036fa3 100644
+index 3548afeef265c21156c1dab90d1758fc47a56b51..640ab1cf00ddc24a704b7f555396d18b29959a87 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -183,6 +183,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -184,6 +184,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
      public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
  
@@ -362,7 +362,7 @@ index 29da08c58200c24fd03003937d30eb41234cabc9..d3d4d10a77af51cff4da201201bac325
      public synchronized RegionFile getRegionFileIfLoaded(ChunkPos chunkcoordintpair) {
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5375a0eba1662dc72d1d31a48e64d080776c9c09..d770a490fb371e4a9d45800f2077d75a62e49b33 100644
+index 912795bad8e64d98a4a13a6224ae653e049be62a..4e683d5d8afcdab9cfa85c657bb76a0022912d9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1229,12 +1229,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0612-Add-Mob-lookAt-API.patch b/patches/server/0613-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0612-Add-Mob-lookAt-API.patch
rename to patches/server/0613-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0613-Add-Unix-domain-socket-support.patch b/patches/server/0614-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0613-Add-Unix-domain-socket-support.patch
rename to patches/server/0614-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0614-Add-EntityInsideBlockEvent.patch b/patches/server/0615-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0614-Add-EntityInsideBlockEvent.patch
rename to patches/server/0615-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0615-Attributes-API-for-item-defaults.patch b/patches/server/0616-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0615-Attributes-API-for-item-defaults.patch
rename to patches/server/0616-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0617-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 95%
rename from patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0617-Add-cause-to-Weather-ThunderChangeEvents.patch
index d70a82fb88..dfe89cd593 100644
--- a/patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0617-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 02723e2d34804d911dcf093a3a6fd6af7ce4c14b..746713d742cf6c375353570e86e5e1802e9aec60 100644
+index 6fc54777e15cebaef7e30702f8537a9a337ad2ed..e63cb62affc88d1482f9926ae459986e2d213fb0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -672,8 +672,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -95,10 +95,10 @@ index 626b861ef2f323a5fc50ab5178d3e108e0f9cc25..31c31a9138cb5f6e41de01a6210f84e7
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4176671381862d45eb004c6738ae9663bf8dd1b6..bdf431755aa44869f54f38240e4ec9c3b547eeb7 100644
+index a38eac88ef3099ba92273ed3818ddf742588552c..55f631626bd35b46bd8f95b0a30de8c84d99d984 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1176,7 +1176,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1181,7 +1181,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setStorm(boolean hasStorm) {
@@ -107,7 +107,7 @@ index 4176671381862d45eb004c6738ae9663bf8dd1b6..bdf431755aa44869f54f38240e4ec9c3
          this.setWeatherDuration(0); // Reset weather duration (legacy behaviour)
          this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
      }
-@@ -1198,7 +1198,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1203,7 +1203,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setThundering(boolean thundering) {
diff --git a/patches/server/0617-More-Lidded-Block-API.patch b/patches/server/0618-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0617-More-Lidded-Block-API.patch
rename to patches/server/0618-More-Lidded-Block-API.patch
diff --git a/patches/server/0618-Limit-item-frame-cursors-on-maps.patch b/patches/server/0619-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0618-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0619-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0619-Add-PlayerKickEvent-causes.patch b/patches/server/0620-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0619-Add-PlayerKickEvent-causes.patch
rename to patches/server/0620-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0620-Add-PufferFishStateChangeEvent.patch b/patches/server/0621-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0620-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0621-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0621-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0622-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0621-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0622-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0622-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0623-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 71%
rename from patches/server/0622-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0623-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index d7b094cf7f..21b2143546 100644
--- a/patches/server/0622-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0623-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
@@ -14,11 +14,11 @@ contention situations.
 And this is extremely a low contention situation.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index cd82985b0aa821dccc0484f328407381d58ec81f..a8dc502fffdce89c44ec16cb158b04c30fb1a9cf 100644
+index 5f832a684067f4770ade1f24a29047f0f1fe0860..de91ed0d5f7f472cb2f24a8f6e4ebbdeaa4faf52 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-@@ -31,14 +31,14 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
-     public final IdMap<T> registry;
+@@ -32,14 +32,14 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+     private final T @org.jetbrains.annotations.Nullable [] presetValues; // Paper - Anti-Xray - Add preset values
      private volatile PalettedContainer.Data<T> data;
      private final PalettedContainer.Strategy strategy;
 -    private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer");
@@ -34,17 +34,17 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..a8dc502fffdce89c44ec16cb158b04c3
 +        // this.threadingDetector.checkAndUnlock(); // Paper - disable this
      }
  
-     public static <T> Codec<PalettedContainer<T>> codecRW(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue) {
-@@ -90,7 +90,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+     // Paper start - Anti-Xray - Add preset values
+@@ -129,7 +129,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
      }
  
      @Override
 -    public int onResize(int newBits, T object) {
 +    public synchronized int onResize(int newBits, T object) { // Paper - synchronize
          PalettedContainer.Data<T> data = this.data;
-         PalettedContainer.Data<T> data2 = this.createOrReuseData(data, newBits);
-         data2.copyFrom(data.palette, data.storage);
-@@ -115,7 +115,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+ 
+         // Paper start - Anti-Xray - Add preset values
+@@ -176,7 +176,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
          return this.getAndSet(this.strategy.getIndex(x, y, z), value);
      }
  
@@ -53,7 +53,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..a8dc502fffdce89c44ec16cb158b04c3
          int i = this.data.palette.idFor(value);
          int j = this.data.storage.getAndSet(index, i);
          return this.data.palette.valueFor(j);
-@@ -132,7 +132,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -193,7 +193,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
  
      }
  
@@ -62,7 +62,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..a8dc502fffdce89c44ec16cb158b04c3
          int i = this.data.palette.idFor(value);
          this.data.storage.set(index, i);
      }
-@@ -157,7 +157,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -218,7 +218,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
          });
      }
  
@@ -71,16 +71,16 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..a8dc502fffdce89c44ec16cb158b04c3
          this.acquire();
  
          try {
-@@ -173,7 +173,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
-     }
- 
+@@ -238,7 +238,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
      @Override
--    public void write(FriendlyByteBuf buf) {
-+    public synchronized void write(FriendlyByteBuf buf) { // Paper - synchronize
+     @Deprecated @io.papermc.paper.annotation.DoNotUse public void write(FriendlyByteBuf buf) { this.write(buf, null, 0); }
+     @Override
+-    public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int chunkSectionIndex) {
++    public synchronized void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int chunkSectionIndex) { // Paper - synchronize
          this.acquire();
  
          try {
-@@ -228,7 +228,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -298,7 +298,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
      }
  
      @Override
diff --git a/patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0624-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0624-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0624-Add-BellRevealRaiderEvent.patch b/patches/server/0625-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0624-Add-BellRevealRaiderEvent.patch
rename to patches/server/0625-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0625-Fix-invulnerable-end-crystals.patch b/patches/server/0626-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0625-Fix-invulnerable-end-crystals.patch
rename to patches/server/0626-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0626-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0627-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0626-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0627-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0627-Fix-dangerous-end-portal-logic.patch b/patches/server/0628-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0627-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0628-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0628-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0629-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0628-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0629-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0629-Make-item-validations-configurable.patch b/patches/server/0630-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0629-Make-item-validations-configurable.patch
rename to patches/server/0630-Make-item-validations-configurable.patch
diff --git a/patches/server/0630-Line-Of-Sight-Changes.patch b/patches/server/0631-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0630-Line-Of-Sight-Changes.patch
rename to patches/server/0631-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0631-add-per-world-spawn-limits.patch b/patches/server/0632-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0631-add-per-world-spawn-limits.patch
rename to patches/server/0632-add-per-world-spawn-limits.patch
index 200eebd866..6555137e8e 100644
--- a/patches/server/0631-add-per-world-spawn-limits.patch
+++ b/patches/server/0632-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bdf431755aa44869f54f38240e4ec9c3b547eeb7..200c0125c009ce08b3381814568054b881651b96 100644
+index 55f631626bd35b46bd8f95b0a30de8c84d99d984..7e635571aea53e2ee7c39315c14347955f46dfe8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -213,6 +213,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0632-Fix-potions-splash-events.patch b/patches/server/0633-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0632-Fix-potions-splash-events.patch
rename to patches/server/0633-Fix-potions-splash-events.patch
diff --git a/patches/server/0633-Add-more-LimitedRegion-API.patch b/patches/server/0634-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0633-Add-more-LimitedRegion-API.patch
rename to patches/server/0634-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0634-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0635-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0634-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0635-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0635-Missing-Entity-Behavior-API.patch b/patches/server/0636-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0635-Missing-Entity-Behavior-API.patch
rename to patches/server/0636-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0637-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0636-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0637-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0637-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0638-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0637-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0638-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0638-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0639-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 88%
rename from patches/server/0638-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0639-Use-getChunkIfLoadedImmediately-in-places.patch
index c6622fc571..c5f7bc04c3 100644
--- a/patches/server/0638-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0639-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 746713d742cf6c375353570e86e5e1802e9aec60..712002e1b2effb08daee0e0204000e32b7df5b27 100644
+index e63cb62affc88d1482f9926ae459986e2d213fb0..bc7daf89e30152a3bcb215e91b30c9680be5c343 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,10 +21,10 @@ index 746713d742cf6c375353570e86e5e1802e9aec60..712002e1b2effb08daee0e0204000e32
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b953fa1bec2bd017b97a8a8b966fa79086036fa3..bce4aa1d7cb7ebeb046ed9f2483d71820c3f0bae 100644
+index 640ab1cf00ddc24a704b7f555396d18b29959a87..e35e25aea3d5f0f9e033a112545a398b636d638a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -200,6 +200,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -201,6 +201,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return (CraftServer) Bukkit.getServer();
      }
  
@@ -37,7 +37,7 @@ index b953fa1bec2bd017b97a8a8b966fa79086036fa3..bce4aa1d7cb7ebeb046ed9f2483d7182
 +
      public abstract ResourceKey<LevelStem> getTypeKey();
  
-     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator) { // Paper
+     protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
 diff --git a/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java b/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java
 index e9ead1e49f9043430e316c36ade83b70cf850e47..f2d10d58617644a589ecec3e17358c1277795e5d 100644
 --- a/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java
diff --git a/patches/server/0639-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0640-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0639-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0640-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0640-Adds-PlayerArmSwingEvent.patch b/patches/server/0641-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0640-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0641-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0642-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0641-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0642-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0643-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0643-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0643-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0644-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0643-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0644-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0644-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0645-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0644-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0645-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0645-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0646-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0645-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0646-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0646-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0647-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0646-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0647-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0647-Stinger-API.patch b/patches/server/0648-Stinger-API.patch
similarity index 100%
rename from patches/server/0647-Stinger-API.patch
rename to patches/server/0648-Stinger-API.patch
diff --git a/patches/server/0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0649-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0649-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0649-Add-System.out-err-catcher.patch b/patches/server/0650-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0649-Add-System.out-err-catcher.patch
rename to patches/server/0650-Add-System.out-err-catcher.patch
index 25c3a6e84c..f0508a65a3 100644
--- a/patches/server/0649-Add-System.out-err-catcher.patch
+++ b/patches/server/0650-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d770a490fb371e4a9d45800f2077d75a62e49b33..9558aa3cbca5ec5fb7ee0c0e107924b5f4da7ffd 100644
+index 4e683d5d8afcdab9cfa85c657bb76a0022912d9b..6a56751dc98a8760e68a486442e30006cf4a4637 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -300,6 +300,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0650-Fix-test-not-bootstrapping.patch b/patches/server/0651-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0650-Fix-test-not-bootstrapping.patch
rename to patches/server/0651-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0652-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0652-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0652-Improve-boat-collision-performance.patch b/patches/server/0653-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0652-Improve-boat-collision-performance.patch
rename to patches/server/0653-Improve-boat-collision-performance.patch
diff --git a/patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0654-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0654-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0654-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0655-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0654-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0655-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0655-Add-PlayerSetSpawnEvent.patch b/patches/server/0656-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0655-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0656-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0656-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0657-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0656-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0657-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0657-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0658-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0657-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0658-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0658-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0659-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0658-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0659-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0659-Added-EntityDamageItemEvent.patch b/patches/server/0660-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0659-Added-EntityDamageItemEvent.patch
rename to patches/server/0660-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0660-Optimize-indirect-passenger-iteration.patch b/patches/server/0661-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0660-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0661-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0661-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0662-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0661-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0662-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0662-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0663-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0662-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0663-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0663-Clear-bucket-NBT-after-dispense.patch b/patches/server/0664-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0663-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0664-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0664-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0665-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0664-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0665-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0665-Add-BlockBreakBlockEvent.patch b/patches/server/0666-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0665-Add-BlockBreakBlockEvent.patch
rename to patches/server/0666-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0667-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0667-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0667-More-CommandBlock-API.patch b/patches/server/0668-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0667-More-CommandBlock-API.patch
rename to patches/server/0668-More-CommandBlock-API.patch
diff --git a/patches/server/0668-Add-missing-team-sidebar-display-slots.patch b/patches/server/0669-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0668-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0669-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0669-Add-back-EntityPortalExitEvent.patch b/patches/server/0670-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0669-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0670-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0671-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 91%
rename from patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0671-Add-methods-to-find-targets-for-lightning-strikes.patch
index a32e1cf46f..64c6192aa1 100644
--- a/patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0671-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 712002e1b2effb08daee0e0204000e32b7df5b27..0f0c19fcf7eb273adcee9bf181d0ad1ad06037f0 100644
+index bc7daf89e30152a3bcb215e91b30c9680be5c343..e809a959d69197ecdec768a2d4f348c73c0d5b9a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -974,6 +974,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -31,10 +31,10 @@ index 712002e1b2effb08daee0e0204000e32b7df5b27..0f0c19fcf7eb273adcee9bf181d0ad1a
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 200c0125c009ce08b3381814568054b881651b96..470f4f64dc5628de463e5da5083a5fbc6f2166f0 100644
+index 7e635571aea53e2ee7c39315c14347955f46dfe8..a37fd8fcc1924f99f1d4a97b36a04946d06f9347 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -688,6 +688,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -693,6 +693,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (LightningStrike) lightning.getBukkitEntity();
      }
  
diff --git a/patches/server/0671-Get-entity-default-attributes.patch b/patches/server/0672-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0671-Get-entity-default-attributes.patch
rename to patches/server/0672-Get-entity-default-attributes.patch
diff --git a/patches/server/0672-Left-handed-API.patch b/patches/server/0673-Left-handed-API.patch
similarity index 100%
rename from patches/server/0672-Left-handed-API.patch
rename to patches/server/0673-Left-handed-API.patch
diff --git a/patches/server/0673-Add-more-advancement-API.patch b/patches/server/0674-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0673-Add-more-advancement-API.patch
rename to patches/server/0674-Add-more-advancement-API.patch
diff --git a/patches/server/0674-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0675-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0674-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0675-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0675-Add-critical-damage-API.patch b/patches/server/0676-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0675-Add-critical-damage-API.patch
rename to patches/server/0676-Add-critical-damage-API.patch
diff --git a/patches/server/0676-Fix-issues-with-mob-conversion.patch b/patches/server/0677-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0676-Fix-issues-with-mob-conversion.patch
rename to patches/server/0677-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0677-Add-isCollidable-methods-to-various-places.patch b/patches/server/0678-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0677-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0678-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0678-Goat-ram-API.patch b/patches/server/0679-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0678-Goat-ram-API.patch
rename to patches/server/0679-Goat-ram-API.patch
diff --git a/patches/server/0679-Add-API-for-resetting-a-single-score.patch b/patches/server/0680-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0679-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0680-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0680-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0681-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0680-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0681-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0681-Vanilla-command-permission-fixes.patch b/patches/server/0682-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0681-Vanilla-command-permission-fixes.patch
rename to patches/server/0682-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0683-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0683-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index e91f310b7f..0323f3318d 100644
--- a/patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0683-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0f0c19fcf7eb273adcee9bf181d0ad1ad06037f0..e8dd1f2c354d2031076b7c96bfcc5bec9249fb67 100644
+index e809a959d69197ecdec768a2d4f348c73c0d5b9a..0f6d4f80677c54a94a1bbfb861a3bcce17b83489 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1553,9 +1553,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0683-Fix-GameProfileCache-concurrency.patch b/patches/server/0684-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0683-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0684-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0684-Improve-and-expand-AsyncCatcher.patch b/patches/server/0685-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0684-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0685-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0686-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 98%
rename from patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0686-Add-paper-mobcaps-and-paper-playermobcaps.patch
index f26260d5cb..814d6c5557 100644
--- a/patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0686-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -278,7 +278,7 @@ index a3461824fd2162d509facf6f64c5008e3f0fd42b..d4f99f4592a86e2d8344bc2c44711fef
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9558aa3cbca5ec5fb7ee0c0e107924b5f4da7ffd..ecd6d91ca1ddee0d0d3b6d41fb96f432273deffc 100644
+index 6a56751dc98a8760e68a486442e30006cf4a4637..395ca8b6ad62fc3c4c4bed0715bb8570683d755a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2182,6 +2182,11 @@ public final class CraftServer implements Server {
@@ -294,10 +294,10 @@ index 9558aa3cbca5ec5fb7ee0c0e107924b5f4da7ffd..ecd6d91ca1ddee0d0d3b6d41fb96f432
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 470f4f64dc5628de463e5da5083a5fbc6f2166f0..34f15449a72b59ba7c466d2ba5aa46d49fbd8b63 100644
+index a37fd8fcc1924f99f1d4a97b36a04946d06f9347..84f55724f38cd7bbe1971e9fbd7bfbfe86cd4c00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1693,9 +1693,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1698,9 +1698,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Validate.notNull(spawnCategory, "SpawnCategory cannot be null");
          Validate.isTrue(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory." + spawnCategory + " are not supported.");
  
diff --git a/patches/server/0686-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0687-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0686-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0687-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0687-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0688-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0687-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0688-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0688-Optimise-general-POI-access.patch b/patches/server/0689-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0688-Optimise-general-POI-access.patch
rename to patches/server/0689-Optimise-general-POI-access.patch
diff --git a/patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0690-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 99%
rename from patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0690-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 39a597aec3..fe1cc645eb 100644
--- a/patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0690-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -42,7 +42,7 @@ index c5389e7f3665c06e487dfde3200b7e229694fbd2..4164204ba80f68a768de0ed1721c6447
      private final com.destroystokyo.paper.util.maplist.ReferenceList<ServerPlayer> playersSentChunkTo = new com.destroystokyo.paper.util.maplist.ReferenceList<>();
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 897205c326f9c8d37e0320c59e09dcc40fa38711..13df88938d9fe7471806d6a7ba7c00143d89b411 100644
+index 93dea79180ebaef3ffb6abffd47f0026a91406cd..4e65e1d2d1538366f554d94bff31ab74c2e8a225 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -174,12 +174,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0690-Optimise-chunk-tick-iteration.patch b/patches/server/0691-Optimise-chunk-tick-iteration.patch
similarity index 99%
rename from patches/server/0690-Optimise-chunk-tick-iteration.patch
rename to patches/server/0691-Optimise-chunk-tick-iteration.patch
index ca66148b12..701231d24f 100644
--- a/patches/server/0690-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0691-Optimise-chunk-tick-iteration.patch
@@ -72,7 +72,7 @@ index 4164204ba80f68a768de0ed1721c6447b972a631..4ae1ba645d9fdc1eb6d5a3e4f8ceed9b
              List list;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 13df88938d9fe7471806d6a7ba7c00143d89b411..d9ef2a44e2e9f1ce32589638fad3d305dadb4cce 100644
+index 4e65e1d2d1538366f554d94bff31ab74c2e8a225..ee298a136d95a2759ee77ffc11cf6e43cc54c1bb 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -115,6 +115,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
diff --git a/patches/server/0691-Execute-chunk-tasks-mid-tick.patch b/patches/server/0692-Execute-chunk-tasks-mid-tick.patch
similarity index 96%
rename from patches/server/0691-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0692-Execute-chunk-tasks-mid-tick.patch
index d7150b35c6..edd4022302 100644
--- a/patches/server/0691-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0692-Execute-chunk-tasks-mid-tick.patch
@@ -127,7 +127,7 @@ index 828de28f2777e2477a9c6545c8af96c4ca4e352b..2a31265ac49b7a6e32105530d00952ee
                  }
                  // Paper start - optimise chunk tick iteration
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e8dd1f2c354d2031076b7c96bfcc5bec9249fb67..0b12c1f2fab60f5832ff6a968d3a4545f42042fc 100644
+index 0f6d4f80677c54a94a1bbfb861a3bcce17b83489..1d0f87185a8a74394bc2da29828407fd4210754c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -155,10 +155,10 @@ index e8dd1f2c354d2031076b7c96bfcc5bec9249fb67..0b12c1f2fab60f5832ff6a968d3a4545
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index bce4aa1d7cb7ebeb046ed9f2483d71820c3f0bae..873a375946949a8f48109d5da925933f3956600b 100644
+index e35e25aea3d5f0f9e033a112545a398b636d638a..577262c3e040188f1f25dad26cfa0a5a40712bb7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -822,6 +822,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -825,6 +825,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // Spigot end
              } else if (this.shouldTickBlocksAt(tickingblockentity.getPos())) {
                  tickingblockentity.tick();
@@ -170,7 +170,7 @@ index bce4aa1d7cb7ebeb046ed9f2483d71820c3f0bae..873a375946949a8f48109d5da925933f
              }
          }
          this.blockEntityTickers.removeAll(toRemove);
-@@ -836,6 +841,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -839,6 +844,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
          try {
              tickConsumer.accept(entity);
diff --git a/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 99%
rename from patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index b6a78c51a9..293669046c 100644
--- a/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
@@ -10,7 +10,7 @@ hoping that at least then we don't swap chunks, and maybe recover
 them all.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 40372e47f33d2e6ff164a00d964e8d965f1fd323..ebcc7ece0654abd368fc759029f87a7cec9ed036 100644
+index fce679e2b72d2ce1c8e75710041937c2c0566044..9c6a2884c34a9f6e775103da42480cd6b8c693b3 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -70,6 +70,18 @@ import net.minecraft.world.ticks.ProtoChunkTicks;
@@ -30,9 +30,9 @@ index 40372e47f33d2e6ff164a00d964e8d965f1fd323..ebcc7ece0654abd368fc759029f87a7c
 +    }
 +    // Paper end
  
-     public static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
+     public static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState(), null); // Paper - Anti-Xray - Add preset block states
      private static final Logger LOGGER = LogUtils.getLogger();
-@@ -446,7 +458,7 @@ public class ChunkSerializer {
+@@ -450,7 +462,7 @@ public class ChunkSerializer {
          nbttagcompound.putInt("xPos", chunkcoordintpair.x);
          nbttagcompound.putInt("yPos", chunk.getMinSection());
          nbttagcompound.putInt("zPos", chunkcoordintpair.z);
diff --git a/patches/server/0693-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0694-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0693-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0694-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0695-Detail-more-information-in-watchdog-dumps.patch
similarity index 99%
rename from patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0695-Detail-more-information-in-watchdog-dumps.patch
index 8ddf40397d..d4e6413e24 100644
--- a/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0695-Detail-more-information-in-watchdog-dumps.patch
@@ -76,7 +76,7 @@ index 4a1148a76020089caf01f888f87afdbb35788dc0..52a84eeb3b7df782cbf91aac6df42fb8
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0b12c1f2fab60f5832ff6a968d3a4545f42042fc..25ffcafd27b0119301faf81817e3072cd6fd8de6 100644
+index 1d0f87185a8a74394bc2da29828407fd4210754c..d6429d721116aac2a4df8d0b217e9efcb698094e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1200,7 +1200,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0695-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0696-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0695-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0696-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0696-Distance-manager-tick-timings.patch b/patches/server/0697-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0696-Distance-manager-tick-timings.patch
rename to patches/server/0697-Distance-manager-tick-timings.patch
diff --git a/patches/server/0697-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0698-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0697-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0698-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0698-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0699-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 90%
rename from patches/server/0698-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0699-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index c5fe64993f..336cbb88f7 100644
--- a/patches/server/0698-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0699-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -13,10 +13,10 @@ Paper recently reverted this optimisation, so it's been reintroduced
 here.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 873a375946949a8f48109d5da925933f3956600b..2ed14a26084150fc67b031a7ab6b76fd8f0b075a 100644
+index 577262c3e040188f1f25dad26cfa0a5a40712bb7..f04f216f052095710d7ef13743489991380d6a62 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -369,6 +369,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -371,6 +371,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public final LevelChunk getChunk(int chunkX, int chunkZ) { // Paper - final to help inline
diff --git a/patches/server/0699-Add-packet-limiter-config.patch b/patches/server/0700-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0699-Add-packet-limiter-config.patch
rename to patches/server/0700-Add-packet-limiter-config.patch
diff --git a/patches/server/0700-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0701-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0700-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0701-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0701-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0702-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0701-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0702-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0702-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0703-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0702-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0703-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0703-Time-scoreboard-search.patch b/patches/server/0704-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0703-Time-scoreboard-search.patch
rename to patches/server/0704-Time-scoreboard-search.patch
diff --git a/patches/server/0704-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0705-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0704-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0705-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0705-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0706-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0705-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0706-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0706-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0707-Oprimise-map-impl-for-tracked-players.patch
similarity index 87%
rename from patches/server/0706-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0707-Oprimise-map-impl-for-tracked-players.patch
index 6893327e50..6d88849131 100644
--- a/patches/server/0706-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0707-Oprimise-map-impl-for-tracked-players.patch
@@ -7,10 +7,10 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d9ef2a44e2e9f1ce32589638fad3d305dadb4cce..6b8a318d9793b290798d44acdcd0d93687c8747d 100644
+index ee298a136d95a2759ee77ffc11cf6e43cc54c1bb..d83a4405b68d2417de345849b936d43c17e11392 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1400,7 +1400,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1405,7 +1405,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          final Entity entity;
          private final int range;
          SectionPos lastSectionPos;
diff --git a/patches/server/0707-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0708-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0707-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0708-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0708-Optimise-random-block-ticking.patch b/patches/server/0709-Optimise-random-block-ticking.patch
similarity index 96%
rename from patches/server/0708-Optimise-random-block-ticking.patch
rename to patches/server/0709-Optimise-random-block-ticking.patch
index effe884c6f..4157e93a2c 100644
--- a/patches/server/0708-Optimise-random-block-ticking.patch
+++ b/patches/server/0709-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 25ffcafd27b0119301faf81817e3072cd6fd8de6..f1ae9c3b3db3a7540650365b1c8a9b8274b25644 100644
+index d6429d721116aac2a4df8d0b217e9efcb698094e..fb9cf86250939fbc9cf1bfb90f6a1a7f4a489460 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -845,6 +845,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -317,10 +317,10 @@ index 99fc97051c61ac8d08afdc0ea4845e96705e243b..c48bf4ca76f70d878378fc43c8270de5
  
      public BlockPos getHomePos() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2ed14a26084150fc67b031a7ab6b76fd8f0b075a..4847b6358e823bd53ecfaf7d82ed9e36d45b1233 100644
+index f04f216f052095710d7ef13743489991380d6a62..69886eb8bf9769aa8f2942ad68aeadbb4e86c223 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1293,10 +1293,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1296,10 +1296,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public abstract RecipeManager getRecipeManager();
  
      public BlockPos getBlockRandomPos(int x, int y, int z, int l) {
@@ -341,7 +341,7 @@ index 2ed14a26084150fc67b031a7ab6b76fd8f0b075a..4847b6358e823bd53ecfaf7d82ed9e36
  
      public boolean noSave() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf41a7168f8 100644
+index b8fee4f8a0cfe32b9ef7f3f3cf818cbaec0d3fca..12edaf88cca54540c617239ac31b2263dfa0ecd7 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 @@ -25,6 +25,7 @@ public class LevelChunkSection {
@@ -352,7 +352,7 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4
  
      public LevelChunkSection(PalettedContainer<BlockState> datapaletteblock, PalettedContainer<Holder<Biome>> palettedcontainerro) {
          // CraftBukkit end
-@@ -74,6 +75,9 @@ public class LevelChunkSection {
+@@ -77,6 +78,9 @@ public class LevelChunkSection {
              --this.nonEmptyBlockCount;
              if (iblockdata1.isRandomlyTicking()) {
                  --this.tickingBlockCount;
@@ -362,7 +362,7 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4
              }
          }
  
-@@ -85,6 +89,9 @@ public class LevelChunkSection {
+@@ -88,6 +92,9 @@ public class LevelChunkSection {
              ++this.nonEmptyBlockCount;
              if (state.isRandomlyTicking()) {
                  ++this.tickingBlockCount;
@@ -372,7 +372,7 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4
              }
          }
  
-@@ -112,40 +119,31 @@ public class LevelChunkSection {
+@@ -115,40 +122,31 @@ public class LevelChunkSection {
      }
  
      public void recalcBlockCounts() {
@@ -421,9 +421,9 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4
 -
              }
 -        }
--
--        a a0 = new a();
  
+-        a a0 = new a();
+-
 -        this.states.count(a0);
 -        this.nonEmptyBlockCount = (short) a0.nonEmptyBlockCount;
 -        this.tickingBlockCount = (short) a0.tickingBlockCount;
@@ -434,10 +434,10 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4
  
      public PalettedContainer<BlockState> getStates() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index a8dc502fffdce89c44ec16cb158b04c30fb1a9cf..f4658eea741bed1c80f8aca7dc365b897b698cd4 100644
+index de91ed0d5f7f472cb2f24a8f6e4ebbdeaa4faf52..7f5547dc31aa53b2863f4c09f598fa88e7fe2afd 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-@@ -315,6 +315,14 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -385,6 +385,14 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
          }
      }
  
diff --git a/patches/server/0709-Optimise-non-flush-packet-sending.patch b/patches/server/0710-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0709-Optimise-non-flush-packet-sending.patch
rename to patches/server/0710-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0710-Optimise-nearby-player-lookups.patch b/patches/server/0711-Optimise-nearby-player-lookups.patch
similarity index 98%
rename from patches/server/0710-Optimise-nearby-player-lookups.patch
rename to patches/server/0711-Optimise-nearby-player-lookups.patch
index 3d2f9b527d..43c9989b3d 100644
--- a/patches/server/0710-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0711-Optimise-nearby-player-lookups.patch
@@ -39,7 +39,7 @@ index 4ae1ba645d9fdc1eb6d5a3e4f8ceed9b4841e003..e2202389a2c4133a183cca59c4e909fc
      // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 6b8a318d9793b290798d44acdcd0d93687c8747d..f0347600b2f07105ce4802273b0cfe8631ee8876 100644
+index d83a4405b68d2417de345849b936d43c17e11392..9209b598d7168b82574e4800056b8b9f84265dd0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -157,6 +157,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -104,7 +104,7 @@ index 6b8a318d9793b290798d44acdcd0d93687c8747d..f0347600b2f07105ce4802273b0cfe86
  
      protected ChunkGenerator generator() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f1ae9c3b3db3a7540650365b1c8a9b8274b25644..ac3d978b81f0f238ace9724f817c25cbdd866e83 100644
+index fb9cf86250939fbc9cf1bfb90f6a1a7f4a489460..84ef33f700d3205d934802dceb4a2279df00adb0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -562,6 +562,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -226,10 +226,10 @@ index b6e48531a2a1316eef786e0476574eb1c3c29a9e..e2a25c29ec74147b3e66aa0b3deb85a8
              if (entityhuman != null) {
                  double d0 = entityhuman.distanceToSqr((Entity) this);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4847b6358e823bd53ecfaf7d82ed9e36d45b1233..799d31874be8a7498e71e7e01f84aa81a7f1eed4 100644
+index 69886eb8bf9769aa8f2942ad68aeadbb4e86c223..5778dd4bdcf116d7932cebcd261c5f624edd5874 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -206,6 +206,69 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -207,6 +207,69 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return this.getChunkIfLoaded(chunkX, chunkZ) != null;
      }
      // Paper end
@@ -322,7 +322,7 @@ index d4f99f4592a86e2d8344bc2c44711fef1543acdf..089dd93d4cd4c1f72e63c4944b3b82c1
  
      private static Boolean isValidSpawnPostitionForType(ServerLevel world, MobCategory group, StructureManager structureAccessor, ChunkGenerator chunkGenerator, MobSpawnSettings.SpawnerData spawnEntry, BlockPos.MutableBlockPos pos, double squaredDistance) { // Paper
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index b90697fbf292f73fc661c46edcc71c1bbce99d94..17398a48ff84ba1b21bd64f7857e3a326fcc54cf 100644
+index 4d052f4cde791100f04b822899f0f436feaa23ea..4ff0d2fc9fd76e92e64abd69f2c9e299aa08ac32 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -221,6 +221,98 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0711-Remove-streams-for-villager-AI.patch b/patches/server/0712-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0711-Remove-streams-for-villager-AI.patch
rename to patches/server/0712-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0712-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0713-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0712-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0713-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0713-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0714-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0713-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0714-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0714-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0715-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0714-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0715-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0715-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0716-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 94%
rename from patches/server/0715-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0716-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 78c7bc6940..175e6eef47 100644
--- a/patches/server/0715-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0716-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ac3d978b81f0f238ace9724f817c25cbdd866e83..e03810a2c4dea09f52236e7d25877cd803ed764f 100644
+index 84ef33f700d3205d934802dceb4a2279df00adb0..b00c1df57789996fef58b2c649588c13df149abd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2737,6 +2737,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0716-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0717-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0716-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0717-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0718-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0717-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0718-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0718-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0719-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0718-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0719-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0719-Ensure-valid-vehicle-status.patch b/patches/server/0720-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0719-Ensure-valid-vehicle-status.patch
rename to patches/server/0720-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0720-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0721-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0720-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0721-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0721-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0722-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0721-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0722-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0722-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0723-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0722-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0723-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0723-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0724-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0723-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0724-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0724-Preserve-overstacked-loot.patch b/patches/server/0725-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0724-Preserve-overstacked-loot.patch
rename to patches/server/0725-Preserve-overstacked-loot.patch
diff --git a/patches/server/0725-Update-head-rotation-in-missing-places.patch b/patches/server/0726-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0725-Update-head-rotation-in-missing-places.patch
rename to patches/server/0726-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0726-prevent-unintended-light-block-manipulation.patch b/patches/server/0727-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0726-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0727-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0727-Fix-CraftCriteria-defaults-map.patch b/patches/server/0728-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0727-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0728-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0728-Fix-upstreams-block-state-factories.patch b/patches/server/0729-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0728-Fix-upstreams-block-state-factories.patch
rename to patches/server/0729-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0729-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0730-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0729-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0730-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0730-Configurable-feature-seeds.patch b/patches/server/0731-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0730-Configurable-feature-seeds.patch
rename to patches/server/0731-Configurable-feature-seeds.patch
diff --git a/patches/server/0731-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0732-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0731-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0732-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0732-Add-root-admin-user-detection.patch b/patches/server/0733-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0732-Add-root-admin-user-detection.patch
rename to patches/server/0733-Add-root-admin-user-detection.patch
diff --git a/patches/server/0733-Always-allow-item-changing-in-Fireball.patch b/patches/server/0734-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0733-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0734-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0735-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0735-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0735-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0736-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0735-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0736-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0736-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0737-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0736-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0737-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0737-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0738-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0737-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0738-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0738-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0739-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0738-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0739-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0740-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0739-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0740-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0740-Fix-Spigot-growth-modifiers.patch b/patches/server/0741-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0740-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0741-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0741-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0742-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0741-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0742-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0742-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0743-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0742-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0743-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0743-Add-player-health-update-API.patch b/patches/server/0744-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0743-Add-player-health-update-API.patch
rename to patches/server/0744-Add-player-health-update-API.patch
diff --git a/patches/server/0744-Optimize-HashMapPalette.patch b/patches/server/0745-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0744-Optimize-HashMapPalette.patch
rename to patches/server/0745-Optimize-HashMapPalette.patch
diff --git a/patches/server/0745-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0746-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 95%
rename from patches/server/0745-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0746-Allow-delegation-to-vanilla-chunk-gen.patch
index b647b5da08..a872c107fd 100644
--- a/patches/server/0745-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0746-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ecd6d91ca1ddee0d0d3b6d41fb96f432273deffc..a03785664a9d1806f3e3e2b53c10a941935ae9d9 100644
+index 395ca8b6ad62fc3c4c4bed0715bb8570683d755a..3f5a8f259f8afb42760602c8bac18e92b8299092 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2354,6 +2354,88 @@ public final class CraftServer implements Server {
-         return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME));
+         return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME), world); // Paper - Anti-Xray - Add parameters
      }
  
 +    // Paper start
@@ -98,7 +98,7 @@ index ecd6d91ca1ddee0d0d3b6d41fb96f432273deffc..a03785664a9d1806f3e3e2b53c10a941
      public BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag... flags) {
          return new CraftBossBar(title, color, style, flags);
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
-index c23ce88cb9693291fec81a99e3a5bcb2615bb897..189a584b4b81bbc28d4c47b901b5aa6f85fb7932 100644
+index a9700b750f124b5367c91ac071ee5194e9f7f8d8..1a363ceeefbf69618e5f17f67b6f6a2660579ba5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java
 @@ -23,7 +23,7 @@ import org.bukkit.material.MaterialData;
@@ -110,7 +110,7 @@ index c23ce88cb9693291fec81a99e3a5bcb2615bb897..189a584b4b81bbc28d4c47b901b5aa6f
      private final Registry<net.minecraft.world.level.biome.Biome> biomes;
      private Set<BlockPos> tiles;
      private final Set<BlockPos> lights = new HashSet<>();
-@@ -189,7 +189,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
+@@ -194,7 +194,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
          return this.tiles;
      }
  
diff --git a/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0747-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0747-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 2f8bc394c4..b26948317b 100644
--- a/patches/server/0746-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0747-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1547,11 +1547,11 @@ index a9e8d9c65a809562d4768df348dcd79bec4d0e3c..27680befd64967ef3c2ae0f35c9e7bd6
  
          public Block getBlock() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index 5d53b09e19b664fad337ea5098bf9cf41a7168f8..f150a16fbf888455301d8b9043f0b45fb1fa1d84 100644
+index 12edaf88cca54540c617239ac31b2263dfa0ecd7..7a57a75db00cd64e4c95740b575277a1f355e414 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -39,6 +39,110 @@ public class LevelChunkSection {
-         this.biomes = new PalettedContainer<>(biomeRegistry.asHolderIdMap(), biomeRegistry.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
+@@ -42,6 +42,110 @@ public class LevelChunkSection {
+         this.biomes = new PalettedContainer<>(biomeRegistry.asHolderIdMap(), biomeRegistry.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES, null); // Paper - Anti-Xray - Add preset biomes
      }
  
 +    // Paper start
@@ -1661,7 +1661,7 @@ index 5d53b09e19b664fad337ea5098bf9cf41a7168f8..f150a16fbf888455301d8b9043f0b45f
      public BlockState getBlockState(int x, int y, int z) {
          return (BlockState) this.states.get(x, y, z);
      }
-@@ -59,8 +163,8 @@ public class LevelChunkSection {
+@@ -62,8 +166,8 @@ public class LevelChunkSection {
          return this.setBlockState(x, y, z, state, true);
      }
  
@@ -1672,7 +1672,7 @@ index 5d53b09e19b664fad337ea5098bf9cf41a7168f8..f150a16fbf888455301d8b9043f0b45f
  
          if (lock) {
              iblockdata1 = (BlockState) this.states.getAndSet(x, y, z, state);
-@@ -99,6 +203,7 @@ public class LevelChunkSection {
+@@ -102,6 +206,7 @@ public class LevelChunkSection {
              ++this.tickingFluidCount;
          }
  
@@ -1680,7 +1680,7 @@ index 5d53b09e19b664fad337ea5098bf9cf41a7168f8..f150a16fbf888455301d8b9043f0b45f
          return iblockdata1;
      }
  
-@@ -144,6 +249,7 @@ public class LevelChunkSection {
+@@ -147,6 +252,7 @@ public class LevelChunkSection {
  
          });
          // Paper end
diff --git a/patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0748-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0747-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0748-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0748-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0749-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 96%
rename from patches/server/0748-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0749-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index c0e3e643ee..78d359b1d9 100644
--- a/patches/server/0748-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0749-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix ChunkSnapshot#isSectionEmpty(int) and optimize
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index b738e1f7debac7d70910d5ac908ca9d4f60640d5..007fd353bd55056ecddba2e16c5fa8c479961402 100644
+index 269ebe8e8826a0c89e471cb59b503900d7ebe0fa..883eed6e92792e225ebfa8667ce3f4eeb6287d6a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -289,13 +289,17 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0749-Add-more-Campfire-API.patch b/patches/server/0750-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0749-Add-more-Campfire-API.patch
rename to patches/server/0750-Add-more-Campfire-API.patch
diff --git a/patches/server/0750-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0751-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0750-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0751-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0751-Fix-tripwire-state-inconsistency.patch b/patches/server/0752-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0751-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0752-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0752-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0753-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0752-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0753-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0753-Improve-scoreboard-entries.patch b/patches/server/0754-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0753-Improve-scoreboard-entries.patch
rename to patches/server/0754-Improve-scoreboard-entries.patch
diff --git a/patches/server/0754-Entity-powdered-snow-API.patch b/patches/server/0755-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0754-Entity-powdered-snow-API.patch
rename to patches/server/0755-Entity-powdered-snow-API.patch
diff --git a/patches/server/0755-Add-API-for-item-entity-health.patch b/patches/server/0756-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0755-Add-API-for-item-entity-health.patch
rename to patches/server/0756-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0756-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0757-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0756-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0757-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0757-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0758-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0757-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0758-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0758-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0759-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0758-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0759-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0759-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0760-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0759-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0760-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0760-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0761-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0760-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0761-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0761-Fix-bees-aging-inside-hives.patch b/patches/server/0762-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0761-Fix-bees-aging-inside-hives.patch
rename to patches/server/0762-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0762-Bucketable-API.patch b/patches/server/0763-Bucketable-API.patch
similarity index 100%
rename from patches/server/0762-Bucketable-API.patch
rename to patches/server/0763-Bucketable-API.patch
diff --git a/patches/server/0763-Validate-usernames.patch b/patches/server/0764-Validate-usernames.patch
similarity index 100%
rename from patches/server/0763-Validate-usernames.patch
rename to patches/server/0764-Validate-usernames.patch
diff --git a/patches/server/0764-Make-water-animal-spawn-height-configurable.patch b/patches/server/0765-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0764-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0765-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0765-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0766-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 97%
rename from patches/server/0765-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0766-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 282c371902..c5a9ac0e03 100644
--- a/patches/server/0765-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0766-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -18,7 +18,7 @@ index d8fa1cb0b340f97debceb7e5b90051d29448fc58..d55c798657bf8922f3d43d84620cfeed
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a03785664a9d1806f3e3e2b53c10a941935ae9d9..52bbb31803b4ebd0d7dec0de50c4de3b0b808be1 100644
+index 3f5a8f259f8afb42760602c8bac18e92b8299092..357990dc0259f03a9deb8c8df613ab8949a239b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1236,7 +1236,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index a03785664a9d1806f3e3e2b53c10a941935ae9d9..52bbb31803b4ebd0d7dec0de50c4de3b
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 34f15449a72b59ba7c466d2ba5aa46d49fbd8b63..d0f52da906d976fd7a6ddb5894bb4a33106d2b2c 100644
+index 84f55724f38cd7bbe1971e9fbd7bfbfe86cd4c00..70e149700237fb960741a1a32e72a8007909544d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -203,6 +203,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0766-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0767-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0766-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0767-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0767-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0768-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0767-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0768-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0768-Multiple-Entries-with-Scoreboards.patch b/patches/server/0769-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0768-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0769-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0769-Reset-placed-block-on-exception.patch b/patches/server/0770-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0769-Reset-placed-block-on-exception.patch
rename to patches/server/0770-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0770-Add-configurable-height-for-slime-spawn.patch b/patches/server/0771-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0770-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0771-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0771-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0772-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0771-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0772-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0772-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0773-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0772-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0773-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0773-Kick-on-main-for-illegal-chat.patch b/patches/server/0774-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0773-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0774-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0774-Multi-Block-Change-API-Implementation.patch b/patches/server/0775-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0774-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0775-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0775-Fix-NotePlayEvent.patch b/patches/server/0776-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0775-Fix-NotePlayEvent.patch
rename to patches/server/0776-Fix-NotePlayEvent.patch
diff --git a/patches/server/0776-Freeze-Tick-Lock-API.patch b/patches/server/0777-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0776-Freeze-Tick-Lock-API.patch
rename to patches/server/0777-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0777-Dolphin-API.patch b/patches/server/0778-Dolphin-API.patch
similarity index 100%
rename from patches/server/0777-Dolphin-API.patch
rename to patches/server/0778-Dolphin-API.patch
diff --git a/patches/server/0778-More-PotionEffectType-API.patch b/patches/server/0779-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0778-More-PotionEffectType-API.patch
rename to patches/server/0779-More-PotionEffectType-API.patch
diff --git a/patches/server/0779-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0780-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0779-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0780-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0780-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0781-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0780-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0781-API-for-creating-command-sender-which-forwards-feedb.patch
index eb05717a37..c2777a1918 100644
--- a/patches/server/0780-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0781-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 52bbb31803b4ebd0d7dec0de50c4de3b0b808be1..1d6c2724571803a9f1dc77d145dd5355d36444b8 100644
+index 357990dc0259f03a9deb8c8df613ab8949a239b9..5c64c95289b466026722a318e818da23da56086a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2016,6 +2016,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0781-Add-missing-structure-set-seed-configs.patch b/patches/server/0782-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0781-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0782-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0782-Implement-regenerateChunk.patch b/patches/server/0783-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0782-Implement-regenerateChunk.patch
rename to patches/server/0783-Implement-regenerateChunk.patch
index f3a90bb636..98e8a8ddd5 100644
--- a/patches/server/0782-Implement-regenerateChunk.patch
+++ b/patches/server/0783-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d0f52da906d976fd7a6ddb5894bb4a33106d2b2c..24dd33aede00f016ecf810d23d87e47025c5c1b5 100644
+index 70e149700237fb960741a1a32e72a8007909544d..2b0ed0b70b01e1efd315ec13492a53ec728a9fec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -142,6 +142,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/server/0783-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0784-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0783-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0784-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0784-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0785-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 91%
rename from patches/server/0784-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0785-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 63d2f386cb..b3024ef399 100644
--- a/patches/server/0784-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0785-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1d6c2724571803a9f1dc77d145dd5355d36444b8..7a4b42cb1a24a281ddb7d5f92ed8c104d392e318 100644
+index 5c64c95289b466026722a318e818da23da56086a..2ef63197ab4bbad14e90139528879f8caef45372 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2190,6 +2190,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0785-Add-GameEvent-tags.patch b/patches/server/0786-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0785-Add-GameEvent-tags.patch
rename to patches/server/0786-Add-GameEvent-tags.patch
index 2a62d03327..091acd03cf 100644
--- a/patches/server/0785-Add-GameEvent-tags.patch
+++ b/patches/server/0786-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7a4b42cb1a24a281ddb7d5f92ed8c104d392e318..0b88024287076448db40adc58f9b47091eb9f7fe 100644
+index 2ef63197ab4bbad14e90139528879f8caef45372..9d319df303599ba44773526902d3314430031689 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2598,6 +2598,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0786-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0787-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0786-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0787-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0787-Furnace-RecipesUsed-API.patch b/patches/server/0788-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0787-Furnace-RecipesUsed-API.patch
rename to patches/server/0788-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0788-Configurable-sculk-sensor-listener-range.patch b/patches/server/0789-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0788-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0789-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0789-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0790-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0789-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0790-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0790-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0791-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0790-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0791-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0791-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0792-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 95%
rename from patches/server/0791-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0792-Put-world-into-worldlist-before-initing-the-world.patch
index 6a40f957ff..f2649ab6e0 100644
--- a/patches/server/0791-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0792-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index f2f5778bc44ed5f7cd9f935bf5df08d2c1cc6d23..1f4a3e170188ebde3d56ec59252bb69c
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0b88024287076448db40adc58f9b47091eb9f7fe..a63f533f636c2ee3720dca0f89b219f8c2c5747b 100644
+index 9d319df303599ba44773526902d3314430031689..f105033854dede9e7fa3f3d7af5dab95295d320f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1265,10 +1265,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0792-Fix-Entity-Position-Desync.patch b/patches/server/0793-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0792-Fix-Entity-Position-Desync.patch
rename to patches/server/0793-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0793-Custom-Potion-Mixes.patch b/patches/server/0794-Custom-Potion-Mixes.patch
similarity index 99%
rename from patches/server/0793-Custom-Potion-Mixes.patch
rename to patches/server/0794-Custom-Potion-Mixes.patch
index f826ed9061..7bb42d300a 100644
--- a/patches/server/0793-Custom-Potion-Mixes.patch
+++ b/patches/server/0794-Custom-Potion-Mixes.patch
@@ -164,7 +164,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a63f533f636c2ee3720dca0f89b219f8c2c5747b..a76b37d131daee4e0518ee4a7a56c14b54eff05b 100644
+index f105033854dede9e7fa3f3d7af5dab95295d320f..6b39340b835156f43e5a9db32302adacb3257739 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -301,6 +301,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0794-Force-close-world-loading-screen.patch b/patches/server/0795-Force-close-world-loading-screen.patch
similarity index 92%
rename from patches/server/0794-Force-close-world-loading-screen.patch
rename to patches/server/0795-Force-close-world-loading-screen.patch
index 5d929f416f..548601c851 100644
--- a/patches/server/0794-Force-close-world-loading-screen.patch
+++ b/patches/server/0795-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 42e7b41526f7cf31f33a58f18e851cd435472921..3d6b84e307f3222bb96270d149abddb7024c83da 100644
+index 42e7b41526f7cf31f33a58f18e851cd435472921..ae4fe6eba052496fb3a95f1272c26605c2b1af48 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -396,6 +396,16 @@ public abstract class PlayerList {
@@ -23,7 +23,7 @@ index 42e7b41526f7cf31f33a58f18e851cd435472921..3d6b84e307f3222bb96270d149abddb7
 +                .getHolderOrThrow(net.minecraft.world.level.biome.Biomes.PLAINS);
 +            player.connection.send(new net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket(
 +                new net.minecraft.world.level.chunk.EmptyLevelChunk(worldserver1, player.chunkPosition(), plains),
-+                worldserver1.getLightEngine(), null, null)
++                worldserver1.getLightEngine(), null, null, false)
 +            );
 +        }
 +        // Paper end
diff --git a/patches/server/0795-Fix-falling-block-spawn-methods.patch b/patches/server/0796-Fix-falling-block-spawn-methods.patch
similarity index 93%
rename from patches/server/0795-Fix-falling-block-spawn-methods.patch
rename to patches/server/0796-Fix-falling-block-spawn-methods.patch
index 512587a809..9d47ce782e 100644
--- a/patches/server/0795-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0796-Fix-falling-block-spawn-methods.patch
@@ -24,10 +24,10 @@ index c738fb984ffd120e5adccdb5828833f180e72e80..5c8e905bbf56dd2af5b30d34371793c3
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 24dd33aede00f016ecf810d23d87e47025c5c1b5..9d7aaee0a1176330f9d082b22741f8ee3bc69170 100644
+index 2b0ed0b70b01e1efd315ec13492a53ec728a9fec..3ccba43d0eaa4ad867a555a92dd41f5924fc8b44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1386,7 +1386,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1391,7 +1391,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Validate.notNull(material, "Material cannot be null");
          Validate.isTrue(material.isBlock(), "Material must be a block");
  
@@ -41,7 +41,7 @@ index 24dd33aede00f016ecf810d23d87e47025c5c1b5..9d7aaee0a1176330f9d082b22741f8ee
          return (FallingBlock) entity.getBukkitEntity();
      }
  
-@@ -1395,7 +1400,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1400,7 +1405,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Validate.notNull(location, "Location cannot be null");
          Validate.notNull(data, "BlockData cannot be null");
  
diff --git a/patches/server/0796-Expose-furnace-minecart-push-values.patch b/patches/server/0797-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0796-Expose-furnace-minecart-push-values.patch
rename to patches/server/0797-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0797-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0798-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0797-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0798-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0798-More-Projectile-API.patch b/patches/server/0799-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0798-More-Projectile-API.patch
rename to patches/server/0799-More-Projectile-API.patch
diff --git a/patches/server/0799-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0800-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0799-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0800-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0801-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0800-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0801-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0801-Implement-getComputedBiome-API.patch b/patches/server/0802-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0801-Implement-getComputedBiome-API.patch
rename to patches/server/0802-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0802-Make-some-itemstacks-nonnull.patch b/patches/server/0803-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0802-Make-some-itemstacks-nonnull.patch
rename to patches/server/0803-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0803-Implement-enchantWithLevels-API.patch b/patches/server/0804-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0803-Implement-enchantWithLevels-API.patch
rename to patches/server/0804-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0804-Fix-saving-in-unloadWorld.patch b/patches/server/0805-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0804-Fix-saving-in-unloadWorld.patch
rename to patches/server/0805-Fix-saving-in-unloadWorld.patch
index fcd51bc3ca..6dc981ae74 100644
--- a/patches/server/0804-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0805-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a76b37d131daee4e0518ee4a7a56c14b54eff05b..501f2b4f9065aa8bf54c4acf1db54164e5f6043e 100644
+index 6b39340b835156f43e5a9db32302adacb3257739..2faee338276501f22815b9961e1f9109f3adc9b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1313,7 +1313,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0805-Buffer-OOB-setBlock-calls.patch b/patches/server/0806-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0805-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0806-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0806-Add-TameableDeathMessageEvent.patch b/patches/server/0807-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0806-Add-TameableDeathMessageEvent.patch
rename to patches/server/0807-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0807-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0808-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0807-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0808-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0808-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0809-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0808-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0809-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0809-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0810-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0809-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0810-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0810-Guard-against-invalid-entity-positions.patch b/patches/server/0811-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0810-Guard-against-invalid-entity-positions.patch
rename to patches/server/0811-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0811-cache-resource-keys.patch b/patches/server/0812-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0811-cache-resource-keys.patch
rename to patches/server/0812-cache-resource-keys.patch
diff --git a/patches/server/0812-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0813-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0812-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0813-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0813-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0814-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0813-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0814-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0814-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0815-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0814-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0815-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0816-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0815-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0816-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0816-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0817-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 92%
rename from patches/server/0816-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0817-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 8910ad0934..e16514b7c7 100644
--- a/patches/server/0816-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0817-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3d6b84e307f3222bb96270d149abddb7024c83da..1bce8dca483ebf53f82b7b67a5194c38b5b3963d 100644
+index ae4fe6eba052496fb3a95f1272c26605c2b1af48..57e63c91051c5885103ba55466dacdb449cd5316 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1430,7 +1430,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0817-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0818-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0817-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0818-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0819-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0819-Pass-ServerLevel-for-gamerule-callbacks.patch
index 90e9ee9720..a0d16729d8 100644
--- a/patches/server/0818-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0819-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -158,10 +158,10 @@ index de713f1ca1d61a6b1fca2b66de9162556d102449..edd2c9d0cf5a81c779011cb4215d496a
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9d7aaee0a1176330f9d082b22741f8ee3bc69170..255afed65617d7f91f559b647efd26b2216124d1 100644
+index 3ccba43d0eaa4ad867a555a92dd41f5924fc8b44..467505468574168c63bd81024bdc60f97b660782 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1939,7 +1939,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1944,7 +1944,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper end
          GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule));
          handle.deserialize(event.getValue()); // Paper
@@ -170,7 +170,7 @@ index 9d7aaee0a1176330f9d082b22741f8ee3bc69170..255afed65617d7f91f559b647efd26b2
          return true;
      }
  
-@@ -1979,7 +1979,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1984,7 +1984,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper end
          GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule.getName()));
          handle.deserialize(event.getValue()); // Paper
diff --git a/patches/server/0819-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0820-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0819-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0820-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0820-WorldCreator-keepSpawnLoaded.patch b/patches/server/0821-WorldCreator-keepSpawnLoaded.patch
similarity index 91%
rename from patches/server/0820-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0821-WorldCreator-keepSpawnLoaded.patch
index f1bf6ea6b9..4d12867285 100644
--- a/patches/server/0820-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0821-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 501f2b4f9065aa8bf54c4acf1db54164e5f6043e..5bb99ff6ecb8da705a9a7bcb342f7eaa1b0288a6 100644
+index 2faee338276501f22815b9961e1f9109f3adc9b8..22b19bd06495d3771736f9d05c949807c12f87a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1272,6 +1272,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0821-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0822-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 93%
rename from patches/server/0821-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0822-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index b23da16299..91934e5589 100644
--- a/patches/server/0821-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0822-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 34def52e9380a4587c5008f1d133a07e72621f56..0f0cf4fdfcbf8537696f15f98f3fb7e68baeb27c 100644
+index e903371b370034f6447c5f23562fe5c9d2b48dbe..a88d9c733a647d4b3ad9e079b289f2979d092b07 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -426,12 +426,16 @@ public class ServerPlayerGameMode {
+@@ -428,12 +428,16 @@ public class ServerPlayerGameMode {
                      block.destroy(this.level, pos, iblockdata);
                  }
  
@@ -25,7 +25,7 @@ index 34def52e9380a4587c5008f1d133a07e72621f56..0f0cf4fdfcbf8537696f15f98f3fb7e6
  
                      itemstack.mineBlock(this.level, iblockdata, pos, this.player);
                      if (flag && flag1 && event.isDropItems()) { // CraftBukkit - Check if block should drop items
-@@ -452,6 +456,13 @@ public class ServerPlayerGameMode {
+@@ -454,6 +458,13 @@ public class ServerPlayerGameMode {
                  if (flag && event != null) {
                      iblockdata.getBlock().popExperience(this.level, pos, event.getExpToDrop(), this.player); // Paper
                  }
diff --git a/patches/server/0822-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0823-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0822-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0823-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0823-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0824-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0823-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0824-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0824-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0825-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0824-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0825-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0825-Add-PlayerStopUsingItemEvent.patch b/patches/server/0826-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0825-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0826-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0826-FallingBlock-auto-expire-setting.patch b/patches/server/0827-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0826-FallingBlock-auto-expire-setting.patch
rename to patches/server/0827-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0827-Don-t-tick-markers.patch b/patches/server/0828-Don-t-tick-markers.patch
similarity index 97%
rename from patches/server/0827-Don-t-tick-markers.patch
rename to patches/server/0828-Don-t-tick-markers.patch
index aeeeff22c9..0e75fac529 100644
--- a/patches/server/0827-Don-t-tick-markers.patch
+++ b/patches/server/0828-Don-t-tick-markers.patch
@@ -23,7 +23,7 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5f43aedc6596e2b1ac7af97115157147
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e03810a2c4dea09f52236e7d25877cd803ed764f..6ed2833f89fd159daa81cd8b577be31a886469eb 100644
+index b00c1df57789996fef58b2c649588c13df149abd..67e096207b08d2ba13ebc1b92ac94ed2e170f896 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2647,6 +2647,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0828-Do-not-accept-invalid-client-settings.patch b/patches/server/0829-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0828-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0829-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0829-Add-support-for-Proxy-Protocol.patch b/patches/server/0830-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0829-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0830-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0830-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0831-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0830-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0831-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0831-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0832-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0831-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0832-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0832-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0833-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 94%
rename from patches/server/0832-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0833-Sanitize-Sent-BlockEntity-NBT.patch
index 0fb24ebfc0..52fcd344ad 100644
--- a/patches/server/0832-Sanitize-Sent-BlockEntity-NBT.patch
+++ b/patches/server/0833-Sanitize-Sent-BlockEntity-NBT.patch
@@ -18,10 +18,10 @@ index d79284a790569141c2ac8178d6ecc20b17cdd0d3..3944852921335c78a04a9dc301882ab5
  
      public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity) {
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index 0ef3e9b472e35bd2572b04722781abf7d4a1094b..bd439aef96aeecb9c72b5f50d748d231cccbc970 100644
+index c08440826d84f97412e2587cb98daae04e1bdd32..39b879f21f958dbd91ab0f74e5d4f3c74928fc33 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-@@ -170,6 +170,7 @@ public class ClientboundLevelChunkPacketData {
+@@ -186,6 +186,7 @@ public class ClientboundLevelChunkPacketData {
              CompoundTag compoundTag = blockEntity.getUpdateTag();
              BlockPos blockPos = blockEntity.getBlockPos();
              int i = SectionPos.sectionRelative(blockPos.getX()) << 4 | SectionPos.sectionRelative(blockPos.getZ());
diff --git a/patches/server/0833-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0834-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0833-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0834-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0834-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0835-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0834-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0835-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0835-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0836-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 97%
rename from patches/server/0835-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0836-Throw-exception-on-world-create-while-being-ticked.patch
index 436abc049f..3db48852f1 100644
--- a/patches/server/0835-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0836-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,7 +45,7 @@ index d373a5f20b017efdb9c339541b124009e07616c8..37441421a50867eeecf5cf3aed3e7096
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5bb99ff6ecb8da705a9a7bcb342f7eaa1b0288a6..3e3b84c2a400b81937cd54c03f4d423a37d4cd10 100644
+index 22b19bd06495d3771736f9d05c949807c12f87a2..a640587213b3c68b46363b1fdd06af37391efa2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -868,6 +868,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0836-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0837-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0836-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0837-Add-Alternate-Current-redstone-implementation.patch
index a25de7286a..2638138390 100644
--- a/patches/server/0836-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0837-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6ed2833f89fd159daa81cd8b577be31a886469eb..90b69060de8bf17b3414a79b901ee7c652f646a8 100644
+index 67e096207b08d2ba13ebc1b92ac94ed2e170f896..653c9c41ab7c5cd332565436564396d18f26c17c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2034,10 +2034,10 @@ index 6ed2833f89fd159daa81cd8b577be31a886469eb..90b69060de8bf17b3414a79b901ee7c6
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 799d31874be8a7498e71e7e01f84aa81a7f1eed4..01e420715d47b5531ede82139133a9bb59c25955 100644
+index 5778dd4bdcf116d7932cebcd261c5f624edd5874..8107c8e4a994523c75252f7762e362ab6eb13e43 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1454,4 +1454,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1457,4 +1457,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return ret;
      }
      // Paper end
diff --git a/patches/server/0837-Dont-resent-entity-on-art-update.patch b/patches/server/0838-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0837-Dont-resent-entity-on-art-update.patch
rename to patches/server/0838-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0838-Add-WardenAngerChangeEvent.patch b/patches/server/0839-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0838-Add-WardenAngerChangeEvent.patch
rename to patches/server/0839-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0839-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0840-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0839-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0840-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0840-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0841-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0840-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0841-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0841-Nameable-Banner-API.patch b/patches/server/0842-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0841-Nameable-Banner-API.patch
rename to patches/server/0842-Nameable-Banner-API.patch
diff --git a/patches/server/0842-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0843-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0842-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0843-Don-t-broadcast-messages-to-command-blocks.patch
index 29f6cef53b..e0724ba67d 100644
--- a/patches/server/0842-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0843-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3e3b84c2a400b81937cd54c03f4d423a37d4cd10..bc30e70c8451a8ef1aa671d7a2593a67fc3bd687 100644
+index a640587213b3c68b46363b1fdd06af37391efa2c..b6e676be787d477c2fe78a0c84a02ae0050f257f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1789,7 +1789,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0843-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0844-Prevent-empty-items-from-being-added-to-world.patch
similarity index 96%
rename from patches/server/0843-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0844-Prevent-empty-items-from-being-added-to-world.patch
index 202f89a88e..af7950c0cb 100644
--- a/patches/server/0843-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0844-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 90b69060de8bf17b3414a79b901ee7c652f646a8..1ee55cb0e1a75f45e5d10feb8a611b45653df60a 100644
+index 653c9c41ab7c5cd332565436564396d18f26c17c..06df21e55fdb70558b85fc095a04b3bb64fbe770 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1645,6 +1645,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0844-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0845-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0844-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0845-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0846-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0845-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0846-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0846-Add-Player-getFishHook.patch b/patches/server/0847-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0846-Add-Player-getFishHook.patch
rename to patches/server/0847-Add-Player-getFishHook.patch
diff --git a/patches/server/0847-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0848-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0847-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0848-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0848-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0849-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0848-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0849-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0850-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0849-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0850-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0850-Fix-Bee-flower-NPE.patch b/patches/server/0851-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0850-Fix-Bee-flower-NPE.patch
rename to patches/server/0851-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0852-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0851-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0852-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0852-More-Teleport-API.patch b/patches/server/0853-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0852-More-Teleport-API.patch
rename to patches/server/0853-More-Teleport-API.patch
diff --git a/patches/server/0853-Add-EntityPortalReadyEvent.patch b/patches/server/0854-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0853-Add-EntityPortalReadyEvent.patch
rename to patches/server/0854-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0854-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0855-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0854-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0855-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0855-Send-block-entities-after-destroy-prediction.patch b/patches/server/0856-Send-block-entities-after-destroy-prediction.patch
similarity index 97%
rename from patches/server/0855-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0856-Send-block-entities-after-destroy-prediction.patch
index 8112369925..af323d6830 100644
--- a/patches/server/0855-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0856-Send-block-entities-after-destroy-prediction.patch
@@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua
 block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 0f0cf4fdfcbf8537696f15f98f3fb7e68baeb27c..c38268b11dd5a76d5b3c2013c241063cade30909 100644
+index a88d9c733a647d4b3ad9e079b289f2979d092b07..257fa5207b889f882b77885d375564a8a7a7ac8c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -62,6 +62,8 @@ public class ServerPlayerGameMode {
@@ -43,7 +43,7 @@ index 0f0cf4fdfcbf8537696f15f98f3fb7e68baeb27c..c38268b11dd5a76d5b3c2013c241063c
                      return;
                  }
                  // CraftBukkit end
-@@ -392,10 +388,12 @@ public class ServerPlayerGameMode {
+@@ -394,10 +390,12 @@ public class ServerPlayerGameMode {
                  }
  
                  // Update any tile entity data for this block
diff --git a/patches/server/0856-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0857-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 89%
rename from patches/server/0856-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0857-Warn-on-plugins-accessing-faraway-chunks.patch
index 571205fc03..fdbf36a54d 100644
--- a/patches/server/0856-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0857-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 01e420715d47b5531ede82139133a9bb59c25955..090771dce76f4e8037b6b2df9fc0dad7fe73411d 100644
+index 8107c8e4a994523c75252f7762e362ab6eb13e43..b3f4469c137d221bf5f43565800df59c06101610 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -419,7 +419,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -421,7 +421,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      private static boolean isInWorldBoundsHorizontal(BlockPos pos) {
@@ -18,7 +18,7 @@ index 01e420715d47b5531ede82139133a9bb59c25955..090771dce76f4e8037b6b2df9fc0dad7
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 255afed65617d7f91f559b647efd26b2216124d1..439857a814212b36e475461a01b320731a10b86d 100644
+index 467505468574168c63bd81024bdc60f97b660782..89514af7f3771db496e7e2a40fa4e7fdf527f095 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -311,9 +311,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -54,7 +54,7 @@ index 255afed65617d7f91f559b647efd26b2216124d1..439857a814212b36e475461a01b32073
          // Paper start - implement regenerateChunk method
          final ServerLevel serverLevel = this.world;
          final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource();
-@@ -518,6 +534,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -523,6 +539,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
@@ -62,7 +62,7 @@ index 255afed65617d7f91f559b647efd26b2216124d1..439857a814212b36e475461a01b32073
          // Paper start - Optimize this method
          ChunkPos chunkPos = new ChunkPos(x, z);
          ChunkAccess immediate = world.getChunkSource().getChunkAtIfLoadedImmediately(x, z); // Paper
-@@ -581,6 +598,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -586,6 +603,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean addPluginChunkTicket(int x, int z, Plugin plugin) {
@@ -70,7 +70,7 @@ index 255afed65617d7f91f559b647efd26b2216124d1..439857a814212b36e475461a01b32073
          Preconditions.checkArgument(plugin != null, "null plugin");
          Preconditions.checkArgument(plugin.isEnabled(), "plugin is not enabled");
  
-@@ -649,6 +667,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -654,6 +672,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setChunkForceLoaded(int x, int z, boolean forced) {
@@ -78,7 +78,7 @@ index 255afed65617d7f91f559b647efd26b2216124d1..439857a814212b36e475461a01b32073
          this.getHandle().setChunkForced(x, z, forced);
      }
  
-@@ -955,6 +974,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -960,6 +979,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
@@ -86,7 +86,7 @@ index 255afed65617d7f91f559b647efd26b2216124d1..439857a814212b36e475461a01b32073
          // Transient load for this tick
          return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
      }
-@@ -2364,6 +2384,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2369,6 +2389,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Spigot end
      // Paper start
      public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
diff --git a/patches/server/0857-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0858-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0857-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0858-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0858-Add-missing-BlockFadeEvents.patch b/patches/server/0859-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0858-Add-missing-BlockFadeEvents.patch
rename to patches/server/0859-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0859-Collision-API.patch b/patches/server/0860-Collision-API.patch
similarity index 100%
rename from patches/server/0859-Collision-API.patch
rename to patches/server/0860-Collision-API.patch
diff --git a/patches/server/0860-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0861-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0860-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0861-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0861-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0862-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0861-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0862-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0862-Block-Ticking-API.patch b/patches/server/0863-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0862-Block-Ticking-API.patch
rename to patches/server/0863-Block-Ticking-API.patch
diff --git a/patches/server/0863-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0864-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0863-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0864-Add-Velocity-IP-Forwarding-Support.patch
index 186f977312..52180d7986 100644
--- a/patches/server/0863-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0864-Add-Velocity-IP-Forwarding-Support.patch
@@ -213,7 +213,7 @@ index 3fcd7bfdb8945b276c94a263e9da6b85ce470366..3431b1132e55c53cda7cf47f021f2306
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bc30e70c8451a8ef1aa671d7a2593a67fc3bd687..aefbb6a3f49a74a4c8fd004aa6a4ab1ab907e878 100644
+index b6e676be787d477c2fe78a0c84a02ae0050f257f..ffa27c9c02dc4d12411fc089de3af8e8e12ba06e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -797,7 +797,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0864-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0865-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0864-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0865-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0865-Add-NamespacedKey-biome-methods.patch b/patches/server/0866-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0865-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0866-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0866-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0867-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0866-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0867-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0867-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0868-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0867-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0868-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0868-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0869-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0868-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0869-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0869-Missing-eating-regain-reason.patch b/patches/server/0870-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0869-Missing-eating-regain-reason.patch
rename to patches/server/0870-Missing-eating-regain-reason.patch
diff --git a/patches/server/0870-Missing-effect-cause.patch b/patches/server/0871-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0870-Missing-effect-cause.patch
rename to patches/server/0871-Missing-effect-cause.patch
diff --git a/patches/server/0871-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0872-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0871-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0872-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0872-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0873-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0872-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0873-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0873-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0874-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0873-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0874-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0874-Configurable-chat-thread-limit.patch b/patches/server/0875-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0874-Configurable-chat-thread-limit.patch
rename to patches/server/0875-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0876-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0875-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0876-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0876-fix-Jigsaw-block-kicking-user.patch b/patches/server/0877-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0876-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0877-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0877-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0878-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0877-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0878-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0878-Add-getDrops-to-BlockState.patch b/patches/server/0879-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0878-Add-getDrops-to-BlockState.patch
rename to patches/server/0879-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0879-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0880-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 98%
rename from patches/server/0879-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0880-Fix-a-bunch-of-vanilla-bugs.patch
index 978419875c..193fb96886 100644
--- a/patches/server/0879-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0880-Fix-a-bunch-of-vanilla-bugs.patch
@@ -79,7 +79,7 @@ index 6cd6d69a20e95e344fc18ab67dc300824537a59b..2e2a7c2cf3081187da817479a9da3eb1
              }
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1ee55cb0e1a75f45e5d10feb8a611b45653df60a..b4eae79189397995cbc81d449fcd82c7a6ea8327 100644
+index 06df21e55fdb70558b85fc095a04b3bb64fbe770..c6a7aace64785f76792b03be08fb69e4cb93d1b3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1091,7 +1091,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -92,7 +92,7 @@ index 1ee55cb0e1a75f45e5d10feb8a611b45653df60a..b4eae79189397995cbc81d449fcd82c7
  
              if (!list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index c38268b11dd5a76d5b3c2013c241063cade30909..25c289b737f6cd7ede94725d86fbbf8d9ae1d70d 100644
+index 257fa5207b889f882b77885d375564a8a7a7ac8c..92340937194a985999a85c5d387f4d73e8354d24 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -92,7 +92,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0880-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0881-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 94%
rename from patches/server/0880-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0881-Remove-unnecessary-onTrackingStart-during-navigation.patch
index b22d5c46dc..758839864f 100644
--- a/patches/server/0880-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0881-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b4eae79189397995cbc81d449fcd82c7a6ea8327..d3e2005f4f1abd9ad5bda6acc8860bd74a2d2d25 100644
+index c6a7aace64785f76792b03be08fb69e4cb93d1b3..5bdae591d344fc9b72ffcc1a44fb5e495b1e6bb2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2683,7 +2683,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0881-Fix-custom-piglin-loved-items.patch b/patches/server/0882-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0881-Fix-custom-piglin-loved-items.patch
rename to patches/server/0882-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0882-EntityPickupItemEvent-fixes.patch b/patches/server/0883-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0882-EntityPickupItemEvent-fixes.patch
rename to patches/server/0883-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0883-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0884-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 94%
rename from patches/server/0883-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0884-Correctly-handle-interactions-with-items-on-cooldown.patch
index 127f2818f3..cf990e4602 100644
--- a/patches/server/0883-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0884-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 25c289b737f6cd7ede94725d86fbbf8d9ae1d70d..bb7ad618fad7f11a02d7e088e2c05bfffaf0b41d 100644
+index 92340937194a985999a85c5d387f4d73e8354d24..1635fee928d64f4d2c336dca6675ed4641918830 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -519,6 +519,7 @@ public class ServerPlayerGameMode {
+@@ -521,6 +521,7 @@ public class ServerPlayerGameMode {
          BlockState iblockdata = world.getBlockState(blockposition);
          InteractionResult enuminteractionresult = InteractionResult.PASS;
          boolean cancelledBlock = false;
@@ -16,7 +16,7 @@ index 25c289b737f6cd7ede94725d86fbbf8d9ae1d70d..bb7ad618fad7f11a02d7e088e2c05bff
  
          if (!iblockdata.getBlock().isEnabled(world.enabledFeatures())) {
              return InteractionResult.FAIL;
-@@ -528,10 +529,10 @@ public class ServerPlayerGameMode {
+@@ -530,10 +531,10 @@ public class ServerPlayerGameMode {
          }
  
          if (player.getCooldowns().isOnCooldown(stack.getItem())) {
diff --git a/patches/server/0884-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0885-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0884-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0885-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0885-Elder-Guardian-appearance-API.patch b/patches/server/0886-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0885-Elder-Guardian-appearance-API.patch
rename to patches/server/0886-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0886-Allow-changing-bed-s-occupied-property.patch b/patches/server/0887-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0886-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0887-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0887-Add-entity-knockback-API.patch b/patches/server/0888-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0887-Add-entity-knockback-API.patch
rename to patches/server/0888-Add-entity-knockback-API.patch
diff --git a/patches/server/0888-Detect-headless-JREs.patch b/patches/server/0889-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0888-Detect-headless-JREs.patch
rename to patches/server/0889-Detect-headless-JREs.patch
diff --git a/patches/server/0889-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0890-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0889-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0890-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0890-optimized-dirt-and-snow-spreading.patch b/patches/server/0891-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0890-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0891-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0891-Added-EntityToggleSitEvent.patch b/patches/server/0892-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0891-Added-EntityToggleSitEvent.patch
rename to patches/server/0892-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0892-Add-fire-tick-delay-option.patch b/patches/server/0893-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0892-Add-fire-tick-delay-option.patch
rename to patches/server/0893-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0893-Add-Moving-Piston-API.patch b/patches/server/0894-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0893-Add-Moving-Piston-API.patch
rename to patches/server/0894-Add-Moving-Piston-API.patch
diff --git a/patches/server/0894-Ignore-impossible-spawn-tick.patch b/patches/server/0895-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0894-Ignore-impossible-spawn-tick.patch
rename to patches/server/0895-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0895-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0896-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0895-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0896-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0896-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0897-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0896-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0897-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0898-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0898-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0898-Prevent-compass-from-loading-chunks.patch b/patches/server/0899-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0898-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0899-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0899-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0900-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0899-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0900-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0900-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0901-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0900-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0901-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0901-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0902-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0901-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0902-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0902-Add-Player-Warden-Warning-API.patch b/patches/server/0903-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0902-Add-Player-Warden-Warning-API.patch
rename to patches/server/0903-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0903-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0904-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0903-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0904-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0904-Add-paper-dumplisteners-command.patch b/patches/server/0905-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0904-Add-paper-dumplisteners-command.patch
rename to patches/server/0905-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0905-check-global-player-list-where-appropriate.patch b/patches/server/0906-check-global-player-list-where-appropriate.patch
similarity index 97%
rename from patches/server/0905-check-global-player-list-where-appropriate.patch
rename to patches/server/0906-check-global-player-list-where-appropriate.patch
index 9e0e69b4ee..d3b00c98b3 100644
--- a/patches/server/0905-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0906-check-global-player-list-where-appropriate.patch
@@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d3e2005f4f1abd9ad5bda6acc8860bd74a2d2d25..5932cfd855ee08442e0f8efb52bd9f2de8d6fcc7 100644
+index 5bdae591d344fc9b72ffcc1a44fb5e495b1e6bb2..37873ea2876a89ac8ea702ab0a71171e044852bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2805,4 +2805,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0906-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0907-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0906-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0907-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0907-ItemStack-damage-API.patch b/patches/server/0908-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0907-ItemStack-damage-API.patch
rename to patches/server/0908-ItemStack-damage-API.patch
diff --git a/patches/server/0908-Friction-API.patch b/patches/server/0909-Friction-API.patch
similarity index 100%
rename from patches/server/0908-Friction-API.patch
rename to patches/server/0909-Friction-API.patch
diff --git a/patches/server/0909-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0910-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0909-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0910-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0910-Fix-player-kick-on-shutdown.patch b/patches/server/0911-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0910-Fix-player-kick-on-shutdown.patch
rename to patches/server/0911-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0911-Sync-offhand-slot-in-menus.patch b/patches/server/0912-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0911-Sync-offhand-slot-in-menus.patch
rename to patches/server/0912-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0912-Player-Entity-Tracking-Events.patch b/patches/server/0913-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0912-Player-Entity-Tracking-Events.patch
rename to patches/server/0913-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0913-Limit-pet-look-distance.patch b/patches/server/0914-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0913-Limit-pet-look-distance.patch
rename to patches/server/0914-Limit-pet-look-distance.patch
diff --git a/patches/server/0914-Properly-resend-entities.patch b/patches/server/0915-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0914-Properly-resend-entities.patch
rename to patches/server/0915-Properly-resend-entities.patch
index 932a46a1d2..012882a5e1 100644
--- a/patches/server/0914-Properly-resend-entities.patch
+++ b/patches/server/0915-Properly-resend-entities.patch
@@ -79,7 +79,7 @@ index f525320635dc428610c0ff5259c9ea9a0115ac9e..6c850f8a39f20f30ad744ef946420de4
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1bce8dca483ebf53f82b7b67a5194c38b5b3963d..c11780c9dc444e0f9d80eac9ba7b024ba52faf5f 100644
+index 57e63c91051c5885103ba55466dacdb449cd5316..a977d729c487c6efb4863ea00adbc4d947f7c5ea 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -371,7 +371,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0915-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0916-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0915-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0916-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0916-fix-Instruments.patch b/patches/server/0917-fix-Instruments.patch
similarity index 100%
rename from patches/server/0916-fix-Instruments.patch
rename to patches/server/0917-fix-Instruments.patch
diff --git a/patches/server/0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0918-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0918-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0919-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0919-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0919-Improve-logging-and-errors.patch b/patches/server/0920-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0919-Improve-logging-and-errors.patch
rename to patches/server/0920-Improve-logging-and-errors.patch
diff --git a/patches/server/0920-Add-BlockLockCheckEvent.patch b/patches/server/0921-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0920-Add-BlockLockCheckEvent.patch
rename to patches/server/0921-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0921-Add-Sneaking-API-for-Entities.patch b/patches/server/0922-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0921-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0922-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0922-Improve-PortalEvents.patch b/patches/server/0923-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0922-Improve-PortalEvents.patch
rename to patches/server/0923-Improve-PortalEvents.patch
diff --git a/patches/server/0923-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0924-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0923-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0924-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0925-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0925-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0926-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0926-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0926-Flying-Fall-Damage.patch b/patches/server/0927-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0926-Flying-Fall-Damage.patch
rename to patches/server/0927-Flying-Fall-Damage.patch
diff --git a/patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0928-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/server/0928-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0929-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0929-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0929-config-for-disabling-entity-tag-tags.patch b/patches/server/0930-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0929-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0930-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0930-Use-single-player-info-update-packet-on-join.patch b/patches/server/0931-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0930-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0931-Use-single-player-info-update-packet-on-join.patch
index 9eae4ab946..b413cd9660 100644
--- a/patches/server/0930-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0931-Use-single-player-info-update-packet-on-join.patch
@@ -18,7 +18,7 @@ index b9d86e030aafe526f07e4335e772bcd9c0d8fe2a..b94def027095f4decc00d5f415a220df
          });
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c11780c9dc444e0f9d80eac9ba7b024ba52faf5f..647607827949302098ff45ffa4296ed62511987a 100644
+index a977d729c487c6efb4863ea00adbc4d947f7c5ea..683b5d78f9e3dc34e40c54683f64be32317797ac 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -353,6 +353,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0932-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0932-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0932-Win-Screen-API.patch b/patches/server/0933-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0932-Win-Screen-API.patch
rename to patches/server/0933-Win-Screen-API.patch
diff --git a/patches/server/0933-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0934-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0933-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0934-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0934-Fix-force-opening-enchantment-tables.patch b/patches/server/0935-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0934-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0935-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0935-Add-Entity-Body-Yaw-API.patch b/patches/server/0936-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0935-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0936-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0937-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0937-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0938-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 83%
rename from patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0938-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 8c83ad304e..097c2e3932 100644
--- a/patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0938-Update-the-flag-when-a-captured-block-state-is-outda.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Update the flag when a captured block state is outdated
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 090771dce76f4e8037b6b2df9fc0dad7fe73411d..7771748a15c153352ce4874495f5fa7437aaf9a7 100644
+index b3f4469c137d221bf5f43565800df59c06101610..147d802d9207e358fdb2d1c7806fc2f634dcfd98 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -529,6 +529,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -531,6 +531,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags);
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
              }
diff --git a/patches/server/0938-Add-EntityFertilizeEggEvent.patch b/patches/server/0939-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0938-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0939-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0940-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0940-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0941-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0941-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0941-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0942-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0941-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0942-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0942-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0943-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0942-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0943-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0943-Fix-text-display-error-on-spawn.patch b/patches/server/0944-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0943-Fix-text-display-error-on-spawn.patch
rename to patches/server/0944-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0944-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0945-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0944-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0945-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0945-Add-Shearable-API.patch b/patches/server/0946-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0945-Add-Shearable-API.patch
rename to patches/server/0946-Add-Shearable-API.patch
diff --git a/patches/server/0946-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0947-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0946-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0947-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0948-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0948-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0948-Optimize-Hoppers.patch b/patches/server/0949-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0948-Optimize-Hoppers.patch
rename to patches/server/0949-Optimize-Hoppers.patch
diff --git a/patches/server/0949-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0950-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0949-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0950-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0950-Fix-api-checking-banned-ips.patch b/patches/server/0951-Fix-api-checking-banned-ips.patch
similarity index 100%
rename from patches/server/0950-Fix-api-checking-banned-ips.patch
rename to patches/server/0951-Fix-api-checking-banned-ips.patch
diff --git a/patches/server/0951-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0952-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0951-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0952-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0952-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0953-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0952-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0953-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0953-remove-duplicate-animate-packet-for-records.patch b/patches/server/0954-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0953-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0954-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0955-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0954-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0955-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0956-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 90%
rename from patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0956-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 5211deda6f..6671aa6357 100644
--- a/patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0956-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5932cfd855ee08442e0f8efb52bd9f2de8d6fcc7..2ac23779222369ace69f1e3f7fb12184865b7a43 100644
+index 37873ea2876a89ac8ea702ab0a71171e044852bc..18aac3da3c88f33b1a71a5920a8daa27e9723913 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1782,6 +1782,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0956-Use-array-for-gamerule-storage.patch b/patches/server/0957-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0956-Use-array-for-gamerule-storage.patch
rename to patches/server/0957-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0957-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0958-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0957-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0958-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0958-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0959-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0958-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0959-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0959-Add-Mob-Experience-reward-API.patch b/patches/server/0960-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0959-Add-Mob-Experience-reward-API.patch
rename to patches/server/0960-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0960-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0961-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0960-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0961-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0962-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0962-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0963-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0963-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0963-More-accurate-isInOpenWater-impl.patch b/patches/server/0964-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0963-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0964-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0965-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0965-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0966-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 89%
rename from patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0966-Optimise-recalcBlockCounts-for-empty-sections.patch
index 143efbfdfe..2f061397e0 100644
--- a/patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0966-Optimise-recalcBlockCounts-for-empty-sections.patch
@@ -16,10 +16,10 @@ sections with a ZeroBitStorage data to to take ~20% of the process,
 now it takes <1%.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index f150a16fbf888455301d8b9043f0b45fb1fa1d84..fd4c4122e3811c8f5d8c02f8faaf3579bcb8ad79 100644
+index 7a57a75db00cd64e4c95740b575277a1f355e414..d4477b0dda6a1ef7bd8323c0d11b636bd071d18e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -229,6 +229,7 @@ public class LevelChunkSection {
+@@ -232,6 +232,7 @@ public class LevelChunkSection {
          this.nonEmptyBlockCount = 0;
          this.tickingBlockCount = 0;
          this.tickingFluidCount = 0;
@@ -27,7 +27,7 @@ index f150a16fbf888455301d8b9043f0b45fb1fa1d84..fd4c4122e3811c8f5d8c02f8faaf3579
          this.states.forEachLocation((BlockState iblockdata, int i) -> {
              FluidState fluid = iblockdata.getFluidState();
  
-@@ -248,6 +249,7 @@ public class LevelChunkSection {
+@@ -251,6 +252,7 @@ public class LevelChunkSection {
              }
  
          });
diff --git a/patches/server/0966-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0967-Fix-destroying-beehive-without-any-players-nearby-th.patch
similarity index 100%
rename from patches/server/0966-Fix-destroying-beehive-without-any-players-nearby-th.patch
rename to patches/server/0967-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0967-Expand-PlayerItemMendEvent.patch b/patches/server/0968-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0967-Expand-PlayerItemMendEvent.patch
rename to patches/server/0968-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0969-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0969-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0969-Add-transient-modifier-API.patch b/patches/server/0970-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0969-Add-transient-modifier-API.patch
rename to patches/server/0970-Add-transient-modifier-API.patch
diff --git a/patches/server/0970-Fix-block-place-logic.patch b/patches/server/0971-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0970-Fix-block-place-logic.patch
rename to patches/server/0971-Fix-block-place-logic.patch
diff --git a/patches/server/0971-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0972-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0971-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0972-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch