From e66037960b02c7b22bbed75318904c55a4177977 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 23 Jan 2024 15:43:48 +0100
Subject: [PATCH] [ci skip] Move some disruptive patches back

---
 ...h-absorb-values-and-repair-bad-data.patch} |  2 +-
 ...73-Use-a-Shared-Random-for-Entities.patch} |  0
 ...e-spawn-chances-for-skeleton-horses.patch} |  0
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |  4 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  0
 ...7-Configurable-Chunk-Inhabited-Time.patch} |  2 +-
 ...t.patch => 0078-EntityPathfindEvent.patch} |  0
 ...gionFileCache-and-make-configurable.patch} |  0
 ...-Do-not-load-chunks-for-Pathfinding.patch} |  0
 ...081-Add-PlayerUseUnknownEntityEvent.patch} |  2 +-
 ...urable-random-tick-rates-for-blocks.patch} |  0
 ...-BlockPlaceEvent-triggering-physics.patch} |  0
 ...its.patch => 0084-Optimize-DataBits.patch} |  0
 ...illa-per-world-scoreboard-coloring-.patch} |  0
 ... 0086-Configurable-Player-Collision.patch} |  0
 ...nt-to-allow-plugins-to-handle-clien.patch} |  0
 ...> 0088-Configurable-RCON-IP-address.patch} |  0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  2 +-
 ...to-configure-frosted_ice-properties.patch} |  0
 ...possibility-for-getServer-singleton.patch} |  2 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  0
 ...ble-API-and-replenishable-lootables.patch} |  0
 ...em-property-for-disabling-watchdoge.patch} |  0
 ... 0095-Async-GameProfileCache-saving.patch} |  0
 ...-Optional-TNT-doesn-t-move-in-water.patch} |  0
 ...-redstone-torch-rapid-clock-removal.patch} |  2 +-
 ...h => 0098-Add-server-name-parameter.patch} |  2 +-
 ...h => 0099-Fix-global-sound-handling.patch} |  6 +-
 ...locking-on-Network-Manager-creation.patch} |  0
 ...-profiles-that-have-no-UUID-and-no-.patch} |  2 +-
 ...etting-for-proxy-online-mode-status.patch} |  6 +-
 ...timise-BlockState-s-hashCode-equals.patch} |  0
 ...nfigurable-packet-in-spam-threshold.patch} |  0
 ...5-Configurable-flying-kick-messages.patch} |  2 +-
 ...nt.patch => 0106-Add-EntityZapEvent.patch} |  0
 ...entity-nbt-data-from-falling-blocks.patch} |  0
 ...08-Cache-user-authenticator-threads.patch} |  0
 ...-Allow-Reloading-of-Command-Aliases.patch} |  2 +-
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  2 +-
 ... => 0111-Add-ProjectileCollideEvent.patch} |  2 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |  0
 ...ze-Level.hasChunkAt-BlockPosition-Z.patch} |  4 +-
 ...Bound-Treasure-Maps-to-World-Border.patch} |  0
 ...igurable-Cartographer-Treasure-Maps.patch} |  0
 ...to-control-if-armor-stands-can-move.patch} |  0
 ...=> 0117-String-based-Action-Bar-API.patch} |  2 +-
 ...8-Properly-fix-item-duplication-bug.patch} |  0
 ...-API-s.patch => 0119-Firework-API-s.patch} |  0
 ... 0120-PlayerTeleportEndGatewayEvent.patch} |  0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  2 +-
 ...h => 0122-Enforce-Sync-Player-Saves.patch} |  2 +-
 ...I-for-Reason-Source-Triggering-play.patch} |  2 +-
 ...patch => 0124-Cap-Entity-Collisions.patch} |  4 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |  0
 ...e-async-calls-to-restart-the-server.patch} |  4 +-
 ...e-parrots-stay-on-shoulders-despite.patch} |  2 +-
 ...-option-to-prevent-player-names-fro.patch} |  2 +-
 ...leAppender-for-console-improvements.patch} | 10 +--
 ...rable-option-to-disable-creeper-lin.patch} |  0
 ....patch => 0131-Item-canEntityPickup.patch} |  0
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  0
 ...> 0133-PlayerAttemptPickupItemEvent.patch} |  0
 ...profile-lookups-to-worldgen-threads.patch} |  2 +-
 ...tch => 0135-Basic-PlayerProfile-API.patch} |  8 +--
 ...tch => 0136-Add-UnknownCommandEvent.patch} |  0
 ... 0137-Shoulder-Entities-Release-API.patch} |  4 +-
 ...patch => 0138-Profile-Lookup-Events.patch} |  0
 ...layer-logins-during-server-shutdown.patch} |  0
 ...patch => 0140-Entity-fromMobSpawner.patch} |  2 +-
 ...1-Improve-the-Saddle-API-for-Horses.patch} |  0
 ...=> 0142-ensureServerConversions-API.patch} |  0
 ...> 0143-Implement-getI18NDisplayName.patch} |  0
 ...=> 0144-ProfileWhitelistVerifyEvent.patch} |  2 +-
 ...ch => 0145-Fix-this-stupid-bullshit.patch} |  0
 ...atch => 0146-LivingEntity-setKiller.patch} |  0
 ...wns-should-honor-nametags-and-leash.patch} |  0
 ...mer-when-spawner-event-is-cancelled.patch} |  0
 ...a-custom-authentication-servers-dow.patch} |  2 +-
 ...-prefixes-using-Log4J-configuration.patch} |  4 +-
 ...-Log4J-Configuration-Plugin-Loggers.patch} |  0
 ...t.patch => 0152-Add-PlayerJumpEvent.patch} |  2 +-
 ...le-ServerboundKeepAlivePacket-async.patch} |  0
 ...t-protocol-version-and-virtual-host.patch} |  4 +-
 ...t-serverside-behavior-of-keepalives.patch} |  2 +-
 ...Effects-only-to-players-who-can-see.patch} | 12 ++--
 ... => 0157-Add-PlayerArmorChangeEvent.patch} |  2 +-
 ...om-being-processed-when-the-player-.patch} |  0
 ...17075-Block-entity-unload-lag-spike.patch} |  6 +-
 ...-implementations-for-captured-block.patch} |  8 +--
 ...get-a-BlockState-without-a-snapshot.patch} |  0
 ...patch => 0162-AsyncTabCompleteEvent.patch} |  2 +-
 ...=> 0163-PlayerPickupExperienceEvent.patch} |  2 +-
 ...-Ability-to-apply-mending-to-XP-API.patch} |  2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  2 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...patch => 0167-PreCreatureSpawnEvent.patch} |  4 +-
 ...> 0168-Fill-Profile-Property-Events.patch} |  2 +-
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0170-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0172-Tameable-getOwnerUniqueId-API.patch} |  0
 ...tch => 0173-Toggleable-player-crits.patch} |  4 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  2 +-
 ...d-more-fields-to-AsyncPreLoginEvent.patch} |  2 +-
 ...=> 0177-Player.setPlayerProfile-API.patch} |  8 +--
 ...patch => 0178-getPlayerUniqueId-API.patch} |  2 +-
 ... 0179-Improved-Async-Task-Scheduler.patch} |  0
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...2-Flag-to-disable-the-channel-limit.patch} |  2 +-
 ...-Add-openSign-method-to-HumanEntity.patch} |  2 +-
 ...rable-sprint-interruption-on-attack.patch} |  4 +-
 ...t.patch => 0185-EndermanEscapeEvent.patch} |  0
 ...h => 0186-Enderman.teleportRandomly.patch} |  0
 ...187-Block-Enderpearl-Travel-Exploit.patch} |  2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |  2 +-
 ...allowed-colored-signs-to-be-created.patch} |  2 +-
 ...h => 0190-EndermanAttackPlayerEvent.patch} |  2 +-
 ...tch => 0191-WitchConsumePotionEvent.patch} |  0
 ...patch => 0192-WitchThrowPotionEvent.patch} |  0
 ...patch => 0193-WitchReadyPotionEvent.patch} |  0
 ...194-ItemStack-getMaxItemUseDuration.patch} |  0
 ...5-Add-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  2 +-
 ...ch => 0197-Fix-CraftEntity-hashCode.patch} |  0
 ...-Configurable-LootPool-luck-formula.patch} |  0
 ...ls-when-failing-to-save-player-data.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  2 +-
 ...=> 0201-Improve-EntityShootBowEvent.patch} |  0
 ...patch => 0202-PlayerReadyArrowEvent.patch} |  4 +-
 ...ckByEntityEvent-and-EntityPushedByE.patch} | 14 ++--
 ...patch => 0204-Expand-Explosions-API.patch} |  2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0206-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  0
 ...-Implement-World.getEntity-UUID-API.patch} |  2 +-
 ...0209-InventoryCloseEvent-Reason-API.patch} |  6 +-
 ...tch => 0210-Vex-get-setSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  2 +-
 ...-to-keep-logging-IO-off-main-thread.patch} |  0
 ...more-information-to-Entity.toString.patch} |  2 +-
 ...ts.patch => 0214-EnderDragon-Events.patch} |  0
 ...atch => 0215-PlayerElytraBoostEvent.patch} |  0
 ...=> 0216-PlayerLaunchProjectileEvent.patch} |  0
 ...0217-Improve-BlockPosition-inlining.patch} |  8 +--
 ...-armor-stands-from-doing-entity-loo.patch} |  4 +-
 ...-Vanished-players-don-t-have-rights.patch} |  4 +-
 ...Allow-disabling-armor-stand-ticking.patch} |  0
 ...tch => 0221-SkeletonHorse-Additions.patch} |  0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...patch => 0223-Expand-ArmorStand-API.patch} |  0
 ...vent.patch => 0224-AnvilDamageEvent.patch} |  0
 ...ent.patch => 0225-Add-TNTPrimeEvent.patch} |  0
 ...d-make-tab-spam-limits-configurable.patch} |  2 +-
 ...s.patch => 0227-Fix-NBT-type-issues.patch} |  2 +-
 ...emove-unnecessary-itemmeta-handling.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  2 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  6 +-
 ...1-Use-ConcurrentHashMap-in-JsonList.patch} |  2 +-
 ...2-Use-a-Queue-for-Queueing-Commands.patch} |  2 +-
 ...ock-entities-from-a-chunk-without-s.patch} |  0
 ...timize-BlockPosition-helper-methods.patch} |  0
 ...efault-mob-spawn-range-and-water-an.patch} |  0
 ...tch => 0236-Slime-Pathfinder-Events.patch} |  2 +-
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ...38-Optimize-CraftBlockData-Creation.patch} |  0
 ...tch => 0239-Optimize-MappedRegistry.patch} |  0
 ...ch => 0240-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0241-Add-More-Creeper-API.patch} |  2 +-
 ...=> 0242-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  2 +-
 ...-attack-cooldown-methods-for-Player.patch} |  2 +-
 ....patch => 0246-Improve-death-events.patch} |  8 +--
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0248-Mob-Pathfinding-API.patch} |  0
 ...anPlaceOn-and-CanDestroy-NBT-values.patch} |  0
 ...nteractions-from-causing-chunk-load.patch} |  6 +-
 ...ning-from-loading-generating-chunks.patch} |  2 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ...=> 0253-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  2 +-
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  0
 ...> 0256-Hook-into-CB-plugin-rewrites.patch} |  0
 ....patch => 0257-PreSpawnerSpawnEvent.patch} |  2 +-
 ...58-Add-LivingEntity-getTargetEntity.patch} |  2 +-
 ...I.patch => 0259-Add-sun-related-API.patch} |  2 +-
 ...ception-in-entity-and-block-entity-.patch} |  0
 ...Turtle-API.patch => 0261-Turtle-API.patch} |  0
 ...ator-target-events-and-improve-impl.patch} |  2 +-
 ...PI.patch => 0263-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  2 +-
 ...6-Reset-players-airTicks-on-respawn.patch} |  2 +-
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  2 +-
 ...=> 0269-Optimize-World-Time-Updates.patch} |  2 +-
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...0271-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  4 +-
 ...ult-permission-message-configurable.patch} |  2 +-
 ...-Large-Packets-disconnecting-client.patch} |  2 +-
 ...ntity-dismount-during-teleportation.patch} |  8 +--
 ...I.patch => 0276-Add-more-Zombie-API.patch} |  0
 ...mits.patch => 0277-Book-Size-Limits.patch} |  2 +-
 ...0278-Add-PlayerConnectionCloseEvent.patch} |  4 +-
 ...Replace-OfflinePlayer-getLastPlayed.patch} |  6 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |  2 +-
 ...-remove-if-the-handle-is-a-custom-p.patch} |  2 +-
 ...ent.patch => 0282-BlockDestroyEvent.patch} |  4 +-
 ... => 0283-Async-command-map-building.patch} |  2 +-
 ....patch => 0284-Brigadier-Mojang-API.patch} |  0
 ...ove-exact-choice-recipe-ingredients.patch} |  0
 ... 0286-Limit-Client-Sign-length-more.patch} |  2 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |  2 +-
 ...e-Oversized-Tile-Entities-in-chunks.patch} |  0
 ...=> 0289-Entity-getEntitySpawnReason.patch} |  2 +-
 ...tch => 0290-Fire-event-on-GS4-query.patch} |  0
 ... => 0291-Add-PlayerPostRespawnEvent.patch} |  2 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |  2 +-
 ...ts.patch => 0293-Server-Tick-Events.patch} |  2 +-
 ...294-PlayerDeathEvent-getItemsToKeep.patch} |  2 +-
 ...ptimize-Captured-BlockEntity-Lookup.patch} |  4 +-
 ...API.patch => 0296-Add-Heightmap-API.patch} |  2 +-
 ...> 0297-Mob-Spawner-API-Enhancements.patch} |  2 +-
 ...-to-changed-postToMainThread-method.patch} |  2 +-
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...0300-Implement-CraftBlockSoundGroup.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  2 +-
 ...02-Expose-the-internal-current-tick.patch} |  2 +-
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  2 +-
 ...urable-projectile-relative-velocity.patch} |  2 +-
 ...h => 0306-offset-item-frame-ticking.patch} |  0
 ...event-consuming-the-wrong-itemstack.patch} |  2 +-
 ...8-Dont-send-unnecessary-sign-update.patch} |  0
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ... 0312-Duplicate-UUID-Resolve-Option.patch} |  2 +-
 ...ayerDeathEvent-shouldDropExperience.patch} |  2 +-
 ...ading-chunks-checking-hive-position.patch} |  0
 ...hunks-from-Hoppers-and-other-things.patch} |  0
 ...timise-EntityGetter-getPlayerByUUID.patch} |  2 +-
 ...317-Fix-items-not-falling-correctly.patch} |  2 +-
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...ializing-mismatching-chunk-coordina.patch} |  0
 ... 0321-Alternative-item-despawn-rate.patch} |  0
 ...=> 0322-Tracking-Range-Improvements.patch} |  4 +-
 ...-items-vanishing-through-end-portal.patch} |  4 +-
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...25-Improve-Block-breakNaturally-API.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  2 +-
 ...0327-Add-debug-for-sync-chunk-loads.patch} |  6 +-
 ... => 0328-Improve-java-version-check.patch} |  0
 ...tch => 0329-Add-ThrownEggHatchEvent.patch} |  0
 ...p-API.patch => 0330-Entity-Jump-API.patch} |  2 +-
 ...-to-nerf-pigmen-from-nether-portals.patch} | 12 ++--
 ... => 0332-Make-the-GUI-graph-fancier.patch} |  0
 ...33-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 => 0337-Optimise-Chunk-getFluid.patch} | 10 +--
 ...rbose-world-setting-to-false-by-def.patch} |  2 +-
 ...Add-tick-times-API-and-mspt-command.patch} |  4 +-
 ...40-Expose-MinecraftServer-isRunning.patch} |  2 +-
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...pawn-settings-and-per-player-option.patch} |  2 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |  2 +-
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} | 10 +--
 ...tch => 0346-Don-t-tick-dead-players.patch} |  4 +-
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  4 +-
 ...ove-existing-players-to-world-spawn.patch} |  8 +--
 ....patch => 0349-Optimize-Pathfinding.patch} |  0
 ...0-Reduce-Either-Optional-allocation.patch} |  0
 ...uce-memory-footprint-of-CompoundTag.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  6 +-
 ...entity-collision-code-if-not-needed.patch} |  2 +-
 ...Implement-Player-Client-Options-API.patch} | 10 +--
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...Event-when-Player-is-actually-ready.patch} |  8 +--
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  6 +-
 ...layerAttackEntityCooldownResetEvent.patch} |  2 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...tem-duplication-and-teleport-issues.patch} | 14 ++--
 ...patch => 0362-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  0
 ...n.patch => 0364-Expose-game-version.patch} |  2 +-
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ....patch => 0366-misc-debugging-dumps.patch} |  4 +-
 ...7-Prevent-teleporting-dead-entities.patch} |  0
 ...traces-in-log-messages-crash-report.patch} | 12 ++--
 ...atch => 0369-Implement-Mob-Goal-API.patch} |  2 +-
 ...=> 0370-Add-villager-reputation-API.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ...tch => 0372-ExperienceOrbMergeEvent.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...API.patch => 0374-Potential-bed-API.patch} |  0
 ...ait-for-Async-Tasks-during-shutdown.patch} |  4 +-
 ...er-respects-game-and-entity-rules-f.patch} |  0
 ...> 0377-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0380-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} |  4 +-
 ...uping.patch => 0384-Fix-sand-duping.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...-position-desync-causing-tp-exploit.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...API.patch => 0388-Improve-Arrow-API.patch} |  0
 ...0389-Add-PlayerRecipeBookClickEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  2 +-
 ...1-Add-permission-for-command-blocks.patch} |  4 +-
 ...position-and-AABB-are-never-invalid.patch} |  8 +--
 ...d-Difficulty-Remembering-Difficulty.patch} | 14 ++--
 ...atch => 0394-Paper-dumpitem-command.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} | 45 +++---------
 ...incremental-chunk-and-player-saving.patch} |  8 +--
 ...398-Support-old-UUID-format-for-NBT.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...0400-Support-components-in-ItemMeta.patch} |  0
 ...e-fix-EntityTargetLivingEntityEvent.patch} |  0
 ...patch => 0402-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...atch => 0404-Add-PrepareResultEvent.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  2 +-
 ...x-arrows-never-despawning-MC-125757.patch} |  2 +-
 ...Vanilla-Command-permission-checking.patch} |  0
 ...-5989.patch => 0408-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
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...support.patch => 0415-Brand-support.patch} |  6 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0417-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  6 +-
 ...PI.patch => 0419-Add-moon-phase-API.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  2 +-
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0422-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0424-Buffer-joins-to-world.patch} |  6 +-
 ...s-not-working-in-some-kick-messages.patch} |  2 +-
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...I.patch => 0427-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0430-Cache-block-data-strings.patch} |  2 +-
 ...rtation-and-cancel-velocity-if-tele.patch} |  4 +-
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  8 +--
 ...-Counter-to-allow-plugins-to-use-va.patch} |  4 +-
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0437-Entity-isTicking.patch} |  4 +-
 ...non-whitelisted-player-when-white-l.patch} |  2 +-
 ...-Concurrency-issue-in-ShufflingList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0442-Optimise-getType-calls.patch} |  0
 ....patch => 0443-Villager-resetOffers.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  4 +-
 ...lockpos-allocation-from-pathfinding.patch} |  2 +-
 ...em-locations-dropped-from-campfires.patch} |  0
 ...7-Fix-bell-block-entity-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  2 +-
 ...ch => 0450-Add-ignore-discounts-API.patch} |  6 +-
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  0
 ...> 0453-Item-no-age-no-player-pickup.patch} |  0
 ...454-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0455-Add-API-for-quit-reason.patch} |  8 +--
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...ch => 0457-Expose-world-spawn-angle.patch} |  0
 ...patch => 0458-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  2 +-
 ...60-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0461-Add-PlayerItemCooldownEvent.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...PI.patch => 0463-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  6 +-
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0466-Add-PlayerShearBlockEvent.patch} |  0
 ....patch => 0467-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ...469-Player-Chunk-Load-Unload-Events.patch} | 10 +--
 ...0-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  2 +-
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...valid-ingredient-lists-in-VillagerA.patch} |  0
 ...nt.patch => 0474-Add-TargetHitEvent.patch} |  0
 ... 0475-MC-4-Fix-item-position-desync.patch} |  4 +-
 ... 0476-Additional-Block-Material-API.patch} |  0
 ...tch => 0477-Fix-harming-potion-dupe.patch} |  0
 ...t-Material-from-Boats-and-Minecarts.patch} |  0
 ....patch => 0479-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  4 +-
 ...-Add-PlayerFlowerPotManipulateEvent.patch} |  0
 ...ct-event-not-being-called-sometimes.patch} |  0
 ...h => 0484-Zombie-API-breaking-doors.patch} |  0
 ...485-Fix-nerfed-slime-when-splitting.patch} |  2 +-
 ...=> 0486-Add-EntityLoadCrossbowEvent.patch} |  0
 ...> 0487-Add-WorldGameRuleChangeEvent.patch} |  6 +-
 ...88-Add-ServerResourcesReloadedEvent.patch} |  2 +-
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...> 0490-Add-BlockFailedDispenseEvent.patch} |  0
 ...91-Add-PlayerLecternPageChangeEvent.patch} |  0
 ...92-Add-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  0
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...OIs.patch => 0495-Remove-stale-POIs.patch} |  4 +-
 ...h => 0496-Fix-villager-boat-exploit.patch} |  0
 ...I.patch => 0497-Add-sendOpLevel-API.patch} |  0
 ...0498-TODO-Registry-Modification-API.patch} |  0
 ...h => 0499-Add-StructuresLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  4 +-
 ...leHitEvent-call-when-fireballs-dead.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...503-Make-schedule-command-per-world.patch} |  0
 ...504-Configurable-max-leash-distance.patch} |  6 +-
 ...h => 0505-Add-BlockPreDispenseEvent.patch} |  0
 ...6-Add-PlayerChangeBeaconEffectEvent.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...h => 0509-Expand-EntityUnleashEvent.patch} | 16 ++---
 ...shield-blocking-on-dimension-change.patch} |  4 +-
 ...atch => 0511-Add-DragonEggFormEvent.patch} |  0
 ...t.patch => 0512-Add-EntityMoveEvent.patch} |  6 +-
 ...isable-pathfinding-updates-on-block.patch} |  6 +-
 ... 0514-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
 ...atch => 0520-Expose-Tracked-Players.patch} |  0
 ...GUI.patch => 0521-Improve-ServerGUI.patch} |  0
 ...522-fix-converting-txt-to-json-file.patch} |  0
 ...atch => 0523-Add-worldborder-events.patch} |  0
 ...h => 0524-Add-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0526-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0527-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ....patch => 0529-Expand-world-key-API.patch} |  2 +-
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0531-Item-Rarity-API.patch} |  0
 ...d-item-when-player-has-disconnected.patch} |  0
 ...elist-use-configurable-kick-message.patch} |  2 +-
 ...gnore-result-of-PlayerEditBookEvent.patch} |  0
 ...tch => 0535-Expose-protocol-version.patch} |  0
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  2 +-
 ...patch => 0538-Add-bypass-host-check.patch} |  0
 ...0539-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
 ...ch => 0545-Add-PlayerDeepSleepEvent.patch} |  2 +-
 ...ld-API.patch => 0546-More-World-API.patch} |  4 +-
 ...=> 0547-Add-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...awnEvent-fix-passed-parameter-issue.patch} |  0
 ...acon-activation-deactivation-events.patch} |  0
 ...dd-Channel-initialization-listeners.patch} | 10 +--
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0553-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...55-Entity-load-save-limit-per-chunk.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...close.patch => 0557-Inventory-close.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...atch => 0559-Add-basic-Datapack-API.patch} |  2 +-
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...61-Expand-PlayerGameModeChangeEvent.patch} | 12 ++--
 ... => 0562-ItemStack-repair-check-API.patch} |  0
 ....patch => 0563-More-Enchantment-API.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} | 10 +--
 ...PI.patch => 0566-Add-Mob-lookAt-API.patch} |  0
 ...0567-Add-Unix-domain-socket-support.patch} |  8 +--
 ... => 0568-Add-EntityInsideBlockEvent.patch} |  0
 ...69-Attributes-API-for-item-defaults.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} | 14 ++--
 ...patch => 0571-More-Lidded-Block-API.patch} |  0
 ...72-Limit-item-frame-cursors-on-maps.patch} |  6 +-
 ... => 0573-Add-PlayerKickEvent-causes.patch} |  0
 ...0574-Add-PufferFishStateChangeEvent.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ThreadingDe.patch} | 32 ++++-----
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0578-Add-BellRevealRaiderEvent.patch} |  0
 ... 0579-Fix-invulnerable-end-crystals.patch} |  0
 ...80-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0581-Fix-dangerous-end-portal-logic.patch} |  6 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...patch => 0584-Line-Of-Sight-Changes.patch} |  6 +-
 ... => 0585-add-per-world-spawn-limits.patch} |  2 +-
 ...h => 0586-Fix-potions-splash-events.patch} |  0
 ... => 0587-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  6 +-
 ...PI.patch => 0589-Missing-Entity-API.patch} |  0
 ...ect-for-book-edit-is-called-on-main.patch} |  0
 ...of-Block-applyBoneMeal-always-being.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} | 10 +--
 ...rom-signs-not-firing-command-events.patch} |  0
 ...tch => 0594-Add-PlayerArmSwingEvent.patch} |  0
 ...-event-leave-message-not-being-sent.patch} |  4 +-
 ...-for-mobs-immune-to-default-effects.patch} |  2 +-
 ...-t-apply-cramming-damage-to-players.patch} |  4 +-
 ...d-timings-for-sensors-and-behaviors.patch} |  0
 ... 0599-Add-missing-forceDrop-toggles.patch} |  0
 ...inger-API.patch => 0600-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0602-Add-System.out-err-catcher.patch} |  2 +-
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...AFK-kick-while-watching-end-credits.patch} |  0
 ...iting-of-comments-to-server.propert.patch} |  0
 ...tch => 0606-Add-PlayerSetSpawnEvent.patch} |  8 +--
 ...rs-respect-inventory-max-stack-size.patch} |  0
 ...ize-entity-tracker-passenger-checks.patch} |  2 +-
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...h => 0610-Add-EntityDamageItemEvent.patch} |  0
 ...timize-indirect-passenger-iteration.patch} |  6 +-
 ...em-frame-map-cursor-update-interval.patch} |  2 +-
 ...613-Clear-bucket-NBT-after-dispense.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0615-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0617-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0619-Add-back-EntityPortalExitEvent.patch} |  6 +-
 ...-find-targets-for-lightning-strikes.patch} | 10 +--
 ... 0621-Get-entity-default-attributes.patch} |  0
 ...d-API.patch => 0622-Left-handed-API.patch} |  0
 ...ch => 0623-Add-more-advancement-API.patch} |  0
 ...624-Add-ItemFactory-getSpawnEgg-API.patch} |  0
 ...tch => 0625-Add-critical-damage-API.patch} | 10 +--
 ...0626-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  0
 ...-ram-API.patch => 0628-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...0-Add-Raw-Byte-Entity-Serialization.patch} |  4 +-
 ...31-Vanilla-command-permission-fixes.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} | 10 +--
 ...33-Fix-GameProfileCache-concurrency.patch} |  2 +-
 ...634-Improve-and-expand-AsyncCatcher.patch} | 12 ++--
 ...per-mobcaps-and-paper-playermobcaps.patch} | 14 ++--
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...lly-inline-methods-in-BlockPosition.patch} |  2 +-
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  4 +-
 ...our-chunk-data-off-disk-when-conver.patch} |  0
 ...d-state-when-raytracing-skip-air-bl.patch} |  4 +-
 ...atch => 0642-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  2 +-
 ...rimise-map-impl-for-tracked-players.patch} |  4 +-
 ...imise-BlockSoil-nearby-water-lookup.patch} |  2 +-
 ... 0646-Distance-manager-tick-timings.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  4 +-
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  0
 ...h => 0650-Add-packet-limiter-config.patch} |  6 +-
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0652-Ensure-valid-vehicle-status.patch} |  4 +-
 ...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 => 0657-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  6 +-
 ...unintended-light-block-manipulation.patch} |  0
 ...0660-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ... => 0662-Configurable-feature-seeds.patch} |  0
 ... 0663-Add-root-admin-user-detection.patch} |  0
 ...ays-allow-item-changing-in-Fireball.patch} |  0
 ...t-attempt-to-teleport-dead-entities.patch} |  4 +-
 ...ive-velocity-through-repeated-crits.patch} |  2 +-
 ...e-code-using-deprecated-for-removal.patch} |  0
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  4 +-
 ...e-unnecessary-itemmeta-from-clients.patch} |  4 +-
 ...=> 0671-Fix-Spigot-growth-modifiers.patch} |  2 +-
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0673-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...tch => 0674-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  8 +--
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  2 +-
 ...patch => 0677-Add-more-Campfire-API.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} | 33 ++++-----
 ...ard-CraftEntity-in-teleport-command.patch} |  6 +-
 ... => 0680-Improve-scoreboard-entries.patch} |  0
 ...ch => 0681-Entity-powdered-snow-API.patch} |  0
 ...0682-Add-API-for-item-entity-health.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
 ...=> 0687-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0688-Bucketable-API.patch} |  0
 ...es.patch => 0689-Validate-usernames.patch} |  4 +-
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  6 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...heck-for-PersistentDataContainer-ha.patch} |  0
 ...4-Multiple-Entries-with-Scoreboards.patch} |  2 +-
 ...695-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...0697-Fix-xp-reward-for-baby-zombies.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  2 +-
 ...ent.patch => 0699-Fix-NotePlayEvent.patch} |  0
 ....patch => 0700-Freeze-Tick-Lock-API.patch} | 12 ++--
 ...h => 0701-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  2 +-
 ...-missing-structure-set-seed-configs.patch} |  6 +-
 ...h => 0705-Implement-regenerateChunk.patch} |  4 +-
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  2 +-
 ...gs.patch => 0708-Add-GameEvent-tags.patch} |  2 +-
 ...ks-fairly-for-worlds-while-waiting-.patch} |  2 +-
 ...tch => 0710-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} |  2 +-
 ...-worldlist-before-initing-the-world.patch} |  4 +-
 ... => 0715-Fix-Entity-Position-Desync.patch} |  2 +-
 ...s.patch => 0716-Custom-Potion-Mixes.patch} |  4 +-
 ...17-Force-close-world-loading-screen.patch} |  2 +-
 ...718-Fix-falling-block-spawn-methods.patch} |  6 +-
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  2 +-
 ...I.patch => 0721-More-Projectile-API.patch} |  0
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  0
 ...0724-Implement-getComputedBiome-API.patch} |  0
 ...> 0725-Make-some-itemstacks-nonnull.patch} |  0
 ...726-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0727-Fix-saving-in-unloadWorld.patch} |  2 +-
 ...h => 0728-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0729-Add-TameableDeathMessageEvent.patch} |  0
 ...ock-data-for-EntityChangeBlockEvent.patch} |  0
 ...bles-running-when-mob-loot-gamerule.patch} |  4 +-
 ...ssenger-world-matches-ridden-entity.patch} |  4 +-
 ...s.patch => 0733-cache-resource-keys.patch} |  0
 ...low-changing-the-EnderDragon-podium.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} |  0
 ...-ServerLevel-for-gamerule-callbacks.patch} |  6 +-
 ...> 0740-Expand-PlayerItemDamageEvent.patch} |  0
 ...> 0741-WorldCreator-keepSpawnLoaded.patch} |  2 +-
 ...-in-CraftPersistentDataTypeRegistry.patch} |  0
 ...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
 ...> 0747-Add-PlayerStopUsingItemEvent.patch} |  2 +-
 ...rs.patch => 0748-Don-t-tick-markers.patch} |  8 +--
 ...tch => 0749-Expand-FallingBlock-API.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0751-Add-support-for-Proxy-Protocol.patch} |  4 +-
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0754-Sanitize-sent-BlockEntity-NBT.patch} |  4 +-
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  4 +-
 ...-on-world-create-while-being-ticked.patch} |  2 +-
 ...58-Dont-resent-entity-on-art-update.patch} |  0
 ... => 0759-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  4 +-
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0762-Nameable-Banner-API.patch} |  0
 ...roadcast-messages-to-command-blocks.patch} |  2 +-
 ...pty-items-from-being-added-to-world.patch} |  4 +-
 ...hPotion-and-LingeringPotion-spawnin.patch} |  0
 ...atch => 0766-Add-Player-getFishHook.patch} |  0
 ...chunk-for-dynamic-game-event-listen.patch} |  0
 ...s-missing-EntityDropItemEvent-calls.patch} |  4 +-
 ...PE.patch => 0769-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  0
 ...API.patch => 0771-More-Teleport-API.patch} |  2 +-
 ... => 0772-Add-EntityPortalReadyEvent.patch} |  6 +-
 ...level-random-in-entity-constructors.patch} |  2 +-
 ...k-entities-after-destroy-prediction.patch} |  4 +-
 ...on-plugins-accessing-faraway-chunks.patch} | 24 +++----
 ...tom-Chat-Completion-Suggestions-API.patch} |  2 +-
 ...Add-and-fix-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0778-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...API.patch => 0780-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  2 +-
 ...782-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  2 +-
 ...ok-changes-from-crashing-the-server.patch} |  2 +-
 ...tityChangeBlockEvent-in-more-places.patch} |  0
 ...> 0786-Missing-eating-regain-reason.patch} |  0
 ....patch => 0787-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...0-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0791-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  0
 ... 0793-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ... => 0795-Add-getDrops-to-BlockState.patch} |  0
 ...=> 0796-Fix-a-bunch-of-vanilla-bugs.patch} | 16 ++---
 ...y-onTrackingStart-during-navigation.patch} |  6 +-
 ... 0798-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0799-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  6 +-
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  4 +-
 ... 0802-Elder-Guardian-appearance-API.patch} |  2 +-
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0804-Add-entity-knockback-API.patch} |  0
 ....patch => 0805-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...ch => 0807-Add-EntityToggleSitEvent.patch} |  0
 ... => 0808-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0809-Add-Moving-Piston-API.patch} |  0
 ...> 0810-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} |  4 +-
 ...0814-Add-PrePlayerAttackEntityEvent.patch} |  4 +-
 ...e-reset-EnderDragon-boss-event-name.patch} |  0
 ...-green-map-markers-do-not-disappear.patch} |  0
 ... 0817-Add-Player-Warden-Warning-API.patch} |  2 +-
 ...a-friendly-methods-to-update-trades.patch} |  6 +-
 ...819-Add-paper-dumplisteners-command.patch} |  0
 ...lobal-player-list-where-appropriate.patch} |  6 +-
 ...sync-entity-add-due-to-fungus-trees.patch} |  0
 ....patch => 0822-ItemStack-damage-API.patch} |  0
 ...tion-API.patch => 0823-Friction-API.patch} |  2 +-
 ...trol-player-s-insomnia-and-phantoms.patch} |  0
 ...=> 0825-Fix-player-kick-on-shutdown.patch} |  0
 ... => 0826-Sync-offhand-slot-in-menus.patch} |  4 +-
 ... 0827-Player-Entity-Tracking-Events.patch} |  8 +--
 ...tch => 0828-Limit-pet-look-distance.patch} |  0
 ...nd-additions-to-the-SpawnReason-API.patch} |  0
 ...ments.patch => 0830-fix-Instruments.patch} |  2 +-
 ...for-some-hot-BlockBehavior-and-Flui.patch} |  0
 ...es-in-dispense-events-regarding-sta.patch} |  0
 ...tch => 0833-Add-BlockLockCheckEvent.patch} |  0
 ... 0834-Add-Sneaking-API-for-Entities.patch} |  0
 ... => 0835-Improve-logging-and-errors.patch} |  0
 ....patch => 0836-Improve-PortalEvents.patch} |  4 +-
 ...ion-for-spider-worldborder-climbing.patch} |  0
 ...sing-SpigotConfig-logCommands-check.patch} |  0
 ...Allay-stopDancing-while-not-dancing.patch} |  0
 ...ge.patch => 0840-Flying-Fall-Damage.patch} |  6 +-
 ...k-state-to-BlockExplodeEvent-and-En.patch} |  0
 ...ion-moving-velocity-to-VehicleBlock.patch} |  4 +-
 ...onfig-for-disabling-entity-tag-tags.patch} |  0
 ...e-player-info-update-packet-on-join.patch} |  2 +-
 ...k-items-during-EntityResurrectEvent.patch} |  2 +-
 ...en-API.patch => 0846-Win-Screen-API.patch} |  2 +-
 ...ItemStack-setAmount-null-assignment.patch} |  0
 ...ix-force-opening-enchantment-tables.patch} |  0
 ...tch => 0849-Add-Entity-Body-Yaw-API.patch} |  0
 ...vent-sleeping-villagers-moving-towa.patch} |  0
 ...hen-a-captured-block-state-is-outda.patch} |  4 +-
 ...=> 0852-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} |  2 +-
 ...857-Fix-text-display-error-on-spawn.patch} |  0
 ...nventories-returning-null-Locations.patch} |  0
 ...API.patch => 0859-Add-Shearable-API.patch} |  0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |  0
 ...ives-generating-from-using-bonemeal.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} |  4 +-
 ...0867-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
 ... 0870-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
 ...74-More-accurate-isInOpenWater-impl.patch} |  0
 ...ccess-to-lookups-field-in-RegistryO.patch} |  0
 ... => 0876-Expand-PlayerItemMendEvent.patch} |  2 +-
 ...sh-ProjectileSource-for-projectiles.patch} |  2 +-
 ... => 0878-Add-transient-modifier-API.patch} |  0
 ...patch => 0879-Fix-block-place-logic.patch} |  4 +-
 ...nd-playing-for-BlockItem-ItemStacks.patch} |  0
 ...l-BlockGrowEvent-for-missing-blocks.patch} |  0
 ...nhasbukkit-default-if-alias-block-e.patch} |  2 +-
 ...pLike-spam-for-missing-key-selector.patch} |  0
 ...-Fix-sniffer-removeExploredLocation.patch} |  0
 ...to-remove-all-active-potion-effects.patch} |  0
 ...rafting-result-amount-for-fireworks.patch} |  0
 ...> 0887-Properly-cancel-usable-items.patch} |  8 +--
 ...8-Add-event-for-player-editing-sign.patch} |  0
 ...k-item-frames-if-players-can-see-it.patch} |  2 +-
 ...ermission-levels-for-command-blocks.patch} |  0
 ...Add-option-to-disable-block-updates.patch} |  0
 ...892-Call-missing-BlockDispenseEvent.patch} |  0
 ...-chunks-for-supporting-block-checks.patch} |  4 +-
 ...Optimize-player-lookups-for-beacons.patch} |  0
 ...895-Add-Sign-getInteractableSideFor.patch} |  0
 ...96-Array-backed-synched-entity-data.patch} |  0
 ...7-fix-item-meta-for-tadpole-buckets.patch} |  0
 ...t-API.patch => 0898-Fix-BanList-API.patch} |  2 +-
 ...d-water-fluid-explosion-resistance-.patch} |  0
 ...x-possible-NPE-on-painting-creation.patch} |  0
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...nceOrb-should-call-EntitySpawnEvent.patch} |  0
 ...t-throw-both-Spread-and-Grow-Events.patch} |  0
 ....patch => 0904-Add-whitelist-events.patch} |  0
 ... 0905-Implement-PlayerFailMoveEvent.patch} |  0
 ...olia-scheduler-and-owned-region-API.patch} |  8 +--
 ...se-allay-memory-on-non-item-targets.patch} |  0
 ...API-for-updating-recipes-on-clients.patch} |  2 +-
 ...tion-when-spawning-display-entities.patch} |  0
 ...910-Only-capture-actual-tree-growth.patch} |  4 +-
 ...rce-for-mushroom-block-spread-event.patch} |  0
 ...Data-on-more-entities-when-spawning.patch} |  0
 ...-Use-correct-seed-on-api-world-load.patch} |  2 +-
 ...ta-neighbour-ticks-outside-of-range.patch} |  0
 ...> 0915-Cache-map-ids-on-item-frames.patch} |  2 +-
 ...-custom-statistic-criteria-creation.patch} |  0
 ...atch => 0917-Bandaid-fix-for-Effect.patch} |  6 +-
 ...tch => 0918-SculkCatalyst-bloom-API.patch} |  0
 ...API-for-an-entity-s-scoreboard-name.patch} |  0
 ...lace-methods-with-old-StructureType.patch} |  2 +-
 ...e-namespaced-commands-if-send-names.patch} |  0
 ...-handle-BlockBreakEvent-isDropItems.patch} |  4 +-
 ...entity-death-event-for-ender-dragon.patch} |  0
 ...tity-tracking-range-by-Y-coordinate.patch} |  4 +-
 ... => 0925-Add-Listing-API-for-Player.patch} |  4 +-
 ...figurable-Region-Compression-Format.patch} |  6 +-
 ...7-Add-BlockFace-to-BlockDamageEvent.patch} |  2 +-
 ...h => 0928-Fix-NPE-on-Boat-getStatus.patch} |  0
 ...e-API.patch => 0929-Expand-Pose-API.patch} |  6 +-
 ...patch => 0930-More-DragonBattle-API.patch} |  0
 ... 0931-Deep-clone-unhandled-nbt-tags.patch} |  0
 ...tch => 0932-Add-PlayerPickItemEvent.patch} |  0
 ...=> 0933-Allow-trident-custom-damage.patch} |  0
 ...4-Expose-hand-in-BlockCanBuildEvent.patch} |  0
 ...-nearest-structure-border-iteration.patch} |  0
 ...Implement-OfflinePlayer-isConnected.patch} |  2 +-
 ....patch => 0937-Fix-inventory-desync.patch} |  0
 ...titleOverride-to-InventoryOpenEvent.patch} |  6 +-
 ...39-Configure-sniffer-egg-hatch-time.patch} |  0
 ...-proximity-check-before-entity-look.patch} |  0
 ...kip-POI-finding-if-stuck-in-vehicle.patch} |  0
 ...t-sanity-checks-in-container-clicks.patch} |  0
 ...ll-BlockRedstoneEvents-for-lecterns.patch} |  0
 ...roper-checking-of-empty-item-stacks.patch} |  0
 ...ix-silent-equipment-change-for-mobs.patch} |  4 +-
 ...h => 0946-Fix-spigot-s-Forced-Stats.patch} |  0
 ...ing-InventoryHolders-to-inventories.patch} |  0
 ...entities-in-chunks-that-are-positio.patch} |  6 +-
 ...sing-logs-for-log-ips-config-option.patch} |  0
 ...Remove-Spigot-Bug-Fix-for-MC-109346.patch} |  2 +-
 ...atch => 0951-Fix-SuspiciousStewMeta.patch} |  0
 ...n-on-UpgradeData.BlockFixers-class-.patch} |  0
 ...-AdvancementProgress-getDateAwarded.patch} |  0
 ...idebar-objectives-not-being-cleared.patch} |  0
 ...x-missing-map-initialize-event-call.patch} |  4 +-
 ...a-when-attaching-firework-to-entity.patch} |  0
 ...ble-for-initializing-CraftLootTable.patch} |  0
 ...method-of-Fireballs-change-the-trav.patch} |  0
 ...59-Fix-UnsafeValues-loadAdvancement.patch} |  0
 ...> 0960-Add-player-idle-duration-API.patch} |  2 +-
 ...-if-we-can-see-non-visible-entities.patch} |  4 +-
 ...NPE-in-SculkBloomEvent-world-access.patch} |  0
 ...tack-for-Player-sendEquipmentChange.patch} |  2 +-
 ...Ints.patch => 0964-Optimize-VarInts.patch} |  0
 ...e-collision-shape-of-a-block-before.patch} |  0
 ...redicate-for-blocks-when-raytracing.patch} | 16 ++---
 ...em-packets-with-collector-as-source.patch} |  2 +-
 ... => 0968-Expand-LingeringPotion-API.patch} |  0
 ....patch => 0969-Add-MaterialTagsTest.patch} |  0
 ...ngEffect-powers-lightning-rods-and-.patch} |  4 +-
 ...h-event-for-all-player-interactions.patch} |  0
 ...everal-issues-with-EntityBreedEvent.patch} |  0
 ...973-Add-UUID-attribute-modifier-API.patch} |  0
 ...-event-call-for-entity-teleport-API.patch} |  0
 ...y-create-LootContext-for-criterions.patch} |  0
 ...-t-fire-sync-events-during-worldgen.patch} | 10 +--
 ...-getAttributeModifier-duplication-c.patch} |  0
 ...store-vanilla-entity-drops-behavior.patch} | 14 ++--
 ...tch => 0979-Add-Structure-check-API.patch} |  2 +-
 ...-Dont-resend-blocks-on-interactions.patch} |  8 +--
 ...evious-behavior-for-setResourcePack.patch} |  2 +-
 ...-read-and-store-sus-effect-duration.patch} |  0
 ...e-correct-max-stack-size-in-crafter.patch} |  0
 ...tch => 0984-add-more-scoreboard-API.patch} |  0
 ...stry.patch => 0985-Improve-Registry.patch} |  0
 ...on-null-loc-for-EntityTeleportEvent.patch} |  2 +-
 ...h => 0987-Add-experience-points-API.patch} |  6 +-
 ...h => 0988-Add-missing-InventoryType.patch} |  0
 ...h => 0989-Add-drops-to-shear-events.patch} |  0
 ...> 0990-Add-PlayerShieldDisableEvent.patch} | 12 ++--
 ... => 0991-Add-HiddenPotionEffect-API.patch} |  0
 ...f-bucket-dispenses-will-succeed-for.patch} |  0
 ...x-ItemMeta-removing-CustomModelData.patch} |  0
 ...ate-ResourceLocation-in-NBT-reading.patch} |  6 +-
 ...-experience-dropping-on-block-break.patch} |  4 +-
 ...> 0996-Fixup-NamespacedKey-handling.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  6 +-
 ...ing-for-EntityLiving-hasLineOfSight.patch} | 21 +++---
 ...dBounds-and-getBlockState-for-inlin.patch} | 12 ++--
 ...tem-frames-performance-and-bug-fixe.patch} | 22 +++---
 ...Manager-and-add-advanced-packet-sup.patch} | 30 ++++----
 ...02-Allow-Saving-of-Oversized-Chunks.patch} | 22 +++---
 ...03-Fix-World-isChunkGenerated-calls.patch} | 64 +++++++++--------
 ...004-Flat-bedrock-generator-settings.patch} |  0
 ...=> 1005-Entity-Activation-Range-2.0.patch} | 50 +++++++-------
 ...1006-Optional-per-player-mob-spawns.patch} | 28 ++++----
 ...3-Anti-Xray.patch => 1007-Anti-Xray.patch} | 68 +++++++++----------
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |  6 +-
 ...tance-map-to-optimise-entity-tracker.patch | 12 ++--
 scripts/moveback.py                           |  2 +-
 939 files changed, 945 insertions(+), 974 deletions(-)
 rename patches/server/{0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (96%)
 rename patches/server/{0074-Use-a-Shared-Random-for-Entities.patch => 0073-Use-a-Shared-Random-for-Entities.patch} (100%)
 rename patches/server/{0075-Configurable-spawn-chances-for-skeleton-horses.patch => 0074-Configurable-spawn-chances-for-skeleton-horses.patch} (100%)
 rename patches/server/{0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (96%)
 rename patches/server/{0078-Entity-AddTo-RemoveFrom-World-Events.patch => 0076-Entity-AddTo-RemoveFrom-World-Events.patch} (100%)
 rename patches/server/{0079-Configurable-Chunk-Inhabited-Time.patch => 0077-Configurable-Chunk-Inhabited-Time.patch} (92%)
 rename patches/server/{0080-EntityPathfindEvent.patch => 0078-EntityPathfindEvent.patch} (100%)
 rename patches/server/{0081-Sanitise-RegionFileCache-and-make-configurable.patch => 0079-Sanitise-RegionFileCache-and-make-configurable.patch} (100%)
 rename patches/server/{0082-Do-not-load-chunks-for-Pathfinding.patch => 0080-Do-not-load-chunks-for-Pathfinding.patch} (100%)
 rename patches/server/{0083-Add-PlayerUseUnknownEntityEvent.patch => 0081-Add-PlayerUseUnknownEntityEvent.patch} (97%)
 rename patches/server/{0084-Configurable-random-tick-rates-for-blocks.patch => 0082-Configurable-random-tick-rates-for-blocks.patch} (100%)
 rename patches/server/{0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (100%)
 rename patches/server/{0086-Optimize-DataBits.patch => 0084-Optimize-DataBits.patch} (100%)
 rename patches/server/{0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (100%)
 rename patches/server/{0088-Configurable-Player-Collision.patch => 0086-Configurable-Player-Collision.patch} (100%)
 rename patches/server/{0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename patches/server/{0090-Configurable-RCON-IP-address.patch => 0088-Configurable-RCON-IP-address.patch} (100%)
 rename patches/server/{0091-EntityRegainHealthEvent-isFastRegen-API.patch => 0089-EntityRegainHealthEvent-isFastRegen-API.patch} (96%)
 rename patches/server/{0092-Add-ability-to-configure-frosted_ice-properties.patch => 0090-Add-ability-to-configure-frosted_ice-properties.patch} (100%)
 rename patches/server/{0093-remove-null-possibility-for-getServer-singleton.patch => 0091-remove-null-possibility-for-getServer-singleton.patch} (95%)
 rename patches/server/{0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (100%)
 rename patches/server/{0096-LootTable-API-and-replenishable-lootables.patch => 0093-LootTable-API-and-replenishable-lootables.patch} (100%)
 rename patches/server/{0097-System-property-for-disabling-watchdoge.patch => 0094-System-property-for-disabling-watchdoge.patch} (100%)
 rename patches/server/{0098-Async-GameProfileCache-saving.patch => 0095-Async-GameProfileCache-saving.patch} (100%)
 rename patches/server/{0099-Optional-TNT-doesn-t-move-in-water.patch => 0096-Optional-TNT-doesn-t-move-in-water.patch} (100%)
 rename patches/server/{0100-Faster-redstone-torch-rapid-clock-removal.patch => 0097-Faster-redstone-torch-rapid-clock-removal.patch} (97%)
 rename patches/server/{0101-Add-server-name-parameter.patch => 0098-Add-server-name-parameter.patch} (90%)
 rename patches/server/{0102-Fix-global-sound-handling.patch => 0099-Fix-global-sound-handling.patch} (97%)
 rename patches/server/{0103-Avoid-blocking-on-Network-Manager-creation.patch => 0100-Avoid-blocking-on-Network-Manager-creation.patch} (100%)
 rename patches/server/{0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (90%)
 rename patches/server/{0105-Add-setting-for-proxy-online-mode-status.patch => 0102-Add-setting-for-proxy-online-mode-status.patch} (93%)
 rename patches/server/{0106-Optimise-BlockState-s-hashCode-equals.patch => 0103-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename patches/server/{0107-Configurable-packet-in-spam-threshold.patch => 0104-Configurable-packet-in-spam-threshold.patch} (100%)
 rename patches/server/{0108-Configurable-flying-kick-messages.patch => 0105-Configurable-flying-kick-messages.patch} (95%)
 rename patches/server/{0109-Add-EntityZapEvent.patch => 0106-Add-EntityZapEvent.patch} (100%)
 rename patches/server/{0110-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch => 0107-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch} (100%)
 rename patches/server/{0111-Cache-user-authenticator-threads.patch => 0108-Cache-user-authenticator-threads.patch} (100%)
 rename patches/server/{0112-Allow-Reloading-of-Command-Aliases.patch => 0109-Allow-Reloading-of-Command-Aliases.patch} (94%)
 rename patches/server/{0113-Add-source-to-PlayerExpChangeEvent.patch => 0110-Add-source-to-PlayerExpChangeEvent.patch} (96%)
 rename patches/server/{0114-Add-ProjectileCollideEvent.patch => 0111-Add-ProjectileCollideEvent.patch} (96%)
 rename patches/server/{0115-Prevent-Pathfinding-out-of-World-Border.patch => 0112-Prevent-Pathfinding-out-of-World-Border.patch} (100%)
 rename patches/server/{0116-Optimize-Level.hasChunkAt-BlockPosition-Z.patch => 0113-Optimize-Level.hasChunkAt-BlockPosition-Z.patch} (87%)
 rename patches/server/{0117-Bound-Treasure-Maps-to-World-Border.patch => 0114-Bound-Treasure-Maps-to-World-Border.patch} (100%)
 rename patches/server/{0118-Configurable-Cartographer-Treasure-Maps.patch => 0115-Configurable-Cartographer-Treasure-Maps.patch} (100%)
 rename patches/server/{0119-Add-API-methods-to-control-if-armor-stands-can-move.patch => 0116-Add-API-methods-to-control-if-armor-stands-can-move.patch} (100%)
 rename patches/server/{0120-String-based-Action-Bar-API.patch => 0117-String-based-Action-Bar-API.patch} (96%)
 rename patches/server/{0121-Properly-fix-item-duplication-bug.patch => 0118-Properly-fix-item-duplication-bug.patch} (100%)
 rename patches/server/{0122-Firework-API-s.patch => 0119-Firework-API-s.patch} (100%)
 rename patches/server/{0123-PlayerTeleportEndGatewayEvent.patch => 0120-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0124-Provide-E-TE-Chunk-count-stat-methods.patch => 0121-Provide-E-TE-Chunk-count-stat-methods.patch} (97%)
 rename patches/server/{0125-Enforce-Sync-Player-Saves.patch => 0122-Enforce-Sync-Player-Saves.patch} (92%)
 rename patches/server/{0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0123-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (99%)
 rename patches/server/{0127-Cap-Entity-Collisions.patch => 0124-Cap-Entity-Collisions.patch} (92%)
 rename patches/server/{0128-Remove-CraftScheduler-Async-Task-Debugger.patch => 0125-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename patches/server/{0129-Properly-handle-async-calls-to-restart-the-server.patch => 0126-Properly-handle-async-calls-to-restart-the-server.patch} (98%)
 rename patches/server/{0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0127-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (96%)
 rename patches/server/{0131-Add-configuration-option-to-prevent-player-names-fro.patch => 0128-Add-configuration-option-to-prevent-player-names-fro.patch} (89%)
 rename patches/server/{0132-Use-TerminalConsoleAppender-for-console-improvements.patch => 0129-Use-TerminalConsoleAppender-for-console-improvements.patch} (98%)
 rename patches/server/{0133-provide-a-configurable-option-to-disable-creeper-lin.patch => 0130-provide-a-configurable-option-to-disable-creeper-lin.patch} (100%)
 rename patches/server/{0134-Item-canEntityPickup.patch => 0131-Item-canEntityPickup.patch} (100%)
 rename patches/server/{0135-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0132-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename patches/server/{0136-PlayerAttemptPickupItemEvent.patch => 0133-PlayerAttemptPickupItemEvent.patch} (100%)
 rename patches/server/{0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch => 0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch} (97%)
 rename patches/server/{0138-Basic-PlayerProfile-API.patch => 0135-Basic-PlayerProfile-API.patch} (98%)
 rename patches/server/{0139-Add-UnknownCommandEvent.patch => 0136-Add-UnknownCommandEvent.patch} (100%)
 rename patches/server/{0140-Shoulder-Entities-Release-API.patch => 0137-Shoulder-Entities-Release-API.patch} (96%)
 rename patches/server/{0141-Profile-Lookup-Events.patch => 0138-Profile-Lookup-Events.patch} (100%)
 rename patches/server/{0142-Block-player-logins-during-server-shutdown.patch => 0139-Block-player-logins-during-server-shutdown.patch} (100%)
 rename patches/server/{0143-Entity-fromMobSpawner.patch => 0140-Entity-fromMobSpawner.patch} (97%)
 rename patches/server/{0144-Improve-the-Saddle-API-for-Horses.patch => 0141-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename patches/server/{0145-ensureServerConversions-API.patch => 0142-ensureServerConversions-API.patch} (100%)
 rename patches/server/{0146-Implement-getI18NDisplayName.patch => 0143-Implement-getI18NDisplayName.patch} (100%)
 rename patches/server/{0147-ProfileWhitelistVerifyEvent.patch => 0144-ProfileWhitelistVerifyEvent.patch} (97%)
 rename patches/server/{0148-Fix-this-stupid-bullshit.patch => 0145-Fix-this-stupid-bullshit.patch} (100%)
 rename patches/server/{0149-LivingEntity-setKiller.patch => 0146-LivingEntity-setKiller.patch} (100%)
 rename patches/server/{0150-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0147-Ocelot-despawns-should-honor-nametags-and-leash.patch} (100%)
 rename patches/server/{0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (100%)
 rename patches/server/{0152-Allow-specifying-a-custom-authentication-servers-dow.patch => 0149-Allow-specifying-a-custom-authentication-servers-dow.patch} (94%)
 rename patches/server/{0153-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0150-Handle-plugin-prefixes-using-Log4J-configuration.patch} (95%)
 rename patches/server/{0154-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0151-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 rename patches/server/{0155-Add-PlayerJumpEvent.patch => 0152-Add-PlayerJumpEvent.patch} (96%)
 rename patches/server/{0156-handle-ServerboundKeepAlivePacket-async.patch => 0153-handle-ServerboundKeepAlivePacket-async.patch} (100%)
 rename patches/server/{0157-Expose-client-protocol-version-and-virtual-host.patch => 0154-Expose-client-protocol-version-and-virtual-host.patch} (95%)
 rename patches/server/{0158-revert-serverside-behavior-of-keepalives.patch => 0155-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename patches/server/{0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0156-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (92%)
 rename patches/server/{0160-Add-PlayerArmorChangeEvent.patch => 0157-Add-PlayerArmorChangeEvent.patch} (98%)
 rename patches/server/{0161-Prevent-logins-from-being-processed-when-the-player-.patch => 0158-Prevent-logins-from-being-processed-when-the-player-.patch} (100%)
 rename patches/server/{0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch => 0159-Fix-MC-117075-Block-entity-unload-lag-spike.patch} (89%)
 rename patches/server/{0163-use-CB-BlockState-implementations-for-captured-block.patch => 0160-use-CB-BlockState-implementations-for-captured-block.patch} (92%)
 rename patches/server/{0164-API-to-get-a-BlockState-without-a-snapshot.patch => 0161-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename patches/server/{0165-AsyncTabCompleteEvent.patch => 0162-AsyncTabCompleteEvent.patch} (99%)
 rename patches/server/{0166-PlayerPickupExperienceEvent.patch => 0163-PlayerPickupExperienceEvent.patch} (93%)
 rename patches/server/{0167-Ability-to-apply-mending-to-XP-API.patch => 0164-Ability-to-apply-mending-to-XP-API.patch} (96%)
 rename patches/server/{0168-PlayerNaturallySpawnCreaturesEvent.patch => 0165-PlayerNaturallySpawnCreaturesEvent.patch} (98%)
 rename patches/server/{0169-Add-setPlayerProfile-API-for-Skulls.patch => 0166-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/server/{0170-PreCreatureSpawnEvent.patch => 0167-PreCreatureSpawnEvent.patch} (98%)
 rename patches/server/{0171-Fill-Profile-Property-Events.patch => 0168-Fill-Profile-Property-Events.patch} (97%)
 rename patches/server/{0172-Add-PlayerAdvancementCriterionGrantEvent.patch => 0169-Add-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename patches/server/{0173-Add-ArmorStand-Item-Meta.patch => 0170-Add-ArmorStand-Item-Meta.patch} (100%)
 rename patches/server/{0174-Extend-Player-Interact-cancellation.patch => 0171-Extend-Player-Interact-cancellation.patch} (100%)
 rename patches/server/{0175-Tameable-getOwnerUniqueId-API.patch => 0172-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename patches/server/{0176-Toggleable-player-crits.patch => 0173-Toggleable-player-crits.patch} (85%)
 rename patches/server/{0177-Disable-Explicit-Network-Manager-Flushing.patch => 0174-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename patches/server/{0178-Implement-extended-PaperServerListPingEvent.patch => 0175-Implement-extended-PaperServerListPingEvent.patch} (99%)
 rename patches/server/{0179-Add-more-fields-to-AsyncPreLoginEvent.patch => 0176-Add-more-fields-to-AsyncPreLoginEvent.patch} (98%)
 rename patches/server/{0180-Player.setPlayerProfile-API.patch => 0177-Player.setPlayerProfile-API.patch} (97%)
 rename patches/server/{0181-getPlayerUniqueId-API.patch => 0178-getPlayerUniqueId-API.patch} (94%)
 rename patches/server/{0182-Improved-Async-Task-Scheduler.patch => 0179-Improved-Async-Task-Scheduler.patch} (100%)
 rename patches/server/{0183-Make-legacy-ping-handler-more-reliable.patch => 0180-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename patches/server/{0184-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0181-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename patches/server/{0185-Flag-to-disable-the-channel-limit.patch => 0182-Flag-to-disable-the-channel-limit.patch} (95%)
 rename patches/server/{0186-Add-openSign-method-to-HumanEntity.patch => 0183-Add-openSign-method-to-HumanEntity.patch} (91%)
 rename patches/server/{0187-Configurable-sprint-interruption-on-attack.patch => 0184-Configurable-sprint-interruption-on-attack.patch} (88%)
 rename patches/server/{0188-EndermanEscapeEvent.patch => 0185-EndermanEscapeEvent.patch} (100%)
 rename patches/server/{0189-Enderman.teleportRandomly.patch => 0186-Enderman.teleportRandomly.patch} (100%)
 rename patches/server/{0190-Block-Enderpearl-Travel-Exploit.patch => 0187-Block-Enderpearl-Travel-Exploit.patch} (96%)
 rename patches/server/{0191-Expand-World.spawnParticle-API-and-add-Builder.patch => 0188-Expand-World.spawnParticle-API-and-add-Builder.patch} (97%)
 rename patches/server/{0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (94%)
 rename patches/server/{0193-EndermanAttackPlayerEvent.patch => 0190-EndermanAttackPlayerEvent.patch} (94%)
 rename patches/server/{0194-WitchConsumePotionEvent.patch => 0191-WitchConsumePotionEvent.patch} (100%)
 rename patches/server/{0195-WitchThrowPotionEvent.patch => 0192-WitchThrowPotionEvent.patch} (100%)
 rename patches/server/{0196-WitchReadyPotionEvent.patch => 0193-WitchReadyPotionEvent.patch} (100%)
 rename patches/server/{0197-ItemStack-getMaxItemUseDuration.patch => 0194-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/server/{0198-Add-EntityTeleportEndGatewayEvent.patch => 0195-Add-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (89%)
 rename patches/server/{0200-Fix-CraftEntity-hashCode.patch => 0197-Fix-CraftEntity-hashCode.patch} (100%)
 rename patches/server/{0201-Configurable-LootPool-luck-formula.patch => 0198-Configurable-LootPool-luck-formula.patch} (100%)
 rename patches/server/{0202-Print-Error-details-when-failing-to-save-player-data.patch => 0199-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename patches/server/{0203-Make-shield-blocking-delay-configurable.patch => 0200-Make-shield-blocking-delay-configurable.patch} (96%)
 rename patches/server/{0204-Improve-EntityShootBowEvent.patch => 0201-Improve-EntityShootBowEvent.patch} (100%)
 rename patches/server/{0205-PlayerReadyArrowEvent.patch => 0202-PlayerReadyArrowEvent.patch} (93%)
 rename patches/server/{0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch => 0203-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch} (95%)
 rename patches/server/{0207-Expand-Explosions-API.patch => 0204-Expand-Explosions-API.patch} (94%)
 rename patches/server/{0208-LivingEntity-Hand-Raised-Item-Use-API.patch => 0205-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/server/{0209-RangedEntity-API.patch => 0206-RangedEntity-API.patch} (100%)
 rename patches/server/{0210-Add-config-to-disable-ender-dragon-legacy-check.patch => 0207-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename patches/server/{0211-Implement-World.getEntity-UUID-API.patch => 0208-Implement-World.getEntity-UUID-API.patch} (91%)
 rename patches/server/{0212-InventoryCloseEvent-Reason-API.patch => 0209-InventoryCloseEvent-Reason-API.patch} (98%)
 rename patches/server/{0213-Vex-get-setSummoner-API.patch => 0210-Vex-get-setSummoner-API.patch} (100%)
 rename patches/server/{0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0211-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (94%)
 rename patches/server/{0215-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch => 0212-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch} (100%)
 rename patches/server/{0216-add-more-information-to-Entity.toString.patch => 0213-add-more-information-to-Entity.toString.patch} (95%)
 rename patches/server/{0217-EnderDragon-Events.patch => 0214-EnderDragon-Events.patch} (100%)
 rename patches/server/{0218-PlayerElytraBoostEvent.patch => 0215-PlayerElytraBoostEvent.patch} (100%)
 rename patches/server/{0219-PlayerLaunchProjectileEvent.patch => 0216-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/server/{0220-Improve-BlockPosition-inlining.patch => 0217-Improve-BlockPosition-inlining.patch} (89%)
 rename patches/server/{0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (92%)
 rename patches/server/{0222-Vanished-players-don-t-have-rights.patch => 0219-Vanished-players-don-t-have-rights.patch} (97%)
 rename patches/server/{0223-Allow-disabling-armor-stand-ticking.patch => 0220-Allow-disabling-armor-stand-ticking.patch} (100%)
 rename patches/server/{0224-SkeletonHorse-Additions.patch => 0221-SkeletonHorse-Additions.patch} (100%)
 rename patches/server/{0225-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0222-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename patches/server/{0226-Expand-ArmorStand-API.patch => 0223-Expand-ArmorStand-API.patch} (100%)
 rename patches/server/{0227-AnvilDamageEvent.patch => 0224-AnvilDamageEvent.patch} (100%)
 rename patches/server/{0228-Add-TNTPrimeEvent.patch => 0225-Add-TNTPrimeEvent.patch} (100%)
 rename patches/server/{0229-Break-up-and-make-tab-spam-limits-configurable.patch => 0226-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename patches/server/{0230-Fix-NBT-type-issues.patch => 0227-Fix-NBT-type-issues.patch} (95%)
 rename patches/server/{0231-Remove-unnecessary-itemmeta-handling.patch => 0228-Remove-unnecessary-itemmeta-handling.patch} (100%)
 rename patches/server/{0232-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0229-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (97%)
 rename patches/server/{0233-Add-Early-Warning-Feature-to-WatchDog.patch => 0230-Add-Early-Warning-Feature-to-WatchDog.patch} (97%)
 rename patches/server/{0234-Use-ConcurrentHashMap-in-JsonList.patch => 0231-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename patches/server/{0235-Use-a-Queue-for-Queueing-Commands.patch => 0232-Use-a-Queue-for-Queueing-Commands.patch} (95%)
 rename patches/server/{0236-Ability-to-get-block-entities-from-a-chunk-without-s.patch => 0233-Ability-to-get-block-entities-from-a-chunk-without-s.patch} (100%)
 rename patches/server/{0237-Optimize-BlockPosition-helper-methods.patch => 0234-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename patches/server/{0238-Restore-vanilla-default-mob-spawn-range-and-water-an.patch => 0235-Restore-vanilla-default-mob-spawn-range-and-water-an.patch} (100%)
 rename patches/server/{0239-Slime-Pathfinder-Events.patch => 0236-Slime-Pathfinder-Events.patch} (98%)
 rename patches/server/{0240-Configurable-speed-for-water-flowing-over-lava.patch => 0237-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0241-Optimize-CraftBlockData-Creation.patch => 0238-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0242-Optimize-MappedRegistry.patch => 0239-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0243-Add-PhantomPreSpawnEvent.patch => 0240-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/server/{0244-Add-More-Creeper-API.patch => 0241-Add-More-Creeper-API.patch} (96%)
 rename patches/server/{0245-Inventory-removeItemAnySlot.patch => 0242-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0246-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0243-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (92%)
 rename patches/server/{0247-Add-ray-tracing-methods-to-LivingEntity.patch => 0244-Add-ray-tracing-methods-to-LivingEntity.patch} (97%)
 rename patches/server/{0248-Expose-attack-cooldown-methods-for-Player.patch => 0245-Expose-attack-cooldown-methods-for-Player.patch} (92%)
 rename patches/server/{0249-Improve-death-events.patch => 0246-Improve-death-events.patch} (98%)
 rename patches/server/{0250-Allow-chests-to-be-placed-with-NBT-data.patch => 0247-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0251-Mob-Pathfinding-API.patch => 0248-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0252-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 0249-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (100%)
 rename patches/server/{0253-Prevent-various-interactions-from-causing-chunk-load.patch => 0250-Prevent-various-interactions-from-causing-chunk-load.patch} (96%)
 rename patches/server/{0254-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0251-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename patches/server/{0255-Implement-furnace-cook-speed-multiplier-API.patch => 0252-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0256-Honor-EntityAgeable.ageLock.patch => 0253-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0257-Configurable-connection-throttle-kick-message.patch => 0254-Configurable-connection-throttle-kick-message.patch} (94%)
 rename patches/server/{0258-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0255-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0259-Hook-into-CB-plugin-rewrites.patch => 0256-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0260-PreSpawnerSpawnEvent.patch => 0257-PreSpawnerSpawnEvent.patch} (94%)
 rename patches/server/{0261-Add-LivingEntity-getTargetEntity.patch => 0258-Add-LivingEntity-getTargetEntity.patch} (98%)
 rename patches/server/{0262-Add-sun-related-API.patch => 0259-Add-sun-related-API.patch} (94%)
 rename patches/server/{0263-Catch-JsonParseException-in-entity-and-block-entity-.patch => 0260-Catch-JsonParseException-in-entity-and-block-entity-.patch} (100%)
 rename patches/server/{0264-Turtle-API.patch => 0261-Turtle-API.patch} (100%)
 rename patches/server/{0265-Call-player-spectator-target-events-and-improve-impl.patch => 0262-Call-player-spectator-target-events-and-improve-impl.patch} (96%)
 rename patches/server/{0266-Add-more-Witch-API.patch => 0263-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0267-Check-Drowned-for-Villager-Aggression-Config.patch => 0264-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0268-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0265-Add-option-to-prevent-players-from-moving-into-unloa.patch} (98%)
 rename patches/server/{0269-Reset-players-airTicks-on-respawn.patch => 0266-Reset-players-airTicks-on-respawn.patch} (90%)
 rename patches/server/{0270-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0271-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (98%)
 rename patches/server/{0272-Optimize-World-Time-Updates.patch => 0269-Optimize-World-Time-Updates.patch} (96%)
 rename patches/server/{0273-Restore-custom-InventoryHolder-support.patch => 0270-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0274-Fix-SpongeAbsortEvent-handling.patch => 0271-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0275-Don-t-allow-digging-into-unloaded-chunks.patch => 0272-Don-t-allow-digging-into-unloaded-chunks.patch} (96%)
 rename patches/server/{0276-Make-the-default-permission-message-configurable.patch => 0273-Make-the-default-permission-message-configurable.patch} (95%)
 rename patches/server/{0277-Handle-Large-Packets-disconnecting-client.patch => 0274-Handle-Large-Packets-disconnecting-client.patch} (98%)
 rename patches/server/{0278-force-entity-dismount-during-teleportation.patch => 0275-force-entity-dismount-during-teleportation.patch} (94%)
 rename patches/server/{0279-Add-more-Zombie-API.patch => 0276-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0280-Book-Size-Limits.patch => 0277-Book-Size-Limits.patch} (96%)
 rename patches/server/{0281-Add-PlayerConnectionCloseEvent.patch => 0278-Add-PlayerConnectionCloseEvent.patch} (96%)
 rename patches/server/{0282-Replace-OfflinePlayer-getLastPlayed.patch => 0279-Replace-OfflinePlayer-getLastPlayed.patch} (96%)
 rename patches/server/{0283-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0280-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (91%)
 rename patches/server/{0284-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch => 0281-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch} (92%)
 rename patches/server/{0285-BlockDestroyEvent.patch => 0282-BlockDestroyEvent.patch} (94%)
 rename patches/server/{0286-Async-command-map-building.patch => 0283-Async-command-map-building.patch} (97%)
 rename patches/server/{0287-Brigadier-Mojang-API.patch => 0284-Brigadier-Mojang-API.patch} (100%)
 rename patches/server/{0288-Improve-exact-choice-recipe-ingredients.patch => 0285-Improve-exact-choice-recipe-ingredients.patch} (100%)
 rename patches/server/{0289-Limit-Client-Sign-length-more.patch => 0286-Limit-Client-Sign-length-more.patch} (96%)
 rename patches/server/{0290-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0287-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (89%)
 rename patches/server/{0291-Handle-Oversized-Tile-Entities-in-chunks.patch => 0288-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0292-Entity-getEntitySpawnReason.patch => 0289-Entity-getEntitySpawnReason.patch} (98%)
 rename patches/server/{0294-Fire-event-on-GS4-query.patch => 0290-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0295-Add-PlayerPostRespawnEvent.patch => 0291-Add-PlayerPostRespawnEvent.patch} (95%)
 rename patches/server/{0296-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0292-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (94%)
 rename patches/server/{0297-Server-Tick-Events.patch => 0293-Server-Tick-Events.patch} (94%)
 rename patches/server/{0298-PlayerDeathEvent-getItemsToKeep.patch => 0294-PlayerDeathEvent-getItemsToKeep.patch} (97%)
 rename patches/server/{0299-Optimize-Captured-BlockEntity-Lookup.patch => 0295-Optimize-Captured-BlockEntity-Lookup.patch} (91%)
 rename patches/server/{0300-Add-Heightmap-API.patch => 0296-Add-Heightmap-API.patch} (95%)
 rename patches/server/{0301-Mob-Spawner-API-Enhancements.patch => 0297-Mob-Spawner-API-Enhancements.patch} (98%)
 rename patches/server/{0302-Fix-CB-call-to-changed-postToMainThread-method.patch => 0298-Fix-CB-call-to-changed-postToMainThread-method.patch} (91%)
 rename patches/server/{0303-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0299-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0304-Implement-CraftBlockSoundGroup.patch => 0300-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0305-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0301-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (99%)
 rename patches/server/{0307-Expose-the-internal-current-tick.patch => 0302-Expose-the-internal-current-tick.patch} (90%)
 rename patches/server/{0309-Show-blockstate-location-if-we-failed-to-read-it.patch => 0303-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0310-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0304-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (94%)
 rename patches/server/{0311-Configurable-projectile-relative-velocity.patch => 0305-Configurable-projectile-relative-velocity.patch} (96%)
 rename patches/server/{0312-offset-item-frame-ticking.patch => 0306-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0313-Prevent-consuming-the-wrong-itemstack.patch => 0307-Prevent-consuming-the-wrong-itemstack.patch} (96%)
 rename patches/server/{0314-Dont-send-unnecessary-sign-update.patch => 0308-Dont-send-unnecessary-sign-update.patch} (100%)
 rename patches/server/{0315-Add-option-to-disable-pillager-patrols.patch => 0309-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0317-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0310-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0318-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0311-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0319-Duplicate-UUID-Resolve-Option.patch => 0312-Duplicate-UUID-Resolve-Option.patch} (98%)
 rename patches/server/{0320-PlayerDeathEvent-shouldDropExperience.patch => 0313-PlayerDeathEvent-shouldDropExperience.patch} (91%)
 rename patches/server/{0321-Prevent-bees-loading-chunks-checking-hive-position.patch => 0314-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0322-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0315-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0323-Optimise-EntityGetter-getPlayerByUUID.patch => 0316-Optimise-EntityGetter-getPlayerByUUID.patch} (94%)
 rename patches/server/{0324-Fix-items-not-falling-correctly.patch => 0317-Fix-items-not-falling-correctly.patch} (96%)
 rename patches/server/{0325-Optimize-call-to-getFluid-for-explosions.patch => 0318-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0326-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0319-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0328-Guard-against-serializing-mismatching-chunk-coordina.patch => 0320-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0329-Alternative-item-despawn-rate.patch => 0321-Alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0330-Tracking-Range-Improvements.patch => 0322-Tracking-Range-Improvements.patch} (95%)
 rename patches/server/{0331-Fix-items-vanishing-through-end-portal.patch => 0323-Fix-items-vanishing-through-end-portal.patch} (89%)
 rename patches/server/{0334-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0324-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0335-Improve-Block-breakNaturally-API.patch => 0325-Improve-Block-breakNaturally-API.patch} (100%)
 rename patches/server/{0336-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0326-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (96%)
 rename patches/server/{0337-Add-debug-for-sync-chunk-loads.patch => 0327-Add-debug-for-sync-chunk-loads.patch} (98%)
 rename patches/server/{0338-Improve-java-version-check.patch => 0328-Improve-java-version-check.patch} (100%)
 rename patches/server/{0339-Add-ThrownEggHatchEvent.patch => 0329-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0340-Entity-Jump-API.patch => 0330-Entity-Jump-API.patch} (97%)
 rename patches/server/{0341-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0331-Add-option-to-nerf-pigmen-from-nether-portals.patch} (86%)
 rename patches/server/{0342-Make-the-GUI-graph-fancier.patch => 0332-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0343-add-hand-to-BlockMultiPlaceEvent.patch => 0333-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0344-Validate-tripwire-hook-placement-before-update.patch => 0334-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0345-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0335-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0346-Configurable-chance-of-villager-zombie-infection.patch => 0336-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0347-Optimise-Chunk-getFluid.patch => 0337-Optimise-Chunk-getFluid.patch} (88%)
 rename patches/server/{0348-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0338-Set-spigots-verbose-world-setting-to-false-by-def.patch} (89%)
 rename patches/server/{0349-Add-tick-times-API-and-mspt-command.patch => 0339-Add-tick-times-API-and-mspt-command.patch} (97%)
 rename patches/server/{0350-Expose-MinecraftServer-isRunning.patch => 0340-Expose-MinecraftServer-isRunning.patch} (90%)
 rename patches/server/{0351-Add-Raw-Byte-ItemStack-Serialization.patch => 0341-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0352-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0342-Pillager-patrol-spawn-settings-and-per-player-option.patch} (98%)
 rename patches/server/{0353-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0343-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (95%)
 rename patches/server/{0354-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0344-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0355-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0345-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (88%)
 rename patches/server/{0356-Don-t-tick-dead-players.patch => 0346-Don-t-tick-dead-players.patch} (85%)
 rename patches/server/{0357-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0347-Dead-Player-s-shouldn-t-be-able-to-move.patch} (84%)
 rename patches/server/{0358-Don-t-move-existing-players-to-world-spawn.patch => 0348-Don-t-move-existing-players-to-world-spawn.patch} (88%)
 rename patches/server/{0359-Optimize-Pathfinding.patch => 0349-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0360-Reduce-Either-Optional-allocation.patch => 0350-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0361-Reduce-memory-footprint-of-CompoundTag.patch => 0351-Reduce-memory-footprint-of-CompoundTag.patch} (100%)
 rename patches/server/{0362-Prevent-opening-inventories-when-frozen.patch => 0352-Prevent-opening-inventories-when-frozen.patch} (94%)
 rename patches/server/{0363-Don-t-run-entity-collision-code-if-not-needed.patch => 0353-Don-t-run-entity-collision-code-if-not-needed.patch} (96%)
 rename patches/server/{0364-Implement-Player-Client-Options-API.patch => 0354-Implement-Player-Client-Options-API.patch} (96%)
 rename patches/server/{0365-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0355-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0366-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch => 0356-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch} (94%)
 rename patches/server/{0367-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0357-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (96%)
 rename patches/server/{0368-Add-PlayerAttackEntityCooldownResetEvent.patch => 0358-Add-PlayerAttackEntityCooldownResetEvent.patch} (95%)
 rename patches/server/{0369-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0359-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0370-Add-phantom-creative-and-insomniac-controls.patch => 0360-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0371-Fix-item-duplication-and-teleport-issues.patch => 0361-Fix-item-duplication-and-teleport-issues.patch} (95%)
 rename patches/server/{0372-Villager-Restocks-API.patch => 0362-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0373-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0363-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename patches/server/{0374-Expose-game-version.patch => 0364-Expose-game-version.patch} (89%)
 rename patches/server/{0375-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0365-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0376-misc-debugging-dumps.patch => 0366-misc-debugging-dumps.patch} (96%)
 rename patches/server/{0377-Prevent-teleporting-dead-entities.patch => 0367-Prevent-teleporting-dead-entities.patch} (100%)
 rename patches/server/{0378-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0368-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (98%)
 rename patches/server/{0379-Implement-Mob-Goal-API.patch => 0369-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0380-Add-villager-reputation-API.patch => 0370-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0381-Option-for-maximum-exp-value-when-merging-orbs.patch => 0371-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0382-ExperienceOrbMergeEvent.patch => 0372-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0383-Fix-PotionEffect-ignores-icon-flag.patch => 0373-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0384-Potential-bed-API.patch => 0374-Potential-bed-API.patch} (100%)
 rename patches/server/{0385-Wait-for-Async-Tasks-during-shutdown.patch => 0375-Wait-for-Async-Tasks-during-shutdown.patch} (93%)
 rename patches/server/{0386-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0376-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0387-Ensure-safe-gateway-teleport.patch => 0377-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0388-Add-option-for-console-having-all-permissions.patch => 0378-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0389-Fix-villager-trading-demand-MC-163962.patch => 0379-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0390-Maps-shouldn-t-load-chunks.patch => 0380-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0391-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0381-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0392-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0382-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0393-Fix-piston-physics-inconsistency-MC-188840.patch => 0383-Fix-piston-physics-inconsistency-MC-188840.patch} (97%)
 rename patches/server/{0394-Fix-sand-duping.patch => 0384-Fix-sand-duping.patch} (100%)
 rename patches/server/{0395-Fix-missing-chunks-due-to-integer-overflow.patch => 0385-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0396-Prevent-position-desync-causing-tp-exploit.patch => 0386-Prevent-position-desync-causing-tp-exploit.patch} (100%)
 rename patches/server/{0397-Inventory-getHolder-method-without-block-snapshot.patch => 0387-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0398-Improve-Arrow-API.patch => 0388-Improve-Arrow-API.patch} (100%)
 rename patches/server/{0399-Add-PlayerRecipeBookClickEvent.patch => 0389-Add-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0400-Hide-sync-chunk-writes-behind-flag.patch => 0390-Hide-sync-chunk-writes-behind-flag.patch} (93%)
 rename patches/server/{0401-Add-permission-for-command-blocks.patch => 0391-Add-permission-for-command-blocks.patch} (97%)
 rename patches/server/{0402-Ensure-Entity-position-and-AABB-are-never-invalid.patch => 0392-Ensure-Entity-position-and-AABB-are-never-invalid.patch} (91%)
 rename patches/server/{0403-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0393-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (93%)
 rename patches/server/{0404-Paper-dumpitem-command.patch => 0394-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0405-Improve-Legacy-Component-serialization-size.patch => 0395-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0406-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0396-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (70%)
 rename patches/server/{0407-incremental-chunk-and-player-saving.patch => 0397-incremental-chunk-and-player-saving.patch} (95%)
 rename patches/server/{0408-Support-old-UUID-format-for-NBT.patch => 0398-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0409-Convert-legacy-attributes-in-Item-Meta.patch => 0399-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0410-Support-components-in-ItemMeta.patch => 0400-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0411-Improve-fix-EntityTargetLivingEntityEvent.patch => 0401-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%)
 rename patches/server/{0412-Add-entity-liquid-API.patch => 0402-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0413-Update-itemstack-legacy-name-and-lore.patch => 0403-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0414-Add-PrepareResultEvent.patch => 0404-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0415-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0405-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (91%)
 rename patches/server/{0416-Fix-arrows-never-despawning-MC-125757.patch => 0406-Fix-arrows-never-despawning-MC-125757.patch} (91%)
 rename patches/server/{0417-Thread-Safe-Vanilla-Command-permission-checking.patch => 0407-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0418-Fix-SPIGOT-5989.patch => 0408-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0419-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0409-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0420-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0410-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0421-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0411-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0422-Optimize-NetworkManager-Exception-Handling.patch => 0412-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0423-Fix-some-rails-connecting-improperly.patch => 0413-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0424-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0414-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0425-Brand-support.patch => 0415-Brand-support.patch} (95%)
 rename patches/server/{0426-Add-playPickupItemAnimation-to-LivingEntity.patch => 0416-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0427-Don-t-require-FACING-data.patch => 0417-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0428-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0418-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (91%)
 rename patches/server/{0429-Add-moon-phase-API.patch => 0419-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0430-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0420-Do-not-let-the-server-load-chunks-from-newer-version.patch} (95%)
 rename patches/server/{0431-Prevent-headless-pistons-from-being-created.patch => 0421-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0432-Add-BellRingEvent.patch => 0422-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0433-Add-zombie-targets-turtle-egg-config.patch => 0423-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0434-Buffer-joins-to-world.patch => 0424-Buffer-joins-to-world.patch} (91%)
 rename patches/server/{0435-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0425-Fix-hex-colors-not-working-in-some-kick-messages.patch} (97%)
 rename patches/server/{0436-PortalCreateEvent-needs-to-know-its-entity.patch => 0426-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0437-Add-more-Evoker-API.patch => 0427-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0438-Add-methods-to-get-translation-keys.patch => 0428-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0439-Create-HoverEvent-from-ItemStack-Entity.patch => 0429-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0440-Cache-block-data-strings.patch => 0430-Cache-block-data-strings.patch} (97%)
 rename patches/server/{0441-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0431-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (97%)
 rename patches/server/{0442-Add-additional-open-container-api-to-HumanEntity.patch => 0432-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0443-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0433-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0444-Extend-block-drop-capture-to-capture-all-items-added.patch => 0434-Extend-block-drop-capture-to-capture-all-items-added.patch} (89%)
 rename patches/server/{0445-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0435-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (90%)
 rename patches/server/{0446-Lazily-track-plugin-scoreboards-by-default.patch => 0436-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0447-Entity-isTicking.patch => 0437-Entity-isTicking.patch} (90%)
 rename patches/server/{0448-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0438-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (94%)
 rename patches/server/{0449-Fix-Concurrency-issue-in-ShufflingList.patch => 0439-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/server/{0450-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0440-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0451-Fix-for-large-move-vectors-crashing-server.patch => 0441-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0452-Optimise-getType-calls.patch => 0442-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0453-Villager-resetOffers.patch => 0443-Villager-resetOffers.patch} (100%)
 rename patches/server/{0454-Retain-block-place-order-when-capturing-blockstates.patch => 0444-Retain-block-place-order-when-capturing-blockstates.patch} (91%)
 rename patches/server/{0455-Reduce-blockpos-allocation-from-pathfinding.patch => 0445-Reduce-blockpos-allocation-from-pathfinding.patch} (94%)
 rename patches/server/{0456-Fix-item-locations-dropped-from-campfires.patch => 0446-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0457-Fix-bell-block-entity-memory-leak.patch => 0447-Fix-bell-block-entity-memory-leak.patch} (100%)
 rename patches/server/{0458-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0448-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0459-Add-getOfflinePlayerIfCached-String.patch => 0449-Add-getOfflinePlayerIfCached-String.patch} (93%)
 rename patches/server/{0460-Add-ignore-discounts-API.patch => 0450-Add-ignore-discounts-API.patch} (97%)
 rename patches/server/{0461-Toggle-for-removing-existing-dragon.patch => 0451-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0462-Fix-client-lag-on-advancement-loading.patch => 0452-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0463-Item-no-age-no-player-pickup.patch => 0453-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0464-Beacon-API-custom-effect-ranges.patch => 0454-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0465-Add-API-for-quit-reason.patch => 0455-Add-API-for-quit-reason.patch} (94%)
 rename patches/server/{0466-Add-Wandering-Trader-spawn-rate-config-options.patch => 0456-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0467-Expose-world-spawn-angle.patch => 0457-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0468-Add-Destroy-Speed-API.patch => 0458-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0469-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0459-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (93%)
 rename patches/server/{0470-Add-LivingEntity-clearActiveItem.patch => 0460-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0471-Add-PlayerItemCooldownEvent.patch => 0461-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0472-Significantly-improve-performance-of-the-end-generat.patch => 0462-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0473-More-lightning-API.patch => 0463-More-lightning-API.patch} (100%)
 rename patches/server/{0474-Climbing-should-not-bypass-cramming-gamerule.patch => 0464-Climbing-should-not-bypass-cramming-gamerule.patch} (97%)
 rename patches/server/{0475-Add-missing-default-perms-for-commands.patch => 0465-Add-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0476-Add-PlayerShearBlockEvent.patch => 0466-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0477-Limit-recipe-packets.patch => 0467-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0478-Fix-CraftSound-backwards-compatibility.patch => 0468-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0479-Player-Chunk-Load-Unload-Events.patch => 0469-Player-Chunk-Load-Unload-Events.patch} (78%)
 rename patches/server/{0480-Optimize-Dynamic-get-Missing-Keys.patch => 0470-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0481-Expose-LivingEntity-hurt-direction.patch => 0471-Expose-LivingEntity-hurt-direction.patch} (96%)
 rename patches/server/{0482-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0472-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0483-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch => 0473-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch} (100%)
 rename patches/server/{0484-Add-TargetHitEvent.patch => 0474-Add-TargetHitEvent.patch} (100%)
 rename patches/server/{0485-MC-4-Fix-item-position-desync.patch => 0475-MC-4-Fix-item-position-desync.patch} (93%)
 rename patches/server/{0486-Additional-Block-Material-API.patch => 0476-Additional-Block-Material-API.patch} (100%)
 rename patches/server/{0487-Fix-harming-potion-dupe.patch => 0477-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0488-API-to-get-Material-from-Boats-and-Minecarts.patch => 0478-API-to-get-Material-from-Boats-and-Minecarts.patch} (100%)
 rename patches/server/{0489-Cache-burn-durations.patch => 0479-Cache-burn-durations.patch} (100%)
 rename patches/server/{0490-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0480-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0491-Fix-Not-a-string-Map-Conversion-spam.patch => 0481-Fix-Not-a-string-Map-Conversion-spam.patch} (94%)
 rename patches/server/{0492-Add-PlayerFlowerPotManipulateEvent.patch => 0482-Add-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0493-Fix-interact-event-not-being-called-sometimes.patch => 0483-Fix-interact-event-not-being-called-sometimes.patch} (100%)
 rename patches/server/{0494-Zombie-API-breaking-doors.patch => 0484-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0495-Fix-nerfed-slime-when-splitting.patch => 0485-Fix-nerfed-slime-when-splitting.patch} (90%)
 rename patches/server/{0496-Add-EntityLoadCrossbowEvent.patch => 0486-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0497-Add-WorldGameRuleChangeEvent.patch => 0487-Add-WorldGameRuleChangeEvent.patch} (96%)
 rename patches/server/{0498-Add-ServerResourcesReloadedEvent.patch => 0488-Add-ServerResourcesReloadedEvent.patch} (97%)
 rename patches/server/{0499-Add-world-settings-for-mobs-picking-up-loot.patch => 0489-Add-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0500-Add-BlockFailedDispenseEvent.patch => 0490-Add-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0501-Add-PlayerLecternPageChangeEvent.patch => 0491-Add-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0502-Add-PlayerLoomPatternSelectEvent.patch => 0492-Add-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0503-Configurable-door-breaking-difficulty.patch => 0493-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0504-Empty-commands-shall-not-be-dispatched.patch => 0494-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0505-Remove-stale-POIs.patch => 0495-Remove-stale-POIs.patch} (87%)
 rename patches/server/{0506-Fix-villager-boat-exploit.patch => 0496-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0507-Add-sendOpLevel-API.patch => 0497-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0508-TODO-Registry-Modification-API.patch => 0498-TODO-Registry-Modification-API.patch} (100%)
 rename patches/server/{0509-Add-StructuresLocateEvent.patch => 0499-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0510-Collision-option-for-requiring-a-player-participant.patch => 0500-Collision-option-for-requiring-a-player-participant.patch} (95%)
 rename patches/server/{0511-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0501-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0512-Return-chat-component-with-empty-text-instead-of-thr.patch => 0502-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0513-Make-schedule-command-per-world.patch => 0503-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0514-Configurable-max-leash-distance.patch => 0504-Configurable-max-leash-distance.patch} (87%)
 rename patches/server/{0515-Add-BlockPreDispenseEvent.patch => 0505-Add-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0516-Add-PlayerChangeBeaconEffectEvent.patch => 0506-Add-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0517-Add-toggle-for-always-placing-the-dragon-egg.patch => 0507-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0518-Add-PlayerStonecutterRecipeSelectEvent.patch => 0508-Add-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0519-Expand-EntityUnleashEvent.patch => 0509-Expand-EntityUnleashEvent.patch} (94%)
 rename patches/server/{0520-Reset-shield-blocking-on-dimension-change.patch => 0510-Reset-shield-blocking-on-dimension-change.patch} (84%)
 rename patches/server/{0521-Add-DragonEggFormEvent.patch => 0511-Add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0522-Add-EntityMoveEvent.patch => 0512-Add-EntityMoveEvent.patch} (93%)
 rename patches/server/{0523-added-option-to-disable-pathfinding-updates-on-block.patch => 0513-added-option-to-disable-pathfinding-updates-on-block.patch} (81%)
 rename patches/server/{0524-Inline-shift-direction-fields.patch => 0514-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0525-Allow-adding-items-to-BlockDropItemEvent.patch => 0515-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0526-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0516-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0527-living-entity-allow-attribute-registration.patch => 0517-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0528-fix-dead-slime-setSize-invincibility.patch => 0518-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0529-Merchant-getRecipes-should-return-an-immutable-list.patch => 0519-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0530-Expose-Tracked-Players.patch => 0520-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0531-Improve-ServerGUI.patch => 0521-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0532-fix-converting-txt-to-json-file.patch => 0522-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0533-Add-worldborder-events.patch => 0523-Add-worldborder-events.patch} (100%)
 rename patches/server/{0534-Add-PlayerNameEntityEvent.patch => 0524-Add-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0535-Prevent-grindstones-from-overstacking-items.patch => 0525-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0536-Add-recipe-to-cook-events.patch => 0526-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0537-Add-Block-isValidTool.patch => 0527-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0538-Allow-using-signs-inside-spawn-protection.patch => 0528-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0539-Expand-world-key-API.patch => 0529-Expand-world-key-API.patch} (97%)
 rename patches/server/{0540-Add-fast-alternative-constructor-for-Rotations.patch => 0530-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0541-Item-Rarity-API.patch => 0531-Item-Rarity-API.patch} (100%)
 rename patches/server/{0542-Drop-carried-item-when-player-has-disconnected.patch => 0532-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0543-forced-whitelist-use-configurable-kick-message.patch => 0533-forced-whitelist-use-configurable-kick-message.patch} (92%)
 rename patches/server/{0544-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0534-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0545-Expose-protocol-version.patch => 0535-Expose-protocol-version.patch} (100%)
 rename patches/server/{0546-Enhance-console-tab-completions-for-brigadier-comman.patch => 0536-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0547-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0537-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (93%)
 rename patches/server/{0548-Add-bypass-host-check.patch => 0538-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0549-Set-area-affect-cloud-rotation.patch => 0539-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0550-add-isDeeplySleeping-to-HumanEntity.patch => 0540-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0551-add-consumeFuel-to-FurnaceBurnEvent.patch => 0541-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0552-add-get-set-drop-chance-to-EntityEquipment.patch => 0542-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0553-fix-PigZombieAngerEvent-cancellation.patch => 0543-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0554-fix-PlayerItemHeldEvent-firing-twice.patch => 0544-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0555-Add-PlayerDeepSleepEvent.patch => 0545-Add-PlayerDeepSleepEvent.patch} (91%)
 rename patches/server/{0556-More-World-API.patch => 0546-More-World-API.patch} (95%)
 rename patches/server/{0557-Add-PlayerBedFailEnterEvent.patch => 0547-Add-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0558-Implement-methods-to-convert-between-Component-and-B.patch => 0548-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0559-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch => 0549-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch} (100%)
 rename patches/server/{0560-Introduce-beacon-activation-deactivation-events.patch => 0550-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0561-Add-Channel-initialization-listeners.patch => 0551-Add-Channel-initialization-listeners.patch} (94%)
 rename patches/server/{0562-Send-empty-commands-if-tab-completion-is-disabled.patch => 0552-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0563-Add-more-WanderingTrader-API.patch => 0553-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0564-Add-EntityBlockStorage-clearEntities.patch => 0554-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0565-Entity-load-save-limit-per-chunk.patch => 0555-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0566-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0556-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0567-Inventory-close.patch => 0557-Inventory-close.patch} (100%)
 rename patches/server/{0568-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0558-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0569-Add-basic-Datapack-API.patch => 0559-Add-basic-Datapack-API.patch} (98%)
 rename patches/server/{0570-Add-environment-variable-to-disable-server-gui.patch => 0560-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0571-Expand-PlayerGameModeChangeEvent.patch => 0561-Expand-PlayerGameModeChangeEvent.patch} (95%)
 rename patches/server/{0572-ItemStack-repair-check-API.patch => 0562-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0573-More-Enchantment-API.patch => 0563-More-Enchantment-API.patch} (100%)
 rename patches/server/{0574-Move-range-check-for-block-placing-up.patch => 0564-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0575-Fix-and-optimise-world-force-upgrading.patch => 0565-Fix-and-optimise-world-force-upgrading.patch} (97%)
 rename patches/server/{0576-Add-Mob-lookAt-API.patch => 0566-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0577-Add-Unix-domain-socket-support.patch => 0567-Add-Unix-domain-socket-support.patch} (97%)
 rename patches/server/{0578-Add-EntityInsideBlockEvent.patch => 0568-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0579-Attributes-API-for-item-defaults.patch => 0569-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0580-Add-cause-to-Weather-ThunderChangeEvents.patch => 0570-Add-cause-to-Weather-ThunderChangeEvents.patch} (93%)
 rename patches/server/{0581-More-Lidded-Block-API.patch => 0571-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0582-Limit-item-frame-cursors-on-maps.patch => 0572-Limit-item-frame-cursors-on-maps.patch} (88%)
 rename patches/server/{0583-Add-PlayerKickEvent-causes.patch => 0573-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0584-Add-PufferFishStateChangeEvent.patch => 0574-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0585-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0575-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0586-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0576-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (71%)
 rename patches/server/{0587-Add-option-to-fix-items-merging-through-walls.patch => 0577-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0588-Add-BellRevealRaiderEvent.patch => 0578-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0589-Fix-invulnerable-end-crystals.patch => 0579-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0590-Add-ElderGuardianAppearanceEvent.patch => 0580-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0591-Fix-dangerous-end-portal-logic.patch => 0581-Fix-dangerous-end-portal-logic.patch} (94%)
 rename patches/server/{0592-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0582-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0593-Make-item-validations-configurable.patch => 0583-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0594-Line-Of-Sight-Changes.patch => 0584-Line-Of-Sight-Changes.patch} (91%)
 rename patches/server/{0595-add-per-world-spawn-limits.patch => 0585-add-per-world-spawn-limits.patch} (91%)
 rename patches/server/{0596-Fix-potions-splash-events.patch => 0586-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0597-Add-more-LimitedRegion-API.patch => 0587-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0598-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0588-Fix-PlayerDropItemEvent-using-wrong-item.patch} (86%)
 rename patches/server/{0599-Missing-Entity-API.patch => 0589-Missing-Entity-API.patch} (100%)
 rename patches/server/{0600-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0590-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0601-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0591-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0602-Use-getChunkIfLoadedImmediately-in-places.patch => 0592-Use-getChunkIfLoadedImmediately-in-places.patch} (86%)
 rename patches/server/{0603-Fix-commands-from-signs-not-firing-command-events.patch => 0593-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0604-Add-PlayerArmSwingEvent.patch => 0594-Add-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0605-Fix-kick-event-leave-message-not-being-sent.patch => 0595-Fix-kick-event-leave-message-not-being-sent.patch} (97%)
 rename patches/server/{0606-Add-config-for-mobs-immune-to-default-effects.patch => 0596-Add-config-for-mobs-immune-to-default-effects.patch} (97%)
 rename patches/server/{0607-Don-t-apply-cramming-damage-to-players.patch => 0597-Don-t-apply-cramming-damage-to-players.patch} (90%)
 rename patches/server/{0608-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0598-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0609-Add-missing-forceDrop-toggles.patch => 0599-Add-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0610-Stinger-API.patch => 0600-Stinger-API.patch} (100%)
 rename patches/server/{0611-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0601-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0612-Add-System.out-err-catcher.patch => 0602-Add-System.out-err-catcher.patch} (98%)
 rename patches/server/{0613-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0603-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0614-Prevent-AFK-kick-while-watching-end-credits.patch => 0604-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0615-Allow-skipping-writing-of-comments-to-server.propert.patch => 0605-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0616-Add-PlayerSetSpawnEvent.patch => 0606-Add-PlayerSetSpawnEvent.patch} (97%)
 rename patches/server/{0617-Make-hoppers-respect-inventory-max-stack-size.patch => 0607-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0618-Optimize-entity-tracker-passenger-checks.patch => 0608-Optimize-entity-tracker-passenger-checks.patch} (90%)
 rename patches/server/{0619-Config-option-for-Piglins-guarding-chests.patch => 0609-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0620-Add-EntityDamageItemEvent.patch => 0610-Add-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0621-Optimize-indirect-passenger-iteration.patch => 0611-Optimize-indirect-passenger-iteration.patch} (91%)
 rename patches/server/{0622-Configurable-item-frame-map-cursor-update-interval.patch => 0612-Configurable-item-frame-map-cursor-update-interval.patch} (93%)
 rename patches/server/{0623-Clear-bucket-NBT-after-dispense.patch => 0613-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0624-Change-EnderEye-target-without-changing-other-things.patch => 0614-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0625-Add-BlockBreakBlockEvent.patch => 0615-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0626-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0616-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0627-More-CommandBlock-API.patch => 0617-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0628-Add-missing-team-sidebar-display-slots.patch => 0618-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0629-Add-back-EntityPortalExitEvent.patch => 0619-Add-back-EntityPortalExitEvent.patch} (93%)
 rename patches/server/{0630-Add-methods-to-find-targets-for-lightning-strikes.patch => 0620-Add-methods-to-find-targets-for-lightning-strikes.patch} (88%)
 rename patches/server/{0631-Get-entity-default-attributes.patch => 0621-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0632-Left-handed-API.patch => 0622-Left-handed-API.patch} (100%)
 rename patches/server/{0633-Add-more-advancement-API.patch => 0623-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0634-Add-ItemFactory-getSpawnEgg-API.patch => 0624-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0635-Add-critical-damage-API.patch => 0625-Add-critical-damage-API.patch} (95%)
 rename patches/server/{0636-Fix-issues-with-mob-conversion.patch => 0626-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0637-Add-isCollidable-methods-to-various-places.patch => 0627-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0638-Goat-ram-API.patch => 0628-Goat-ram-API.patch} (100%)
 rename patches/server/{0639-Add-API-for-resetting-a-single-score.patch => 0629-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0640-Add-Raw-Byte-Entity-Serialization.patch => 0630-Add-Raw-Byte-Entity-Serialization.patch} (96%)
 rename patches/server/{0641-Vanilla-command-permission-fixes.patch => 0631-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0642-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0632-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (89%)
 rename patches/server/{0643-Fix-GameProfileCache-concurrency.patch => 0633-Fix-GameProfileCache-concurrency.patch} (98%)
 rename patches/server/{0644-Improve-and-expand-AsyncCatcher.patch => 0634-Improve-and-expand-AsyncCatcher.patch} (96%)
 rename patches/server/{0645-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0635-Add-paper-mobcaps-and-paper-playermobcaps.patch} (96%)
 rename patches/server/{0646-Sanitize-ResourceLocation-error-logging.patch => 0636-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0647-Manually-inline-methods-in-BlockPosition.patch => 0637-Manually-inline-methods-in-BlockPosition.patch} (96%)
 rename patches/server/{0648-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0638-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0649-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0639-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (90%)
 rename patches/server/{0650-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0640-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0651-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch => 0641-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch} (90%)
 rename patches/server/{0652-Time-scoreboard-search.patch => 0642-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0653-Send-full-pos-packets-for-hard-colliding-entities.patch => 0643-Send-full-pos-packets-for-hard-colliding-entities.patch} (94%)
 rename patches/server/{0654-Oprimise-map-impl-for-tracked-players.patch => 0644-Oprimise-map-impl-for-tracked-players.patch} (87%)
 rename patches/server/{0655-Optimise-BlockSoil-nearby-water-lookup.patch => 0645-Optimise-BlockSoil-nearby-water-lookup.patch} (95%)
 rename patches/server/{0656-Distance-manager-tick-timings.patch => 0646-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0657-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0647-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (90%)
 rename patches/server/{0658-Check-requirement-before-suggesting-root-nodes.patch => 0648-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0659-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0649-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0660-Add-packet-limiter-config.patch => 0650-Add-packet-limiter-config.patch} (96%)
 rename patches/server/{0661-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0651-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0662-Ensure-valid-vehicle-status.patch => 0652-Ensure-valid-vehicle-status.patch} (85%)
 rename patches/server/{0663-Prevent-softlocked-end-exit-portal-generation.patch => 0653-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0664-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0654-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0665-Don-t-log-debug-logging-being-disabled.patch => 0655-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0666-fix-various-menus-with-empty-level-accesses.patch => 0656-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0667-Preserve-overstacked-loot.patch => 0657-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0668-Update-head-rotation-in-missing-places.patch => 0658-Update-head-rotation-in-missing-places.patch} (84%)
 rename patches/server/{0669-prevent-unintended-light-block-manipulation.patch => 0659-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0670-Fix-CraftCriteria-defaults-map.patch => 0660-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0671-Fix-upstreams-block-state-factories.patch => 0661-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0672-Configurable-feature-seeds.patch => 0662-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0673-Add-root-admin-user-detection.patch => 0663-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0674-Always-allow-item-changing-in-Fireball.patch => 0664-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0675-don-t-attempt-to-teleport-dead-entities.patch => 0665-don-t-attempt-to-teleport-dead-entities.patch} (85%)
 rename patches/server/{0676-Prevent-excessive-velocity-through-repeated-crits.patch => 0666-Prevent-excessive-velocity-through-repeated-crits.patch} (94%)
 rename patches/server/{0677-Remove-client-side-code-using-deprecated-for-removal.patch => 0667-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0678-Fix-removing-recipes-from-RecipeIterator.patch => 0668-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0679-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0669-Prevent-sending-oversized-item-data-in-equipment-and.patch} (96%)
 rename patches/server/{0680-Hide-unnecessary-itemmeta-from-clients.patch => 0670-Hide-unnecessary-itemmeta-from-clients.patch} (97%)
 rename patches/server/{0681-Fix-Spigot-growth-modifiers.patch => 0671-Fix-Spigot-growth-modifiers.patch} (98%)
 rename patches/server/{0682-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0672-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0683-Add-PlayerItemFrameChangeEvent.patch => 0673-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0684-Optimize-HashMapPalette.patch => 0674-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0685-Allow-delegation-to-vanilla-chunk-gen.patch => 0675-Allow-delegation-to-vanilla-chunk-gen.patch} (95%)
 rename patches/server/{0686-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0676-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (96%)
 rename patches/server/{0687-Add-more-Campfire-API.patch => 0677-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0688-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0678-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (78%)
 rename patches/server/{0689-Forward-CraftEntity-in-teleport-command.patch => 0679-Forward-CraftEntity-in-teleport-command.patch} (89%)
 rename patches/server/{0690-Improve-scoreboard-entries.patch => 0680-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0691-Entity-powdered-snow-API.patch => 0681-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0692-Add-API-for-item-entity-health.patch => 0682-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0693-Configurable-max-block-light-for-monster-spawning.patch => 0683-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0694-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0684-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0695-Load-effect-amplifiers-greater-than-127-correctly.patch => 0685-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0696-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0686-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0697-Fix-bees-aging-inside-hives.patch => 0687-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0698-Bucketable-API.patch => 0688-Bucketable-API.patch} (100%)
 rename patches/server/{0699-Validate-usernames.patch => 0689-Validate-usernames.patch} (96%)
 rename patches/server/{0700-Make-water-animal-spawn-height-configurable.patch => 0690-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0701-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0691-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (96%)
 rename patches/server/{0702-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0692-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0703-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch => 0693-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch} (100%)
 rename patches/server/{0704-Multiple-Entries-with-Scoreboards.patch => 0694-Multiple-Entries-with-Scoreboards.patch} (98%)
 rename patches/server/{0705-Reset-placed-block-on-exception.patch => 0695-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0706-Add-configurable-height-for-slime-spawn.patch => 0696-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0707-Fix-xp-reward-for-baby-zombies.patch => 0697-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0708-Multi-Block-Change-API-Implementation.patch => 0698-Multi-Block-Change-API-Implementation.patch} (97%)
 rename patches/server/{0709-Fix-NotePlayEvent.patch => 0699-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0710-Freeze-Tick-Lock-API.patch => 0700-Freeze-Tick-Lock-API.patch} (89%)
 rename patches/server/{0711-More-PotionEffectType-API.patch => 0701-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0712-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0702-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0713-API-for-creating-command-sender-which-forwards-feedb.patch => 0703-API-for-creating-command-sender-which-forwards-feedb.patch} (98%)
 rename patches/server/{0714-Add-missing-structure-set-seed-configs.patch => 0704-Add-missing-structure-set-seed-configs.patch} (99%)
 rename patches/server/{0715-Implement-regenerateChunk.patch => 0705-Implement-regenerateChunk.patch} (97%)
 rename patches/server/{0716-Fix-cancelled-powdered-snow-bucket-placement.patch => 0706-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0717-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0707-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (92%)
 rename patches/server/{0718-Add-GameEvent-tags.patch => 0708-Add-GameEvent-tags.patch} (97%)
 rename patches/server/{0719-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0709-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (94%)
 rename patches/server/{0720-Furnace-RecipesUsed-API.patch => 0710-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0721-Configurable-sculk-sensor-listener-range.patch => 0711-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0722-Add-missing-block-data-mins-and-maxes.patch => 0712-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0723-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0713-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (96%)
 rename patches/server/{0724-Put-world-into-worldlist-before-initing-the-world.patch => 0714-Put-world-into-worldlist-before-initing-the-world.patch} (92%)
 rename patches/server/{0725-Fix-Entity-Position-Desync.patch => 0715-Fix-Entity-Position-Desync.patch} (93%)
 rename patches/server/{0726-Custom-Potion-Mixes.patch => 0716-Custom-Potion-Mixes.patch} (98%)
 rename patches/server/{0727-Force-close-world-loading-screen.patch => 0717-Force-close-world-loading-screen.patch} (95%)
 rename patches/server/{0728-Fix-falling-block-spawn-methods.patch => 0718-Fix-falling-block-spawn-methods.patch} (95%)
 rename patches/server/{0729-Expose-furnace-minecart-push-values.patch => 0719-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0730-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0720-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (95%)
 rename patches/server/{0731-More-Projectile-API.patch => 0721-More-Projectile-API.patch} (100%)
 rename patches/server/{0732-Fix-swamp-hut-cat-generation-deadlock.patch => 0722-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0733-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0723-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0734-Implement-getComputedBiome-API.patch => 0724-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0735-Make-some-itemstacks-nonnull.patch => 0725-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0736-Implement-enchantWithLevels-API.patch => 0726-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0737-Fix-saving-in-unloadWorld.patch => 0727-Fix-saving-in-unloadWorld.patch} (90%)
 rename patches/server/{0738-Buffer-OOB-setBlock-calls.patch => 0728-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0739-Add-TameableDeathMessageEvent.patch => 0729-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0740-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0730-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0741-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0731-fix-player-loottables-running-when-mob-loot-gamerule.patch} (88%)
 rename patches/server/{0742-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0732-Ensure-entity-passenger-world-matches-ridden-entity.patch} (85%)
 rename patches/server/{0743-cache-resource-keys.patch => 0733-cache-resource-keys.patch} (100%)
 rename patches/server/{0744-Allow-changing-the-EnderDragon-podium.patch => 0734-Allow-changing-the-EnderDragon-podium.patch} (100%)
 rename patches/server/{0745-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0735-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0746-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0736-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0747-Prevent-tile-entity-copies-loading-chunks.patch => 0737-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0748-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0738-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0749-Pass-ServerLevel-for-gamerule-callbacks.patch => 0739-Pass-ServerLevel-for-gamerule-callbacks.patch} (98%)
 rename patches/server/{0750-Expand-PlayerItemDamageEvent.patch => 0740-Expand-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0751-WorldCreator-keepSpawnLoaded.patch => 0741-WorldCreator-keepSpawnLoaded.patch} (94%)
 rename patches/server/{0752-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0742-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0753-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0743-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (94%)
 rename patches/server/{0754-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0744-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0755-Fire-CauldronLevelChange-on-initial-fill.patch => 0745-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0756-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0746-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0757-Add-PlayerStopUsingItemEvent.patch => 0747-Add-PlayerStopUsingItemEvent.patch} (91%)
 rename patches/server/{0758-Don-t-tick-markers.patch => 0748-Don-t-tick-markers.patch} (91%)
 rename patches/server/{0759-Expand-FallingBlock-API.patch => 0749-Expand-FallingBlock-API.patch} (100%)
 rename patches/server/{0760-Do-not-accept-invalid-client-settings.patch => 0750-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0761-Add-support-for-Proxy-Protocol.patch => 0751-Add-support-for-Proxy-Protocol.patch} (95%)
 rename patches/server/{0762-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0752-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0763-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0753-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0764-Sanitize-sent-BlockEntity-NBT.patch => 0754-Sanitize-sent-BlockEntity-NBT.patch} (94%)
 rename patches/server/{0765-Disable-component-selector-resolving-in-books-by-def.patch => 0755-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0766-Prevent-entity-loading-causing-async-lookups.patch => 0756-Prevent-entity-loading-causing-async-lookups.patch} (95%)
 rename patches/server/{0767-Throw-exception-on-world-create-while-being-ticked.patch => 0757-Throw-exception-on-world-create-while-being-ticked.patch} (97%)
 rename patches/server/{0768-Dont-resent-entity-on-art-update.patch => 0758-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0769-Add-WardenAngerChangeEvent.patch => 0759-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0770-Add-option-for-strict-advancement-dimension-checks.patch => 0760-Add-option-for-strict-advancement-dimension-checks.patch} (94%)
 rename patches/server/{0771-Add-missing-important-BlockStateListPopulator-method.patch => 0761-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0772-Nameable-Banner-API.patch => 0762-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0773-Don-t-broadcast-messages-to-command-blocks.patch => 0763-Don-t-broadcast-messages-to-command-blocks.patch} (95%)
 rename patches/server/{0774-Prevent-empty-items-from-being-added-to-world.patch => 0764-Prevent-empty-items-from-being-added-to-world.patch} (89%)
 rename patches/server/{0775-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0765-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0776-Add-Player-getFishHook.patch => 0766-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0777-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0767-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0778-Add-various-missing-EntityDropItemEvent-calls.patch => 0768-Add-various-missing-EntityDropItemEvent-calls.patch} (96%)
 rename patches/server/{0779-Fix-Bee-flower-NPE.patch => 0769-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0780-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0770-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0781-More-Teleport-API.patch => 0771-More-Teleport-API.patch} (99%)
 rename patches/server/{0782-Add-EntityPortalReadyEvent.patch => 0772-Add-EntityPortalReadyEvent.patch} (88%)
 rename patches/server/{0783-Don-t-use-level-random-in-entity-constructors.patch => 0773-Don-t-use-level-random-in-entity-constructors.patch} (96%)
 rename patches/server/{0784-Send-block-entities-after-destroy-prediction.patch => 0774-Send-block-entities-after-destroy-prediction.patch} (97%)
 rename patches/server/{0785-Warn-on-plugins-accessing-faraway-chunks.patch => 0775-Warn-on-plugins-accessing-faraway-chunks.patch} (83%)
 rename patches/server/{0786-Custom-Chat-Completion-Suggestions-API.patch => 0776-Custom-Chat-Completion-Suggestions-API.patch} (94%)
 rename patches/server/{0787-Add-and-fix-missing-BlockFadeEvents.patch => 0777-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0788-Collision-API.patch => 0778-Collision-API.patch} (100%)
 rename patches/server/{0789-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0779-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0790-Block-Ticking-API.patch => 0780-Block-Ticking-API.patch} (100%)
 rename patches/server/{0791-Add-Velocity-IP-Forwarding-Support.patch => 0781-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename patches/server/{0792-Add-NamespacedKey-biome-methods.patch => 0782-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0793-Fix-plugin-loggers-on-server-shutdown.patch => 0783-Fix-plugin-loggers-on-server-shutdown.patch} (96%)
 rename patches/server/{0794-Stop-large-look-changes-from-crashing-the-server.patch => 0784-Stop-large-look-changes-from-crashing-the-server.patch} (96%)
 rename patches/server/{0795-Fire-EntityChangeBlockEvent-in-more-places.patch => 0785-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0796-Missing-eating-regain-reason.patch => 0786-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0797-Missing-effect-cause.patch => 0787-Missing-effect-cause.patch} (100%)
 rename patches/server/{0798-Added-byte-array-serialization-deserialization-for-P.patch => 0788-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0799-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0789-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0800-Call-BlockPhysicsEvent-more-often.patch => 0790-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0801-Configurable-chat-thread-limit.patch => 0791-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0802-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0792-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0803-fix-Jigsaw-block-kicking-user.patch => 0793-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0804-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0794-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0805-Add-getDrops-to-BlockState.patch => 0795-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0806-Fix-a-bunch-of-vanilla-bugs.patch => 0796-Fix-a-bunch-of-vanilla-bugs.patch} (97%)
 rename patches/server/{0807-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0797-Remove-unnecessary-onTrackingStart-during-navigation.patch} (88%)
 rename patches/server/{0808-Fix-custom-piglin-loved-items.patch => 0798-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0809-EntityPickupItemEvent-fixes.patch => 0799-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0810-Correctly-handle-interactions-with-items-on-cooldown.patch => 0800-Correctly-handle-interactions-with-items-on-cooldown.patch} (94%)
 rename patches/server/{0811-Add-PlayerInventorySlotChangeEvent.patch => 0801-Add-PlayerInventorySlotChangeEvent.patch} (95%)
 rename patches/server/{0812-Elder-Guardian-appearance-API.patch => 0802-Elder-Guardian-appearance-API.patch} (90%)
 rename patches/server/{0813-Allow-changing-bed-s-occupied-property.patch => 0803-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0814-Add-entity-knockback-API.patch => 0804-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0815-Detect-headless-JREs.patch => 0805-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0816-fix-entity-vehicle-collision-event-not-called.patch => 0806-fix-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0817-Add-EntityToggleSitEvent.patch => 0807-Add-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0818-Add-fire-tick-delay-option.patch => 0808-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0819-Add-Moving-Piston-API.patch => 0809-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0820-Ignore-impossible-spawn-tick.patch => 0810-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0821-Track-projectile-source-for-fireworks-from-dispenser.patch => 0811-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0822-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0812-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0823-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0813-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (92%)
 rename patches/server/{0824-Add-PrePlayerAttackEntityEvent.patch => 0814-Add-PrePlayerAttackEntityEvent.patch} (89%)
 rename patches/server/{0825-ensure-reset-EnderDragon-boss-event-name.patch => 0815-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0826-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0816-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0827-Add-Player-Warden-Warning-API.patch => 0817-Add-Player-Warden-Warning-API.patch} (95%)
 rename patches/server/{0828-More-vanilla-friendly-methods-to-update-trades.patch => 0818-More-vanilla-friendly-methods-to-update-trades.patch} (94%)
 rename patches/server/{0829-Add-paper-dumplisteners-command.patch => 0819-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0830-check-global-player-list-where-appropriate.patch => 0820-check-global-player-list-where-appropriate.patch} (94%)
 rename patches/server/{0831-Fix-async-entity-add-due-to-fungus-trees.patch => 0821-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0832-ItemStack-damage-API.patch => 0822-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0833-Friction-API.patch => 0823-Friction-API.patch} (98%)
 rename patches/server/{0834-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0824-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0835-Fix-player-kick-on-shutdown.patch => 0825-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0836-Sync-offhand-slot-in-menus.patch => 0826-Sync-offhand-slot-in-menus.patch} (95%)
 rename patches/server/{0837-Player-Entity-Tracking-Events.patch => 0827-Player-Entity-Tracking-Events.patch} (87%)
 rename patches/server/{0838-Limit-pet-look-distance.patch => 0828-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0839-Fixes-and-additions-to-the-SpawnReason-API.patch => 0829-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0840-fix-Instruments.patch => 0830-fix-Instruments.patch} (96%)
 rename patches/server/{0841-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0831-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0842-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0832-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0843-Add-BlockLockCheckEvent.patch => 0833-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0844-Add-Sneaking-API-for-Entities.patch => 0834-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0845-Improve-logging-and-errors.patch => 0835-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0846-Improve-PortalEvents.patch => 0836-Improve-PortalEvents.patch} (89%)
 rename patches/server/{0847-Add-config-option-for-spider-worldborder-climbing.patch => 0837-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0848-Add-missing-SpigotConfig-logCommands-check.patch => 0838-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0849-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0839-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0850-Flying-Fall-Damage.patch => 0840-Flying-Fall-Damage.patch} (89%)
 rename patches/server/{0851-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0841-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/server/{0852-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0842-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (86%)
 rename patches/server/{0853-config-for-disabling-entity-tag-tags.patch => 0843-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0854-Use-single-player-info-update-packet-on-join.patch => 0844-Use-single-player-info-update-packet-on-join.patch} (97%)
 rename patches/server/{0855-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0845-Correctly-shrink-items-during-EntityResurrectEvent.patch} (95%)
 rename patches/server/{0856-Win-Screen-API.patch => 0846-Win-Screen-API.patch} (93%)
 rename patches/server/{0857-Remove-CraftItemStack-setAmount-null-assignment.patch => 0847-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0858-Fix-force-opening-enchantment-tables.patch => 0848-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0859-Add-Entity-Body-Yaw-API.patch => 0849-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0860-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0850-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0861-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0851-Update-the-flag-when-a-captured-block-state-is-outda.patch} (83%)
 rename patches/server/{0862-Add-EntityFertilizeEggEvent.patch => 0852-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/server/{0863-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0853-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0864-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0854-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0865-Correctly-handle-ArmorStand-invisibility.patch => 0855-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0866-Fix-advancement-triggers-for-entity-damage.patch => 0856-Fix-advancement-triggers-for-entity-damage.patch} (97%)
 rename patches/server/{0867-Fix-text-display-error-on-spawn.patch => 0857-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0868-Fix-inventories-returning-null-Locations.patch => 0858-Fix-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0869-Add-Shearable-API.patch => 0859-Add-Shearable-API.patch} (100%)
 rename patches/server/{0870-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0860-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0871-Fix-beehives-generating-from-using-bonemeal.patch => 0861-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0872-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0862-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0873-Treat-sequence-violations-like-they-should-be.patch => 0863-Treat-sequence-violations-like-they-should-be.patch} (100%)
 rename patches/server/{0874-remove-duplicate-animate-packet-for-records.patch => 0864-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0875-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0865-Prevent-causing-expired-keys-from-impacting-new-join.patch} (100%)
 rename patches/server/{0876-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0866-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (86%)
 rename patches/server/{0877-Use-array-for-gamerule-storage.patch => 0867-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0878-Fix-a-couple-of-upstream-bed-issues.patch => 0868-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0879-Fix-demo-flag-not-enabling-demo-mode.patch => 0869-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0880-Add-Mob-Experience-reward-API.patch => 0870-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0881-Break-redstone-on-top-of-trap-doors-early.patch => 0871-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0882-Fix-DamageCause-for-Falling-Blocks.patch => 0872-Fix-DamageCause-for-Falling-Blocks.patch} (100%)
 rename patches/server/{0883-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0873-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0884-More-accurate-isInOpenWater-impl.patch => 0874-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0885-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0875-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0886-Expand-PlayerItemMendEvent.patch => 0876-Expand-PlayerItemMendEvent.patch} (98%)
 rename patches/server/{0887-Refresh-ProjectileSource-for-projectiles.patch => 0877-Refresh-ProjectileSource-for-projectiles.patch} (97%)
 rename patches/server/{0888-Add-transient-modifier-API.patch => 0878-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0889-Fix-block-place-logic.patch => 0879-Fix-block-place-logic.patch} (96%)
 rename patches/server/{0890-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0880-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0891-Call-BlockGrowEvent-for-missing-blocks.patch => 0881-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0892-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0882-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (94%)
 rename patches/server/{0893-fix-MapLike-spam-for-missing-key-selector.patch => 0883-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0894-Fix-sniffer-removeExploredLocation.patch => 0884-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0895-Add-method-to-remove-all-active-potion-effects.patch => 0885-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0896-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0886-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0897-Properly-cancel-usable-items.patch => 0887-Properly-cancel-usable-items.patch} (92%)
 rename patches/server/{0898-Add-event-for-player-editing-sign.patch => 0888-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0899-Only-tick-item-frames-if-players-can-see-it.patch => 0889-Only-tick-item-frames-if-players-can-see-it.patch} (92%)
 rename patches/server/{0900-Fix-cmd-permission-levels-for-command-blocks.patch => 0890-Fix-cmd-permission-levels-for-command-blocks.patch} (100%)
 rename patches/server/{0901-Add-option-to-disable-block-updates.patch => 0891-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0902-Call-missing-BlockDispenseEvent.patch => 0892-Call-missing-BlockDispenseEvent.patch} (100%)
 rename patches/server/{0903-Don-t-load-chunks-for-supporting-block-checks.patch => 0893-Don-t-load-chunks-for-supporting-block-checks.patch} (84%)
 rename patches/server/{0904-Optimize-player-lookups-for-beacons.patch => 0894-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0905-Add-Sign-getInteractableSideFor.patch => 0895-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0906-Array-backed-synched-entity-data.patch => 0896-Array-backed-synched-entity-data.patch} (100%)
 rename patches/server/{0907-fix-item-meta-for-tadpole-buckets.patch => 0897-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0908-Fix-BanList-API.patch => 0898-Fix-BanList-API.patch} (99%)
 rename patches/server/{0909-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0899-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0910-Fix-possible-NPE-on-painting-creation.patch => 0900-Fix-possible-NPE-on-painting-creation.patch} (100%)
 rename patches/server/{0911-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0901-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0912-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0902-ExperienceOrb-should-call-EntitySpawnEvent.patch} (100%)
 rename patches/server/{0913-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0903-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0914-Add-whitelist-events.patch => 0904-Add-whitelist-events.patch} (100%)
 rename patches/server/{0915-Implement-PlayerFailMoveEvent.patch => 0905-Implement-PlayerFailMoveEvent.patch} (100%)
 rename patches/server/{0916-Folia-scheduler-and-owned-region-API.patch => 0906-Folia-scheduler-and-owned-region-API.patch} (99%)
 rename patches/server/{0917-Only-erase-allay-memory-on-non-item-targets.patch => 0907-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0918-API-for-updating-recipes-on-clients.patch => 0908-API-for-updating-recipes-on-clients.patch} (97%)
 rename patches/server/{0919-Fix-rotation-when-spawning-display-entities.patch => 0909-Fix-rotation-when-spawning-display-entities.patch} (100%)
 rename patches/server/{0920-Only-capture-actual-tree-growth.patch => 0910-Only-capture-actual-tree-growth.patch} (97%)
 rename patches/server/{0921-Use-correct-source-for-mushroom-block-spread-event.patch => 0911-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0922-Respect-randomizeData-on-more-entities-when-spawning.patch => 0912-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0923-Use-correct-seed-on-api-world-load.patch => 0913-Use-correct-seed-on-api-world-load.patch} (91%)
 rename patches/server/{0924-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0914-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0925-Cache-map-ids-on-item-frames.patch => 0915-Cache-map-ids-on-item-frames.patch} (96%)
 rename patches/server/{0926-Fix-custom-statistic-criteria-creation.patch => 0916-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{0927-Bandaid-fix-for-Effect.patch => 0917-Bandaid-fix-for-Effect.patch} (96%)
 rename patches/server/{0928-SculkCatalyst-bloom-API.patch => 0918-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0929-API-for-an-entity-s-scoreboard-name.patch => 0919-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0931-Deprecate-and-replace-methods-with-old-StructureType.patch => 0920-Deprecate-and-replace-methods-with-old-StructureType.patch} (96%)
 rename patches/server/{0932-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0921-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (100%)
 rename patches/server/{0933-Properly-handle-BlockBreakEvent-isDropItems.patch => 0922-Properly-handle-BlockBreakEvent-isDropItems.patch} (98%)
 rename patches/server/{0934-Fire-entity-death-event-for-ender-dragon.patch => 0923-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{0935-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0924-Configurable-entity-tracking-range-by-Y-coordinate.patch} (91%)
 rename patches/server/{0936-Add-Listing-API-for-Player.patch => 0925-Add-Listing-API-for-Player.patch} (98%)
 rename patches/server/{0937-Configurable-Region-Compression-Format.patch => 0926-Configurable-Region-Compression-Format.patch} (90%)
 rename patches/server/{0938-Add-BlockFace-to-BlockDamageEvent.patch => 0927-Add-BlockFace-to-BlockDamageEvent.patch} (96%)
 rename patches/server/{0939-Fix-NPE-on-Boat-getStatus.patch => 0928-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{0940-Expand-Pose-API.patch => 0929-Expand-Pose-API.patch} (90%)
 rename patches/server/{0941-More-DragonBattle-API.patch => 0930-More-DragonBattle-API.patch} (100%)
 rename patches/server/{0942-Deep-clone-unhandled-nbt-tags.patch => 0931-Deep-clone-unhandled-nbt-tags.patch} (100%)
 rename patches/server/{0943-Add-PlayerPickItemEvent.patch => 0932-Add-PlayerPickItemEvent.patch} (100%)
 rename patches/server/{0944-Allow-trident-custom-damage.patch => 0933-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{0945-Expose-hand-in-BlockCanBuildEvent.patch => 0934-Expose-hand-in-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{0946-Optimize-nearest-structure-border-iteration.patch => 0935-Optimize-nearest-structure-border-iteration.patch} (100%)
 rename patches/server/{0947-Implement-OfflinePlayer-isConnected.patch => 0936-Implement-OfflinePlayer-isConnected.patch} (94%)
 rename patches/server/{0948-Fix-inventory-desync.patch => 0937-Fix-inventory-desync.patch} (100%)
 rename patches/server/{0949-Add-titleOverride-to-InventoryOpenEvent.patch => 0938-Add-titleOverride-to-InventoryOpenEvent.patch} (97%)
 rename patches/server/{0950-Configure-sniffer-egg-hatch-time.patch => 0939-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{0951-Do-crystal-portal-proximity-check-before-entity-look.patch => 0940-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 rename patches/server/{0952-Skip-POI-finding-if-stuck-in-vehicle.patch => 0941-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{0953-Add-slot-sanity-checks-in-container-clicks.patch => 0942-Add-slot-sanity-checks-in-container-clicks.patch} (100%)
 rename patches/server/{0954-Call-BlockRedstoneEvents-for-lecterns.patch => 0943-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{0955-Allow-proper-checking-of-empty-item-stacks.patch => 0944-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/server/{0956-Fix-silent-equipment-change-for-mobs.patch => 0945-Fix-silent-equipment-change-for-mobs.patch} (96%)
 rename patches/server/{0957-Fix-spigot-s-Forced-Stats.patch => 0946-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{0958-Add-missing-InventoryHolders-to-inventories.patch => 0947-Add-missing-InventoryHolders-to-inventories.patch} (100%)
 rename patches/server/{0959-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 0948-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (93%)
 rename patches/server/{0960-Add-missing-logs-for-log-ips-config-option.patch => 0949-Add-missing-logs-for-log-ips-config-option.patch} (100%)
 rename patches/server/{0961-Remove-Spigot-Bug-Fix-for-MC-109346.patch => 0950-Remove-Spigot-Bug-Fix-for-MC-109346.patch} (92%)
 rename patches/server/{0962-Fix-SuspiciousStewMeta.patch => 0951-Fix-SuspiciousStewMeta.patch} (100%)
 rename patches/server/{0963-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 0952-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%)
 rename patches/server/{0964-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 0953-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%)
 rename patches/server/{0965-Fix-team-sidebar-objectives-not-being-cleared.patch => 0954-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%)
 rename patches/server/{0966-Fix-missing-map-initialize-event-call.patch => 0955-Fix-missing-map-initialize-event-call.patch} (93%)
 rename patches/server/{0967-Update-entity-data-when-attaching-firework-to-entity.patch => 0956-Update-entity-data-when-attaching-firework-to-entity.patch} (100%)
 rename patches/server/{0968-Use-correct-variable-for-initializing-CraftLootTable.patch => 0957-Use-correct-variable-for-initializing-CraftLootTable.patch} (100%)
 rename patches/server/{0969-Make-setVelocity-method-of-Fireballs-change-the-trav.patch => 0958-Make-setVelocity-method-of-Fireballs-change-the-trav.patch} (100%)
 rename patches/server/{0970-Fix-UnsafeValues-loadAdvancement.patch => 0959-Fix-UnsafeValues-loadAdvancement.patch} (100%)
 rename patches/server/{0971-Add-player-idle-duration-API.patch => 0960-Add-player-idle-duration-API.patch} (91%)
 rename patches/server/{0972-Don-t-check-if-we-can-see-non-visible-entities.patch => 0961-Don-t-check-if-we-can-see-non-visible-entities.patch} (85%)
 rename patches/server/{0973-Fix-NPE-in-SculkBloomEvent-world-access.patch => 0962-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%)
 rename patches/server/{0974-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 0963-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (90%)
 rename patches/server/{0975-Optimize-VarInts.patch => 0964-Optimize-VarInts.patch} (100%)
 rename patches/server/{0976-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0965-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/server/{0977-Add-predicate-for-blocks-when-raytracing.patch => 0966-Add-predicate-for-blocks-when-raytracing.patch} (93%)
 rename patches/server/{0978-Broadcast-take-item-packets-with-collector-as-source.patch => 0967-Broadcast-take-item-packets-with-collector-as-source.patch} (92%)
 rename patches/server/{0979-Expand-LingeringPotion-API.patch => 0968-Expand-LingeringPotion-API.patch} (100%)
 rename patches/server/{0980-Add-MaterialTagsTest.patch => 0969-Add-MaterialTagsTest.patch} (100%)
 rename patches/server/{0981-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 0970-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (96%)
 rename patches/server/{0982-Add-hand-to-fish-event-for-all-player-interactions.patch => 0971-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/server/{0983-Fix-several-issues-with-EntityBreedEvent.patch => 0972-Fix-several-issues-with-EntityBreedEvent.patch} (100%)
 rename patches/server/{0984-Add-UUID-attribute-modifier-API.patch => 0973-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/server/{0985-Fix-missing-event-call-for-entity-teleport-API.patch => 0974-Fix-missing-event-call-for-entity-teleport-API.patch} (100%)
 rename patches/server/{0986-Lazily-create-LootContext-for-criterions.patch => 0975-Lazily-create-LootContext-for-criterions.patch} (100%)
 rename patches/server/{0987-Don-t-fire-sync-events-during-worldgen.patch => 0976-Don-t-fire-sync-events-during-worldgen.patch} (96%)
 rename patches/server/{0988-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 0977-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (100%)
 rename patches/server/{0989-Restore-vanilla-entity-drops-behavior.patch => 0978-Restore-vanilla-entity-drops-behavior.patch} (96%)
 rename patches/server/{0990-Add-Structure-check-API.patch => 0979-Add-Structure-check-API.patch} (91%)
 rename patches/server/{0991-Dont-resend-blocks-on-interactions.patch => 0980-Dont-resend-blocks-on-interactions.patch} (98%)
 rename patches/server/{0992-Keep-previous-behavior-for-setResourcePack.patch => 0981-Keep-previous-behavior-for-setResourcePack.patch} (94%)
 rename patches/server/{0993-properly-read-and-store-sus-effect-duration.patch => 0982-properly-read-and-store-sus-effect-duration.patch} (100%)
 rename patches/server/{0994-Use-correct-max-stack-size-in-crafter.patch => 0983-Use-correct-max-stack-size-in-crafter.patch} (100%)
 rename patches/server/{0995-add-more-scoreboard-API.patch => 0984-add-more-scoreboard-API.patch} (100%)
 rename patches/server/{0996-Improve-Registry.patch => 0985-Improve-Registry.patch} (100%)
 rename patches/server/{0997-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch => 0986-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch} (97%)
 rename patches/server/{0998-Add-experience-points-API.patch => 0987-Add-experience-points-API.patch} (93%)
 rename patches/server/{0999-Add-missing-InventoryType.patch => 0988-Add-missing-InventoryType.patch} (100%)
 rename patches/server/{1000-Add-drops-to-shear-events.patch => 0989-Add-drops-to-shear-events.patch} (100%)
 rename patches/server/{1001-Add-PlayerShieldDisableEvent.patch => 0990-Add-PlayerShieldDisableEvent.patch} (89%)
 rename patches/server/{1002-Add-HiddenPotionEffect-API.patch => 0991-Add-HiddenPotionEffect-API.patch} (100%)
 rename patches/server/{1003-Correctly-check-if-bucket-dispenses-will-succeed-for.patch => 0992-Correctly-check-if-bucket-dispenses-will-succeed-for.patch} (100%)
 rename patches/server/{1004-fix-ItemMeta-removing-CustomModelData.patch => 0993-fix-ItemMeta-removing-CustomModelData.patch} (100%)
 rename patches/server/{1005-Validate-ResourceLocation-in-NBT-reading.patch => 0994-Validate-ResourceLocation-in-NBT-reading.patch} (95%)
 rename patches/server/{1006-Properly-handle-experience-dropping-on-block-break.patch => 0995-Properly-handle-experience-dropping-on-block-break.patch} (97%)
 rename patches/server/{1007-Fixup-NamespacedKey-handling.patch => 0996-Fixup-NamespacedKey-handling.patch} (100%)
 rename patches/server/{1008-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0997-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (93%)
 rename patches/server/{0072-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (86%)
 rename patches/server/{0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0999-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (93%)
 rename patches/server/{0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 1000-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (88%)
 rename patches/server/{0293-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 1001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (93%)
 rename patches/server/{0306-Allow-Saving-of-Oversized-Chunks.patch => 1002-Allow-Saving-of-Oversized-Chunks.patch} (91%)
 rename patches/server/{0308-Fix-World-isChunkGenerated-calls.patch => 1003-Fix-World-isChunkGenerated-calls.patch} (86%)
 rename patches/server/{0316-Flat-bedrock-generator-settings.patch => 1004-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0327-Entity-Activation-Range-2.0.patch => 1005-Entity-Activation-Range-2.0.patch} (95%)
 rename patches/server/{0332-Optional-per-player-mob-spawns.patch => 1006-Optional-per-player-mob-spawns.patch} (94%)
 rename patches/server/{0333-Anti-Xray.patch => 1007-Anti-Xray.patch} (96%)
 rename patches/server/{0930-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (95%)

diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 96%
rename from patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 08709918bc..72f6bccd8e 100644
--- a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 537ddaec422399dfa926936501d35bdc48b0baa3..966059931fa4b6c06dd5269be09db8cf9ca0bd51 100644
+index 3179fc1b33f503b0cdd462ad160edee760b5a7eb..428a9d21b24e9c349bf766c16172ffd904f3b6a5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -793,7 +793,13 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch b/patches/server/0073-Use-a-Shared-Random-for-Entities.patch
similarity index 100%
rename from patches/server/0074-Use-a-Shared-Random-for-Entities.patch
rename to patches/server/0073-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 100%
rename from patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch
rename to patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch
diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 96%
rename from patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index e525b3d00f..32f8fee316 100644
--- a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -30,10 +30,10 @@ index 817e0ddc8821dd112fc5aa72bbbe11fdd1b56488..181a4e0e44cd05528c66ce87b653c33d
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 48357a6af14af74195bd6c77488f7f1dc84221cf..1b1a4b91e7185013e9969fdb3a6582a5a6895663 100644
+index 85b1e406b856f3452fe44f909fa5475196f1cf58..c6c8e76a2820b3bd4724344db5e6852a745e663a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -583,7 +583,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -499,7 +499,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0076-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 100%
rename from patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/server/0076-Entity-AddTo-RemoveFrom-World-Events.patch
diff --git a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0077-Configurable-Chunk-Inhabited-Time.patch
similarity index 92%
rename from patches/server/0079-Configurable-Chunk-Inhabited-Time.patch
rename to patches/server/0077-Configurable-Chunk-Inhabited-Time.patch
index 99386554ec..26ea434b4b 100644
--- a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/server/0077-Configurable-Chunk-Inhabited-Time.patch
@@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu
 This allows to fine-tune vanilla gameplay.
 
 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 47815824811a0ca82d70e585cc4d66a521129380..d9d2bf31a0e7ad374aa62197c71626a1abfbaf71 100644
+index 7208b7b916ff179e8dbe9925fb246e3652b4f9c2..31d2de67d3facf00491814f775ef1468b33eb51b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -277,6 +277,13 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0080-EntityPathfindEvent.patch b/patches/server/0078-EntityPathfindEvent.patch
similarity index 100%
rename from patches/server/0080-EntityPathfindEvent.patch
rename to patches/server/0078-EntityPathfindEvent.patch
diff --git a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 100%
rename from patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch
rename to patches/server/0079-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0080-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch
rename to patches/server/0080-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch
similarity index 97%
rename from patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch
rename to patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch
index 4c9c1820e2..72bae5c5bd 100644
--- a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0081-Add-PlayerUseUnknownEntityEvent.patch
@@ -28,7 +28,7 @@ index 644a0fdea6576647539b96528717dbaeab498d93..221e64a66ff12a8de5c75992fc26a54a
 +    // Paper end - PlayerUseUnknownEntityEvent
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8c8c3085711989c90ea9ae51b3d95abee284a71e..3c04fa0a96eb4f3ceb50d69f57df339f6eea3ca3 100644
+index 64b5af3745642d2a2e2075cb70ef4defbee64d15..21d3b837b6875dd9833a70f6f8bca2070016c5a0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2407,8 +2407,38 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0084-Configurable-random-tick-rates-for-blocks.patch b/patches/server/0082-Configurable-random-tick-rates-for-blocks.patch
similarity index 100%
rename from patches/server/0084-Configurable-random-tick-rates-for-blocks.patch
rename to patches/server/0082-Configurable-random-tick-rates-for-blocks.patch
diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 100%
rename from patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to patches/server/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0086-Optimize-DataBits.patch b/patches/server/0084-Optimize-DataBits.patch
similarity index 100%
rename from patches/server/0086-Optimize-DataBits.patch
rename to patches/server/0084-Optimize-DataBits.patch
diff --git a/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to patches/server/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/server/0086-Configurable-Player-Collision.patch
similarity index 100%
rename from patches/server/0088-Configurable-Player-Collision.patch
rename to patches/server/0086-Configurable-Player-Collision.patch
diff --git a/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0090-Configurable-RCON-IP-address.patch b/patches/server/0088-Configurable-RCON-IP-address.patch
similarity index 100%
rename from patches/server/0090-Configurable-RCON-IP-address.patch
rename to patches/server/0088-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 96%
rename from patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch
index b52bcbb9f3..99f0670424 100644
--- a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1e2d3040bb3e8b1901fbc933caa5ad3b82d3468c..043c42d303970920f40bd65a90c147192ed6900b 100644
+index 428a9d21b24e9c349bf766c16172ffd904f3b6a5..fad14002768e55f5b300d1829f16b3d7b7504bf6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1322,10 +1322,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch
rename to patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0091-remove-null-possibility-for-getServer-singleton.patch
similarity index 95%
rename from patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
rename to patches/server/0091-remove-null-possibility-for-getServer-singleton.patch
index b97780e69d..b6715be13c 100644
--- a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/server/0091-remove-null-possibility-for-getServer-singleton.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a5b20c68eef32aa2bafe23d7975c7d6e8a928319..bb964c3ca029a777d86c15251510d7cb13d2f82c 100644
+index 9697e189cf79994ed7d231c7801761791c128310..da845f0e07e1541514c60252192d49a85163b1a8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -190,6 +190,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0096-LootTable-API-and-replenishable-lootables.patch b/patches/server/0093-LootTable-API-and-replenishable-lootables.patch
similarity index 100%
rename from patches/server/0096-LootTable-API-and-replenishable-lootables.patch
rename to patches/server/0093-LootTable-API-and-replenishable-lootables.patch
diff --git a/patches/server/0097-System-property-for-disabling-watchdoge.patch b/patches/server/0094-System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from patches/server/0097-System-property-for-disabling-watchdoge.patch
rename to patches/server/0094-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0098-Async-GameProfileCache-saving.patch b/patches/server/0095-Async-GameProfileCache-saving.patch
similarity index 100%
rename from patches/server/0098-Async-GameProfileCache-saving.patch
rename to patches/server/0095-Async-GameProfileCache-saving.patch
diff --git a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch
similarity index 100%
rename from patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch
rename to patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 97%
rename from patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
rename to patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
index 90e326013b..21d0fce448 100644
--- a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cd3a99585a471981b9fa1f614ddddfce570ee0e7..244c28cd52a177e798153bc6151f0fb0e5c51841 100644
+index c6c8e76a2820b3bd4724344db5e6852a745e663a..28ff413396312df9de73805e06da70a6fc0e8201 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 {
diff --git a/patches/server/0101-Add-server-name-parameter.patch b/patches/server/0098-Add-server-name-parameter.patch
similarity index 90%
rename from patches/server/0101-Add-server-name-parameter.patch
rename to patches/server/0098-Add-server-name-parameter.patch
index e33a8ed452..a78c444de3 100644
--- a/patches/server/0101-Add-server-name-parameter.patch
+++ b/patches/server/0098-Add-server-name-parameter.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 176ffe9f5007bf4bb83bfc0d1186116c98481f45..3eca99ab31f257423ca4d1d2cdcfc19a16758e6d 100644
+index 2134330bafb9312a26f0259b8410f608d87d8247..faf58b6263f45a3b36014eaf628c2dac23a0ccde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -167,6 +167,14 @@ public class Main {
diff --git a/patches/server/0102-Fix-global-sound-handling.patch b/patches/server/0099-Fix-global-sound-handling.patch
similarity index 97%
rename from patches/server/0102-Fix-global-sound-handling.patch
rename to patches/server/0099-Fix-global-sound-handling.patch
index 8fd65a12d8..65b37e92d7 100644
--- a/patches/server/0102-Fix-global-sound-handling.patch
+++ b/patches/server/0099-Fix-global-sound-handling.patch
@@ -11,7 +11,7 @@ Co-authored-by: lexikiq <noellekiq@gmail.com>
 Co-authored-by: Aikar <aikar@aikar.co>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index adb4e72652605f25b25dcd5690fbe7bb499c8809..d96be9d3a24a5eb89fc2a7180b6d7e236e7c2448 100644
+index ad9b4e88e2aaa5d7e70f65536c86742beafc91df..87cd4d17d618cd9d69a38838a05dbe5d0fe807d4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1557,7 +1557,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -81,10 +81,10 @@ index 5bc68514a1e8a212e2681f06b918548c0ec565b6..1977e702f6af39ebf100c1f2f2edc2d1
                              double deltaLength = Math.sqrt(distanceSquared);
                              double relativeX = player.getX() + (deltaX / deltaLength) * viewDistance;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 50f9c4c2974b0a0150068c334e0537e69c0de8f7..36c6a79628ec16eb1ef018e541ed1bec2126bbe6 100644
+index 28ff413396312df9de73805e06da70a6fc0e8201..7f0db74c7a247d313c33bafb0ec773ae8f4f3959 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1366,4 +1366,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1282,4 +1282,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return ret;
      }
      // Paper end
diff --git a/patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch
rename to patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 90%
rename from patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index f7dfc982e6..c4975570f8 100644
--- a/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 1924757cec5d7f2d13ef35f9bbe1554d786713d7..f13b0143ad89386f8e8d350ebacf98f4f66f18a8 100644
+index 370cf30a6411577ec8ed7a32e473217e2f64782b..3c9c6a697143c7e980add58576ad288b8f51ae35 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -89,6 +89,7 @@ public class GameProfileCache {
diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
similarity index 93%
rename from patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
rename to patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
index af9d409ee8..e55de5ec29 100644
--- a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add setting for proxy online mode status
 TODO: Add isProxyOnlineMode check to Metrics
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1ee3e38703175707dec6493a1785b1bbc5170793..73b398ffc86498151944bedb0ef12d63de35c603 100644
+index 1df4c9b12852ac05652260678597d13ced40f80d..eb740abb5f51b9423f76faae1701dca4cc127569 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -584,7 +584,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -23,7 +23,7 @@ index 1ee3e38703175707dec6493a1785b1bbc5170793..73b398ffc86498151944bedb0ef12d63
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index f13b0143ad89386f8e8d350ebacf98f4f66f18a8..64f7c3180a745a62bb5d71a42668cc67b5d56c3a 100644
+index 3c9c6a697143c7e980add58576ad288b8f51ae35..92c22dc10e385f1942f2ec375bbce9faf257462b 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -89,7 +89,8 @@ public class GameProfileCache {
@@ -46,7 +46,7 @@ index f13b0143ad89386f8e8d350ebacf98f4f66f18a8..64f7c3180a745a62bb5d71a42668cc67
  
      public void add(GameProfile profile) {
 diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
-index 78b11d6fd74fb0714a8013fdc78d096643c4f83c..14bd0b94ece3f826f822b4900c7250ebdc27d937 100644
+index b3c6e76105ee26a79a84a203935530f859460652..e697b8f7b165d2394d8155cbee7453e23ac2bee4 100644
 --- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 +++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
 @@ -66,7 +66,8 @@ public class OldUsersConverter {
diff --git a/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch
rename to patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0107-Configurable-packet-in-spam-threshold.patch b/patches/server/0104-Configurable-packet-in-spam-threshold.patch
similarity index 100%
rename from patches/server/0107-Configurable-packet-in-spam-threshold.patch
rename to patches/server/0104-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0108-Configurable-flying-kick-messages.patch b/patches/server/0105-Configurable-flying-kick-messages.patch
similarity index 95%
rename from patches/server/0108-Configurable-flying-kick-messages.patch
rename to patches/server/0105-Configurable-flying-kick-messages.patch
index 852421d2f4..69bb594e2c 100644
--- a/patches/server/0108-Configurable-flying-kick-messages.patch
+++ b/patches/server/0105-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4300fd30f782a2fe32519f7e27edff292ca46ef6..3e745e7adb36b9d5cb06754792c891266ec30722 100644
+index 9d23e60b166caf31856b2592f844af7d6ac68469..4c689d2a794e53a2d9915f1ba46435c41bfa74e9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -338,7 +338,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0106-Add-EntityZapEvent.patch
similarity index 100%
rename from patches/server/0109-Add-EntityZapEvent.patch
rename to patches/server/0106-Add-EntityZapEvent.patch
diff --git a/patches/server/0110-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/server/0107-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
similarity index 100%
rename from patches/server/0110-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
rename to patches/server/0107-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0111-Cache-user-authenticator-threads.patch b/patches/server/0108-Cache-user-authenticator-threads.patch
similarity index 100%
rename from patches/server/0111-Cache-user-authenticator-threads.patch
rename to patches/server/0108-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch
similarity index 94%
rename from patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
rename to patches/server/0109-Allow-Reloading-of-Command-Aliases.patch
index 9bd7e06637..0dbeb2d1a0 100644
--- a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
+++ b/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 876c82e1f1e74417978fd974bd747562b9f8ccdd..3f321cf8a3fa4bc80402ca25d58e0dde62c4e3d5 100644
+index 6d45d5f149211eaad9a07019290dac2c3d04084c..c41876842886e85f44e2cc64a2e6a48cf66c3609 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2746,5 +2746,24 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch
similarity index 96%
rename from patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch
index 9dc1202d54..6a7a0c2b36 100644
--- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,7 +18,7 @@ index 79943167c7e16111a81ff608fd9ed6c06bcb9468..59bad6c92cc421dd05c7315e2ab694a6
  
                  --this.count;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6436da99daa22ace3cdee794d0dab09894c1d92c..f6691073be08db9ea960b1298369687782ba9624 100644
+index 18cd6963863d030e3c360f5e00e8786f28ee04b9..0cadc81bfd86a1bcd4ec1d7a793c548cad7d8a9b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1218,6 +1218,17 @@ public class CraftEventFactory {
diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0111-Add-ProjectileCollideEvent.patch
similarity index 96%
rename from patches/server/0114-Add-ProjectileCollideEvent.patch
rename to patches/server/0111-Add-ProjectileCollideEvent.patch
index 969c65511c..fd0c0df651 100644
--- a/patches/server/0114-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0111-Add-ProjectileCollideEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent
 Deprecated now and replaced with ProjectileHitEvent
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f6691073be08db9ea960b1298369687782ba9624..42c4423979cb007f9e9270ee319d765f208dc61b 100644
+index 0cadc81bfd86a1bcd4ec1d7a793c548cad7d8a9b..848bcabb5922c99ee78cb541c87b464cea032749 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1362,6 +1362,17 @@ public class CraftEventFactory {
diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0116-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/server/0113-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
similarity index 87%
rename from patches/server/0116-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
rename to patches/server/0113-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
index 11679e1ff1..851edacf7d 100644
--- a/patches/server/0116-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
+++ b/patches/server/0113-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize Level.hasChunkAt(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f9e89722d50accecceea26aa12c312b9f331339a..7a5865f10b87022317b5eb3a1d711a0864da9a7f 100644
+index 7f0db74c7a247d313c33bafb0ec773ae8f4f3959..537d532a2663a0f0384a4af1ffe008dfa395cb38 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -430,6 +430,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -346,6 +346,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return chunk == null ? null : chunk.getFluidState(blockposition);
      }
  
diff --git a/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch
rename to patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch
rename to patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0119-Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/server/0116-Add-API-methods-to-control-if-armor-stands-can-move.patch
similarity index 100%
rename from patches/server/0119-Add-API-methods-to-control-if-armor-stands-can-move.patch
rename to patches/server/0116-Add-API-methods-to-control-if-armor-stands-can-move.patch
diff --git a/patches/server/0120-String-based-Action-Bar-API.patch b/patches/server/0117-String-based-Action-Bar-API.patch
similarity index 96%
rename from patches/server/0120-String-based-Action-Bar-API.patch
rename to patches/server/0117-String-based-Action-Bar-API.patch
index c45927d5f6..25324073ee 100644
--- a/patches/server/0120-String-based-Action-Bar-API.patch
+++ b/patches/server/0117-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index cb88a3a4e4c87a6d6c838183c1640b13d82c9344..0b391b0dc6262ef482c4a253a074b593
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3fe9b9a28829f6796a23fe337df3a677d2e8d19b..ba93b5d9b6ee5f4da150248a850970e8ecfb4d2e 100644
+index b15df5f55dc12c358df74df500f210976eaba048..028be33a35e2630cdd49aa03b58e3cf32e565d49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -343,6 +343,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0121-Properly-fix-item-duplication-bug.patch b/patches/server/0118-Properly-fix-item-duplication-bug.patch
similarity index 100%
rename from patches/server/0121-Properly-fix-item-duplication-bug.patch
rename to patches/server/0118-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0122-Firework-API-s.patch b/patches/server/0119-Firework-API-s.patch
similarity index 100%
rename from patches/server/0122-Firework-API-s.patch
rename to patches/server/0119-Firework-API-s.patch
diff --git a/patches/server/0123-PlayerTeleportEndGatewayEvent.patch b/patches/server/0120-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0123-PlayerTeleportEndGatewayEvent.patch
rename to patches/server/0120-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 97%
rename from patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch
index 2759e67157..d95b774acb 100644
--- a/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 7a5865f10b87022317b5eb3a1d711a0864da9a7f..35a87775736a40ba7b4c04116c8fe007512d6161 100644
+index 537d532a2663a0f0384a4af1ffe008dfa395cb38..4e1b8ce73f07b8ea12f9f2b7883cd994aed73648 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -119,7 +119,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0125-Enforce-Sync-Player-Saves.patch b/patches/server/0122-Enforce-Sync-Player-Saves.patch
similarity index 92%
rename from patches/server/0125-Enforce-Sync-Player-Saves.patch
rename to patches/server/0122-Enforce-Sync-Player-Saves.patch
index 48e89d22cc..4caf5c398d 100644
--- a/patches/server/0125-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0122-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 828abde34c7d883831e81b7759a862db43cfe2c6..6d4099d8c9d0c2ea20b98ea3f30ac44a697ff400 100644
+index e3195f03ac449e6e4870489d530ef40918cd5556..e93b9c103e9b48fc4eab4ca41ce77c807d3d11ed 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1061,11 +1061,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0123-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 99%
rename from patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0123-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index af577e50e9..c6a7fb9ad2 100644
--- a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0123-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -127,7 +127,7 @@ index 59bad6c92cc421dd05c7315e2ab694a669433ab4..ae70ad9d6c02fcb5631a3c45db283b29
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1cf4bcb7dcba93c93ad27f10a34b23f616ec9b3f..77a4122cf5a11b29b14a7fc4ac6420ccea49af1b 100644
+index fad14002768e55f5b300d1829f16b3d7b7504bf6..ed8e0f5ca865dcde73a886e65f0fd1d7d4e7ac05 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1786,7 +1786,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0127-Cap-Entity-Collisions.patch b/patches/server/0124-Cap-Entity-Collisions.patch
similarity index 92%
rename from patches/server/0127-Cap-Entity-Collisions.patch
rename to patches/server/0124-Cap-Entity-Collisions.patch
index 630d692f83..955763946f 100644
--- a/patches/server/0127-Cap-Entity-Collisions.patch
+++ b/patches/server/0124-Cap-Entity-Collisions.patch
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index edbfc7bc783833a62542a4515dde13034ae29c10..fbdb708379dc77ce90ca2ca90ebd0bd49ebec12f 100644
+index 34bd4a3f8639295d4980d2b36fe07e2be0ec0d1e..784ab316b6346f62519b06b0dadafa6ac75d8737 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -394,6 +394,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -24,7 +24,7 @@ index edbfc7bc783833a62542a4515dde13034ae29c10..fbdb708379dc77ce90ca2ca90ebd0bd4
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 77a4122cf5a11b29b14a7fc4ac6420ccea49af1b..e2635fc1a80629f8ea1ddd406785be8b07f4f140 100644
+index ed8e0f5ca865dcde73a886e65f0fd1d7d4e7ac05..a799b64e9d655e7eba509e9930e623a88bbb0389 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3348,10 +3348,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0125-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0125-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0126-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 98%
rename from patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0126-Properly-handle-async-calls-to-restart-the-server.patch
index 52c33abc5f..98b711f313 100644
--- a/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0126-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 77ea9b316f186243c74cc080cc7c382ab6666a21..e91dd35a84dceae1ad9c5ede0565591e59d9d84f 100644
+index 3410a2b68146f34f37446c9daeb20f8860b37292..5ab790ed036215d8b09f63f4f13a32a4af07e1c6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -64,7 +64,7 @@ index 77ea9b316f186243c74cc080cc7c382ab6666a21..e91dd35a84dceae1ad9c5ede0565591e
          if (waitForShutdown) {
              try {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6d4099d8c9d0c2ea20b98ea3f30ac44a697ff400..8550245a088be78359b55fa0cc582df35dbbebed 100644
+index e93b9c103e9b48fc4eab4ca41ce77c807d3d11ed..b38496b2a4d10c7f51667fca2a19129ac7db0016 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1175,8 +1175,15 @@ public abstract class PlayerList {
diff --git a/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0127-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 96%
rename from patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0127-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 62d5f2a255..63e95afc61 100644
--- a/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0127-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -32,7 +32,7 @@ index 4c689d2a794e53a2d9915f1ba46435c41bfa74e9..03bc7ae947360a721fef5a772ecadb4a
              case RELEASE_SHIFT_KEY:
                  this.player.setShiftKeyDown(false);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c2725113b3ec36a79c88bcf9837c0ef2955b613e..45b56ca0ec79669cb41d0a14603e2f9ba140c1f1 100644
+index 86d187cadb73dbe0757f9417c4549e358ff303ca..5bac265d9c13da9aceabbd7520cb2ab5fb14b68c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -589,6 +589,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0128-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 89%
rename from patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0128-Add-configuration-option-to-prevent-player-names-fro.patch
index 7d5c1c9026..e9ab16c05f 100644
--- a/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0128-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3f321cf8a3fa4bc80402ca25d58e0dde62c4e3d5..b4d08a9178575d245b69a81311b47433c4682de7 100644
+index c41876842886e85f44e2cc64a2e6a48cf66c3609..5189806a847f27e125cab3a5395e30c9d076aa4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2765,5 +2765,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0129-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 98%
rename from patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/server/0129-Use-TerminalConsoleAppender-for-console-improvements.patch
index 321709f253..02e920ba78 100644
--- a/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0129-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -250,7 +250,7 @@ index 8323f135d6bf2e1f12525e05094ffa3f2420e7e1..a143ea1e58464a3122fbd8ccafe417bd
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 981a2927f0baa5146da732ffa8469d7a210e4170..eb443925f77aff634d4630089d7c2d096dfe8005 100644
+index 5ab790ed036215d8b09f63f4f13a32a4af07e1c6..fae34d85f6c3a81f29fa625c78090895d3af31cc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -155,7 +155,7 @@ import org.slf4j.Logger;
@@ -309,7 +309,7 @@ index 981a2927f0baa5146da732ffa8469d7a210e4170..eb443925f77aff634d4630089d7c2d09
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1ee3e38703175707dec6493a1785b1bbc5170793..07c736fd35afb7f90d41d14a726ac476b0b6a2c0 100644
+index eb740abb5f51b9423f76faae1701dca4cc127569..5b64c7f2f36bdf03f8a764d6c8d77524a0774ad1 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -98,6 +98,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -373,7 +373,7 @@ index 75083eeb9b413e6dd5375007360dce6857a08fff..d292fdb165436f0b9b46b32110f5e09a
          if (!SwingUtilities.isEventDispatchThread()) {
              SwingUtilities.invokeLater(() -> {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8550245a088be78359b55fa0cc582df35dbbebed..ea7effdb4274c7e2c19d737a74b1fc5847b9888c 100644
+index b38496b2a4d10c7f51667fca2a19129ac7db0016..466ca062eaeb9108c59f308a8212cbaf79ad0fc3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -160,8 +160,7 @@ public abstract class PlayerList {
@@ -387,7 +387,7 @@ index 8550245a088be78359b55fa0cc582df35dbbebed..ea7effdb4274c7e2c19d737a74b1fc58
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b4d08a9178575d245b69a81311b47433c4682de7..dc43f7da2851727ea3be618386a6555c515bbddd 100644
+index 5189806a847f27e125cab3a5395e30c9d076aa4e..cc00ace00dc1050d644312a0289221a5c664170d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -42,7 +42,7 @@ import java.util.logging.Level;
@@ -414,7 +414,7 @@ index b4d08a9178575d245b69a81311b47433c4682de7..dc43f7da2851727ea3be618386a6555c
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index d843307a2de71537a5a17c42f9fab4fc0328dc43..9c24fdab1744a5af71d8dfb63736483272476f40 100644
+index faf58b6263f45a3b36014eaf628c2dac23a0ccde..09164f4c446d3e80708f1bcb9da333821ee5733d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,6 @@ import java.util.logging.Logger;
diff --git a/patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0130-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0130-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0134-Item-canEntityPickup.patch b/patches/server/0131-Item-canEntityPickup.patch
similarity index 100%
rename from patches/server/0134-Item-canEntityPickup.patch
rename to patches/server/0131-Item-canEntityPickup.patch
diff --git a/patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0132-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0132-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0136-PlayerAttemptPickupItemEvent.patch b/patches/server/0133-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/0136-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0133-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 97%
rename from patches/server/0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index 36723921bc..144dfef087 100644
--- a/patches/server/0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch
@@ -37,7 +37,7 @@ index 114f4017c4133042178c57d424f10079163835dd..aa52b271bd556a29f774fde375b713d0
      private static final int LINEAR_LOOKUP_THRESHOLD = 8;
      public static final long NANOS_PER_MILLI = 1000000L;
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 64f7c3180a745a62bb5d71a42668cc67b5d56c3a..bbd8cf8b9f51cb5ca881a54df2e6d6227c0bfd6c 100644
+index 92c22dc10e385f1942f2ec375bbce9faf257462b..adb472c175cc6f6ced7075a37423d6c898fd5ccb 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -169,7 +169,7 @@ public class GameProfileCache {
diff --git a/patches/server/0138-Basic-PlayerProfile-API.patch b/patches/server/0135-Basic-PlayerProfile-API.patch
similarity index 98%
rename from patches/server/0138-Basic-PlayerProfile-API.patch
rename to patches/server/0135-Basic-PlayerProfile-API.patch
index 69a7b347c6..fa823a6f39 100644
--- a/patches/server/0138-Basic-PlayerProfile-API.patch
+++ b/patches/server/0135-Basic-PlayerProfile-API.patch
@@ -577,7 +577,7 @@ index 3a00e24d78acb99d226289ccb9ba419dfc607a45..209594863c2aa965055412adb7db009c
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 9d32d03ad59a6e2dfef2c157e621f9ef43098534..b60003f2542e469edf9e856873a1b325686ac31c 100644
+index 9ead836c08ff48430bc6d3ba225864f48d335eee..0c9f6443663bc567a181393b13311a909602f4a4 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -176,7 +176,7 @@ public class Main {
@@ -590,7 +590,7 @@ index 9d32d03ad59a6e2dfef2c157e621f9ef43098534..b60003f2542e469edf9e856873a1b325
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 9c500642eb2b59bf9aabd6b5d563e5fb15603056..731a7c0363c8c91d25b35f7cbbb480879381bc8d 100644
+index adb472c175cc6f6ced7075a37423d6c898fd5ccb..1ec0f3a7148c2f412421772f6e1dff0bb92a51bc 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -126,6 +126,17 @@ public class GameProfileCache {
@@ -612,7 +612,7 @@ index 9c500642eb2b59bf9aabd6b5d563e5fb15603056..731a7c0363c8c91d25b35f7cbbb48087
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dc43f7da2851727ea3be618386a6555c515bbddd..07d88fbfcfde48fbebe8081633beca48df658bd0 100644
+index cc00ace00dc1050d644312a0289221a5c664170d..f06afed5f786aad4415cd369903d97a0912dfac7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -260,6 +260,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -677,7 +677,7 @@ index dc43f7da2851727ea3be618386a6555c515bbddd..07d88fbfcfde48fbebe8081633beca48
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-index 91e913f8652584ffab44c44d10c0e0c47707e261..6422c58907ee289359a11054fec1e4de6f495ae3 100644
+index edd340c66ea8cec1c76ba29f1deab14c4784a7e5..6f779c6f4422c5b5dc22f66e3e702c714d0e052b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 @@ -28,7 +28,7 @@ import org.bukkit.profile.PlayerProfile;
diff --git a/patches/server/0139-Add-UnknownCommandEvent.patch b/patches/server/0136-Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/server/0139-Add-UnknownCommandEvent.patch
rename to patches/server/0136-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0140-Shoulder-Entities-Release-API.patch b/patches/server/0137-Shoulder-Entities-Release-API.patch
similarity index 96%
rename from patches/server/0140-Shoulder-Entities-Release-API.patch
rename to patches/server/0137-Shoulder-Entities-Release-API.patch
index 5df1057b9f..feee9314f4 100644
--- a/patches/server/0140-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0137-Shoulder-Entities-Release-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 09d5561deb40549ce6a7661ebfd9b9db24db0d12..9db07751cf1321c7fd15b2345729deaa6dd5a76f 100644
+index 5bac265d9c13da9aceabbd7520cb2ab5fb14b68c..08dd71295154395d6de41a97f214157658f0c24b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1957,20 +1957,45 @@ public abstract class Player extends LivingEntity {
+@@ -1949,20 +1949,45 @@ public abstract class Player extends LivingEntity {
  
      }
  
diff --git a/patches/server/0141-Profile-Lookup-Events.patch b/patches/server/0138-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0141-Profile-Lookup-Events.patch
rename to patches/server/0138-Profile-Lookup-Events.patch
diff --git a/patches/server/0142-Block-player-logins-during-server-shutdown.patch b/patches/server/0139-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from patches/server/0142-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0139-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0143-Entity-fromMobSpawner.patch b/patches/server/0140-Entity-fromMobSpawner.patch
similarity index 97%
rename from patches/server/0143-Entity-fromMobSpawner.patch
rename to patches/server/0140-Entity-fromMobSpawner.patch
index 130ee5def8..6c15fe5b2f 100644
--- a/patches/server/0143-Entity-fromMobSpawner.patch
+++ b/patches/server/0140-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fbdb708379dc77ce90ca2ca90ebd0bd49ebec12f..4ccdb5ca52700249cb0a24dff186e8cf047df2bb 100644
+index 784ab316b6346f62519b06b0dadafa6ac75d8737..42f8c39fa5f9f31c03d4e7af9fb6b7a842f29aae 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -395,6 +395,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0141-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0144-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0141-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0145-ensureServerConversions-API.patch b/patches/server/0142-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0145-ensureServerConversions-API.patch
rename to patches/server/0142-ensureServerConversions-API.patch
diff --git a/patches/server/0146-Implement-getI18NDisplayName.patch b/patches/server/0143-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0146-Implement-getI18NDisplayName.patch
rename to patches/server/0143-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0147-ProfileWhitelistVerifyEvent.patch b/patches/server/0144-ProfileWhitelistVerifyEvent.patch
similarity index 97%
rename from patches/server/0147-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0144-ProfileWhitelistVerifyEvent.patch
index 1ac23dfe60..48f4648d0a 100644
--- a/patches/server/0147-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0144-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ea7effdb4274c7e2c19d737a74b1fc5847b9888c..29b4399e0f78067ee84748bb15b3978aa6bcd719 100644
+index 466ca062eaeb9108c59f308a8212cbaf79ad0fc3..38329fe27594c3047d948aaf091fcea33ab270dd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -631,9 +631,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0148-Fix-this-stupid-bullshit.patch b/patches/server/0145-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from patches/server/0148-Fix-this-stupid-bullshit.patch
rename to patches/server/0145-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0149-LivingEntity-setKiller.patch b/patches/server/0146-LivingEntity-setKiller.patch
similarity index 100%
rename from patches/server/0149-LivingEntity-setKiller.patch
rename to patches/server/0146-LivingEntity-setKiller.patch
diff --git a/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0147-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0147-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 94%
rename from patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch
index c3134dc8fc..5548378079 100644
--- a/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 657466fc6e28cbb414549044f75eef7310d7aab9..e15c5886b1cc80b5da2ad8e536507a48cea77d2a 100644
+index 33bd60b5ef7383061acf2da24cfee35b495ebfc7..c01596f87efd316816b597b83c3cac1dbddc22c2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -262,7 +262,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0150-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 95%
rename from patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0150-Handle-plugin-prefixes-using-Log4J-configuration.patch
index db3e1a54a0..8dc571bba3 100644
--- a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0150-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0bfa5a3fe47d96f159f0093c046de3f2d8a0211c..2c885574b6c2667984b4996af0a421d8325842ef 100644
+index 7a3c96318f95fcd6cf6fd94415958382d1193ec6..38ded67b38bb5dc7c59eb610b81ac33d88d25dac 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ dependencies {
@@ -28,7 +28,7 @@ index 0bfa5a3fe47d96f159f0093c046de3f2d8a0211c..2c885574b6c2667984b4996af0a421d8
      runtimeOnly(log4jPlugins.output)
      alsoShade(log4jPlugins.output)
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 0fca20580d81c461e903c8cbd1cf090f5d5083c6..bf368d3ab947f027eaffb5498c45429bf702788c 100644
+index bd4c744c597201267418b07b9bcb522805c485eb..0f391af1274926ef6316bd06458767a27640f54a 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -290,7 +290,7 @@ public class SpigotConfig
diff --git a/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0151-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/server/0151-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0155-Add-PlayerJumpEvent.patch b/patches/server/0152-Add-PlayerJumpEvent.patch
similarity index 96%
rename from patches/server/0155-Add-PlayerJumpEvent.patch
rename to patches/server/0152-Add-PlayerJumpEvent.patch
index 64caef2dde..6e62818a62 100644
--- a/patches/server/0155-Add-PlayerJumpEvent.patch
+++ b/patches/server/0152-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5d32f12b01db3d2cc5ca743048c43c76e2a5a7cb..f422b6ffcd590788085486778293aaabc141d392 100644
+index 03bc7ae947360a721fef5a772ecadb4a18ac73b2..dd1de1632900fd3a3771241c5f3ce69c673f64d7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1225,7 +1225,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0153-handle-ServerboundKeepAlivePacket-async.patch
similarity index 100%
rename from patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
rename to patches/server/0153-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0154-Expose-client-protocol-version-and-virtual-host.patch
similarity index 95%
rename from patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0154-Expose-client-protocol-version-and-virtual-host.patch
index 7defeb27e0..63dabebf9b 100644
--- a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0154-Expose-client-protocol-version-and-virtual-host.patch
@@ -75,7 +75,7 @@ index 5b267514504497de3faa7ffa490a179200d9415c..faac9ba36d83f537fe62e177c15ae237
      // Paper start - add utility methods
      public final net.minecraft.server.level.ServerPlayer getPlayer() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 0d9658b1c6b5912a34058c0ce53b8e7f8c28afac..203fc53142bb0c9b6e2d1876fe8dfbe33c42af99 100644
+index ce51bde4db395ff30c7d75e3badd68d6395fa40f..3dfec4462d85f3223071b4e78465587db6185f0d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -165,6 +165,10 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
@@ -90,7 +90,7 @@ index 0d9658b1c6b5912a34058c0ce53b8e7f8c28afac..203fc53142bb0c9b6e2d1876fe8dfbe3
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ba93b5d9b6ee5f4da150248a850970e8ecfb4d2e..809ad04237c85f41bdf3bd772deb67d203b4a4b6 100644
+index 028be33a35e2630cdd49aa03b58e3cf32e565d49..f35a53f6e4af319a4ce6f8e5dc8eb65edb47b6ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -289,6 +289,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch b/patches/server/0155-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from patches/server/0158-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0155-revert-serverside-behavior-of-keepalives.patch
index 01ca99ca69..27c77cb9ee 100644
--- a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0155-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 0fcedb954c20d9777d27d896e29cea7f6eebffd3..8e96e9bc12855964dcb3a111617232df4118114e 100644
+index 156cb6a00a2580eb16e05c80bc3267128b5804a3..d0f89a66734423ceea67fbeb99b0e72797f80e63 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -48,12 +48,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0156-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 92%
rename from patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0156-Send-attack-SoundEffects-only-to-players-who-can-see.patch
index 1170f4b84f..2d02036ac6 100644
--- a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
+++ b/patches/server/0156-Send-attack-SoundEffects-only-to-players-who-can-see.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9db07751cf1321c7fd15b2345729deaa6dd5a76f..6881f6041d1605689f33d6d50b592f7d8a70cbdf 100644
+index 08dd71295154395d6de41a97f214157658f0c24b..5680bc0c9c71f915f66eecae401e8f51dc4225fe 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1235,7 +1235,7 @@ public abstract class Player extends LivingEntity {
+@@ -1227,7 +1227,7 @@ public abstract class Player extends LivingEntity {
                      int i = b0 + EnchantmentHelper.getKnockbackBonus(this);
  
                      if (this.isSprinting() && flag) {
@@ -18,7 +18,7 @@ index 9db07751cf1321c7fd15b2345729deaa6dd5a76f..6881f6041d1605689f33d6d50b592f7d
                          ++i;
                          flag1 = true;
                      }
-@@ -1310,7 +1310,7 @@ public abstract class Player extends LivingEntity {
+@@ -1302,7 +1302,7 @@ public abstract class Player extends LivingEntity {
                                  }
                              }
  
@@ -27,7 +27,7 @@ index 9db07751cf1321c7fd15b2345729deaa6dd5a76f..6881f6041d1605689f33d6d50b592f7d
                              this.sweepAttack();
                          }
  
-@@ -1338,15 +1338,15 @@ public abstract class Player extends LivingEntity {
+@@ -1330,15 +1330,15 @@ public abstract class Player extends LivingEntity {
                          }
  
                          if (flag2) {
@@ -46,7 +46,7 @@ index 9db07751cf1321c7fd15b2345729deaa6dd5a76f..6881f6041d1605689f33d6d50b592f7d
                              }
                          }
  
-@@ -1398,7 +1398,7 @@ public abstract class Player extends LivingEntity {
+@@ -1390,7 +1390,7 @@ public abstract class Player extends LivingEntity {
  
                          this.causeFoodExhaustion(this.level().spigotConfig.combatExhaustion, EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
                      } else {
@@ -55,7 +55,7 @@ index 9db07751cf1321c7fd15b2345729deaa6dd5a76f..6881f6041d1605689f33d6d50b592f7d
                          if (flag4) {
                              target.clearFire();
                          }
-@@ -1792,6 +1792,14 @@ public abstract class Player extends LivingEntity {
+@@ -1784,6 +1784,14 @@ public abstract class Player extends LivingEntity {
      public int getXpNeededForNextLevel() {
          return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2);
      }
diff --git a/patches/server/0160-Add-PlayerArmorChangeEvent.patch b/patches/server/0157-Add-PlayerArmorChangeEvent.patch
similarity index 98%
rename from patches/server/0160-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0157-Add-PlayerArmorChangeEvent.patch
index 9241f395c2..8b9fc0d446 100644
--- a/patches/server/0160-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0157-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 202e3b66a81de2f76d5a8bba3538f1554b8debf3..914b126965392b2465fc8ce80b0e3a7917a7052b 100644
+index a799b64e9d655e7eba509e9930e623a88bbb0389..acf892ce7cf566fc6b9b88c6502c97a06cdedfd4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0158-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0158-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/server/0159-Fix-MC-117075-Block-entity-unload-lag-spike.patch
similarity index 89%
rename from patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch
rename to patches/server/0159-Fix-MC-117075-Block-entity-unload-lag-spike.patch
index 9a55778010..9169113362 100644
--- a/patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch
+++ b/patches/server/0159-Fix-MC-117075-Block-entity-unload-lag-spike.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-117075: Block entity unload lag spike
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 7e5cf2adf9b2adab681b25beb2cb573378815bef..b419eaee987585e2980016ae8bd2614cdc42cfce 100644
+index 4e1b8ce73f07b8ea12f9f2b7883cd994aed73648..0e837193b5b858d0be30974c7454cf76920d58e9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -816,6 +816,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -732,6 +732,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          boolean flag = this.tickRateManager().runsNormally();
  
          int tilesThisCycle = 0;
@@ -17,7 +17,7 @@ index 7e5cf2adf9b2adab681b25beb2cb573378815bef..b419eaee987585e2980016ae8bd2614c
          for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
              this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
              TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(this.tileTickPosition);
-@@ -824,12 +826,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -740,12 +742,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (tickingblockentity.isRemoved()) {
                  // Spigot start
                  tilesThisCycle--;
diff --git a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0160-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 92%
rename from patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0160-use-CB-BlockState-implementations-for-captured-block.patch
index d24a7145b1..1b15ed07e5 100644
--- a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0160-use-CB-BlockState-implementations-for-captured-block.patch
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2dad35f00a98be534db1da1a38a6865e41a1a94d..eb9da7e3912430921219cd4ebdcc295c0e5162bb 100644
+index 0e837193b5b858d0be30974c7454cf76920d58e9..a349755740483148dcdc8d490943fdce74aa4434 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 {
@@ -30,7 +30,7 @@ index 2dad35f00a98be534db1da1a38a6865e41a1a94d..eb9da7e3912430921219cd4ebdcc295c
      public Map<BlockPos, BlockEntity> capturedTileEntities = new HashMap<>();
      public List<ItemEntity> captureDrops;
      public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<SpawnCategory> ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();
-@@ -472,7 +472,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -388,7 +388,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
@@ -39,7 +39,7 @@ index 2dad35f00a98be534db1da1a38a6865e41a1a94d..eb9da7e3912430921219cd4ebdcc295c
              if (blockstate == null) {
                  blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags);
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
-@@ -492,7 +492,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -408,7 +408,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // CraftBukkit start - capture blockstates
              boolean captured = false;
              if (this.captureBlockStates && !this.capturedBlockStates.containsKey(pos)) {
@@ -49,7 +49,7 @@ index 2dad35f00a98be534db1da1a38a6865e41a1a94d..eb9da7e3912430921219cd4ebdcc295c
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
                  captured = true;
              }
-@@ -698,7 +699,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -614,7 +615,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public BlockState getBlockState(BlockPos pos) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
diff --git a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0161-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0161-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0165-AsyncTabCompleteEvent.patch b/patches/server/0162-AsyncTabCompleteEvent.patch
similarity index 99%
rename from patches/server/0165-AsyncTabCompleteEvent.patch
rename to patches/server/0162-AsyncTabCompleteEvent.patch
index af9c1a1a42..4e3a23dd1a 100644
--- a/patches/server/0165-AsyncTabCompleteEvent.patch
+++ b/patches/server/0162-AsyncTabCompleteEvent.patch
@@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent
 Co-authored-by: Aikar <aikar@aikar.co>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f422b6ffcd590788085486778293aaabc141d392..243e111392aca01c94aee052673d0a91008524de 100644
+index dd1de1632900fd3a3771241c5f3ce69c673f64d7..14e891458fad814e374f14ef5710a352efb9dac4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -688,12 +688,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0166-PlayerPickupExperienceEvent.patch b/patches/server/0163-PlayerPickupExperienceEvent.patch
similarity index 93%
rename from patches/server/0166-PlayerPickupExperienceEvent.patch
rename to patches/server/0163-PlayerPickupExperienceEvent.patch
index c276fe0ac5..c4ef53a205 100644
--- a/patches/server/0166-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0163-PlayerPickupExperienceEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index b49e48fa6dd37b5eddb45877be90018ec9d23b0e..7ef1b6decd87371db1636ace091b975db210f4fb 100644
+index ae70ad9d6c02fcb5631a3c45db283b29844bbb0d..0f55715f2d97ab09746a51f9d39134b513778fdd 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -312,7 +312,7 @@ public class ExperienceOrb extends Entity {
diff --git a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0164-Ability-to-apply-mending-to-XP-API.patch
similarity index 96%
rename from patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0164-Ability-to-apply-mending-to-XP-API.patch
index 1487a51ace..c9b5761eb0 100644
--- a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0164-Ability-to-apply-mending-to-XP-API.patch
@@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 809ad04237c85f41bdf3bd772deb67d203b4a4b6..7021921980b20a8c61016a021b281af58ed72b51 100644
+index f35a53f6e4af319a4ce6f8e5dc8eb65edb47b6ed..62c531603c68597add75de31749943bd47e4580f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1543,7 +1543,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 98%
rename from patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch
index fe5c651f9e..87f605b172 100644
--- a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch
@@ -60,7 +60,7 @@ index 1ad6b62ee53e2ee4a710211dfc750780519004f9..de1d5da6318958e11a9da56ddd8fef11
                  boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
                  Iterator iterator1 = list.iterator();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5e60c85a78aedb8275a7cd619006346fcb80405c..989359525a188cc2177e2b258de7baa44773bb53 100644
+index ede3afab5c2a1d175a5beea85ffa362a3481a857..708d1033306da34844827854edaf8a68ed67a936 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -265,6 +265,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0166-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0166-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0170-PreCreatureSpawnEvent.patch b/patches/server/0167-PreCreatureSpawnEvent.patch
similarity index 98%
rename from patches/server/0170-PreCreatureSpawnEvent.patch
rename to patches/server/0167-PreCreatureSpawnEvent.patch
index 78b6f9f5ca..979a740ce6 100644
--- a/patches/server/0170-PreCreatureSpawnEvent.patch
+++ b/patches/server/0167-PreCreatureSpawnEvent.patch
@@ -84,7 +84,7 @@ index 382b55167dede435b034866bd394455f0f6f2a00..bd4ae65070eb4b98dae0529b5985f800
  
          if (t0 != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index a0a313fa5e7e4e1973c020d0262e34381a19dea7..0429b927e63ec12f53a6ce1ebe1e64d99bf7e129 100644
+index f0d5e45d0d6ac51106379d20690d34a032a24c39..bfd156acbae31619234fffb1804726090802fbae 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -975,7 +975,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -129,7 +129,7 @@ index 393b77043cbaf58200fca6e56c22c36aa2aa2cfb..db4beb22cf54bb3b53561ec0fe06209c
                          Entity entity = EntityType.loadEntityRecursive(nbttagcompound, world, (entity1) -> {
                              entity1.moveTo(d0, d1, d2, entity1.getYRot(), entity1.getXRot());
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 92e76dd39dc3575e9466031dd799080a98ad8b8d..449a811202c9dea62bcf4a2f483e08a9bc1d0129 100644
+index 604766a286d00bb4b40c20482376fe80651beabe..286592be7aeb183d1a9ee439c250f2acf932f0bf 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -213,7 +213,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0171-Fill-Profile-Property-Events.patch b/patches/server/0168-Fill-Profile-Property-Events.patch
similarity index 97%
rename from patches/server/0171-Fill-Profile-Property-Events.patch
rename to patches/server/0168-Fill-Profile-Property-Events.patch
index 1c699ab0ce..1b8f42fb8d 100644
--- a/patches/server/0171-Fill-Profile-Property-Events.patch
+++ b/patches/server/0168-Fill-Profile-Property-Events.patch
@@ -46,7 +46,7 @@ index 985e6fc43a0946943847e0c283426242ef594a26..d577384797bb381eb57437f57b726ea8
          return super.fetchProfile(profileId, requireSecure);
      }
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
-index 92b770d10f34596ce52392a0db1ccd825108730b..252d8db6c802a2f23d6c6f8cf3726668225b853d 100644
+index d0b3a836de9830a4da534bedd9f94a16a82ef9c6..6f52256bfb668aee7fd1628c1c0c7b3434b847a6 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SkullBlockEntity.java
 @@ -74,7 +74,7 @@ public class SkullBlockEntity extends BlockEntity {
diff --git a/patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0169-Add-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0169-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0173-Add-ArmorStand-Item-Meta.patch b/patches/server/0170-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0173-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0170-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0174-Extend-Player-Interact-cancellation.patch b/patches/server/0171-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0174-Extend-Player-Interact-cancellation.patch
rename to patches/server/0171-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0175-Tameable-getOwnerUniqueId-API.patch b/patches/server/0172-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0175-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0172-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0176-Toggleable-player-crits.patch b/patches/server/0173-Toggleable-player-crits.patch
similarity index 85%
rename from patches/server/0176-Toggleable-player-crits.patch
rename to patches/server/0173-Toggleable-player-crits.patch
index 3a0ff5f64a..03a7103dee 100644
--- a/patches/server/0176-Toggleable-player-crits.patch
+++ b/patches/server/0173-Toggleable-player-crits.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Toggleable player crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6881f6041d1605689f33d6d50b592f7d8a70cbdf..755364ee011df4deed65fc36ea41012d0667c918 100644
+index 5680bc0c9c71f915f66eecae401e8f51dc4225fe..4bba558b77d857ebc422c0313ba7b914df4dc2a8 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1242,6 +1242,7 @@ public abstract class Player extends LivingEntity {
+@@ -1234,6 +1234,7 @@ public abstract class Player extends LivingEntity {
  
                      boolean flag2 = flag && this.fallDistance > 0.0F && !this.onGround() && !this.onClimbable() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && target instanceof LivingEntity;
  
diff --git a/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0174-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0174-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0175-Implement-extended-PaperServerListPingEvent.patch
similarity index 99%
rename from patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0175-Implement-extended-PaperServerListPingEvent.patch
index 44c9c1509f..0f625038b5 100644
--- a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0175-Implement-extended-PaperServerListPingEvent.patch
@@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..6b0bdc266109cdfb874f08bf74323603
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 06bbe33eeb2474119c22b918c93c57d6b253c319..becbff154ba757a80f9e90a8a7da00acc279d9f5 100644
+index fae34d85f6c3a81f29fa625c78090895d3af31cc..34189700b682377426bb70c9684f56115a6ab112 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,6 +3,9 @@ package net.minecraft.server;
diff --git a/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/server/0176-Add-more-fields-to-AsyncPreLoginEvent.patch
similarity index 98%
rename from patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
rename to patches/server/0176-Add-more-fields-to-AsyncPreLoginEvent.patch
index d56e4c78c9..2affee9d3d 100644
--- a/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
+++ b/patches/server/0176-Add-more-fields-to-AsyncPreLoginEvent.patch
@@ -7,7 +7,7 @@ Co-authored-by: Connor Linfoot <connorlinfoot@me.com>
 Co-authored-by: MCMDEV <john-m.1@gmx.de>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 000e5e6085b95e4fc4995e53dc83d9075e27aa05..58d97fce07ad8f786940c3f5e74e9aaeabe8d261 100644
+index abfeaa9485b71d0b802c41bfd8e113d0bc9e9773..c05c4258c48d967be7bde8570ac7bd91a9f3bdda 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -157,7 +157,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0177-Player.setPlayerProfile-API.patch
similarity index 97%
rename from patches/server/0180-Player.setPlayerProfile-API.patch
rename to patches/server/0177-Player.setPlayerProfile-API.patch
index 932856ea66..efbd55b0ed 100644
--- a/patches/server/0180-Player.setPlayerProfile-API.patch
+++ b/patches/server/0177-Player.setPlayerProfile-API.patch
@@ -9,7 +9,7 @@ This can be useful for changing name or skins after a player has logged in.
 public-f net.minecraft.world.entity.player.Player gameProfile
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9c0440a6e3768ca6300e128da7f1b11a96f10f91..c1c9076be05cd4b0b19d16aabbf0320c2531cca1 100644
+index 14e891458fad814e374f14ef5710a352efb9dac4..51d5bed032f89333917accca242772a09ee98d93 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1468,7 +1468,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -22,7 +22,7 @@ index 9c0440a6e3768ca6300e128da7f1b11a96f10f91..c1c9076be05cd4b0b19d16aabbf0320c
          if (Float.isNaN(f)) {
              f = 0;
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 58d97fce07ad8f786940c3f5e74e9aaeabe8d261..dd4e97ff4c8fb2d2f251713271f5ac493574fcd9 100644
+index c05c4258c48d967be7bde8570ac7bd91a9f3bdda..b23b7560854a9904e28bbd06afccf5bb0dae16e2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -295,11 +295,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -40,7 +40,7 @@ index 58d97fce07ad8f786940c3f5e74e9aaeabe8d261..dd4e97ff4c8fb2d2f251713271f5ac49
          playerName = gameprofile.getName();
          uniqueId = gameprofile.getId();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6e0a21935f9d5f35cbce72b32e0a89bb636804e2..782cc6d910efe5bc5498d0083afab42fad6c4fa2 100644
+index 38329fe27594c3047d948aaf091fcea33ab270dd..99ba7c82f8a8db9d5841cce18ed5f39439b512b0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -862,10 +862,16 @@ public abstract class PlayerList {
@@ -77,7 +77,7 @@ index 477d3245facb5ae59c786d4f696f64226cb540a6..e8490a58dd4d9bc39a5bb2f9fc109526
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8dd7e875d0e2ac3c10cce9b7045b5dbc742e9fb7..d296e1687fd596d6674e18b316603d08cd9057df 100644
+index 62c531603c68597add75de31749943bd47e4580f..8c64222f2b0d725c54543911efb0f7d9e98b7bd1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -272,11 +272,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0181-getPlayerUniqueId-API.patch b/patches/server/0178-getPlayerUniqueId-API.patch
similarity index 94%
rename from patches/server/0181-getPlayerUniqueId-API.patch
rename to patches/server/0178-getPlayerUniqueId-API.patch
index da4573f45a..73d33c7f0b 100644
--- a/patches/server/0181-getPlayerUniqueId-API.patch
+++ b/patches/server/0178-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dbbb697a91f137c32be663bb8c0a263158723a94..146b21e3d3b1432d7b14cda4a9462d77b30e5fe2 100644
+index 9bc095ccb142e83e419a7f88591bf1219d09bacb..8c987d3a3042fadee01508ad0a62eb9878e8dd54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1826,6 +1826,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0182-Improved-Async-Task-Scheduler.patch b/patches/server/0179-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0182-Improved-Async-Task-Scheduler.patch
rename to patches/server/0179-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0180-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0180-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0181-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0181-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0185-Flag-to-disable-the-channel-limit.patch b/patches/server/0182-Flag-to-disable-the-channel-limit.patch
similarity index 95%
rename from patches/server/0185-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0182-Flag-to-disable-the-channel-limit.patch
index 99438eae96..1e9b411ae5 100644
--- a/patches/server/0185-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0182-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1094475d819f9d5fa866c33bcc1b2985c47c4f07..69f4147523c7cc75c91a0f6c0553cea66a6df151 100644
+index 8c64222f2b0d725c54543911efb0f7d9e98b7bd1..bcbe11807186d2d79a155f6be7bda029ca5f555d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -190,6 +190,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch b/patches/server/0183-Add-openSign-method-to-HumanEntity.patch
similarity index 91%
rename from patches/server/0186-Add-openSign-method-to-HumanEntity.patch
rename to patches/server/0183-Add-openSign-method-to-HumanEntity.patch
index 1cf74ce84b..73acd70a6b 100644
--- a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0183-Add-openSign-method-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add openSign method to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index b143c417b70bbc4d5fdbe1b31f3a86594ea82ae9..f0194d4431821638e43a0f1b12b39f668ad147d1 100644
+index e6b16e3db7a197c7af0c4fdb782749c3c3f37538..092d2bfab7e8fd9840e853f09adc85311ab29046 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -626,6 +626,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch b/patches/server/0184-Configurable-sprint-interruption-on-attack.patch
similarity index 88%
rename from patches/server/0187-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0184-Configurable-sprint-interruption-on-attack.patch
index f6123af66d..257d62d08e 100644
--- a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0184-Configurable-sprint-interruption-on-attack.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 755364ee011df4deed65fc36ea41012d0667c918..fd29c7f9fd50b52333f792cd07540704af579058 100644
+index 4bba558b77d857ebc422c0313ba7b914df4dc2a8..e693d81be914800073b51acef98ef5f4e607c874 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1291,7 +1291,11 @@ public abstract class Player extends LivingEntity {
+@@ -1283,7 +1283,11 @@ public abstract class Player extends LivingEntity {
                              }
  
                              this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
diff --git a/patches/server/0188-EndermanEscapeEvent.patch b/patches/server/0185-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0188-EndermanEscapeEvent.patch
rename to patches/server/0185-EndermanEscapeEvent.patch
diff --git a/patches/server/0189-Enderman.teleportRandomly.patch b/patches/server/0186-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0189-Enderman.teleportRandomly.patch
rename to patches/server/0186-Enderman.teleportRandomly.patch
diff --git a/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0187-Block-Enderpearl-Travel-Exploit.patch
similarity index 96%
rename from patches/server/0190-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0187-Block-Enderpearl-Travel-Exploit.patch
index a4c7873ceb..00de4c971e 100644
--- a/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0187-Block-Enderpearl-Travel-Exploit.patch
@@ -16,7 +16,7 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile ownerUUID
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d96be9d3a24a5eb89fc2a7180b6d7e236e7c2448..b974d917879a42d8df4bca4cbb505cb599c6f2ff 100644
+index 87cd4d17d618cd9d69a38838a05dbe5d0fe807d4..f27472e03a6dc0781168c5862c57b501f7ae2dc9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2368,6 +2368,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0188-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 97%
rename from patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0188-Expand-World.spawnParticle-API-and-add-Builder.patch
index 0f3b448018..87f4720737 100644
--- a/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0188-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b974d917879a42d8df4bca4cbb505cb599c6f2ff..a306269019b6b8ff6f24cbc3f209f2359ac668fe 100644
+index f27472e03a6dc0781168c5862c57b501f7ae2dc9..6c6ccdf7fb1cab27af720b2c8ef9d68b4521a20d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1742,12 +1742,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 94%
rename from patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 2c01302eec..d591924a6b 100644
--- a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 0b5d988c6372ee5b7c2edd56f87ef604e76a2a5b..2d230e1f56be70f6373421c0649b0b9d3f2702e8 100644
+index 6003731da7be596baf1954df2e13ae54e111cd91..a822b190aeee1d644c3509bb75106fa4dfdd963f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -201,9 +201,9 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0193-EndermanAttackPlayerEvent.patch b/patches/server/0190-EndermanAttackPlayerEvent.patch
similarity index 94%
rename from patches/server/0193-EndermanAttackPlayerEvent.patch
rename to patches/server/0190-EndermanAttackPlayerEvent.patch
index 42534bc87a..8504592c00 100644
--- a/patches/server/0193-EndermanAttackPlayerEvent.patch
+++ b/patches/server/0190-EndermanAttackPlayerEvent.patch
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index c897d55acdceae54bc2e7f3f3694ce421a8df687..259ba77dcbc8ed5f7e4015a6683799cc4604dfb8 100644
+index aa7762037c3bcbbb3e51325b2ba91d5ad6db0ab0..13ba764d51f941c2b0d1d2af88ffd0c1fc3982c0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -236,7 +236,15 @@ public class EnderMan extends Monster implements NeutralMob {
diff --git a/patches/server/0194-WitchConsumePotionEvent.patch b/patches/server/0191-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0194-WitchConsumePotionEvent.patch
rename to patches/server/0191-WitchConsumePotionEvent.patch
diff --git a/patches/server/0195-WitchThrowPotionEvent.patch b/patches/server/0192-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0195-WitchThrowPotionEvent.patch
rename to patches/server/0192-WitchThrowPotionEvent.patch
diff --git a/patches/server/0196-WitchReadyPotionEvent.patch b/patches/server/0193-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0196-WitchReadyPotionEvent.patch
rename to patches/server/0193-WitchReadyPotionEvent.patch
diff --git a/patches/server/0197-ItemStack-getMaxItemUseDuration.patch b/patches/server/0194-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0197-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0194-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch b/patches/server/0195-Add-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0195-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 89%
rename from patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index 071b12ee35..cd0b43941d 100644
--- a/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 864854a677d6f498909b70c12babd190a8b1eb36..d85095117d7837e75640f0e447242b45e24cf00e 100644
+index db7485806d90fe90f806736ac55143564488467d..d08ccf5eb52e5975b161f5f7bcbdd385eb8318c9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -278,6 +278,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0200-Fix-CraftEntity-hashCode.patch b/patches/server/0197-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0200-Fix-CraftEntity-hashCode.patch
rename to patches/server/0197-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0201-Configurable-LootPool-luck-formula.patch b/patches/server/0198-Configurable-LootPool-luck-formula.patch
similarity index 100%
rename from patches/server/0201-Configurable-LootPool-luck-formula.patch
rename to patches/server/0198-Configurable-LootPool-luck-formula.patch
diff --git a/patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0199-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0199-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0203-Make-shield-blocking-delay-configurable.patch b/patches/server/0200-Make-shield-blocking-delay-configurable.patch
similarity index 96%
rename from patches/server/0203-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0200-Make-shield-blocking-delay-configurable.patch
index 82e12bb8c2..b242056da4 100644
--- a/patches/server/0203-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0200-Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 39e02e922e67915c23ce4565eba33f656cbe81b6..0c0f8385a64e4b90dbd4e6363f3d0478a7f437e3 100644
+index acf892ce7cf566fc6b9b88c6502c97a06cdedfd4..fa1c7d1781a2e2269359fa1860de79e918de7635 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3808,12 +3808,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0204-Improve-EntityShootBowEvent.patch b/patches/server/0201-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0204-Improve-EntityShootBowEvent.patch
rename to patches/server/0201-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0205-PlayerReadyArrowEvent.patch b/patches/server/0202-PlayerReadyArrowEvent.patch
similarity index 93%
rename from patches/server/0205-PlayerReadyArrowEvent.patch
rename to patches/server/0202-PlayerReadyArrowEvent.patch
index 6900915d22..d0e62e0777 100644
--- a/patches/server/0205-PlayerReadyArrowEvent.patch
+++ b/patches/server/0202-PlayerReadyArrowEvent.patch
@@ -7,10 +7,10 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 729c960a18a77b744eba0c9319cf5c2a9e84b707..695f241372eb0fe457cf91595520cbed9a5cdc3e 100644
+index e693d81be914800073b51acef98ef5f4e607c874..bfc33822ab5ca58d77e11d3cbd140ba6c0374a6e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2177,18 +2177,29 @@ public abstract class Player extends LivingEntity {
+@@ -2169,18 +2169,29 @@ public abstract class Player extends LivingEntity {
          return ImmutableList.of(Pose.STANDING, Pose.CROUCHING, Pose.SWIMMING);
      }
  
diff --git a/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/server/0203-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
similarity index 95%
rename from patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
rename to patches/server/0203-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
index c0c612f8f1..98c708b9d8 100644
--- a/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
+++ b/patches/server/0203-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
@@ -9,7 +9,7 @@ Co-authored-by: aerulion <aerulion@gmail.com>
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d66d30a016ac04d5f051e59ca168a6c2bb8794ab..d9abd56d3802033bfd440f13640350b2fba017aa 100644
+index 42f8c39fa5f9f31c03d4e7af9fb6b7a842f29aae..d6437a6b6b90ceb6fe7d2375ab2fc9e28b469c9b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1909,8 +1909,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -33,7 +33,7 @@ index d66d30a016ac04d5f051e59ca168a6c2bb8794ab..d9abd56d3802033bfd440f13640350b2
  
      protected void markHurt() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0c0f8385a64e4b90dbd4e6363f3d0478a7f437e3..b8c4e7d81b20887e5a05b93a1bbe01e72ff55ba7 100644
+index fa1c7d1781a2e2269359fa1860de79e918de7635..854177cb491d602c1f33e3496e01ba8a63d708e6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1513,7 +1513,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -83,7 +83,7 @@ index 0c0f8385a64e4b90dbd4e6363f3d0478a7f437e3..b8c4e7d81b20887e5a05b93a1bbe01e7
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index fa0e96fd884a0338b44f68506b1d3ee6c42f17b1..524f99eeefb1ab95d1752df2faea76837f2e3787 100644
+index 374a91e712c2a6a8ad87d1047bb07d44eaa9908a..70820b8d95c71ea6df8a5cae16784ed764440a45 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1646,7 +1646,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -161,10 +161,10 @@ index 81003ce3f05c6be6f52a92b86a4721235f4ce12a..cae7e3e85c3b911f50f8a06badf695c3
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 695f241372eb0fe457cf91595520cbed9a5cdc3e..0704fad49e680d3274b23024497963c4d0ad353b 100644
+index bfc33822ab5ca58d77e11d3cbd140ba6c0374a6e..871adf673c536912604ea18f8146e7eead01bde5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1285,9 +1285,9 @@ public abstract class Player extends LivingEntity {
+@@ -1277,9 +1277,9 @@ public abstract class Player extends LivingEntity {
                      if (flag5) {
                          if (i > 0) {
                              if (target instanceof LivingEntity) {
@@ -176,7 +176,7 @@ index 695f241372eb0fe457cf91595520cbed9a5cdc3e..0704fad49e680d3274b23024497963c4
                              }
  
                              this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
-@@ -1309,7 +1309,7 @@ public abstract class Player extends LivingEntity {
+@@ -1301,7 +1301,7 @@ public abstract class Player extends LivingEntity {
                                  if (entityliving != this && entityliving != target && !this.isAlliedTo((Entity) entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && this.distanceToSqr((Entity) entityliving) < 9.0D) {
                                      // CraftBukkit start - Only apply knockback if the damage hits
                                      if (entityliving.hurt(this.damageSources().playerAttack(this).sweep(), f4)) {
@@ -186,7 +186,7 @@ index 695f241372eb0fe457cf91595520cbed9a5cdc3e..0704fad49e680d3274b23024497963c4
                                      // CraftBukkit end
                                  }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index b24f828d39fc26b4f85f5c76010f0ba47e9fe05f..385cbee1d30735152cccb0d85a77a12fabfd9427 100644
+index 0f700442a7559fac5d27d1fb6b3716f3853a9897..f3861cea4eb6a39fa16936383f8dabc6689a58a9 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -409,7 +409,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0207-Expand-Explosions-API.patch b/patches/server/0204-Expand-Explosions-API.patch
similarity index 94%
rename from patches/server/0207-Expand-Explosions-API.patch
rename to patches/server/0204-Expand-Explosions-API.patch
index 2deb0a4c31..23a102686c 100644
--- a/patches/server/0207-Expand-Explosions-API.patch
+++ b/patches/server/0204-Expand-Explosions-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c8e13ea3bc256b112fa5fd916c0fb583322c081b..ed851ec919c18d724d3376e893eca09259ad9bf3 100644
+index 6abf000543cb842ff43f0adbde035fff595e553d..fd73f71cf9ab267c8904012062fc6030897d0de4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -719,6 +719,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0208-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0205-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0208-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0205-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0209-RangedEntity-API.patch b/patches/server/0206-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0209-RangedEntity-API.patch
rename to patches/server/0206-RangedEntity-API.patch
diff --git a/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0207-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0207-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0211-Implement-World.getEntity-UUID-API.patch b/patches/server/0208-Implement-World.getEntity-UUID-API.patch
similarity index 91%
rename from patches/server/0211-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0208-Implement-World.getEntity-UUID-API.patch
index f4a8fff452..ad2a2f2673 100644
--- a/patches/server/0211-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0208-Implement-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ed851ec919c18d724d3376e893eca09259ad9bf3..fda8fd0d69a3889909e804798a49c19e2a9d49a6 100644
+index fd73f71cf9ab267c8904012062fc6030897d0de4..ca6bc987d0bbff0a835fe7b28a2692e1a8d27a6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1048,6 +1048,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0212-InventoryCloseEvent-Reason-API.patch b/patches/server/0209-InventoryCloseEvent-Reason-API.patch
similarity index 98%
rename from patches/server/0212-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0209-InventoryCloseEvent-Reason-API.patch
index 7f704e7c3d..4d25cf13f1 100644
--- a/patches/server/0212-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0209-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a306269019b6b8ff6f24cbc3f209f2359ac668fe..9e967dac4db56e6b0713b7351a1cd0896e757c7e 100644
+index 6c6ccdf7fb1cab27af720b2c8ef9d68b4521a20d..d993f6421e17a24bd6c371298ae78c2bc2f8a7ac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1474,7 +1474,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -19,7 +19,7 @@ index a306269019b6b8ff6f24cbc3f209f2359ac668fe..9e967dac4db56e6b0713b7351a1cd089
                  }
              }
          }
-@@ -2459,7 +2459,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2458,7 +2458,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
@@ -117,7 +117,7 @@ index 99ba7c82f8a8db9d5841cce18ed5f39439b512b0..5517f873e709b6f3b9206f0ad0212a95
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2ec9d75ad64c40cb4577151a050c534e38226b72..0c34063bdbfa70d65b3548e5ea800ef088a5444d 100644
+index 871adf673c536912604ea18f8146e7eead01bde5..f9d7ef3b689ce1411b922649f9ee64dca34d3c74 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -265,7 +265,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0213-Vex-get-setSummoner-API.patch b/patches/server/0210-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0213-Vex-get-setSummoner-API.patch
rename to patches/server/0210-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0211-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 94%
rename from patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0211-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index a36560f289..f1f1fc7a9b 100644
--- a/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0211-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d1c2dad79f6e265e184d374494b3f45414c5fafc..a00f68b058d6d7aa28ce34ad726c5b228e5c2e64 100644
+index 678c46517757e3f37d5051fc88c481cbe8bf861b..90574b9bd5eb9dcb89baf280e0a9503d7b975c01 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2419,6 +2419,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0215-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0212-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 100%
rename from patches/server/0215-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0212-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0216-add-more-information-to-Entity.toString.patch b/patches/server/0213-add-more-information-to-Entity.toString.patch
similarity index 95%
rename from patches/server/0216-add-more-information-to-Entity.toString.patch
rename to patches/server/0213-add-more-information-to-Entity.toString.patch
index 2fc6c9f002..e6cbd7263b 100644
--- a/patches/server/0216-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0213-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d9abd56d3802033bfd440f13640350b2fba017aa..ad2e61c7fd7906477e30e91c826d9ce4fb6bffc0 100644
+index d6437a6b6b90ceb6fe7d2375ab2fc9e28b469c9b..47ba1f8fbbe3e5a052028ee1dbff31844bc61f78 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3202,7 +3202,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0217-EnderDragon-Events.patch b/patches/server/0214-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0217-EnderDragon-Events.patch
rename to patches/server/0214-EnderDragon-Events.patch
diff --git a/patches/server/0218-PlayerElytraBoostEvent.patch b/patches/server/0215-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0218-PlayerElytraBoostEvent.patch
rename to patches/server/0215-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0219-PlayerLaunchProjectileEvent.patch b/patches/server/0216-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0219-PlayerLaunchProjectileEvent.patch
rename to patches/server/0216-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0220-Improve-BlockPosition-inlining.patch b/patches/server/0217-Improve-BlockPosition-inlining.patch
similarity index 89%
rename from patches/server/0220-Improve-BlockPosition-inlining.patch
rename to patches/server/0217-Improve-BlockPosition-inlining.patch
index 74cbf3248a..b9b5c09af2 100644
--- a/patches/server/0220-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0217-Improve-BlockPosition-inlining.patch
@@ -21,10 +21,10 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index 40950db0c242c65dfd4de247c86249354d12108f..6d760fa1dbd13a66bff4695edc28f4ab4b3e44a3 100644
+index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..5256ff18d992250e04a6180e196c2d5d3f0928ca 100644
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
-@@ -44,7 +44,7 @@ public class Vec3i implements Comparable<Vec3i> {
+@@ -38,7 +38,7 @@ public class Vec3i implements Comparable<Vec3i> {
      }
  
      @Override
@@ -33,7 +33,7 @@ index 40950db0c242c65dfd4de247c86249354d12108f..6d760fa1dbd13a66bff4695edc28f4ab
          if (this == object) {
              return true;
          } else if (!(object instanceof Vec3i)) {
-@@ -62,7 +62,7 @@ public class Vec3i implements Comparable<Vec3i> {
+@@ -56,7 +56,7 @@ public class Vec3i implements Comparable<Vec3i> {
      }
  
      @Override
@@ -42,7 +42,7 @@ index 40950db0c242c65dfd4de247c86249354d12108f..6d760fa1dbd13a66bff4695edc28f4ab
          return (this.getY() + this.getZ() * 31) * 31 + this.getX();
      }
  
-@@ -75,15 +75,15 @@ public class Vec3i implements Comparable<Vec3i> {
+@@ -69,15 +69,15 @@ public class Vec3i implements Comparable<Vec3i> {
          }
      }
  
diff --git a/patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 92%
rename from patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 98ed62ea67..dd307e0c92 100644
--- a/patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -17,10 +17,10 @@ index d04d0b9cbf91beb57da7e37e72f8e7c98cf6cf4c..e6e3a7ae08f7346ccbce02b9d3623948
          Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4c48be9f98d75758e582e37ba45d0e8c5737adeb..d7dfbd198e16533aab8db3ee64daf26996380331 100644
+index a349755740483148dcdc8d490943fdce74aa4434..9cd032be21a5239a268d41fa2d3db0f7ee2680fd 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -854,6 +854,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -770,6 +770,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper end
          }
      }
diff --git a/patches/server/0222-Vanished-players-don-t-have-rights.patch b/patches/server/0219-Vanished-players-don-t-have-rights.patch
similarity index 97%
rename from patches/server/0222-Vanished-players-don-t-have-rights.patch
rename to patches/server/0219-Vanished-players-don-t-have-rights.patch
index 17673a4ced..6d33d035a7 100644
--- a/patches/server/0222-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0219-Vanished-players-don-t-have-rights.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index e8620ad6be2dda7fe288f884c4ae88a924be4a62..75f08dcce4ac923678bf8c1f25ca02b0efbab7c2 100644
+index e432855ce79f69c0e91fa31e8f6c59a465b0d09e..4ebc38d0666d01c67c2728355fbbef296a0672e3 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -237,6 +237,15 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@@ -39,7 +39,7 @@ index a6638e626600e4304a973497a39e3fac52203b16..c19069f65a9ecbc9000ea4333417a2df
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d7dfbd198e16533aab8db3ee64daf26996380331..09f2bee26387641191ae7ee3b863ca4ae2106cb4 100644
+index 9cd032be21a5239a268d41fa2d3db0f7ee2680fd..2a849e7125e2a6294aab49a436eeab8e4201fd15 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -276,6 +276,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0223-Allow-disabling-armor-stand-ticking.patch b/patches/server/0220-Allow-disabling-armor-stand-ticking.patch
similarity index 100%
rename from patches/server/0223-Allow-disabling-armor-stand-ticking.patch
rename to patches/server/0220-Allow-disabling-armor-stand-ticking.patch
diff --git a/patches/server/0224-SkeletonHorse-Additions.patch b/patches/server/0221-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0224-SkeletonHorse-Additions.patch
rename to patches/server/0221-SkeletonHorse-Additions.patch
diff --git a/patches/server/0225-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0222-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0225-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0222-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0226-Expand-ArmorStand-API.patch b/patches/server/0223-Expand-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0226-Expand-ArmorStand-API.patch
rename to patches/server/0223-Expand-ArmorStand-API.patch
diff --git a/patches/server/0227-AnvilDamageEvent.patch b/patches/server/0224-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0227-AnvilDamageEvent.patch
rename to patches/server/0224-AnvilDamageEvent.patch
diff --git a/patches/server/0228-Add-TNTPrimeEvent.patch b/patches/server/0225-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0228-Add-TNTPrimeEvent.patch
rename to patches/server/0225-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0229-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0226-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from patches/server/0229-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0226-Break-up-and-make-tab-spam-limits-configurable.patch
index 13a8fbad08..6c6aef1e4a 100644
--- a/patches/server/0229-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0226-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2291ca80352db1aaa99b2f266de6d493785be7cf..6f628fedbba120a0db13cb942f6e79ebf2acf14b 100644
+index 90574b9bd5eb9dcb89baf280e0a9503d7b975c01..f0470d4711a7451ca0d524a7b8a90b8d08fa4632 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -257,6 +257,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0230-Fix-NBT-type-issues.patch b/patches/server/0227-Fix-NBT-type-issues.patch
similarity index 95%
rename from patches/server/0230-Fix-NBT-type-issues.patch
rename to patches/server/0227-Fix-NBT-type-issues.patch
index b33019a3b7..58e82e71e9 100644
--- a/patches/server/0230-Fix-NBT-type-issues.patch
+++ b/patches/server/0227-Fix-NBT-type-issues.patch
@@ -8,7 +8,7 @@ Addresses two issues:
 - Allay duplication cooldown is saved and exposed as a long, but loaded as an int
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 4973cd6eeda0b484999c8a81d188b01f0fd08cac..5685951b71a8b81c7a71fd93b099b276d535b401 100644
+index 0f55715f2d97ab09746a51f9d39134b513778fdd..36d5d1736bf826f3abc756277de431c94cabb744 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -295,7 +295,7 @@ public class ExperienceOrb extends Entity {
diff --git a/patches/server/0231-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0228-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0231-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0228-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0232-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0229-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 97%
rename from patches/server/0232-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0229-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 78694ba4a1..2e132faeaa 100644
--- a/patches/server/0232-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0229-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -26,7 +26,7 @@ index 422ef83670f7c4a2e5b0da48dc0906ad96b8ece0..e4936a70d3a686e5cba0ea9d878f6e09
  
      protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9e967dac4db56e6b0713b7351a1cd0896e757c7e..2a7d7881a200e12ae9369bb2d704aecce9322e52 100644
+index d993f6421e17a24bd6c371298ae78c2bc2f8a7ac..b818ac80bd9d68f6058e4dc6ee447645083dc177 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1436,6 +1436,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0233-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0230-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 97%
rename from patches/server/0233-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0230-Add-Early-Warning-Feature-to-WatchDog.patch
index 11c5619fca..9d4b04066a 100644
--- a/patches/server/0233-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0230-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7f68ffdb88c0c4b9d91f699d088cd81e62e94620..85beb9c7a02f7f561716d017f40ae24ad49a61a3 100644
+index 34189700b682377426bb70c9684f56115a6ab112..feac302358f627c682c3294fca1ae21c8e57b84b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1075,6 +1075,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -21,7 +21,7 @@ index 7f68ffdb88c0c4b9d91f699d088cd81e62e94620..85beb9c7a02f7f561716d017f40ae24a
              long tickSection = Util.getNanos(), curTime, tickCount = 1; // Paper
              while (this.running) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 99d247ff2c03c568e8d909d2fb2014f67a4c2c4e..1de3b2fc41e2fe2d27ebe9f93810b4503cec89cb 100644
+index 5b64c7f2f36bdf03f8a764d6c8d77524a0774ad1..6025b3ce5a4aee45061dfb72a089deff889fe823 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -198,6 +198,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -33,7 +33,7 @@ index 99d247ff2c03c568e8d909d2fb2014f67a4c2c4e..1de3b2fc41e2fe2d27ebe9f93810b450
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 625d2e04b3e48f5884ec36210d27639504fe0a1d..f90361a27c067d0d8a92fd6af930a0d453b4c2a7 100644
+index 8c987d3a3042fadee01508ad0a62eb9878e8dd54..b89c1d4067c6cbc0faa58ac8a176ab16e8c83a4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -915,6 +915,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0234-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0231-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from patches/server/0234-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0231-Use-ConcurrentHashMap-in-JsonList.patch
index 7e2c9a02b1..78b0f1759b 100644
--- a/patches/server/0234-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0231-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a0779dfcbcfad3807163bc309ac4003114898394..88f27be746b5ca02bde3001d57a105f779271bdb 100644
+index 5517f873e709b6f3b9206f0ad0212a9524f2c691..e927448d7df9a99bf1d5184557ed57b8c32a2773 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -634,7 +634,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0235-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0232-Use-a-Queue-for-Queueing-Commands.patch
similarity index 95%
rename from patches/server/0235-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0232-Use-a-Queue-for-Queueing-Commands.patch
index 1aad9d2192..ec2467d0f9 100644
--- a/patches/server/0235-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0232-Use-a-Queue-for-Queueing-Commands.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1de3b2fc41e2fe2d27ebe9f93810b4503cec89cb..907129b7ca0bb2b356502c84b86518e843cecfa2 100644
+index 6025b3ce5a4aee45061dfb72a089deff889fe823..a7d7c676f1ab8c47395b91aea028f143837b8801 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -69,7 +69,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0236-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0233-Ability-to-get-block-entities-from-a-chunk-without-s.patch
similarity index 100%
rename from patches/server/0236-Ability-to-get-block-entities-from-a-chunk-without-s.patch
rename to patches/server/0233-Ability-to-get-block-entities-from-a-chunk-without-s.patch
diff --git a/patches/server/0237-Optimize-BlockPosition-helper-methods.patch b/patches/server/0234-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0237-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0234-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0238-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0235-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0238-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0235-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0239-Slime-Pathfinder-Events.patch b/patches/server/0236-Slime-Pathfinder-Events.patch
similarity index 98%
rename from patches/server/0239-Slime-Pathfinder-Events.patch
rename to patches/server/0236-Slime-Pathfinder-Events.patch
index f41d435c06..80b0cd1b08 100644
--- a/patches/server/0239-Slime-Pathfinder-Events.patch
+++ b/patches/server/0236-Slime-Pathfinder-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Slime Pathfinder Events
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index ef382b08ff8e7f24500aed6752c76e6ffc3f0729..ca3bf718336ef02d379c0ec670f62fafb1600153 100644
+index 897c815fb448d1e9ca75b7f8b93b4021dccf7596..168b422ac9f3f98630c4d05b64a9f0470b20fe61 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -115,6 +115,7 @@ public class Slime extends Mob implements Enemy {
diff --git a/patches/server/0240-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0237-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0240-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0237-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0241-Optimize-CraftBlockData-Creation.patch b/patches/server/0238-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0241-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0238-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0242-Optimize-MappedRegistry.patch b/patches/server/0239-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0242-Optimize-MappedRegistry.patch
rename to patches/server/0239-Optimize-MappedRegistry.patch
diff --git a/patches/server/0243-Add-PhantomPreSpawnEvent.patch b/patches/server/0240-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0243-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0240-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0244-Add-More-Creeper-API.patch b/patches/server/0241-Add-More-Creeper-API.patch
similarity index 96%
rename from patches/server/0244-Add-More-Creeper-API.patch
rename to patches/server/0241-Add-More-Creeper-API.patch
index 6afb294abe..042306c22c 100644
--- a/patches/server/0244-Add-More-Creeper-API.patch
+++ b/patches/server/0241-Add-More-Creeper-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index d85095117d7837e75640f0e447242b45e24cf00e..51ab33d805028fb739ff9fa1a22a010e70777c1e 100644
+index d08ccf5eb52e5975b161f5f7bcbdd385eb8318c9..6a91960f93e624a4b975c1cf76698eb45ceda838 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -132,7 +132,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0245-Inventory-removeItemAnySlot.patch b/patches/server/0242-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0245-Inventory-removeItemAnySlot.patch
rename to patches/server/0242-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0246-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0243-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 92%
rename from patches/server/0246-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0243-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index a05de3dd4c..ab8493a315 100644
--- a/patches/server/0246-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0243-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fda8fd0d69a3889909e804798a49c19e2a9d49a6..5f65a43c45058bc4ea204623da82ef6befe8d5b7 100644
+index ca6bc987d0bbff0a835fe7b28a2692e1a8d27a6d..9f0e22fde4965cae806c92892d0711d8edc099c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -403,7 +403,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0247-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0244-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 97%
rename from patches/server/0247-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0244-Add-ray-tracing-methods-to-LivingEntity.patch
index 01cb214d56..f97ec8b317 100644
--- a/patches/server/0247-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0244-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b8c4e7d81b20887e5a05b93a1bbe01e72ff55ba7..5461121145c3cbe10f9ae492885c5aa0977b9049 100644
+index 854177cb491d602c1f33e3496e01ba8a63d708e6..9780f8f42caa8bc5b67af85eeb8ab146b2b3a9e9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3829,6 +3829,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0248-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0245-Expose-attack-cooldown-methods-for-Player.patch
similarity index 92%
rename from patches/server/0248-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0245-Expose-attack-cooldown-methods-for-Player.patch
index fe6c952b0b..dceee4dd11 100644
--- a/patches/server/0248-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0245-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f0392f2562ee2b65011da556dbe1a8369c5f954c..bebda561ce6fbb6a9dd750852934ca27a04aa034 100644
+index 91ca962588fffc486ca44289f2eb0bac6fcd808d..9d04b97afbbc9e4a8c1ab17b067bd766451c5281 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2871,6 +2871,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0249-Improve-death-events.patch b/patches/server/0246-Improve-death-events.patch
similarity index 98%
rename from patches/server/0249-Improve-death-events.patch
rename to patches/server/0246-Improve-death-events.patch
index e1bc6ccabd..4da4607ac6 100644
--- a/patches/server/0249-Improve-death-events.patch
+++ b/patches/server/0246-Improve-death-events.patch
@@ -19,7 +19,7 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou
 public net.minecraft.world.entity.LivingEntity getSoundVolume()F
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e144adc6e5e2a195174ed7617c29993804ab87ff..b3ad3b459e0ad6db37cde0c7de481202f928ea64 100644
+index 0bdb75f733896335b87a19eb4d29024186e2d4d0..4f1a7c0e4f9ca1706f51096fe9533dc49c460205 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -248,6 +248,10 @@ public class ServerPlayer extends Player {
@@ -80,7 +80,7 @@ index e144adc6e5e2a195174ed7617c29993804ab87ff..b3ad3b459e0ad6db37cde0c7de481202
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5461121145c3cbe10f9ae492885c5aa0977b9049..9808a03ed37708bec0f9c32bd2f1e4cb6afa2551 100644
+index 9780f8f42caa8bc5b67af85eeb8ab146b2b3a9e9..d22ce89c97107c0c6db3f911329e53328c2387c4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -259,6 +259,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -235,7 +235,7 @@ index 5461121145c3cbe10f9ae492885c5aa0977b9049..9808a03ed37708bec0f9c32bd2f1e4cb
      // CraftBukkit start
      public int getExpReward() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 524f99eeefb1ab95d1752df2faea76837f2e3787..40becb18c6afae979875b684c1816e84970babb5 100644
+index 70820b8d95c71ea6df8a5cae16784ed764440a45..7d0ccdd4b144afed8a93256941b3d8618c847f4d 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1075,7 +1075,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -402,7 +402,7 @@ index ecce8036e58a9ed1408e110e75980bf77c18779a..ddd512e1d7608ec051fb5adf6ec2c6bb
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bebda561ce6fbb6a9dd750852934ca27a04aa034..07076f9216fe904fe0f1f018b7e3862d5aab1398 100644
+index 9d04b97afbbc9e4a8c1ab17b067bd766451c5281..17ee1e953de98c56e06e97d995b0781c8aa5ecb0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2408,7 +2408,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0250-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0247-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0250-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0247-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0251-Mob-Pathfinding-API.patch b/patches/server/0248-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0251-Mob-Pathfinding-API.patch
rename to patches/server/0248-Mob-Pathfinding-API.patch
diff --git a/patches/server/0252-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/0249-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/server/0252-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/server/0249-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/server/0253-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch
similarity index 96%
rename from patches/server/0253-Prevent-various-interactions-from-causing-chunk-load.patch
rename to patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch
index 7f21373d4d..5fad22ce92 100644
--- a/patches/server/0253-Prevent-various-interactions-from-causing-chunk-load.patch
+++ b/patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch
@@ -40,7 +40,7 @@ index e3d070d46729c023d594699619a4b3f8658edbce..5580a396a56c6e0f364a5368985ee99b
          return ichunkaccess == null ? false : ichunkaccess.getBlockState(pos).is(this.blockToRemove) && ichunkaccess.getBlockState(pos.above()).isAir() && ichunkaccess.getBlockState(pos.above(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 259ba77dcbc8ed5f7e4015a6683799cc4604dfb8..d259d7b8f7380763e3976f5f20bc01f06ce6901c 100644
+index 13ba764d51f941c2b0d1d2af88ffd0c1fc3982c0..9637c26a3c381869f0a4dfe9189c0095387009b4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -517,7 +517,8 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -77,10 +77,10 @@ index 5d3047a420efe59063e90bfc7b42392127e0ad7d..b3c67c954acf7e518d89d6af65a55d6f
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 3b31a1927aaed7fffc1b4f4bcefc12120d66af3d..618d6a94d695a3bf114307f85f0f151ee24f1879 100644
+index d6d8bbc98fc71997cb52521d59ebb59d727d3c22..c3760e0c8ac0b3ea200f4e1c237e250137a78caf 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -83,7 +83,15 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -70,7 +70,15 @@ public interface BlockGetter extends LevelHeightAccessor {
  
      // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
      default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
diff --git a/patches/server/0254-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from patches/server/0254-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch
index 4a0e2020ca..5933a5395e 100644
--- a/patches/server/0254-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index b3a7d065900f63b15ee2a8e3c1d69d5513f7b85c..9ed7abddf30d298a5abb04974efd1b470d015b09 100644
+index 286592be7aeb183d1a9ee439c250f2acf932f0bf..aec4897a647206da20666f4d54cdc5d1b516bfc2 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -170,9 +170,9 @@ public final class NaturalSpawner {
diff --git a/patches/server/0255-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0252-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0255-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0252-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0256-Honor-EntityAgeable.ageLock.patch b/patches/server/0253-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0256-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0253-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0257-Configurable-connection-throttle-kick-message.patch b/patches/server/0254-Configurable-connection-throttle-kick-message.patch
similarity index 94%
rename from patches/server/0257-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0254-Configurable-connection-throttle-kick-message.patch
index 07b0dea431..d14ef13eaa 100644
--- a/patches/server/0257-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0254-Configurable-connection-throttle-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index e68020588ed81fc14ef53a429e5bc86f7685235d..21aafb1ea51769659462d722aa318460b37cbc1c 100644
+index 3dfec4462d85f3223071b4e78465587db6185f0d..08a7461a92ae84cac69e4bb57a099d1f35ff1c1a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -51,7 +51,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0255-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0255-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0259-Hook-into-CB-plugin-rewrites.patch b/patches/server/0256-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0259-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0256-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0260-PreSpawnerSpawnEvent.patch b/patches/server/0257-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from patches/server/0260-PreSpawnerSpawnEvent.patch
rename to patches/server/0257-PreSpawnerSpawnEvent.patch
index 766060fe2a..c822f9ddbf 100644
--- a/patches/server/0260-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0257-PreSpawnerSpawnEvent.patch
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 04cce4380e6e833b1d5e0a613eb0a167fdfe4e16..713608239cc7518d05b04d3dd79c3af0c358c64e 100644
+index db4beb22cf54bb3b53561ec0fe06209c478977ff..388a66e37c9f1d9c62e0c8977a2d5b9068c58fe7 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -136,11 +136,11 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0261-Add-LivingEntity-getTargetEntity.patch b/patches/server/0258-Add-LivingEntity-getTargetEntity.patch
similarity index 98%
rename from patches/server/0261-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0258-Add-LivingEntity-getTargetEntity.patch
index 51a61c458d..368ef9cec3 100644
--- a/patches/server/0261-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0258-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9808a03ed37708bec0f9c32bd2f1e4cb6afa2551..ab55d44e505fd50dae0000ce5a999f52f916103f 100644
+index d22ce89c97107c0c6db3f911329e53328c2387c4..966db97da239e3712d382d18c2a0c6c111b60ab2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
diff --git a/patches/server/0262-Add-sun-related-API.patch b/patches/server/0259-Add-sun-related-API.patch
similarity index 94%
rename from patches/server/0262-Add-sun-related-API.patch
rename to patches/server/0259-Add-sun-related-API.patch
index f675d68b26..cd4f462cc7 100644
--- a/patches/server/0262-Add-sun-related-API.patch
+++ b/patches/server/0259-Add-sun-related-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add sun related API
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5f65a43c45058bc4ea204623da82ef6befe8d5b7..5e25cbee42dbd27c97b4732d70225e54a296b80e 100644
+index 9f0e22fde4965cae806c92892d0711d8edc099c8..377c85f458e3e3ce7c7532fb991627b32590a691 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -695,6 +695,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0263-Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/server/0260-Catch-JsonParseException-in-entity-and-block-entity-.patch
similarity index 100%
rename from patches/server/0263-Catch-JsonParseException-in-entity-and-block-entity-.patch
rename to patches/server/0260-Catch-JsonParseException-in-entity-and-block-entity-.patch
diff --git a/patches/server/0264-Turtle-API.patch b/patches/server/0261-Turtle-API.patch
similarity index 100%
rename from patches/server/0264-Turtle-API.patch
rename to patches/server/0261-Turtle-API.patch
diff --git a/patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 96%
rename from patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch
index beb6453634..cfe8b7543a 100644
--- a/patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,7 +19,7 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b3ad3b459e0ad6db37cde0c7de481202f928ea64..6624fd85fc8b5efc22b71f7aa665bd8f62aad7ed 100644
+index 4f1a7c0e4f9ca1706f51096fe9533dc49c460205..fc4eeefa8c4dbb76e9a98ba9d67a942314b243fa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2085,6 +2085,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0266-Add-more-Witch-API.patch b/patches/server/0263-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0266-Add-more-Witch-API.patch
rename to patches/server/0263-Add-more-Witch-API.patch
diff --git a/patches/server/0267-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0264-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0267-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0264-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0268-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 98%
rename from patches/server/0268-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch
index ef155970a6..a4bb753a26 100644
--- a/patches/server/0268-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 222e9ab6fa6a40f7846451cee256d3dbbac54fde..91791fffa52dae34e6ab5e786bce7d0c6d077b73 100644
+index f0470d4711a7451ca0d524a7b8a90b8d08fa4632..4ac5ed4e7761b753c5eb60937ab325a72114a259 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -475,9 +475,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0269-Reset-players-airTicks-on-respawn.patch b/patches/server/0266-Reset-players-airTicks-on-respawn.patch
similarity index 90%
rename from patches/server/0269-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0266-Reset-players-airTicks-on-respawn.patch
index 8dbbcde710..db14554690 100644
--- a/patches/server/0269-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0266-Reset-players-airTicks-on-respawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6624fd85fc8b5efc22b71f7aa665bd8f62aad7ed..4b163b9f6f6abc89ed62291e8df80d987bdc46e3 100644
+index fc4eeefa8c4dbb76e9a98ba9d67a942314b243fa..684cebce4bb611e3302d4fe0d26df96ee33dd228 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2560,6 +2560,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0270-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0270-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0271-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 98%
rename from patches/server/0271-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 89b81942f0..a23bf2643c 100644
--- a/patches/server/0271-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -92,7 +92,7 @@ index aa52b271bd556a29f774fde375b713d0d187521b..765e4bc00a0526aab6e263dae7233f63
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 85beb9c7a02f7f561716d017f40ae24ad49a61a3..b57661a04bba7d32a338a0ee485f9ee8475ea246 100644
+index feac302358f627c682c3294fca1ae21c8e57b84b..f43459256120b1d9bdc0f0e5f4e299c51bfaa504 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0272-Optimize-World-Time-Updates.patch b/patches/server/0269-Optimize-World-Time-Updates.patch
similarity index 96%
rename from patches/server/0272-Optimize-World-Time-Updates.patch
rename to patches/server/0269-Optimize-World-Time-Updates.patch
index 8dcf90dba7..ac4e84b7e8 100644
--- a/patches/server/0272-Optimize-World-Time-Updates.patch
+++ b/patches/server/0269-Optimize-World-Time-Updates.patch
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b57661a04bba7d32a338a0ee485f9ee8475ea246..bfcb155b1e8b04edfdbd26f4cc3bc2b4a7cbf5ea 100644
+index f43459256120b1d9bdc0f0e5f4e299c51bfaa504..df04c80feb1f427737e53080b592e39153da18ad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1469,12 +1469,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0273-Restore-custom-InventoryHolder-support.patch b/patches/server/0270-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0273-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0270-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0274-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0271-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0274-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0271-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0275-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 96%
rename from patches/server/0275-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch
index ec54330504..9f653f00f9 100644
--- a/patches/server/0275-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index e3b7441d875b55ffce295c948f3dc867be09e042..32327f639b3cc10444ad122fb3405174e32c4f01 100644
+index f56ba2973aaf0fd41a974d6b38c2b2797631959e..deef24ad28ecf7895aa03bf8dae085814d307ece 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -119,8 +119,8 @@ public class ServerPlayerGameMode {
@@ -59,7 +59,7 @@ index e3b7441d875b55ffce295c948f3dc867be09e042..32327f639b3cc10444ad122fb3405174
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 91791fffa52dae34e6ab5e786bce7d0c6d077b73..944bb7bf990dbd7198496a45c1babe8ad01e8eee 100644
+index 4ac5ed4e7761b753c5eb60937ab325a72114a259..e9103f58207353b416da2901ab9443810305ae8f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1592,6 +1592,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0276-Make-the-default-permission-message-configurable.patch b/patches/server/0273-Make-the-default-permission-message-configurable.patch
similarity index 95%
rename from patches/server/0276-Make-the-default-permission-message-configurable.patch
rename to patches/server/0273-Make-the-default-permission-message-configurable.patch
index c94d157ac7..c6ae5a3961 100644
--- a/patches/server/0276-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0273-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 0dd48e4098191c8b6e29945d62bc473e9f3a1e77..ae51993e0de706cb62c96795ca9de766
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f90361a27c067d0d8a92fd6af930a0d453b4c2a7..25d059f802a4bdcb7076bca8fa8a587e5de065bd 100644
+index b89c1d4067c6cbc0faa58ac8a176ab16e8c83a4e..4a180f6e04ba08480024c297dcdc15f625504213 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2807,6 +2807,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0277-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0274-Handle-Large-Packets-disconnecting-client.patch
similarity index 98%
rename from patches/server/0277-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0274-Handle-Large-Packets-disconnecting-client.patch
index 9943a06f4e..f5fce50aca 100644
--- a/patches/server/0277-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0274-Handle-Large-Packets-disconnecting-client.patch
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index df5da9398c903d073485aaa0dce8e70947137cb9..090a130676de3ab458df6bd1e08f0b755a3f685a 100644
+index 02b3f5c67b47a098f7fe15ddba0df6cb586a9ae5..157f055df00faf3a7870df8109e84fdb12f55964 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -156,6 +156,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0278-force-entity-dismount-during-teleportation.patch b/patches/server/0275-force-entity-dismount-during-teleportation.patch
similarity index 94%
rename from patches/server/0278-force-entity-dismount-during-teleportation.patch
rename to patches/server/0275-force-entity-dismount-during-teleportation.patch
index 974887a1fd..34cf60aa15 100644
--- a/patches/server/0278-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0275-force-entity-dismount-during-teleportation.patch
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bbb6abd5a51a0ffef41f2ee38eb6d7a21d1c6c23..4b9cb1c85ed17250f145e815d5c40cf09b34e4d2 100644
+index 72478a84e1dca85bb9694ea9816a1acc09c8ff5f..797c1c9db2fabd3f0ca6a37a17a368f63f144eb4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2605,11 +2605,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -72,7 +72,7 @@ index bbb6abd5a51a0ffef41f2ee38eb6d7a21d1c6c23..4b9cb1c85ed17250f145e815d5c40cf0
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ab55d44e505fd50dae0000ce5a999f52f916103f..0290302c2b49b9fb262f8675f90010715fe53c50 100644
+index 966db97da239e3712d382d18c2a0c6c111b60ab2..98a26f97749d883f4ca04da27199f499211f0f33 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3471,9 +3471,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -93,10 +93,10 @@ index ab55d44e505fd50dae0000ce5a999f52f916103f..0290302c2b49b9fb262f8675f9001071
              this.dismountVehicle(entity);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 636c8d53e5c07f5d75881113b8cfb366a007a162..18394311d9d0bed5fa1ac09182947375380c7670 100644
+index f9d7ef3b689ce1411b922649f9ee64dca34d3c74..fc9eed382c8de51b298102cdcf584bf7e19ea968 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1149,7 +1149,13 @@ public abstract class Player extends LivingEntity {
+@@ -1141,7 +1141,13 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public void removeVehicle() {
diff --git a/patches/server/0279-Add-more-Zombie-API.patch b/patches/server/0276-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0279-Add-more-Zombie-API.patch
rename to patches/server/0276-Add-more-Zombie-API.patch
diff --git a/patches/server/0280-Book-Size-Limits.patch b/patches/server/0277-Book-Size-Limits.patch
similarity index 96%
rename from patches/server/0280-Book-Size-Limits.patch
rename to patches/server/0277-Book-Size-Limits.patch
index d14c8dd2aa..3df0a28958 100644
--- a/patches/server/0280-Book-Size-Limits.patch
+++ b/patches/server/0277-Book-Size-Limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 944bb7bf990dbd7198496a45c1babe8ad01e8eee..592493efdd799c76c753de825126c4f7b04a3179 100644
+index e9103f58207353b416da2901ab9443810305ae8f..4d907d43015b9a8aa5298ec9a641580f82058f1d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1026,6 +1026,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0281-Add-PlayerConnectionCloseEvent.patch b/patches/server/0278-Add-PlayerConnectionCloseEvent.patch
similarity index 96%
rename from patches/server/0281-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0278-Add-PlayerConnectionCloseEvent.patch
index db512740f6..766864cc59 100644
--- a/patches/server/0281-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0278-Add-PlayerConnectionCloseEvent.patch
@@ -38,7 +38,7 @@ public net.minecraft.server.network.ServerLoginPacketListenerImpl$State
 public net.minecraft.server.network.ServerLoginPacketListenerImpl state
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 090a130676de3ab458df6bd1e08f0b755a3f685a..c521e2eab937f90085c4f1a98aab13d46720a07b 100644
+index 157f055df00faf3a7870df8109e84fdb12f55964..cd9ed68079abf103759865a3e2a038ac629a18ea 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -644,6 +644,26 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -69,7 +69,7 @@ index 090a130676de3ab458df6bd1e08f0b755a3f685a..c521e2eab937f90085c4f1a98aab13d4
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index dd4e97ff4c8fb2d2f251713271f5ac493574fcd9..e9d94abb77693a845ea6318b7045bd61a7a46feb 100644
+index b23b7560854a9904e28bbd06afccf5bb0dae16e2..ba0bdd685c49c02bcb1b6d840ddceb9049565d34 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -60,7 +60,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0282-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0279-Replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from patches/server/0282-Replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0279-Replace-OfflinePlayer-getLastPlayed.patch
index 2b7af6707e..58034c6934 100644
--- a/patches/server/0282-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0279-Replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4b163b9f6f6abc89ed62291e8df80d987bdc46e3..0afa8c7c826bb01f8a1139ced76fa599d205e045 100644
+index 684cebce4bb611e3302d4fe0d26df96ee33dd228..7451883595155fdeb0714fb12b98a0dc33348359 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -248,6 +248,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 4b163b9f6f6abc89ed62291e8df80d987bdc46e3..0afa8c7c826bb01f8a1139ced76fa599
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index af26a2b45cba7083f3bd7ddbbfde5bcfb30f1907..a1ab652fe6a838f8506c735815894ca16307264c 100644
+index e927448d7df9a99bf1d5184557ed57b8c32a2773..7a7abe0d87936d853ef32e85bd6a4ebb0dfa0ba7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -179,6 +179,7 @@ public abstract class PlayerList {
@@ -106,7 +106,7 @@ index e8490a58dd4d9bc39a5bb2f9fc109526e031b971..5f590575f95eff8bf0cdcafde7dee0e3
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 07076f9216fe904fe0f1f018b7e3862d5aab1398..f7ec6a6822608c51129c4bb3247179cce16a39c2 100644
+index 17ee1e953de98c56e06e97d995b0781c8aa5ecb0..e44fbfc43ac8e92d62f5ab8b13b45a3bfaf648ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -191,6 +191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0283-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0280-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 91%
rename from patches/server/0283-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0280-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index c61cf07b90..902530fed7 100644
--- a/patches/server/0283-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0280-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0afa8c7c826bb01f8a1139ced76fa599d205e045..4b7aacb6abe20dbac735b8edc2ca3c10ed8bfbe6 100644
+index 7451883595155fdeb0714fb12b98a0dc33348359..ab59cfccd2addba45525a657df8c488664e10290 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1749,6 +1749,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0284-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0281-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
similarity index 92%
rename from patches/server/0284-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
rename to patches/server/0281-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index d80712d1b8..f0d1fc3732 100644
--- a/patches/server/0284-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0281-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f7ec6a6822608c51129c4bb3247179cce16a39c2..0f0956066203f1598997e54b89b23c500951009c 100644
+index e44fbfc43ac8e92d62f5ab8b13b45a3bfaf648ae..c279d53a9ec8c3b77c1734c9321e3642dd16c47c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -247,8 +247,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0285-BlockDestroyEvent.patch b/patches/server/0282-BlockDestroyEvent.patch
similarity index 94%
rename from patches/server/0285-BlockDestroyEvent.patch
rename to patches/server/0282-BlockDestroyEvent.patch
index f9033b6bec..5eda372d62 100644
--- a/patches/server/0285-BlockDestroyEvent.patch
+++ b/patches/server/0282-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 09f2bee26387641191ae7ee3b863ca4ae2106cb4..942b27decf93713b00e28a6360e62c090caa5a01 100644
+index 2a849e7125e2a6294aab49a436eeab8e4201fd15..a5bdbf62bdeb9fd505699a92701f9ed4724b6c85 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -31,6 +31,7 @@ import net.minecraft.nbt.CompoundTag;
@@ -22,7 +22,7 @@ index 09f2bee26387641191ae7ee3b863ca4ae2106cb4..942b27decf93713b00e28a6360e62c09
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.FullChunkStatus;
  import net.minecraft.server.level.ServerLevel;
-@@ -668,9 +669,26 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -584,9 +585,26 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;
          } else {
              FluidState fluid = this.getFluidState(pos);
diff --git a/patches/server/0286-Async-command-map-building.patch b/patches/server/0283-Async-command-map-building.patch
similarity index 97%
rename from patches/server/0286-Async-command-map-building.patch
rename to patches/server/0283-Async-command-map-building.patch
index 5ed527dc5a..3a4b98f8c7 100644
--- a/patches/server/0286-Async-command-map-building.patch
+++ b/patches/server/0283-Async-command-map-building.patch
@@ -53,7 +53,7 @@ index 15a5059994371da4850adcf726034a715b80efba..af7cb518a32a4d550eae833fdd5bb17f
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ee21ba8a6cd3e02bddbf090180b0e3186151813b..04e00e02848e15cad4efe8818da46de5d2f14080 100644
+index df04c80feb1f427737e53080b592e39153da18ad..36c74467a4527b9641e8eace03e93cd04381cd08 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -926,6 +926,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0287-Brigadier-Mojang-API.patch b/patches/server/0284-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0287-Brigadier-Mojang-API.patch
rename to patches/server/0284-Brigadier-Mojang-API.patch
diff --git a/patches/server/0288-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0285-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from patches/server/0288-Improve-exact-choice-recipe-ingredients.patch
rename to patches/server/0285-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0289-Limit-Client-Sign-length-more.patch b/patches/server/0286-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from patches/server/0289-Limit-Client-Sign-length-more.patch
rename to patches/server/0286-Limit-Client-Sign-length-more.patch
index fb127f4da0..03a81ee975 100644
--- a/patches/server/0289-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0286-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index efa12d25cacd0b746ff8e689f35380bc310f5d75..a191254fa3bd8cdf2cb5446c88c71ed0be6761e8 100644
+index 2d00a3d669bf76c2aba12cf258dcd43d90ad8c82..f3abc5552d058c5b96ed56fc49ffd9f420668d01 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -291,6 +291,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0290-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0287-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 89%
rename from patches/server/0290-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0287-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index fcad8a5306..c08c85dcb6 100644
--- a/patches/server/0290-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0287-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a1ab652fe6a838f8506c735815894ca16307264c..3748e7d8267f659cb4942e54efa7e993fa4a99b5 100644
+index 7a7abe0d87936d853ef32e85bd6a4ebb0dfa0ba7..a7119e1bccf009428e74cd3375bc61555062e408 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1157,6 +1157,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0291-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0288-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0291-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0288-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0292-Entity-getEntitySpawnReason.patch b/patches/server/0289-Entity-getEntitySpawnReason.patch
similarity index 98%
rename from patches/server/0292-Entity-getEntitySpawnReason.patch
rename to patches/server/0289-Entity-getEntitySpawnReason.patch
index 68a02f0df9..11cfd79bc1 100644
--- a/patches/server/0292-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0289-Entity-getEntitySpawnReason.patch
@@ -22,7 +22,7 @@ index 2eddeb8d5239bbfeefbf4d3bd363f1ad083299b6..e2b44b8ddb8afc6e1f7dddadb434c226
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2a7d7881a200e12ae9369bb2d704aecce9322e52..2010cc573b447d79552b64d61acfe8a668007a2f 100644
+index b818ac80bd9d68f6058e4dc6ee447645083dc177..4cb3d42f88cb50233edd6f46adf5082c2bb732e8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1442,6 +1442,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0294-Fire-event-on-GS4-query.patch b/patches/server/0290-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0294-Fire-event-on-GS4-query.patch
rename to patches/server/0290-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0295-Add-PlayerPostRespawnEvent.patch b/patches/server/0291-Add-PlayerPostRespawnEvent.patch
similarity index 95%
rename from patches/server/0295-Add-PlayerPostRespawnEvent.patch
rename to patches/server/0291-Add-PlayerPostRespawnEvent.patch
index d01259c01b..e381e3f475 100644
--- a/patches/server/0295-Add-PlayerPostRespawnEvent.patch
+++ b/patches/server/0291-Add-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2670d20fce0e1c3e1930f3e4dc18c22b7cc1e0ec..81acbabe942de6f1716e384dc4e9cbd451f0a535 100644
+index f4e1fe5e5a12e5a3547a2e0305814ea60160c3fc..3f39d64fe673ae0f4b155a5f9e757c981ada96c1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -751,9 +751,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0296-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0292-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 94%
rename from patches/server/0296-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0292-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 0b46e05dd4..6af7f0c025 100644
--- a/patches/server/0296-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0292-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index e06f4c5b36411dd545982d9f6e3691f89cb04ac5..37ae35b76dc9585c7eaf53dd66e016977ca8f45d 100644
+index 1523be0c9f7ae3b8015b8017797601489c068e8c..9badb48b6004c5799132ed70ddcc767bdd72510c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -140,6 +140,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0297-Server-Tick-Events.patch b/patches/server/0293-Server-Tick-Events.patch
similarity index 94%
rename from patches/server/0297-Server-Tick-Events.patch
rename to patches/server/0293-Server-Tick-Events.patch
index 346295f633..d04c548d47 100644
--- a/patches/server/0297-Server-Tick-Events.patch
+++ b/patches/server/0293-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 06d70213a9f19bbd2a0f22a26af2dbb989bca5ce..cef1554db34a1d917fa5c7bbccfe22efd93bebfd 100644
+index 36c74467a4527b9641e8eace03e93cd04381cd08..f3a66cd277a3950b75076fd5f80f159f6eb4dd1c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1348,6 +1348,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0298-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0294-PlayerDeathEvent-getItemsToKeep.patch
similarity index 97%
rename from patches/server/0298-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0294-PlayerDeathEvent-getItemsToKeep.patch
index b80d6bc8de..17aab8cd97 100644
--- a/patches/server/0298-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0294-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4b7aacb6abe20dbac735b8edc2ca3c10ed8bfbe6..74967544779847f42a284c0c9c89ef6a6a3880fe 100644
+index ab59cfccd2addba45525a657df8c488664e10290..271d5a95aeb1e75a46b84dfa412ddb10d3159b54 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -857,6 +857,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0299-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0295-Optimize-Captured-BlockEntity-Lookup.patch
similarity index 91%
rename from patches/server/0299-Optimize-Captured-BlockEntity-Lookup.patch
rename to patches/server/0295-Optimize-Captured-BlockEntity-Lookup.patch
index d853854581..e3fa18dffb 100644
--- a/patches/server/0299-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0295-Optimize-Captured-BlockEntity-Lookup.patch
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 942b27decf93713b00e28a6360e62c090caa5a01..1b5b703350a5c3645658429b0cd5d8aa56f647fe 100644
+index a5bdbf62bdeb9fd505699a92701f9ed4724b6c85..e51f4df5b6fcd28e681a77a1aa3a9eeb0c463e1a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -997,9 +997,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -913,9 +913,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
diff --git a/patches/server/0300-Add-Heightmap-API.patch b/patches/server/0296-Add-Heightmap-API.patch
similarity index 95%
rename from patches/server/0300-Add-Heightmap-API.patch
rename to patches/server/0296-Add-Heightmap-API.patch
index 6934730a45..dc70728e70 100644
--- a/patches/server/0300-Add-Heightmap-API.patch
+++ b/patches/server/0296-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5e25cbee42dbd27c97b4732d70225e54a296b80e..c71a82ec42c7edd51979c9636205a931c56c6117 100644
+index 377c85f458e3e3ce7c7532fb991627b32590a691..50d0d854159396064ee8ee7de5a7f885d8cc13a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -222,6 +222,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0301-Mob-Spawner-API-Enhancements.patch b/patches/server/0297-Mob-Spawner-API-Enhancements.patch
similarity index 98%
rename from patches/server/0301-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0297-Mob-Spawner-API-Enhancements.patch
index ec161f0ae5..327e478176 100644
--- a/patches/server/0301-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0297-Mob-Spawner-API-Enhancements.patch
@@ -9,7 +9,7 @@ public net.minecraft.world.level.BaseSpawner delay(Lnet/minecraft/world/level/Le
 public net.minecraft.world.level.BaseSpawner setNextSpawnData(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/SpawnData;)V
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 0d04581b73a9daa91bbcb0ef0b28d601fc0e9599..f4e1a540243d1f699dd2ef407707af27517d9360 100644
+index 1bc11de2144bc8e0a313e753bbfeed571132d9d5..0c14b382e7660ce518096e9f26525ccea57a1bf9 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -235,7 +235,13 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0302-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0298-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0302-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0298-Fix-CB-call-to-changed-postToMainThread-method.patch
index c4625cebc1..1571598444 100644
--- a/patches/server/0302-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0298-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 494069d69d8d0f9f1b6700349310ec6d2031abdd..b68301f4cf650891140d3be6aebdc7ddf0d2a54f 100644
+index d0f89a66734423ceea67fbeb99b0e72797f80e63..e69043316372d98b122ed3788fda79cdd36849e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -310,7 +310,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0303-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0299-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0303-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0299-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0304-Implement-CraftBlockSoundGroup.patch b/patches/server/0300-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0304-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0300-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0305-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0301-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from patches/server/0305-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0301-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index a41b64c410..d0c7e8e517 100644
--- a/patches/server/0305-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0301-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -62,7 +62,7 @@ index f3a66cd277a3950b75076fd5f80f159f6eb4dd1c..fe6098ffcd63e4bb28c223c5693482b4
          // this.updateMobSpawningFlags();
          worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2010cc573b447d79552b64d61acfe8a668007a2f..659a5395d55df0457a8565b9f1907d34d868be8a 100644
+index 4cb3d42f88cb50233edd6f46adf5082c2bb732e8..7b7072dc81f745bd03c1e56e669c1b5e26f42d3f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1879,12 +1879,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0307-Expose-the-internal-current-tick.patch b/patches/server/0302-Expose-the-internal-current-tick.patch
similarity index 90%
rename from patches/server/0307-Expose-the-internal-current-tick.patch
rename to patches/server/0302-Expose-the-internal-current-tick.patch
index 4b74bf8824..ce22f9d682 100644
--- a/patches/server/0307-Expose-the-internal-current-tick.patch
+++ b/patches/server/0302-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 25d059f802a4bdcb7076bca8fa8a587e5de065bd..01fa200bc6911388ee3b0e700e82ad681e02fe4a 100644
+index 4a180f6e04ba08480024c297dcdc15f625504213..eba4767efb8ebe373c8f8898d6dd7f9f759d4ce3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2853,5 +2853,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0309-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0303-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0309-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0303-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0310-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0304-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 94%
rename from patches/server/0310-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0304-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index 5e909fa219..4ba6c07c18 100644
--- a/patches/server/0310-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0304-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -17,7 +17,7 @@ This should fully solve all of the issues around it so that only natural
 influences natural spawns.
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 9ed7abddf30d298a5abb04974efd1b470d015b09..a19c0e30ebcea8feff035a451ded567dfa86dfff 100644
+index aec4897a647206da20666f4d54cdc5d1b516bfc2..4ad3a4403f497f4b437209a9e63445f0d29b09f1 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -88,6 +88,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0311-Configurable-projectile-relative-velocity.patch b/patches/server/0305-Configurable-projectile-relative-velocity.patch
similarity index 96%
rename from patches/server/0311-Configurable-projectile-relative-velocity.patch
rename to patches/server/0305-Configurable-projectile-relative-velocity.patch
index 78be0464aa..5c75a20f54 100644
--- a/patches/server/0311-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0305-Configurable-projectile-relative-velocity.patch
@@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 75f08dcce4ac923678bf8c1f25ca02b0efbab7c2..cd9ef09e2d975ab16a3b96b8662477b687d58a4f 100644
+index 4ebc38d0666d01c67c2728355fbbef296a0672e3..20842ed5b730dda88efd0cda9292a37f879a4017 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -173,7 +173,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
diff --git a/patches/server/0312-offset-item-frame-ticking.patch b/patches/server/0306-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0312-offset-item-frame-ticking.patch
rename to patches/server/0306-offset-item-frame-ticking.patch
diff --git a/patches/server/0313-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0307-Prevent-consuming-the-wrong-itemstack.patch
similarity index 96%
rename from patches/server/0313-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0307-Prevent-consuming-the-wrong-itemstack.patch
index 55aa853c3d..26f30425d2 100644
--- a/patches/server/0313-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0307-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0290302c2b49b9fb262f8675f90010715fe53c50..9837ed5e3470b6bc563f466c958ca9c3978acdc9 100644
+index 98a26f97749d883f4ca04da27199f499211f0f33..e06aa636bf4e18ca2810e0626f427839cd2bce88 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3709,9 +3709,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0314-Dont-send-unnecessary-sign-update.patch b/patches/server/0308-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0314-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0308-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0315-Add-option-to-disable-pillager-patrols.patch b/patches/server/0309-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0315-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0309-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0317-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0310-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0317-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0310-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0318-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0311-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0318-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0311-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0319-Duplicate-UUID-Resolve-Option.patch b/patches/server/0312-Duplicate-UUID-Resolve-Option.patch
similarity index 98%
rename from patches/server/0319-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0312-Duplicate-UUID-Resolve-Option.patch
index 252e758cf9..ca4f4c1e6e 100644
--- a/patches/server/0319-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0312-Duplicate-UUID-Resolve-Option.patch
@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 56f52d4b9c1af6a04d464640ed06b841a47b4cd9..87edc78afea997db8935432b2c452aec6638fb06 100644
+index e4936a70d3a686e5cba0ea9d878f6e09fbee713d..2e6ff171ea9ca9159509e1bbd59f076b63c92776 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -533,6 +533,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0320-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0313-PlayerDeathEvent-shouldDropExperience.patch
similarity index 91%
rename from patches/server/0320-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0313-PlayerDeathEvent-shouldDropExperience.patch
index f1fec154d0..4bee049e15 100644
--- a/patches/server/0320-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0313-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 74967544779847f42a284c0c9c89ef6a6a3880fe..af75f20fff15f95aed238e3f6ae57182f4076d46 100644
+index 271d5a95aeb1e75a46b84dfa412ddb10d3159b54..1d7955f8d3bd722bc4524b520e9c6862a4fd52da 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -978,7 +978,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0321-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0314-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0321-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0314-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0322-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0315-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0322-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0315-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0323-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0316-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0323-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0316-Optimise-EntityGetter-getPlayerByUUID.patch
index 90df534a77..2436a7ea78 100644
--- a/patches/server/0323-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0316-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID
 Use the PlayerList map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 659a5395d55df0457a8565b9f1907d34d868be8a..262335dfd4ea0315e43e0a055a7259916bb6ee37 100644
+index 7b7072dc81f745bd03c1e56e669c1b5e26f42d3f..c93269e0a6026870c13083cee0f86334c5c3fdb1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -555,6 +555,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0324-Fix-items-not-falling-correctly.patch b/patches/server/0317-Fix-items-not-falling-correctly.patch
similarity index 96%
rename from patches/server/0324-Fix-items-not-falling-correctly.patch
rename to patches/server/0317-Fix-items-not-falling-correctly.patch
index 0aa26ff6dd..cd8d9ee71c 100644
--- a/patches/server/0324-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0317-Fix-items-not-falling-correctly.patch
@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking Spigot's entity
 activation range check from an item's move method.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 37ae35b76dc9585c7eaf53dd66e016977ca8f45d..16c30342ac9ebf5cffa0bf23ab9700b6704a1ec0 100644
+index 9badb48b6004c5799132ed70ddcc767bdd72510c..7d12bedc4b80b9bcf50f468a9204191bea0894c1 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -168,7 +168,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0325-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0318-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0325-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0318-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0326-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0319-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0326-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0319-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0328-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0320-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0328-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0320-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0329-Alternative-item-despawn-rate.patch b/patches/server/0321-Alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0329-Alternative-item-despawn-rate.patch
rename to patches/server/0321-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0330-Tracking-Range-Improvements.patch b/patches/server/0322-Tracking-Range-Improvements.patch
similarity index 95%
rename from patches/server/0330-Tracking-Range-Improvements.patch
rename to patches/server/0322-Tracking-Range-Improvements.patch
index 051228951f..4975d31857 100644
--- a/patches/server/0330-Tracking-Range-Improvements.patch
+++ b/patches/server/0322-Tracking-Range-Improvements.patch
@@ -8,10 +8,10 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 87edc78afea997db8935432b2c452aec6638fb06..279cb641b795b6f4ced545c3a09b61fde69c47d6 100644
+index 2e6ff171ea9ca9159509e1bbd59f076b63c92776..4b11a14bd6ba6d90c93db1e5733120bb319c9a48 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1260,6 +1260,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1199,6 +1199,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              while (iterator.hasNext()) {
                  Entity entity = (Entity) iterator.next();
                  int j = entity.getType().clientTrackingRange() * 16;
diff --git a/patches/server/0331-Fix-items-vanishing-through-end-portal.patch b/patches/server/0323-Fix-items-vanishing-through-end-portal.patch
similarity index 89%
rename from patches/server/0331-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0323-Fix-items-vanishing-through-end-portal.patch
index 6e8cb44a2c..8b3b94c26e 100644
--- a/patches/server/0331-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0323-Fix-items-vanishing-through-end-portal.patch
@@ -13,10 +13,10 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 31c1e5c5e0ccd1c7bd65e5f52121f0af444f73fa..2c8e2ed7199c33f5c4fe25faa9f60fa74982de35 100644
+index 7abdfeacec4787819e2e66d3b8a322b750d203f7..72b8c527a06f260322430dd274cfae5582cd972b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3410,6 +3410,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3399,6 +3399,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (flag1) {
                  blockposition1 = ServerLevel.END_SPAWN_POINT;
              } else {
diff --git a/patches/server/0334-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0324-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0334-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0324-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0335-Improve-Block-breakNaturally-API.patch b/patches/server/0325-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0335-Improve-Block-breakNaturally-API.patch
rename to patches/server/0325-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0336-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0326-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 96%
rename from patches/server/0336-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0326-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index d99eda95aa..eea0c2c464 100644
--- a/patches/server/0336-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0326-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 488f7e2f1ab0312673983d9079b4d7d99eebe611..70f15e3af9e954483ab116500f84a9ee17f67ce4 100644
+index de1d5da6318958e11a9da56ddd8fef1174d0a537..250f9821d400628c9431b07d1c02c379120e815a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -268,6 +268,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0337-Add-debug-for-sync-chunk-loads.patch b/patches/server/0327-Add-debug-for-sync-chunk-loads.patch
similarity index 98%
rename from patches/server/0337-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0327-Add-debug-for-sync-chunk-loads.patch
index e713c613be..f9aaf65978 100644
--- a/patches/server/0337-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0327-Add-debug-for-sync-chunk-loads.patch
@@ -300,7 +300,7 @@ index 0000000000000000000000000000000000000000..95d6022c9cfb2e36ec5a71be6e343540
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 3b11d7e3ccb9f9ca289355d4dab235d2040fcd06..a2220291f6d0726019187c2fc93bca801a3f0610 100644
+index 250f9821d400628c9431b07d1c02c379120e815a..5bea335653d3cd45354dc67b160a6bf5ce907f41 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -292,6 +292,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -312,10 +312,10 @@ index 3b11d7e3ccb9f9ca289355d4dab235d2040fcd06..a2220291f6d0726019187c2fc93bca80
              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 f4262817adfcbf1fa2db4e930b8b3a2879d99baf..5b8d3588fa062df8ccbfcd08af7918ab5c8487a3 100644
+index c93269e0a6026870c13083cee0f86334c5c3fdb1..8a7032d909452cec6c4b3e99b02fb00df5cea324 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -648,6 +648,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -649,6 +649,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.entityLookup = new io.papermc.paper.chunk.system.entity.EntityLookup(this, new EntityCallbacks()); // Paper - rewrite chunk system
      }
  
diff --git a/patches/server/0338-Improve-java-version-check.patch b/patches/server/0328-Improve-java-version-check.patch
similarity index 100%
rename from patches/server/0338-Improve-java-version-check.patch
rename to patches/server/0328-Improve-java-version-check.patch
diff --git a/patches/server/0339-Add-ThrownEggHatchEvent.patch b/patches/server/0329-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0339-Add-ThrownEggHatchEvent.patch
rename to patches/server/0329-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0340-Entity-Jump-API.patch b/patches/server/0330-Entity-Jump-API.patch
similarity index 97%
rename from patches/server/0340-Entity-Jump-API.patch
rename to patches/server/0330-Entity-Jump-API.patch
index 897985cc17..6cb6c184cf 100644
--- a/patches/server/0340-Entity-Jump-API.patch
+++ b/patches/server/0330-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9837ed5e3470b6bc563f466c958ca9c3978acdc9..fa496424e48c73672605b2128ec2bd3a6be86889 100644
+index e06aa636bf4e18ca2810e0626f427839cd2bce88..bc51c6d8b39907d89a4f65cd7a8266df1fceab8c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3283,8 +3283,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0341-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0331-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 86%
rename from patches/server/0341-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0331-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 5dd4de2336..922e62f41c 100644
--- a/patches/server/0341-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0331-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d19e64b6c1b85829b62854abef0987f62c616d54..b6b4be7f49ae756ebbda59e55dee98000aec2314 100644
+index 72b8c527a06f260322430dd274cfae5582cd972b..b40eed864faf11962efc1e0df417074eb8737c6b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -399,6 +399,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -397,6 +397,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+     // Spigot end
+     // Paper start
      protected int numCollisions = 0; // Paper - Cap entity collisions
-     public long activatedImmunityTick = Integer.MIN_VALUE; // Paper
-     public boolean isTemporarilyActive; // Paper
 +    public boolean fromNetherPortal; // Paper - Add option to nerf pigmen from nether portals
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      @javax.annotation.Nullable
      private org.bukkit.util.Vector origin;
-@@ -2232,6 +2233,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2221,6 +2222,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (spawnedViaMobSpawner) {
                  nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
              }
@@ -26,7 +26,7 @@ index d19e64b6c1b85829b62854abef0987f62c616d54..b6b4be7f49ae756ebbda59e55dee9800
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -2374,6 +2378,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2363,6 +2367,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/patches/server/0342-Make-the-GUI-graph-fancier.patch b/patches/server/0332-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0342-Make-the-GUI-graph-fancier.patch
rename to patches/server/0332-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0343-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0333-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0343-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0333-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0344-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0334-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0344-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0334-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0345-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0335-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0345-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0335-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0346-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0336-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0346-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0336-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0347-Optimise-Chunk-getFluid.patch b/patches/server/0337-Optimise-Chunk-getFluid.patch
similarity index 88%
rename from patches/server/0347-Optimise-Chunk-getFluid.patch
rename to patches/server/0337-Optimise-Chunk-getFluid.patch
index 3dd619df8f..a6d2c62b44 100644
--- a/patches/server/0347-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0337-Optimise-Chunk-getFluid.patch
@@ -8,10 +8,10 @@ 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 e599bfb9a7b0b85bea2940f6bf55118305dd0ce8..796aa86e12cf9062b3467a3678c895af5ad626fe 100644
+index 31d2de67d3facf00491814f775ef1468b33eb51b..749a056c17efb0788ac671d536658fc84b105ff2 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -377,18 +377,20 @@ public class LevelChunk extends ChunkAccess {
+@@ -360,18 +360,20 @@ public class LevelChunk extends ChunkAccess {
      }
  
      public FluidState getFluidState(int x, int y, int z) {
@@ -38,7 +38,7 @@ index e599bfb9a7b0b85bea2940f6bf55118305dd0ce8..796aa86e12cf9062b3467a3678c895af
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Getting fluid state");
              CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block being got");
-@@ -398,6 +400,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -381,6 +383,7 @@ public class LevelChunk extends ChunkAccess {
              });
              throw new ReportedException(crashreport);
          }
@@ -47,10 +47,10 @@ index e599bfb9a7b0b85bea2940f6bf55118305dd0ce8..796aa86e12cf9062b3467a3678c895af
  
      // 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 4eeb719b40ff1c18a7cdda7ecc6b135dbedd626e..3efd0a462306fbd02a506a3f952d609645b1f874 100644
+index d59392c322936ce89b759ac9787c8f4f0b228af6..ea2fb64ff15af1cbb7b3f59386fb7a40f54e9b4f 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -46,7 +46,7 @@ public class LevelChunkSection {
+@@ -43,7 +43,7 @@ public class LevelChunkSection {
      }
  
      public FluidState getFluidState(int x, int y, int z) {
diff --git a/patches/server/0348-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0338-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 89%
rename from patches/server/0348-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0338-Set-spigots-verbose-world-setting-to-false-by-def.patch
index b9d2820ee5..f00c33db91 100644
--- a/patches/server/0348-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0338-Set-spigots-verbose-world-setting-to-false-by-def.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 50e57486d49694396816122504028e410ebb602d..11ac344ef113732fa717b67c51f76692b9b247e7 100644
+index 81c76360e8c7389bafd61f38e6782668e8c65d27..2a787b641fec29427963ac2bdc14df60f32af2bc 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -20,7 +20,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0349-Add-tick-times-API-and-mspt-command.patch b/patches/server/0339-Add-tick-times-API-and-mspt-command.patch
similarity index 97%
rename from patches/server/0349-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0339-Add-tick-times-API-and-mspt-command.patch
index 172ec87dd0..1281c627b5 100644
--- a/patches/server/0349-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0339-Add-tick-times-API-and-mspt-command.patch
@@ -125,7 +125,7 @@ index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7
  
      public static void registerCommands(final MinecraftServer server) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f92e4d6cfae684b5c8df6424d63a574cb17ef6b7..5cb0f93bc7d4495e65674c22de2ebd8854c696fe 100644
+index fe6098ffcd63e4bb28c223c5693482b47c6a2331..a8115ac8e938631448d331b6d12d43a1e9646d68 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -252,6 +252,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -184,7 +184,7 @@ index f92e4d6cfae684b5c8df6424d63a574cb17ef6b7..5cb0f93bc7d4495e65674c22de2ebd88
 +    // Paper end - Add tick times API and /mspt command
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 217fd2af254f7206cf4c1d7d7ad08384a38427d2..a74d346cd72d841be195f02801bba8cd00ac4097 100644
+index eba4767efb8ebe373c8f8898d6dd7f9f759d4ce3..d1d430886790d0fbed385147ab638a0e73237772 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2628,6 +2628,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0350-Expose-MinecraftServer-isRunning.patch b/patches/server/0340-Expose-MinecraftServer-isRunning.patch
similarity index 90%
rename from patches/server/0350-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0340-Expose-MinecraftServer-isRunning.patch
index df99e66826..9e261dc5c8 100644
--- a/patches/server/0350-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0340-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 a74d346cd72d841be195f02801bba8cd00ac4097..b501ed140902a0143553f338871e3b8b71a7f71e 100644
+index d1d430886790d0fbed385147ab638a0e73237772..edec1e0c931eff59d69890bd48355a0e15b3a001 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2868,5 +2868,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0351-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0341-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0351-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0341-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0352-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0342-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from patches/server/0352-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0342-Pillager-patrol-spawn-settings-and-per-player-option.patch
index d91e654ceb..d144d859b3 100644
--- a/patches/server/0352-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0342-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f9f994f74ff2fc9024c51104eb9af536beb24943..728cc9511c537cab93bdd716235b4fa0c27f29ef 100644
+index 1d7955f8d3bd722bc4524b520e9c6862a4fd52da..e28b4976341157b8dbc7245ee91024fd1e025b09 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -249,6 +249,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0353-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0343-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 95%
rename from patches/server/0353-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0343-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index d5a1d9812a..269d7f6be9 100644
--- a/patches/server/0353-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0343-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 907129b7ca0bb2b356502c84b86518e843cecfa2..3779e02083fb41e93248aed27a9214be88167e5a 100644
+index a7d7c676f1ab8c47395b91aea028f143837b8801..9c7079d0c3c25bef970891b0579daa940fa61e33 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0354-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0344-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0354-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0344-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0355-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0345-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 88%
rename from patches/server/0355-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0345-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 17cbbc8422..3cb95d3899 100644
--- a/patches/server/0355-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0345-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,10 +7,10 @@ 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 2b9a1a178233fb7cfb4d58853ff3176cb1236d3a..e3146ae94ae55764fcd7ec650a44d457889c179d 100644
+index 4b11a14bd6ba6d90c93db1e5733120bb319c9a48..ad98c74dc6d032bedd01fffd9cdb6c8f8a267c7e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -989,6 +989,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -905,6 +905,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      public void addEntity(Entity entity) {
          org.spigotmc.AsyncCatcher.catchOp("entity track"); // Spigot
@@ -25,10 +25,10 @@ index 2b9a1a178233fb7cfb4d58853ff3176cb1236d3a..e3146ae94ae55764fcd7ec650a44d457
              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 5b8d3588fa062df8ccbfcd08af7918ab5c8487a3..97a04d12acbf0d6eb8f9f4ecc45085570f74a0f5 100644
+index 8a7032d909452cec6c4b3e99b02fb00df5cea324..5f384b764aa361d9cd575b9910afea789cb054bc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2496,7 +2496,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2478,7 +2478,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTrackingStart(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -37,7 +37,7 @@ index 5b8d3588fa062df8ccbfcd08af7918ab5c8487a3..97a04d12acbf0d6eb8f9f4ecc4508557
              if (entity instanceof ServerPlayer) {
                  ServerPlayer entityplayer = (ServerPlayer) entity;
  
-@@ -2531,6 +2531,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2513,6 +2513,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.inWorld = true; // CraftBukkit - Mark entity as in world
              entity.valid = true; // CraftBukkit
diff --git a/patches/server/0356-Don-t-tick-dead-players.patch b/patches/server/0346-Don-t-tick-dead-players.patch
similarity index 85%
rename from patches/server/0356-Don-t-tick-dead-players.patch
rename to patches/server/0346-Don-t-tick-dead-players.patch
index cb3f8a4849..9b36f159d7 100644
--- a/patches/server/0356-Don-t-tick-dead-players.patch
+++ b/patches/server/0346-Don-t-tick-dead-players.patch
@@ -7,10 +7,10 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 728cc9511c537cab93bdd716235b4fa0c27f29ef..d70316c45bd657243d6c998723f6bb1324b6a880 100644
+index e28b4976341157b8dbc7245ee91024fd1e025b09..285a9badc1a8b6582b808f0d474bcd22821e2c71 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -732,7 +732,7 @@ public class ServerPlayer extends Player {
+@@ -728,7 +728,7 @@ public class ServerPlayer extends Player {
  
      public void doTick() {
          try {
diff --git a/patches/server/0357-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0347-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 84%
rename from patches/server/0357-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0347-Dead-Player-s-shouldn-t-be-able-to-move.patch
index c0d2a6c8aa..71eab615ff 100644
--- a/patches/server/0357-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0347-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,10 +7,10 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 18394311d9d0bed5fa1ac09182947375380c7670..ca7f6ffdbfc8c796c3a26108f281bef7af560f78 100644
+index fc9eed382c8de51b298102cdcf584bf7e19ea968..808a784a312438433fba0e65cbfd1afbad19fe86 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1161,7 +1161,7 @@ public abstract class Player extends LivingEntity {
+@@ -1153,7 +1153,7 @@ public abstract class Player extends LivingEntity {
  
      @Override
      protected boolean isImmobile() {
diff --git a/patches/server/0358-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0348-Don-t-move-existing-players-to-world-spawn.patch
similarity index 88%
rename from patches/server/0358-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0348-Don-t-move-existing-players-to-world-spawn.patch
index 77541b8358..5597570f86 100644
--- a/patches/server/0358-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0348-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,10 +13,10 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3fbd65849649d77f9ef8920fcd7ab32c829f91c6..d7c5697ab781bb0c1cb3cb60685dca2466e966d3 100644
+index 285a9badc1a8b6582b808f0d474bcd22821e2c71..538fe865ad27796371d11123ce03602719a9be68 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -385,7 +385,7 @@ public class ServerPlayer extends Player {
+@@ -381,7 +381,7 @@ public class ServerPlayer extends Player {
          this.stats = server.getPlayerList().getPlayerStats(this);
          this.advancements = server.getPlayerList().getPlayerAdvancements(this);
          this.setMaxUpStep(1.0F);
@@ -25,7 +25,7 @@ index 3fbd65849649d77f9ef8920fcd7ab32c829f91c6..d7c5697ab781bb0c1cb3cb60685dca24
          this.updateOptions(clientOptions);
  
          this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
-@@ -619,7 +619,7 @@ public class ServerPlayer extends Player {
+@@ -615,7 +615,7 @@ public class ServerPlayer extends Player {
                  position = Vec3.atCenterOf(world.getSharedSpawnPos());
              }
              this.setLevel(world);
@@ -35,7 +35,7 @@ index 3fbd65849649d77f9ef8920fcd7ab32c829f91c6..d7c5697ab781bb0c1cb3cb60685dca24
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 71619422fdb212b3aad8cf64a3a417168e3e8d2d..05983ba80532f3c0235af7e712948edf4d8f021b 100644
+index 3f39d64fe673ae0f4b155a5f9e757c981ada96c1..c04db4712ac4127cffe250e404eed9198b377429 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -226,6 +226,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0359-Optimize-Pathfinding.patch b/patches/server/0349-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0359-Optimize-Pathfinding.patch
rename to patches/server/0349-Optimize-Pathfinding.patch
diff --git a/patches/server/0360-Reduce-Either-Optional-allocation.patch b/patches/server/0350-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0360-Reduce-Either-Optional-allocation.patch
rename to patches/server/0350-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0361-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0351-Reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/server/0361-Reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/0351-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0362-Prevent-opening-inventories-when-frozen.patch b/patches/server/0352-Prevent-opening-inventories-when-frozen.patch
similarity index 94%
rename from patches/server/0362-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0352-Prevent-opening-inventories-when-frozen.patch
index 7d9c54a36e..2b8439c66f 100644
--- a/patches/server/0362-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0352-Prevent-opening-inventories-when-frozen.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d7c5697ab781bb0c1cb3cb60685dca2466e966d3..36b4512c7f5e8d7a21b94b1eda3ec13a8d7113f2 100644
+index 538fe865ad27796371d11123ce03602719a9be68..2d8642f9a3dfa1a8a014fe773bbee93b86602677 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -701,7 +701,7 @@ public class ServerPlayer extends Player {
+@@ -697,7 +697,7 @@ public class ServerPlayer extends Player {
              containerUpdateDelay = this.level().paperConfig().tickRates.containerUpdate;
          }
          // Paper end
@@ -17,7 +17,7 @@ index d7c5697ab781bb0c1cb3cb60685dca2466e966d3..36b4512c7f5e8d7a21b94b1eda3ec13a
              this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper - Inventory close reason
              this.containerMenu = this.inventoryMenu;
          }
-@@ -1556,7 +1556,7 @@ public class ServerPlayer extends Player {
+@@ -1552,7 +1552,7 @@ public class ServerPlayer extends Player {
              } else {
                  // CraftBukkit start
                  this.containerMenu = container;
diff --git a/patches/server/0363-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0353-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 96%
rename from patches/server/0363-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0353-Don-t-run-entity-collision-code-if-not-needed.patch
index ac9cee85c0..6b4ad7f099 100644
--- a/patches/server/0363-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0353-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b813357da558649c2244af524f79141fdc7f997e..ddbb823a5f1ac6318b6931fef2140b7e16e61056 100644
+index bc51c6d8b39907d89a4f65cd7a8266df1fceab8c..1d75c7d7232dedaf6451c5a1e5bf224174d21041 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3398,10 +3398,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0364-Implement-Player-Client-Options-API.patch b/patches/server/0354-Implement-Player-Client-Options-API.patch
similarity index 96%
rename from patches/server/0364-Implement-Player-Client-Options-API.patch
rename to patches/server/0354-Implement-Player-Client-Options-API.patch
index 2d4cec5a3f..aadbb6c539 100644
--- a/patches/server/0364-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0354-Implement-Player-Client-Options-API.patch
@@ -87,10 +87,10 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 36b4512c7f5e8d7a21b94b1eda3ec13a8d7113f2..0a75cba1b0b5a85826bd60615e3f09d2f41cc6a3 100644
+index 2d8642f9a3dfa1a8a014fe773bbee93b86602677..86aa09683423b4beae9986250b12359077703f4f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -386,7 +386,7 @@ public class ServerPlayer extends Player {
+@@ -382,7 +382,7 @@ public class ServerPlayer extends Player {
          this.advancements = server.getPlayerList().getPlayerAdvancements(this);
          this.setMaxUpStep(1.0F);
          // this.fudgeSpawnLocation(world); // Paper - Don't move existing players to world spawn
@@ -99,7 +99,7 @@ index 36b4512c7f5e8d7a21b94b1eda3ec13a8d7113f2..0a75cba1b0b5a85826bd60615e3f09d2
  
          this.cachedSingleHashSet = new com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
  
-@@ -2052,7 +2052,23 @@ public class ServerPlayer extends Player {
+@@ -2048,7 +2048,23 @@ public class ServerPlayer extends Player {
          }
      }
  
@@ -123,7 +123,7 @@ index 36b4512c7f5e8d7a21b94b1eda3ec13a8d7113f2..0a75cba1b0b5a85826bd60615e3f09d2
          // CraftBukkit start
          if (this.getMainArm() != clientOptions.mainHand()) {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), this.getMainArm() == HumanoidArm.LEFT ? MainHand.LEFT : MainHand.RIGHT);
-@@ -2064,6 +2080,11 @@ public class ServerPlayer extends Player {
+@@ -2060,6 +2076,11 @@ public class ServerPlayer extends Player {
              this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.language, clientOptions.language())); // Paper
          }
          // CraftBukkit end
@@ -136,7 +136,7 @@ index 36b4512c7f5e8d7a21b94b1eda3ec13a8d7113f2..0a75cba1b0b5a85826bd60615e3f09d2
          this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0f0956066203f1598997e54b89b23c500951009c..e05d22471a80f5afba4634116aff9dcf636f2501 100644
+index c279d53a9ec8c3b77c1734c9321e3642dd16c47c..4de49a81238ca3d550f85fdcdf921c17f992f65a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -609,6 +609,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0365-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0355-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0365-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0355-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0366-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0356-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
similarity index 94%
rename from patches/server/0366-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
rename to patches/server/0356-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index d0d27efd05..01b9259fe2 100644
--- a/patches/server/0366-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0356-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -31,10 +31,10 @@ 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 e3146ae94ae55764fcd7ec650a44d457889c179d..9ddad716d641d649e09c094795240bd2e8c926b9 100644
+index ad98c74dc6d032bedd01fffd9cdb6c8f8a267c7e..1ad4e5a0a4d236012c1dfb0dbffdacd0f134b72c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -996,6 +996,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -912,6 +912,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return;
          }
          // Paper end - ignore and warn about illegal addEntity calls instead of crashing server
@@ -43,10 +43,10 @@ index e3146ae94ae55764fcd7ec650a44d457889c179d..9ddad716d641d649e09c094795240bd2
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0a75cba1b0b5a85826bd60615e3f09d2f41cc6a3..b5dcb539548ca35d7c8a076d474a5c679a61c071 100644
+index 86aa09683423b4beae9986250b12359077703f4f..5c9a6fe2f2d67ff4e27c691ebc97e7a50d62fc22 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
+@@ -267,6 +267,7 @@ public class ServerPlayer extends Player {
      public double maxHealthCache;
      public boolean joining = true;
      public boolean sentListPacket = false;
diff --git a/patches/server/0367-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0357-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 96%
rename from patches/server/0367-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0357-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index 29df490d6e..7b2f30c00f 100644
--- a/patches/server/0367-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0357-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -10,7 +10,7 @@ Co-authored-by: Wyatt Childers <wchilders@nearce.com>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index dc6774fdc215de6a157b64678aec5a79344084e9..7750c1980ea7e211a35ad077b95ab0e206900e17 100644
+index 4be466a21fb1fb936e1eaa6351e30a53c7b5cbb4..5657999a85b9b9dfb48a51170d5fa3d9c37263ad 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -194,7 +194,7 @@ public abstract class PlayerList {
@@ -87,10 +87,10 @@ index dc6774fdc215de6a157b64678aec5a79344084e9..7750c1980ea7e211a35ad077b95ab0e2
          }
          // Paper end - Entity#getEntitySpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b6b4be7f49ae756ebbda59e55dee98000aec2314..0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2 100644
+index b40eed864faf11962efc1e0df417074eb8737c6b..71b499843b25f78491ab2f7dad97523b9facd77c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2335,27 +2335,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2324,27 +2324,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
              // CraftBukkit end
  
diff --git a/patches/server/0368-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0358-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from patches/server/0368-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0358-Add-PlayerAttackEntityCooldownResetEvent.patch
index cf0433593c..d4b6bd254a 100644
--- a/patches/server/0368-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0358-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ddbb823a5f1ac6318b6931fef2140b7e16e61056..e309d74047b039e595cb59396710f68490a2249a 100644
+index 1d75c7d7232dedaf6451c5a1e5bf224174d21041..72ce49ead51a846013c887b39b80abb7d141cb0f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2190,7 +2190,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0369-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0359-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0369-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0359-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0370-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0360-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0370-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0360-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0371-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0361-Fix-item-duplication-and-teleport-issues.patch
similarity index 95%
rename from patches/server/0371-Fix-item-duplication-and-teleport-issues.patch
rename to patches/server/0361-Fix-item-duplication-and-teleport-issues.patch
index 64cceef8a1..13b35c9903 100644
--- a/patches/server/0371-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0361-Fix-item-duplication-and-teleport-issues.patch
@@ -16,10 +16,10 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2..d0f46b955041487ce1cec4a9a5ed8808ef4d9e9f 100644
+index 71b499843b25f78491ab2f7dad97523b9facd77c..d2526510202c17006f22b148e4a1305714a4effd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2465,11 +2465,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2454,11 +2454,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          } else {
              // CraftBukkit start - Capture drops for death event
              if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) {
@@ -34,7 +34,7 @@ index 0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2..d0f46b955041487ce1cec4a9a5ed8808
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
-@@ -3269,6 +3270,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3258,6 +3259,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      @Nullable
      public Entity teleportTo(ServerLevel worldserver, Vec3 location) {
          // CraftBukkit end
@@ -47,7 +47,7 @@ index 0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2..d0f46b955041487ce1cec4a9a5ed8808
          if (this.level() instanceof ServerLevel && !this.isRemoved()) {
              this.level().getProfiler().push("changeDimension");
              // CraftBukkit start
-@@ -3295,6 +3302,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3284,6 +3291,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  // CraftBukkit end
  
                  this.level().getProfiler().popPush("reloading");
@@ -59,7 +59,7 @@ index 0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2..d0f46b955041487ce1cec4a9a5ed8808
                  Entity entity = this.getType().create(worldserver);
  
                  if (entity != null) {
-@@ -3312,10 +3324,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3301,10 +3313,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                      // CraftBukkit start - Forward the CraftEntity to the new entity
                      this.getBukkitEntity().setHandle(entity);
                      entity.bukkitEntity = this.getBukkitEntity();
@@ -70,7 +70,7 @@ index 0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2..d0f46b955041487ce1cec4a9a5ed8808
                      // CraftBukkit end
                  }
  
-@@ -3434,7 +3442,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3423,7 +3431,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public boolean canChangeDimensions() {
@@ -80,7 +80,7 @@ index 0d7dff8ca6a3d68fdcbf300fb2f65b1d08c429b2..d0f46b955041487ce1cec4a9a5ed8808
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e309d74047b039e595cb59396710f68490a2249a..6114cc60d8cb122b708ae65db86bfd1ea2ea82c1 100644
+index 72ce49ead51a846013c887b39b80abb7d141cb0f..b7bf58ddbc02989777c5c8dd58f6dd34acf57507 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1705,9 +1705,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0372-Villager-Restocks-API.patch b/patches/server/0362-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0372-Villager-Restocks-API.patch
rename to patches/server/0362-Villager-Restocks-API.patch
diff --git a/patches/server/0373-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0363-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0373-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0363-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0374-Expose-game-version.patch b/patches/server/0364-Expose-game-version.patch
similarity index 89%
rename from patches/server/0374-Expose-game-version.patch
rename to patches/server/0364-Expose-game-version.patch
index 169ab7f810..e0af77195c 100644
--- a/patches/server/0374-Expose-game-version.patch
+++ b/patches/server/0364-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 f88426ce7f1b4ebc65a39c19900e75de22c5903b..28fe0834c6287181cc21b9ceedc2dd1074db984e 100644
+index edec1e0c931eff59d69890bd48355a0e15b3a001..449f6e07c9693a32b9159657baf038a61391d24f 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/0375-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0365-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0375-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0365-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0376-misc-debugging-dumps.patch b/patches/server/0366-misc-debugging-dumps.patch
similarity index 96%
rename from patches/server/0376-misc-debugging-dumps.patch
rename to patches/server/0366-misc-debugging-dumps.patch
index 1553a974f1..127daea30c 100644
--- a/patches/server/0376-misc-debugging-dumps.patch
+++ b/patches/server/0366-misc-debugging-dumps.patch
@@ -42,7 +42,7 @@ index 40ff3090fb17fb0f01a9b52639fb783ea57ce6b6..d39743d9626eb01c942194387dafb110
                  StackTraceElement[] astacktraceelement = exception.getStackTrace();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 831998b12c296d5731ae09d4abb5548201226c77..0b79a72b8b2325416cd1a5743a27787e93ffa644 100644
+index a8115ac8e938631448d331b6d12d43a1e9646d68..480f4946658c3cc9c3c5acc1168a182297eb2bd7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -914,6 +914,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -87,7 +87,7 @@ index 04a728a16bb629adbae1cd8586764a6dbc22b5dc..d130f843975236018df4fa2ccc3ca6aa
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 28fe0834c6287181cc21b9ceedc2dd1074db984e..42548bcd1a890e713c4b5103f36a5a9facc703d0 100644
+index 449f6e07c9693a32b9159657baf038a61391d24f..7b15b13fc0e5d22e1ba348fff05502cb33b1d46b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1006,6 +1006,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0377-Prevent-teleporting-dead-entities.patch b/patches/server/0367-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0377-Prevent-teleporting-dead-entities.patch
rename to patches/server/0367-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0378-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0368-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 98%
rename from patches/server/0378-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0368-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index ce87250721..608ad14457 100644
--- a/patches/server/0378-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0368-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -495,7 +495,7 @@ index 52eb3176437113f9a0ff85d10ce5c2415e1b5570..b54ddd0ba0b001fbcb1838a838ca4890
          }
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 128debf837da32d27ba37184162e7b3bfb463812..6cfb814ecaf12161ec2e2545560453d7dd41e2da 100644
+index cd9ed68079abf103759865a3e2a038ac629a18ea..dc9f8625e15c49ea64d2b7d9515d36d5ef834820 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -75,13 +75,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -514,8 +514,8 @@ index 128debf837da32d27ba37184162e7b3bfb463812..6cfb814ecaf12161ec2e2545560453d7
 +        return new DefaultEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Client IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()); // Paper
      });
      private final PacketFlow receiving;
-     private final Queue<WrappedConsumer> pendingActions = Queues.newConcurrentLinkedQueue();
-@@ -211,7 +211,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     private final Queue<Consumer<Connection>> pendingActions = Queues.newConcurrentLinkedQueue();
+@@ -207,7 +207,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
              }
          }
@@ -570,7 +570,7 @@ index d130f843975236018df4fa2ccc3ca6aaca7a06b8..76f31845fe50200d09e5ab6a6c08da00
              // Paper end - Debugging
              this.connection.send(new ClientboundDisconnectPacket(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA));
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 9db7fc8c053aa9e929fa6dddf70290a8f7ad5273..dfa07c9ede9d748a05ee47826bdbcf7390ec8219 100644
+index 187b2cf175ba5cea94158d29b53993dc5a7c5b94..3b6bafb242d2623c15f26acdacd036478c7dc214 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -52,10 +52,10 @@ public class ServerConnectionListener {
@@ -609,10 +609,10 @@ index e697b8f7b165d2394d8155cbee7453e23ac2bee4..6706ac701963fed4798247e6e835b06f
                              }
                         }
 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 873e8de4638d14ce9052e3978f528e10fa591924..6e1006675339551ca499a57a8f8553020f16a4fa 100644
+index 749a056c17efb0788ac671d536658fc84b105ff2..90d6376f0441505a4c5f32d620827dfe233a5783 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -599,7 +599,7 @@ public class LevelChunk extends ChunkAccess {
+@@ -582,7 +582,7 @@ public class LevelChunk extends ChunkAccess {
                      + " (" + getBlockState(blockposition) + ") where there was no entity tile!\n" +
                      "Chunk coordinates: " + (this.chunkPos.x * 16) + "," + (this.chunkPos.z * 16) +
                      "\nWorld: " + level.getLevel().dimension().location());
diff --git a/patches/server/0379-Implement-Mob-Goal-API.patch b/patches/server/0369-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0379-Implement-Mob-Goal-API.patch
rename to patches/server/0369-Implement-Mob-Goal-API.patch
index 2605232bdc..c16e1d23bd 100644
--- a/patches/server/0379-Implement-Mob-Goal-API.patch
+++ b/patches/server/0369-Implement-Mob-Goal-API.patch
@@ -768,7 +768,7 @@ index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..16f9a98b8a939e5ca7e2dc04f87134a7
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 42548bcd1a890e713c4b5103f36a5a9facc703d0..8997f35d4e3d66f4ac2e1b774e7869771d938dde 100644
+index 7b15b13fc0e5d22e1ba348fff05502cb33b1d46b..e2f0bb22882b571cca71ea1d82aa12bffdfdb418 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2881,5 +2881,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0380-Add-villager-reputation-API.patch b/patches/server/0370-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0380-Add-villager-reputation-API.patch
rename to patches/server/0370-Add-villager-reputation-API.patch
diff --git a/patches/server/0381-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0371-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0381-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0371-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0382-ExperienceOrbMergeEvent.patch b/patches/server/0372-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0382-ExperienceOrbMergeEvent.patch
rename to patches/server/0372-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0383-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0373-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0383-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0373-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0384-Potential-bed-API.patch b/patches/server/0374-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0384-Potential-bed-API.patch
rename to patches/server/0374-Potential-bed-API.patch
diff --git a/patches/server/0385-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0375-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 93%
rename from patches/server/0385-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0375-Wait-for-Async-Tasks-during-shutdown.patch
index 803c2f5e89..82ad4e32b9 100644
--- a/patches/server/0385-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0375-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0b79a72b8b2325416cd1a5743a27787e93ffa644..87966edd7fb8b936c55659257291478c862e2542 100644
+index 480f4946658c3cc9c3c5acc1168a182297eb2bd7..b9dbedd118a9287f659d2e785c3a582e817e4e36 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -941,6 +941,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -22,7 +22,7 @@ index 0b79a72b8b2325416cd1a5743a27787e93ffa644..87966edd7fb8b936c55659257291478c
          // CraftBukkit end
          this.getConnection().stop();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8997f35d4e3d66f4ac2e1b774e7869771d938dde..ad390e137aa1492a4aa807f7cc315fb0cac46e62 100644
+index e2f0bb22882b571cca71ea1d82aa12bffdfdb418..41935f3b0d4e8b7bc18d308de964db537afe863b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1016,6 +1016,31 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0386-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0376-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0386-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0376-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0387-Ensure-safe-gateway-teleport.patch b/patches/server/0377-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0387-Ensure-safe-gateway-teleport.patch
rename to patches/server/0377-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0388-Add-option-for-console-having-all-permissions.patch b/patches/server/0378-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0388-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0378-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0389-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0379-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0389-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0379-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0390-Maps-shouldn-t-load-chunks.patch b/patches/server/0380-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0390-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0380-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0391-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0381-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0391-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0381-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0392-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0382-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0392-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0382-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0393-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0383-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 97%
rename from patches/server/0393-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0383-Fix-piston-physics-inconsistency-MC-188840.patch
index b8b63a48fb..d5379f5106 100644
--- a/patches/server/0393-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0383-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -66,10 +66,10 @@ index b3732a6246a2b011e36c5c35fa2ac7749e75db16..3ae61e7b50bfc440c597f88843f92903
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-index 17a6327ab7b26dfab38881bbc0689b0b25f8f025..c71690dbc3dc52803945f1608f0ee3ba94146354 100644
+index 45f55c79a9d105f732054d61c4cf83eb5db49762..b1061db1d9b3bfde61d5016e10556c4320095827 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-@@ -288,7 +288,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
+@@ -284,7 +284,7 @@ public class PistonMovingBlockEntity extends BlockEntity {
                  if (world.getBlockState(pos).is(Blocks.MOVING_PISTON)) {
                      BlockState blockState = Block.updateFromNeighbourShapes(blockEntity.movedState, world, pos);
                      if (blockState.isAir()) {
diff --git a/patches/server/0394-Fix-sand-duping.patch b/patches/server/0384-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0394-Fix-sand-duping.patch
rename to patches/server/0384-Fix-sand-duping.patch
diff --git a/patches/server/0395-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0385-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0395-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0385-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0396-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0386-Prevent-position-desync-causing-tp-exploit.patch
similarity index 100%
rename from patches/server/0396-Prevent-position-desync-causing-tp-exploit.patch
rename to patches/server/0386-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0397-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0387-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0397-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0387-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0398-Improve-Arrow-API.patch b/patches/server/0388-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0398-Improve-Arrow-API.patch
rename to patches/server/0388-Improve-Arrow-API.patch
diff --git a/patches/server/0399-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0389-Add-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0399-Add-PlayerRecipeBookClickEvent.patch
rename to patches/server/0389-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0400-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0390-Hide-sync-chunk-writes-behind-flag.patch
similarity index 93%
rename from patches/server/0400-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0390-Hide-sync-chunk-writes-behind-flag.patch
index e46537bbd1..cf5c2534f0 100644
--- a/patches/server/0400-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0390-Hide-sync-chunk-writes-behind-flag.patch
@@ -9,7 +9,7 @@ on harddrives.
 -DPaper.enable-sync-chunk-writes=true to enable
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
-index 7edce6f8d1f313a9e1e100704d625e317f779fa0..c58d03898edc49b4451c82d4ccdb86980bc1a40a 100644
+index 90fe26a546eeebf90ccf7f899103346cdb3ae702..bab2471616404821671264ccefd729cab8d0bf58 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java
 @@ -144,7 +144,7 @@ public class DedicatedServerProperties extends Settings<DedicatedServerPropertie
diff --git a/patches/server/0401-Add-permission-for-command-blocks.patch b/patches/server/0391-Add-permission-for-command-blocks.patch
similarity index 97%
rename from patches/server/0401-Add-permission-for-command-blocks.patch
rename to patches/server/0391-Add-permission-for-command-blocks.patch
index 9f6c638bb1..2e62ea5cb3 100644
--- a/patches/server/0401-Add-permission-for-command-blocks.patch
+++ b/patches/server/0391-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 99784bac05ea0d2ea1e9053466e21c1175fe0a4b..9f3450d6bbd330a2aebd271a086965bf364c9fe4 100644
+index deef24ad28ecf7895aa03bf8dae085814d307ece..6721b086ec4e8efe29b75a0e08dc15015e180c09 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -399,7 +399,7 @@ public class ServerPlayerGameMode {
+@@ -397,7 +397,7 @@ public class ServerPlayerGameMode {
              BlockEntity tileentity = this.level.getBlockEntity(pos);
              Block block = iblockdata.getBlock();
  
diff --git a/patches/server/0402-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0392-Ensure-Entity-position-and-AABB-are-never-invalid.patch
similarity index 91%
rename from patches/server/0402-Ensure-Entity-position-and-AABB-are-never-invalid.patch
rename to patches/server/0392-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index bfb02d5bcf..c1ab7d31b2 100644
--- a/patches/server/0402-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0392-Ensure-Entity-position-and-AABB-are-never-invalid.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d0f46b955041487ce1cec4a9a5ed8808ef4d9e9f..7040b3b9b743b4f88f00da698e37afa42f277990 100644
+index d2526510202c17006f22b148e4a1305714a4effd..a6fc2a67027b749b9f87110aa15b339bdc58a72b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -693,8 +693,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -691,8 +691,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void setPos(double x, double y, double z) {
@@ -20,7 +20,7 @@ index d0f46b955041487ce1cec4a9a5ed8808ef4d9e9f..7040b3b9b743b4f88f00da698e37afa4
      }
  
      protected AABB makeBoundingBox() {
-@@ -4206,7 +4206,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4195,7 +4195,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale);
      }
  
@@ -50,7 +50,7 @@ index d0f46b955041487ce1cec4a9a5ed8808ef4d9e9f..7040b3b9b743b4f88f00da698e37afa4
          // Paper start - rewrite chunk system
          if (this.updatingSectionStatus) {
              LOGGER.error("Refusing to update position for entity " + this + " to position " + new Vec3(x, y, z) + " since it is processing a section status update", new Throwable());
-@@ -4230,6 +4252,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4219,6 +4241,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              this.levelCallback.onMove();
          }
  
diff --git a/patches/server/0403-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0393-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 93%
rename from patches/server/0403-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0393-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index cfa2f0e060..03be76b17b 100644
--- a/patches/server/0403-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0393-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,7 +8,7 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 87966edd7fb8b936c55659257291478c862e2542..74ce2fc0256c1747bb1638eea8947d3416f23ab8 100644
+index b9dbedd118a9287f659d2e785c3a582e817e4e36..e824ac0c487ab42c68cbf1a6f7c24d4b689809c3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -825,7 +825,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -63,7 +63,7 @@ index 997a96a21440ae72696d68f8031ece4ba487d3ef..3d8584929cee000ae7df10c5bd94f358
                  return Component.translatable("commands.difficulty.success", difficulty.getDisplayName());
              }, true);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1d8f8b1910f50e90d60bb2a924d49f3fd3518fd6..b6f87e28625df68548a296001a0d67601513f7d1 100644
+index 249944e48d3e07cc5dd412f58f39a3abdbe446b1..5ecf65315b42cd07dcd69a10c445b1f0576f03c5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -325,7 +325,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -76,10 +76,10 @@ index 1d8f8b1910f50e90d60bb2a924d49f3fd3518fd6..b6f87e28625df68548a296001a0d6760
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b5dcb539548ca35d7c8a076d474a5c679a61c071..6020da902ef3c05d38116c302e3848aa1828e1fa 100644
+index 5c9a6fe2f2d67ff4e27c691ebc97e7a50d62fc22..4ce4a620e07ed30a28716adc4076fc5efbcf9b62 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1209,7 +1209,7 @@ public class ServerPlayer extends Player {
+@@ -1205,7 +1205,7 @@ public class ServerPlayer extends Player {
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
  
                  this.connection.send(new ClientboundRespawnPacket(this.createCommonSpawnInfo(worldserver), (byte) 3));
@@ -102,7 +102,7 @@ index 2502b8145da151a63dc769c4e717d53d651203c3..2f8715e200b9b8ae4c4b70ddd7cdc336
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ad390e137aa1492a4aa807f7cc315fb0cac46e62..c5bb505112f7d8207f4a62cc00111cce2cb09cf0 100644
+index 41935f3b0d4e8b7bc18d308de964db537afe863b..8bc0f2a7a4a5af73a4a0b693b91c6bbbf7c6e2d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -955,8 +955,8 @@ public final class CraftServer implements Server {
@@ -117,10 +117,10 @@ index ad390e137aa1492a4aa807f7cc315fb0cac46e62..c5bb505112f7d8207f4a62cc00111cce
              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 40c9f9a0e1a2b126160428124b3430b56f5a0b83..d5b308cab976c5a4004683592882aa09fe72e345 100644
+index f72409e92cbf00c5665037bf4916ddbd352d66d5..e8b06b5952e5cc63f82d7a0542bf931bd4b45d65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1158,7 +1158,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1111,7 +1111,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setDifficulty(Difficulty difficulty) {
diff --git a/patches/server/0404-Paper-dumpitem-command.patch b/patches/server/0394-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0404-Paper-dumpitem-command.patch
rename to patches/server/0394-Paper-dumpitem-command.patch
diff --git a/patches/server/0405-Improve-Legacy-Component-serialization-size.patch b/patches/server/0395-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0405-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0395-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0406-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0396-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 70%
rename from patches/server/0406-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0396-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 32198f287d..fde0556c31 100644
--- a/patches/server/0406-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0396-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 c5bb505112f7d8207f4a62cc00111cce2cb09cf0..6dde3d479aa1ae50c6404419ec5da52f0b68a11e 100644
+index 8bc0f2a7a4a5af73a4a0b693b91c6bbbf7c6e2d1..8b5fb5e5719ea1453751ef8f7bd97bca1af64ae8 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 c5bb505112f7d8207f4a62cc00111cce2cb09cf0..6dde3d479aa1ae50c6404419ec5da52f
          this.printSaveWarning = false;
          this.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 d5b308cab976c5a4004683592882aa09fe72e345..b91205b8459cfc78fce4b98e04ae4517eef22e20 100644
+index e8b06b5952e5cc63f82d7a0542bf931bd4b45d65..f248735d48aa5c430752426e9dc02c1ae6644aaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -282,7 +282,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -75,7 +75,7 @@ index d5b308cab976c5a4004683592882aa09fe72e345..b91205b8459cfc78fce4b98e04ae4517
      @Override
      public Chunk getChunkAt(Block block) {
          Preconditions.checkArgument(block != null, "null block");
-@@ -361,7 +373,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -347,7 +359,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public boolean unloadChunkRequest(int x, int z) {
          org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
          if (this.isChunkLoaded(x, z)) {
@@ -84,39 +84,16 @@ index d5b308cab976c5a4004683592882aa09fe72e345..b91205b8459cfc78fce4b98e04ae4517
          }
  
          return true;
-@@ -447,9 +459,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);
-+        ChunkAccess immediate = world.getChunkSource().getChunkAtIfLoadedImmediately(x, z); // Paper
-+        if (immediate != null) return true; // Paper
- 
-         if (!generate) {
--            ChunkAccess immediate = world.getChunkSource().getChunkAtImmediately(x, z);
-+
-+            //IChunkAccess immediate = world.getChunkProvider().getChunkAtImmediately(x, z); // Paper
-             if (immediate == null) {
-                 immediate = world.getChunkSource().chunkMap.getUnloadingChunk(x, z);
-             }
-@@ -457,7 +472,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
-                 }
--                world.getChunkSource().addRegionTicket(TicketType.PLUGIN, chunkPos, 1, Unit.INSTANCE);
-+                world.getChunkSource().addRegionTicket(TicketType.PLUGIN, chunkPos, 0, Unit.INSTANCE); // Paper
-                 world.getChunk(x, z); // make sure we're at ticket level 32 or lower
-                 return true;
-             }
-@@ -483,7 +498,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-             // we do this so we do not re-read the chunk data on disk
+@@ -435,7 +447,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          }
  
--        world.getChunkSource().addRegionTicket(TicketType.PLUGIN, chunkPos, 1, Unit.INSTANCE);
-+        world.getChunkSource().addRegionTicket(TicketType.PLUGIN, chunkPos, 0, Unit.INSTANCE); // Paper
-         world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
-         return true;
-         // Paper end - Optimize this method
-@@ -2260,6 +2275,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+         if (chunk instanceof net.minecraft.world.level.chunk.LevelChunk) {
+-            this.world.getChunkSource().addRegionTicket(TicketType.PLUGIN, new ChunkPos(x, z), 1, Unit.INSTANCE);
++            this.world.getChunkSource().addRegionTicket(TicketType.PLUGIN, new ChunkPos(x, z), 0, Unit.INSTANCE); // Paper
+             return true;
+         }
+ 
+@@ -2213,6 +2225,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/0407-incremental-chunk-and-player-saving.patch b/patches/server/0397-incremental-chunk-and-player-saving.patch
similarity index 95%
rename from patches/server/0407-incremental-chunk-and-player-saving.patch
rename to patches/server/0397-incremental-chunk-and-player-saving.patch
index 44ffbfc04c..6c1f9994f6 100644
--- a/patches/server/0407-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0397-incremental-chunk-and-player-saving.patch
@@ -56,7 +56,7 @@ index e824ac0c487ab42c68cbf1a6f7c24d4b689809c3..7d265471685e34b434ab25bee14854f6
          // Paper start - move executeAll() into full server tick timing
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index a2220291f6d0726019187c2fc93bca801a3f0610..25009accd401fc3860c57cac1ef628b233e746e7 100644
+index 5bea335653d3cd45354dc67b160a6bf5ce907f41..35f463e5237d12e42f7a8b8c177af3236d2e7986 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -450,6 +450,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -76,10 +76,10 @@ index a2220291f6d0726019187c2fc93bca801a3f0610..25009accd401fc3860c57cac1ef628b2
      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 97a04d12acbf0d6eb8f9f4ecc45085570f74a0f5..9f9bb129b7450a9862293e83fefe0acb8986235d 100644
+index 5f384b764aa361d9cd575b9910afea789cb054bc..dcc411b3c7d5e5a675c8e21adef25e821ffd7cdd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1301,6 +1301,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1283,6 +1283,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
      }
  
@@ -118,7 +118,7 @@ index 97a04d12acbf0d6eb8f9f4ecc45085570f74a0f5..9f9bb129b7450a9862293e83fefe0acb
          // Paper start - rewrite chunk system - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6020da902ef3c05d38116c302e3848aa1828e1fa..553cdac6fef1626d0eac86ca971fcf65a17839f8 100644
+index 4ce4a620e07ed30a28716adc4076fc5efbcf9b62..897fa2857f070a976cc95695d7009f663a6bc89d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -190,6 +190,7 @@ import org.bukkit.inventory.MainHand;
diff --git a/patches/server/0408-Support-old-UUID-format-for-NBT.patch b/patches/server/0398-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0408-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0398-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0409-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0399-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0409-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0399-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0410-Support-components-in-ItemMeta.patch b/patches/server/0400-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0410-Support-components-in-ItemMeta.patch
rename to patches/server/0400-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0411-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0401-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0411-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0401-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0412-Add-entity-liquid-API.patch b/patches/server/0402-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0412-Add-entity-liquid-API.patch
rename to patches/server/0402-Add-entity-liquid-API.patch
diff --git a/patches/server/0413-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0403-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0413-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0403-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0414-Add-PrepareResultEvent.patch b/patches/server/0404-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0414-Add-PrepareResultEvent.patch
rename to patches/server/0404-Add-PrepareResultEvent.patch
diff --git a/patches/server/0415-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0405-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 91%
rename from patches/server/0415-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0405-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index a2dfcd3223..d46fd307e0 100644
--- a/patches/server/0415-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0405-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6114cc60d8cb122b708ae65db86bfd1ea2ea82c1..b691d188c741c8acf8d20bc9e6184b6445ba6332 100644
+index b7bf58ddbc02989777c5c8dd58f6dd34acf57507..115dbe71ff1e9996e8307a389569303a320101f4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3510,7 +3510,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0416-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0406-Fix-arrows-never-despawning-MC-125757.patch
similarity index 91%
rename from patches/server/0416-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0406-Fix-arrows-never-despawning-MC-125757.patch
index abed4b5fa6..f18ca77619 100644
--- a/patches/server/0416-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0406-Fix-arrows-never-despawning-MC-125757.patch
@@ -9,7 +9,7 @@ instead of getting stuck in a never despawn state (bubble columns,
 etc).
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 385cbee1d30735152cccb0d85a77a12fabfd9427..004c130fc03dc01ef75fabdb4ef1ef711e33cb95 100644
+index f3861cea4eb6a39fa16936383f8dabc6689a58a9..0e1d4bd6f70e439b33eca57bf06e9e090825f58a 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -207,6 +207,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0417-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0407-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0417-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0407-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0418-Fix-SPIGOT-5989.patch b/patches/server/0408-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0418-Fix-SPIGOT-5989.patch
rename to patches/server/0408-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0419-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0409-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0419-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0409-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0420-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0410-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0420-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0410-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0421-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0411-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0421-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0411-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0422-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0412-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0422-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0412-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0423-Fix-some-rails-connecting-improperly.patch b/patches/server/0413-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0423-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0413-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0424-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0414-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0424-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0414-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0425-Brand-support.patch b/patches/server/0415-Brand-support.patch
similarity index 95%
rename from patches/server/0425-Brand-support.patch
rename to patches/server/0415-Brand-support.patch
index f087858722..687d90e2ef 100644
--- a/patches/server/0425-Brand-support.patch
+++ b/patches/server/0415-Brand-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 553cdac6fef1626d0eac86ca971fcf65a17839f8..2834161f763a556400f0c8acdcc7e88c4317d318 100644
+index 897fa2857f070a976cc95695d7009f663a6bc89d..27f1d336b2493bf475a388f63cce8d99408acea3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
+@@ -274,6 +274,7 @@ public class ServerPlayer extends Player {
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
@@ -57,7 +57,7 @@ index e69043316372d98b122ed3788fda79cdd36849e8..6597e6e9987ddb5906909c22704fdfb6
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e05d22471a80f5afba4634116aff9dcf636f2501..878744936f1d2c7bc3ad13bf29d422cc31d0f8d4 100644
+index 4de49a81238ca3d550f85fdcdf921c17f992f65a..ac908edaad2e58e4813f236e938e9d305f93dbe6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3030,6 +3030,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0426-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0416-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0426-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0416-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0427-Don-t-require-FACING-data.patch b/patches/server/0417-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0427-Don-t-require-FACING-data.patch
rename to patches/server/0417-Don-t-require-FACING-data.patch
diff --git a/patches/server/0428-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0418-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 91%
rename from patches/server/0428-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0418-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index a657c722fc..076d1e6550 100644
--- a/patches/server/0428-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0418-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,10 +5,10 @@ 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 9f9bb129b7450a9862293e83fefe0acb8986235d..10ccdfa28d5b9da5c380f7417a6bc800f642e390 100644
+index dcc411b3c7d5e5a675c8e21adef25e821ffd7cdd..b455472d258ce59252cb4f93cbef73d3c2da342e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2014,9 +2014,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1996,9 +1996,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public void setDefaultSpawnPos(BlockPos pos, float angle) {
          // Paper start - Configurable Keep Spawn Loaded range per world
          BlockPos prevSpawn = this.getSharedSpawnPos();
@@ -21,7 +21,7 @@ index 9f9bb129b7450a9862293e83fefe0acb8986235d..10ccdfa28d5b9da5c380f7417a6bc800
              // 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 b91205b8459cfc78fce4b98e04ae4517eef22e20..705c1b2bba2b60b260c59a6953151f34cdfc8960 100644
+index f248735d48aa5c430752426e9dc02c1ae6644aaf..f0f6f2b5f474881c865f1a2098611cd395249530 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -262,12 +262,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0429-Add-moon-phase-API.patch b/patches/server/0419-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0429-Add-moon-phase-API.patch
rename to patches/server/0419-Add-moon-phase-API.patch
diff --git a/patches/server/0430-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0420-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 95%
rename from patches/server/0430-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0420-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 0d84c00975..ba7f1213ae 100644
--- a/patches/server/0430-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0420-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 0341d9e951366b77e7eeac7cdaa950af62c88aab..0ef8ecc7932107029d85e961e2e747d7312d816e 100644
+index 7862caa0f787634cec14af81fe1f39803a43f115..1650541abeedce04ddeddfed15411b64a01be452 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/0431-Prevent-headless-pistons-from-being-created.patch b/patches/server/0421-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0431-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0421-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0432-Add-BellRingEvent.patch b/patches/server/0422-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0432-Add-BellRingEvent.patch
rename to patches/server/0422-Add-BellRingEvent.patch
diff --git a/patches/server/0433-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0423-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0433-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0423-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0434-Buffer-joins-to-world.patch b/patches/server/0424-Buffer-joins-to-world.patch
similarity index 91%
rename from patches/server/0434-Buffer-joins-to-world.patch
rename to patches/server/0424-Buffer-joins-to-world.patch
index a8b0b7d087..04aef85833 100644
--- a/patches/server/0434-Buffer-joins-to-world.patch
+++ b/patches/server/0424-Buffer-joins-to-world.patch
@@ -8,12 +8,12 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 6cfb814ecaf12161ec2e2545560453d7dd41e2da..a25090d277f586c932e975068636ccd6cc43b204 100644
+index dc9f8625e15c49ea64d2b7d9515d36d5ef834820..777681a58417684a35a875c869ab22e50bb27da5 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -498,14 +498,29 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -415,14 +415,29 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+         }
      }
-     // Paper end - Optimize network
  
 +    private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper - Buffer joins to world
 +    private static int joinAttemptsThisTick; // Paper - Buffer joins to world
diff --git a/patches/server/0435-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0425-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 97%
rename from patches/server/0435-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0425-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 7976f5c39f..57e0372840 100644
--- a/patches/server/0435-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0425-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix hex colors not working in some kick messages
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 21aafb1ea51769659462d722aa318460b37cbc1c..228359f13511262a0e4afeb9deff982ca0f46d9a 100644
+index 08a7461a92ae84cac69e4bb57a099d1f35ff1c1a..9b611fc277baf99a5d24b30a11f0efa77b22693f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -77,14 +77,16 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0436-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0426-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0436-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0426-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0437-Add-more-Evoker-API.patch b/patches/server/0427-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0437-Add-more-Evoker-API.patch
rename to patches/server/0427-Add-more-Evoker-API.patch
diff --git a/patches/server/0438-Add-methods-to-get-translation-keys.patch b/patches/server/0428-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0438-Add-methods-to-get-translation-keys.patch
rename to patches/server/0428-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0439-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0429-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0439-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0429-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0440-Cache-block-data-strings.patch b/patches/server/0430-Cache-block-data-strings.patch
similarity index 97%
rename from patches/server/0440-Cache-block-data-strings.patch
rename to patches/server/0430-Cache-block-data-strings.patch
index 06f4d481f4..8c01b2ce07 100644
--- a/patches/server/0440-Cache-block-data-strings.patch
+++ b/patches/server/0430-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index efb5a5b31ada326593b3bea0f49c05591db18801..903d43aaa84fa20f1ca8a3e1dbf97c91584c8891 100644
+index 7d265471685e34b434ab25bee14854f6f261837b..80b67f8e1a44db078a0ca7382a6c774529ac6976 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2071,6 +2071,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0441-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0431-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 97%
rename from patches/server/0441-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0431-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 40c9cdc166..333021cbc4 100644
--- a/patches/server/0441-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0431-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index 2f8715e200b9b8ae4c4b70ddd7cdc3368a109939..fba468f0a15dca041acf00e386548505
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7040b3b9b743b4f88f00da698e37afa42f277990..945d702f5fd204b2197d445e74bb941e814c09f8 100644
+index a6fc2a67027b749b9f87110aa15b339bdc58a72b..ac2380e43639f661358b63eef77cbc7b408a0180 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -161,6 +161,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -42,7 +42,7 @@ index 7040b3b9b743b4f88f00da698e37afa42f277990..945d702f5fd204b2197d445e74bb941e
      static boolean isLevelAtLeast(CompoundTag tag, int level) {
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
-@@ -1836,6 +1837,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1825,6 +1826,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void moveTo(double x, double y, double z, float yaw, float pitch) {
diff --git a/patches/server/0442-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0432-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0442-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0432-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0443-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0433-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0443-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0433-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0444-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0434-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 89%
rename from patches/server/0444-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0434-Extend-block-drop-capture-to-capture-all-items-added.patch
index a93c2fdcbb..4f59e89ef2 100644
--- a/patches/server/0444-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0434-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,10 +6,10 @@ 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 10ccdfa28d5b9da5c380f7417a6bc800f642e390..c6d8dd26f3e9a1aab95c6b394d5f856990b564f1 100644
+index b455472d258ce59252cb4f93cbef73d3c2da342e..611f06d58708a06e1b8ac4f9d4c7a715f177e31f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1512,6 +1512,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1494,6 +1494,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
@@ -23,10 +23,10 @@ index 10ccdfa28d5b9da5c380f7417a6bc800f642e390..c6d8dd26f3e9a1aab95c6b394d5f8569
              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 9f3450d6bbd330a2aebd271a086965bf364c9fe4..a157ccbedb94f287c610975d6c3cfb66a3bddbe8 100644
+index 6721b086ec4e8efe29b75a0e08dc15015e180c09..f66ce9ae705b0fbe17a1bb437bad6808ff47ed92 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -431,10 +431,12 @@ public class ServerPlayerGameMode {
+@@ -429,10 +429,12 @@ public class ServerPlayerGameMode {
                      // return true; // CraftBukkit
                  }
                  // CraftBukkit start
diff --git a/patches/server/0445-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0435-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 90%
rename from patches/server/0445-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0435-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 6bc5b0b8cc..109726f867 100644
--- a/patches/server/0445-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0435-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 945d702f5fd204b2197d445e74bb941e814c09f8..d26516fd10ec60bc8e27490df8e1f70aa0976d5c 100644
+index ac2380e43639f661358b63eef77cbc7b408a0180..b5fc9879a17b681b1801be96f1e57ea2b56870a9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4473,4 +4473,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4462,4 +4462,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
          void accept(Entity entity, double x, double y, double z);
      }
diff --git a/patches/server/0446-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0436-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0446-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0436-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0447-Entity-isTicking.patch b/patches/server/0437-Entity-isTicking.patch
similarity index 90%
rename from patches/server/0447-Entity-isTicking.patch
rename to patches/server/0437-Entity-isTicking.patch
index 1ee10cfb02..24f73822f5 100644
--- a/patches/server/0447-Entity-isTicking.patch
+++ b/patches/server/0437-Entity-isTicking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d26516fd10ec60bc8e27490df8e1f70aa0976d5c..49bea2b71d4fd3f2e38eabd1ebb57dd66d9abe0b 100644
+index b5fc9879a17b681b1801be96f1e57ea2b56870a9..fcb928696e676fe0749b1bc4b1aa433985767f5b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4478,5 +4478,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4467,5 +4467,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public static int nextEntityId() {
          return ENTITY_COUNTER.incrementAndGet();
      }
diff --git a/patches/server/0448-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0438-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 94%
rename from patches/server/0448-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0438-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 4a158e1ee2..3518de4cf1 100644
--- a/patches/server/0448-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0438-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 903d43aaa84fa20f1ca8a3e1dbf97c91584c8891..abee10fbb354e22f6c41b04d9f281ffeafdc4498 100644
+index 80b67f8e1a44db078a0ca7382a6c774529ac6976..589feabf9ad471462aa7fb46f179b5de9455ff65 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2154,13 +2154,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0449-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0439-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0449-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0439-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0450-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0440-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0450-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0440-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0451-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0441-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0451-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0441-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0452-Optimise-getType-calls.patch b/patches/server/0442-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0452-Optimise-getType-calls.patch
rename to patches/server/0442-Optimise-getType-calls.patch
diff --git a/patches/server/0453-Villager-resetOffers.patch b/patches/server/0443-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0453-Villager-resetOffers.patch
rename to patches/server/0443-Villager-resetOffers.patch
diff --git a/patches/server/0454-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0444-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 91%
rename from patches/server/0454-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0444-Retain-block-place-order-when-capturing-blockstates.patch
index 91b1830d17..9be9efef85 100644
--- a/patches/server/0454-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0444-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 f8246abc1bf9be51e93d645e03b9223326e919f9..b0c61b274c24e2ced86a6acc0ea007a80e61fd3e 100644
+index e51f4df5b6fcd28e681a77a1aa3a9eeb0c463e1a..27de84c6f58476ebf5357c03922e7399c02718b9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -159,7 +159,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -21,4 +21,4 @@ index f8246abc1bf9be51e93d645e03b9223326e919f9..b0c61b274c24e2ced86a6acc0ea007a8
 +    public Map<BlockPos, BlockEntity> capturedTileEntities = new java.util.LinkedHashMap<>(); // Paper - Retain block place order when capturing blockstates
      public List<ItemEntity> captureDrops;
      public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<SpawnCategory> ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();
-     // Paper start
+     public boolean populating;
diff --git a/patches/server/0455-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0445-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 94%
rename from patches/server/0455-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0445-Reduce-blockpos-allocation-from-pathfinding.patch
index eae9a412e2..8d14eb1a05 100644
--- a/patches/server/0455-Reduce-blockpos-allocation-from-pathfinding.patch
+++ b/patches/server/0445-Reduce-blockpos-allocation-from-pathfinding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce blockpos allocation from pathfinding
 
 
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
-index 8e90b284fb576738b834626bb52c9962ccbc5ad2..1e96bac6f22b1fddd22fc239126ff2f823c2abd0 100644
+index dbb6a7d950b1a6f58a845b4d399ead6eb6d4fe14..70c7c735fdd0c1b66243915622e47eab8a57e7cc 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java
 @@ -479,7 +479,7 @@ public class WalkNodeEvaluator extends NodeEvaluator {
diff --git a/patches/server/0456-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0446-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0456-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0446-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0457-Fix-bell-block-entity-memory-leak.patch b/patches/server/0447-Fix-bell-block-entity-memory-leak.patch
similarity index 100%
rename from patches/server/0457-Fix-bell-block-entity-memory-leak.patch
rename to patches/server/0447-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0458-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0448-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0458-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0448-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0459-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0449-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0459-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0449-Add-getOfflinePlayerIfCached-String.patch
index 32d7d4f546..96f1ef8cc8 100644
--- a/patches/server/0459-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0449-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 6dde3d479aa1ae50c6404419ec5da52f0b68a11e..4b787a548a21512f8fe44a32568181ed18a38157 100644
+index 8b5fb5e5719ea1453751ef8f7bd97bca1af64ae8..2685722282f0b90bdcf65ba6675998b31f491b31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1909,6 +1909,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0460-Add-ignore-discounts-API.patch b/patches/server/0450-Add-ignore-discounts-API.patch
similarity index 97%
rename from patches/server/0460-Add-ignore-discounts-API.patch
rename to patches/server/0450-Add-ignore-discounts-API.patch
index 60e260aea0..2cf4261e19 100644
--- a/patches/server/0460-Add-ignore-discounts-API.patch
+++ b/patches/server/0450-Add-ignore-discounts-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ignore discounts API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 7956c1ec7bf6b9fe224ec14bb695c0b8ca9dcf2d..fb5d4b1a86d00fce9482ed4fd4ae71fdcdb63781 100644
+index bfd156acbae31619234fffb1804726090802fbae..3653193effdecd969b5ac159b6d5ce633451d706 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -508,6 +508,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -490,6 +490,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
              while (iterator.hasNext()) {
                  MerchantOffer merchantrecipe = (MerchantOffer) iterator.next();
@@ -16,7 +16,7 @@ index 7956c1ec7bf6b9fe224ec14bb695c0b8ca9dcf2d..fb5d4b1a86d00fce9482ed4fd4ae71fd
  
                  merchantrecipe.addToSpecialPriceDiff(-Mth.floor((float) i * merchantrecipe.getPriceMultiplier()));
              }
-@@ -520,6 +521,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -502,6 +503,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
              while (iterator1.hasNext()) {
                  MerchantOffer merchantrecipe1 = (MerchantOffer) iterator1.next();
diff --git a/patches/server/0461-Toggle-for-removing-existing-dragon.patch b/patches/server/0451-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0461-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0451-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0462-Fix-client-lag-on-advancement-loading.patch b/patches/server/0452-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0462-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0452-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0463-Item-no-age-no-player-pickup.patch b/patches/server/0453-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0463-Item-no-age-no-player-pickup.patch
rename to patches/server/0453-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0464-Beacon-API-custom-effect-ranges.patch b/patches/server/0454-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0464-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0454-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0465-Add-API-for-quit-reason.patch b/patches/server/0455-Add-API-for-quit-reason.patch
similarity index 94%
rename from patches/server/0465-Add-API-for-quit-reason.patch
rename to patches/server/0455-Add-API-for-quit-reason.patch
index 2b59c7f32f..e610f51c4e 100644
--- a/patches/server/0465-Add-API-for-quit-reason.patch
+++ b/patches/server/0455-Add-API-for-quit-reason.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index a25090d277f586c932e975068636ccd6cc43b204..dd7deb9175059857c59c85c745053cc88a922d3b 100644
+index 777681a58417684a35a875c869ab22e50bb27da5..1e495daf53a53260e1a3b1c86365edb9abad1e80 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -183,12 +183,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -179,12 +179,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
              this.handlingFault = true;
              if (this.channel.isOpen()) {
@@ -25,10 +25,10 @@ index a25090d277f586c932e975068636ccd6cc43b204..dd7deb9175059857c59c85c745053cc8
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2834161f763a556400f0c8acdcc7e88c4317d318..cf3c2229347f8a8ca860e8b1fbf9226c497df479 100644
+index 27f1d336b2493bf475a388f63cce8d99408acea3..d5b5ad2f91d440ae0a1e61accab60122335591d4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
+@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
      public @Nullable String clientBrandName = null; // Paper - Brand support
diff --git a/patches/server/0466-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0456-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0466-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0456-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0467-Expose-world-spawn-angle.patch b/patches/server/0457-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0467-Expose-world-spawn-angle.patch
rename to patches/server/0457-Expose-world-spawn-angle.patch
diff --git a/patches/server/0468-Add-Destroy-Speed-API.patch b/patches/server/0458-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0468-Add-Destroy-Speed-API.patch
rename to patches/server/0458-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0469-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0459-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 93%
rename from patches/server/0469-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0459-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index af3c8f43f2..16a21f556b 100644
--- a/patches/server/0469-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0459-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 878744936f1d2c7bc3ad13bf29d422cc31d0f8d4..bbe18e0342ad68c844f095d3b6413929adc18ab5 100644
+index ac908edaad2e58e4813f236e938e9d305f93dbe6..7d5733f6c45c0521b1d1a37d6dfc3b0a7aad1662 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2593,7 +2593,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0470-Add-LivingEntity-clearActiveItem.patch b/patches/server/0460-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0470-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0460-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0471-Add-PlayerItemCooldownEvent.patch b/patches/server/0461-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0471-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0461-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0472-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0462-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0472-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0462-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0473-More-lightning-API.patch b/patches/server/0463-More-lightning-API.patch
similarity index 100%
rename from patches/server/0473-More-lightning-API.patch
rename to patches/server/0463-More-lightning-API.patch
diff --git a/patches/server/0474-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0464-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 97%
rename from patches/server/0474-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0464-Climbing-should-not-bypass-cramming-gamerule.patch
index f0a4f03864..f0adf634a9 100644
--- a/patches/server/0474-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0464-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 49bea2b71d4fd3f2e38eabd1ebb57dd66d9abe0b..5baa6503b9d0e4f854c2546d0bbdd527c9f63cca 100644
+index fcb928696e676fe0749b1bc4b1aa433985767f5b..a1cf6f17313f4f861f3c5c6ebcaafc85d9102b55 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2029,6 +2029,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2018,6 +2018,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public boolean isPushable() {
@@ -44,7 +44,7 @@ index c9c7833755af3c7bef1d40f2ca425cbec59efa68..75cdddbfbbc4c0c521194dde27ba5f5d
              } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b691d188c741c8acf8d20bc9e6184b6445ba6332..cf57c977d64a76d29a4f9a4811d55a17cc51e368 100644
+index 115dbe71ff1e9996e8307a389569303a320101f4..95ee76c0e96318866a7b21355c9617c2ca79776e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3426,7 +3426,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0475-Add-missing-default-perms-for-commands.patch b/patches/server/0465-Add-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0475-Add-missing-default-perms-for-commands.patch
rename to patches/server/0465-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0476-Add-PlayerShearBlockEvent.patch b/patches/server/0466-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0476-Add-PlayerShearBlockEvent.patch
rename to patches/server/0466-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0477-Limit-recipe-packets.patch b/patches/server/0467-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0477-Limit-recipe-packets.patch
rename to patches/server/0467-Limit-recipe-packets.patch
diff --git a/patches/server/0478-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0468-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0478-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0468-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0479-Player-Chunk-Load-Unload-Events.patch b/patches/server/0469-Player-Chunk-Load-Unload-Events.patch
similarity index 78%
rename from patches/server/0479-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0469-Player-Chunk-Load-Unload-Events.patch
index 213aeca6b7..ed886a05a1 100644
--- a/patches/server/0479-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0469-Player-Chunk-Load-Unload-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
-index 19b3f4fa7678a038bf25efc2a8b46ddad0193fde..fb1863d235a61ec977e8ad87a289d935a9c5d0e4 100644
+index 5de5209e04d631bd6a50e28e8d3abebf148252c1..43e3c99eafaed42161664e31827dfd0abb127ad2 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
 @@ -46,6 +46,11 @@ public class PlayerChunkSender {
@@ -20,10 +20,10 @@ index 19b3f4fa7678a038bf25efc2a8b46ddad0193fde..fb1863d235a61ec977e8ad87a289d935
      }
      // Paper end - rewrite player chunk loader
  
-@@ -89,6 +94,11 @@ public class PlayerChunkSender {
-         final boolean shouldModify = world.chunkPacketBlockController.shouldModify(handler.player, chunk);
-         handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null, shouldModify));
-         // Paper end - Anti-Xray
+@@ -86,6 +91,11 @@ public class PlayerChunkSender {
+     public static void sendChunk(ServerGamePacketListenerImpl handler, ServerLevel world, LevelChunk chunk) { // Paper - rewrite chunk loader - public
+         handler.player.serverLevel().chunkSource.chunkMap.getVisibleChunkIfPresent(chunk.getPos().toLong()).addPlayer(handler.player);
+         handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null));
 +        // Paper start - PlayerChunkLoadEvent
 +        if (io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0) {
 +            new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), handler.getPlayer().getBukkitEntity()).callEvent();
diff --git a/patches/server/0480-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0470-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0480-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0470-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0481-Expose-LivingEntity-hurt-direction.patch b/patches/server/0471-Expose-LivingEntity-hurt-direction.patch
similarity index 96%
rename from patches/server/0481-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0471-Expose-LivingEntity-hurt-direction.patch
index 29f45c6f9c..3e8d4f12e0 100644
--- a/patches/server/0481-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0471-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2a7d62305d16074de4eeb84d8870a089cf8641ac..1f5f27bea4afdab99bb41f87288f66b29d7c5264 100644
+index 808a784a312438433fba0e65cbfd1afbad19fe86..b4d1caa4c853ce4b88d53fb6f69ad437d3dcb381 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -178,7 +178,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0482-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0472-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0482-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0472-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0483-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0473-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
similarity index 100%
rename from patches/server/0483-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
rename to patches/server/0473-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0484-Add-TargetHitEvent.patch b/patches/server/0474-Add-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0484-Add-TargetHitEvent.patch
rename to patches/server/0474-Add-TargetHitEvent.patch
diff --git a/patches/server/0485-MC-4-Fix-item-position-desync.patch b/patches/server/0475-MC-4-Fix-item-position-desync.patch
similarity index 93%
rename from patches/server/0485-MC-4-Fix-item-position-desync.patch
rename to patches/server/0475-MC-4-Fix-item-position-desync.patch
index d81d8f0fb9..e1d5b5d4e8 100644
--- a/patches/server/0485-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0475-MC-4-Fix-item-position-desync.patch
@@ -28,10 +28,10 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..3c4ac79c094dc2fff7de94150a34b7bf
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5baa6503b9d0e4f854c2546d0bbdd527c9f63cca..0b7ac3f3115a6e83fe5f2bee8a372ad01dd91fb3 100644
+index a1cf6f17313f4f861f3c5c6ebcaafc85d9102b55..3877544229bc8a4e6e475060c4edca17c64ff739 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4249,6 +4249,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4238,6 +4238,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              return;
          }
          // Paper end - rewrite chunk system
diff --git a/patches/server/0486-Additional-Block-Material-API.patch b/patches/server/0476-Additional-Block-Material-API.patch
similarity index 100%
rename from patches/server/0486-Additional-Block-Material-API.patch
rename to patches/server/0476-Additional-Block-Material-API.patch
diff --git a/patches/server/0487-Fix-harming-potion-dupe.patch b/patches/server/0477-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0487-Fix-harming-potion-dupe.patch
rename to patches/server/0477-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0488-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0478-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/server/0488-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/server/0478-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0489-Cache-burn-durations.patch b/patches/server/0479-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0489-Cache-burn-durations.patch
rename to patches/server/0479-Cache-burn-durations.patch
diff --git a/patches/server/0490-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0480-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0490-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0480-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0491-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0481-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 94%
rename from patches/server/0491-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0481-Fix-Not-a-string-Map-Conversion-spam.patch
index 38593b84f5..e434023f48 100644
--- a/patches/server/0491-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0481-Fix-Not-a-string-Map-Conversion-spam.patch
@@ -12,7 +12,7 @@ requesting the world.
 Track spigot issue to see when fixed: https://hub.spigotmc.org/jira/browse/SPIGOT-6181
 
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index e1623ade449fe56ec51955ee9594a93f85660c51..5992f450f01349ce49286c34b8af56737de01a45 100644
+index 8f144a357174bbe096ac9b38a5e67a61127d7b87..0ca0808c5eeeba969c048b422af37a273217ff52 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -15,6 +15,8 @@ import net.minecraft.core.BlockPos;
@@ -24,7 +24,7 @@ index e1623ade449fe56ec51955ee9594a93f85660c51..5992f450f01349ce49286c34b8af5673
  import net.minecraft.nbt.Tag;
  import net.minecraft.network.chat.Component;
  import net.minecraft.network.protocol.Packet;
-@@ -110,7 +112,26 @@ public class MapItemSavedData extends SavedData {
+@@ -108,7 +110,26 @@ public class MapItemSavedData extends SavedData {
      }
  
      public static MapItemSavedData load(CompoundTag nbt) {
diff --git a/patches/server/0492-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0482-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0492-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0482-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0493-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0483-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0493-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0483-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0494-Zombie-API-breaking-doors.patch b/patches/server/0484-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0494-Zombie-API-breaking-doors.patch
rename to patches/server/0484-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0495-Fix-nerfed-slime-when-splitting.patch b/patches/server/0485-Fix-nerfed-slime-when-splitting.patch
similarity index 90%
rename from patches/server/0495-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0485-Fix-nerfed-slime-when-splitting.patch
index 400295b015..d6cfcc1ead 100644
--- a/patches/server/0495-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0485-Fix-nerfed-slime-when-splitting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix nerfed slime when splitting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index ca3bf718336ef02d379c0ec670f62fafb1600153..3752ff83c91be55e8a5e7c81b75409d64a8aafde 100644
+index 168b422ac9f3f98630c4d05b64a9f0470b20fe61..2977e5986958cbee987893dd9de1dfb3764b291d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -243,6 +243,7 @@ public class Slime extends Mob implements Enemy {
diff --git a/patches/server/0496-Add-EntityLoadCrossbowEvent.patch b/patches/server/0486-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0496-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0486-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0497-Add-WorldGameRuleChangeEvent.patch b/patches/server/0487-Add-WorldGameRuleChangeEvent.patch
similarity index 96%
rename from patches/server/0497-Add-WorldGameRuleChangeEvent.patch
rename to patches/server/0487-Add-WorldGameRuleChangeEvent.patch
index 449e76ade1..b4fe45d7a8 100644
--- a/patches/server/0497-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0487-Add-WorldGameRuleChangeEvent.patch
@@ -64,10 +64,10 @@ index 334001cb749600c973c82391e1c11f0e40bd2dfb..f3cdf1fa7731eb7bb1cb89aa6a37204d
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 705c1b2bba2b60b260c59a6953151f34cdfc8960..e092afa65bc6d14c53a09175b0a8cd9ad50a7477 100644
+index f0f6f2b5f474881c865f1a2098611cd395249530..9ca85c53236528460441d2da7f2935438c6b0078 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1930,8 +1930,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1880,8 +1880,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule)) return false;
  
@@ -82,7 +82,7 @@ index 705c1b2bba2b60b260c59a6953151f34cdfc8960..e092afa65bc6d14c53a09175b0a8cd9a
          handle.onChanged(this.getHandle().getServer());
          return true;
      }
-@@ -1967,8 +1972,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1917,8 +1922,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule.getName())) return false;
  
diff --git a/patches/server/0498-Add-ServerResourcesReloadedEvent.patch b/patches/server/0488-Add-ServerResourcesReloadedEvent.patch
similarity index 97%
rename from patches/server/0498-Add-ServerResourcesReloadedEvent.patch
rename to patches/server/0488-Add-ServerResourcesReloadedEvent.patch
index 8e5036524f..d18bedb2dc 100644
--- a/patches/server/0498-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0488-Add-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index abee10fbb354e22f6c41b04d9f281ffeafdc4498..6268b8ffe365c45406df7f40fcbc0567cc5d1db4 100644
+index 589feabf9ad471462aa7fb46f179b5de9455ff65..1aa73c3934c754fb9a4e09e8ac9c7f96d608ceb5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2039,7 +2039,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0499-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0489-Add-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0499-Add-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0489-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0500-Add-BlockFailedDispenseEvent.patch b/patches/server/0490-Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0500-Add-BlockFailedDispenseEvent.patch
rename to patches/server/0490-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0501-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0491-Add-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0501-Add-PlayerLecternPageChangeEvent.patch
rename to patches/server/0491-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0502-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0492-Add-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0502-Add-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0492-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0503-Configurable-door-breaking-difficulty.patch b/patches/server/0493-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0503-Configurable-door-breaking-difficulty.patch
rename to patches/server/0493-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0504-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0494-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0504-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0494-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0505-Remove-stale-POIs.patch b/patches/server/0495-Remove-stale-POIs.patch
similarity index 87%
rename from patches/server/0505-Remove-stale-POIs.patch
rename to patches/server/0495-Remove-stale-POIs.patch
index bb01f0fa84..b42cc0ac45 100644
--- a/patches/server/0505-Remove-stale-POIs.patch
+++ b/patches/server/0495-Remove-stale-POIs.patch
@@ -5,10 +5,10 @@ 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 c6d8dd26f3e9a1aab95c6b394d5f856990b564f1..30a71abd6dab3967d7206583ece6c496f5ff61df 100644
+index 611f06d58708a06e1b8ac4f9d4c7a715f177e31f..5020d671c7bbaf4277c300f3688c770b6a565129 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2083,6 +2083,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2065,6 +2065,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              });
              optional1.ifPresent((holder) -> {
                  this.getServer().execute(() -> {
diff --git a/patches/server/0506-Fix-villager-boat-exploit.patch b/patches/server/0496-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0506-Fix-villager-boat-exploit.patch
rename to patches/server/0496-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0507-Add-sendOpLevel-API.patch b/patches/server/0497-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0507-Add-sendOpLevel-API.patch
rename to patches/server/0497-Add-sendOpLevel-API.patch
diff --git a/patches/server/0508-TODO-Registry-Modification-API.patch b/patches/server/0498-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0508-TODO-Registry-Modification-API.patch
rename to patches/server/0498-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0509-Add-StructuresLocateEvent.patch b/patches/server/0499-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0509-Add-StructuresLocateEvent.patch
rename to patches/server/0499-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0510-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0500-Collision-option-for-requiring-a-player-participant.patch
similarity index 95%
rename from patches/server/0510-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0500-Collision-option-for-requiring-a-player-participant.patch
index 992c90a2f3..725ea5ef49 100644
--- a/patches/server/0510-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0500-Collision-option-for-requiring-a-player-participant.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0b7ac3f3115a6e83fe5f2bee8a372ad01dd91fb3..d80d849e9991da00f6aa63913407bf7fd368cadf 100644
+index 3877544229bc8a4e6e475060c4edca17c64ff739..d2c2dd79cc6f484306bd1ab523cb4d9283131d1b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1899,6 +1899,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1888,6 +1888,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public void push(Entity entity) {
          if (!this.isPassengerOfSameVehicle(entity)) {
              if (!entity.noPhysics && !this.noPhysics) {
diff --git a/patches/server/0511-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0501-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0511-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0501-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0512-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0502-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0512-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0502-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0513-Make-schedule-command-per-world.patch b/patches/server/0503-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0513-Make-schedule-command-per-world.patch
rename to patches/server/0503-Make-schedule-command-per-world.patch
diff --git a/patches/server/0514-Configurable-max-leash-distance.patch b/patches/server/0504-Configurable-max-leash-distance.patch
similarity index 87%
rename from patches/server/0514-Configurable-max-leash-distance.patch
rename to patches/server/0504-Configurable-max-leash-distance.patch
index 6f899de2d2..99a4a50ca9 100644
--- a/patches/server/0514-Configurable-max-leash-distance.patch
+++ b/patches/server/0504-Configurable-max-leash-distance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max leash distance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-index b5964614823059261c28eb2e998ad54249f07e7b..08245016186c47077294f758409f8bf14398199f 100644
+index 5e9cf929674888b3a143a0691dc6936b304467f1..85a9bcbd229b56317c2de15670a04c6d0eb51e18 100644
 --- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 +++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-@@ -56,7 +56,7 @@ public abstract class PathfinderMob extends Mob {
+@@ -55,7 +55,7 @@ public abstract class PathfinderMob extends Mob {
              float f = this.distanceTo(entity);
  
              if (this instanceof TamableAnimal && ((TamableAnimal) this).isInSittingPose()) {
@@ -17,7 +17,7 @@ index b5964614823059261c28eb2e998ad54249f07e7b..08245016186c47077294f758409f8bf1
                      this.level().getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit
                      this.dropLeash(true, true);
                  }
-@@ -65,7 +65,7 @@ public abstract class PathfinderMob extends Mob {
+@@ -64,7 +64,7 @@ public abstract class PathfinderMob extends Mob {
              }
  
              this.onLeashDistance(f);
diff --git a/patches/server/0515-Add-BlockPreDispenseEvent.patch b/patches/server/0505-Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0515-Add-BlockPreDispenseEvent.patch
rename to patches/server/0505-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0516-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0506-Add-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0516-Add-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0506-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0517-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0507-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0517-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0507-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0518-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0508-Add-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0518-Add-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0508-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0519-Expand-EntityUnleashEvent.patch b/patches/server/0509-Expand-EntityUnleashEvent.patch
similarity index 94%
rename from patches/server/0519-Expand-EntityUnleashEvent.patch
rename to patches/server/0509-Expand-EntityUnleashEvent.patch
index 98433c53eb..8589ce0a04 100644
--- a/patches/server/0519-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0509-Expand-EntityUnleashEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index a04240f64541009f342bcdeb725ccb04c65b697b..59b776c591af3e890b81f9c2ca67c119ba89695e 100644
+index 7d0ccdd4b144afed8a93256941b3d8618c847f4d..6482dc12324524b92e0161055ad13d27dfb7f97d 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1305,12 +1305,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1292,12 +1292,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
              return InteractionResult.PASS;
          } else if (this.getLeashHolder() == player) {
              // CraftBukkit start - fire PlayerUnleashEntityEvent
@@ -26,7 +26,7 @@ index a04240f64541009f342bcdeb725ccb04c65b697b..59b776c591af3e890b81f9c2ca67c119
              this.gameEvent(GameEvent.ENTITY_INTERACT, player);
              return InteractionResult.sidedSuccess(this.level().isClientSide);
          } else {
-@@ -1478,8 +1481,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1465,8 +1468,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
  
          if (this.leashHolder != null) {
              if (!this.isAlive() || !this.leashHolder.isAlive()) {
@@ -40,7 +40,7 @@ index a04240f64541009f342bcdeb725ccb04c65b697b..59b776c591af3e890b81f9c2ca67c119
              }
  
          }
-@@ -1542,8 +1548,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1529,8 +1535,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
          boolean flag1 = super.startRiding(entity, force);
  
          if (flag1 && this.isLeashed()) {
@@ -54,7 +54,7 @@ index a04240f64541009f342bcdeb725ccb04c65b697b..59b776c591af3e890b81f9c2ca67c119
          }
  
          return flag1;
-@@ -1733,8 +1742,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1720,8 +1729,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
      @Override
      protected void removeAfterChangingDimensions() {
          super.removeAfterChangingDimensions();
@@ -69,10 +69,10 @@ index a04240f64541009f342bcdeb725ccb04c65b697b..59b776c591af3e890b81f9c2ca67c119
              if (!itemstack.isEmpty()) {
                  itemstack.setCount(0);
 diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-index 08245016186c47077294f758409f8bf14398199f..3d95257d2203fe40bb1fab58ad2a1f9e815184a9 100644
+index 85a9bcbd229b56317c2de15670a04c6d0eb51e18..d6393210cfee53685f83c8491bea8b9c13b01eea 100644
 --- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 +++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-@@ -57,8 +57,11 @@ public abstract class PathfinderMob extends Mob {
+@@ -56,8 +56,11 @@ public abstract class PathfinderMob extends Mob {
  
              if (this instanceof TamableAnimal && ((TamableAnimal) this).isInSittingPose()) {
                  if (f > entity.level().paperConfig().misc.maxLeashDistance) { // Paper - Configurable max leash distance
@@ -86,7 +86,7 @@ index 08245016186c47077294f758409f8bf14398199f..3d95257d2203fe40bb1fab58ad2a1f9e
                  }
  
                  return;
-@@ -66,8 +69,11 @@ public abstract class PathfinderMob extends Mob {
+@@ -65,8 +68,11 @@ public abstract class PathfinderMob extends Mob {
  
              this.onLeashDistance(f);
              if (f > entity.level().paperConfig().misc.maxLeashDistance) { // Paper - Configurable max leash distance
diff --git a/patches/server/0520-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0510-Reset-shield-blocking-on-dimension-change.patch
similarity index 84%
rename from patches/server/0520-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0510-Reset-shield-blocking-on-dimension-change.patch
index 80b3f993f7..80bf8880eb 100644
--- a/patches/server/0520-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0510-Reset-shield-blocking-on-dimension-change.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index cf3c2229347f8a8ca860e8b1fbf9226c497df479..449bd6d823746b5d6bbcbde54eeb3105f9cf9f04 100644
+index d5b5ad2f91d440ae0a1e61accab60122335591d4..75bd3de7bc1596a4782b82e30162d89aa3e99211 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1247,6 +1247,11 @@ public class ServerPlayer extends Player {
+@@ -1243,6 +1243,11 @@ public class ServerPlayer extends Player {
                  this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
              }
diff --git a/patches/server/0521-Add-DragonEggFormEvent.patch b/patches/server/0511-Add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0521-Add-DragonEggFormEvent.patch
rename to patches/server/0511-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0522-Add-EntityMoveEvent.patch b/patches/server/0512-Add-EntityMoveEvent.patch
similarity index 93%
rename from patches/server/0522-Add-EntityMoveEvent.patch
rename to patches/server/0512-Add-EntityMoveEvent.patch
index 172eded7ce..201613e609 100644
--- a/patches/server/0522-Add-EntityMoveEvent.patch
+++ b/patches/server/0512-Add-EntityMoveEvent.patch
@@ -17,10 +17,10 @@ index 1aa73c3934c754fb9a4e09e8ac9c7f96d608ceb5..849161e11d547445d9bd10ac54bcd994
              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 30a71abd6dab3967d7206583ece6c496f5ff61df..be76b852ced7ac9cd3c2d3469d6120cc504e9700 100644
+index 5020d671c7bbaf4277c300f3688c770b6a565129..f69fae303770b3ccace8e7d421b762504a7cb5dc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -221,6 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public final LevelStorageSource.LevelStorageAccess convertable;
      public final UUID uuid;
      public boolean hasPhysicsEvent = true; // Paper - BlockPhysicsEvent
@@ -29,7 +29,7 @@ index 30a71abd6dab3967d7206583ece6c496f5ff61df..be76b852ced7ac9cd3c2d3469d6120cc
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 71aaa67177cb782e3ee20d57b73a4f6904b39cf1..6db503e99166cae9efdc25d2eae66956e6cf9699 100644
+index 95ee76c0e96318866a7b21355c9617c2ca79776e..bcd1a608796065eb705363bdc246151b68553c0e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3361,6 +3361,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0523-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0513-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 81%
rename from patches/server/0523-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0513-added-option-to-disable-pathfinding-updates-on-block.patch
index 2c41565a0a..f6619b9d44 100644
--- a/patches/server/0523-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0513-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,10 +5,10 @@ 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 be76b852ced7ac9cd3c2d3469d6120cc504e9700..a27dd0fe48f018e5e2f99e00d8ef5d1f61cea635 100644
+index f69fae303770b3ccace8e7d421b762504a7cb5dc..901d9f47a63f5c6ddd596c7d327abd06f5a17f16 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1657,6 +1657,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1639,6 +1639,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          this.getChunkSource().blockChanged(pos);
@@ -16,7 +16,7 @@ index be76b852ced7ac9cd3c2d3469d6120cc504e9700..a27dd0fe48f018e5e2f99e00d8ef5d1f
          VoxelShape voxelshape = oldState.getCollisionShape(this, pos);
          VoxelShape voxelshape1 = newState.getCollisionShape(this, pos);
  
-@@ -1698,6 +1699,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1680,6 +1681,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
          }
diff --git a/patches/server/0524-Inline-shift-direction-fields.patch b/patches/server/0514-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0524-Inline-shift-direction-fields.patch
rename to patches/server/0514-Inline-shift-direction-fields.patch
diff --git a/patches/server/0525-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0515-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0525-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0515-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0526-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0516-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0526-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0516-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0527-living-entity-allow-attribute-registration.patch b/patches/server/0517-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0527-living-entity-allow-attribute-registration.patch
rename to patches/server/0517-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0528-fix-dead-slime-setSize-invincibility.patch b/patches/server/0518-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0528-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0518-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0529-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0519-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0529-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0519-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0530-Expose-Tracked-Players.patch b/patches/server/0520-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0530-Expose-Tracked-Players.patch
rename to patches/server/0520-Expose-Tracked-Players.patch
diff --git a/patches/server/0531-Improve-ServerGUI.patch b/patches/server/0521-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0531-Improve-ServerGUI.patch
rename to patches/server/0521-Improve-ServerGUI.patch
diff --git a/patches/server/0532-fix-converting-txt-to-json-file.patch b/patches/server/0522-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0532-fix-converting-txt-to-json-file.patch
rename to patches/server/0522-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0533-Add-worldborder-events.patch b/patches/server/0523-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0533-Add-worldborder-events.patch
rename to patches/server/0523-Add-worldborder-events.patch
diff --git a/patches/server/0534-Add-PlayerNameEntityEvent.patch b/patches/server/0524-Add-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0534-Add-PlayerNameEntityEvent.patch
rename to patches/server/0524-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0535-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0525-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0535-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0525-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0536-Add-recipe-to-cook-events.patch b/patches/server/0526-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0536-Add-recipe-to-cook-events.patch
rename to patches/server/0526-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0537-Add-Block-isValidTool.patch b/patches/server/0527-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0537-Add-Block-isValidTool.patch
rename to patches/server/0527-Add-Block-isValidTool.patch
diff --git a/patches/server/0538-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0528-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0538-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0528-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0539-Expand-world-key-API.patch b/patches/server/0529-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0539-Expand-world-key-API.patch
rename to patches/server/0529-Expand-world-key-API.patch
index cb490b2a3b..d943671eb9 100644
--- a/patches/server/0539-Expand-world-key-API.patch
+++ b/patches/server/0529-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index 0fb214ddd919b568da64541fd9b531c65caa5fad..9cd267f53505658d1c75187b662c4d9f
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4b787a548a21512f8fe44a32568181ed18a38157..cd3131c2ebac59a1a2a05fe0216214d9b301abfe 100644
+index 2685722282f0b90bdcf65ba6675998b31f491b31..59935e2557ece2890cf0fc62096a01ef2c52e384 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1137,9 +1137,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0540-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0530-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0540-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0530-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0541-Item-Rarity-API.patch b/patches/server/0531-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0541-Item-Rarity-API.patch
rename to patches/server/0531-Item-Rarity-API.patch
diff --git a/patches/server/0542-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0532-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0542-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0532-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0543-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0533-forced-whitelist-use-configurable-kick-message.patch
similarity index 92%
rename from patches/server/0543-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0533-forced-whitelist-use-configurable-kick-message.patch
index 8798f4c76d..a307882c30 100644
--- a/patches/server/0543-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0533-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e048caafe645e33764a26154b5150c5c5de5b1ad..ccb26a6ccd7b5eb493d926ba0fcff22b924280d0 100644
+index 849161e11d547445d9bd10ac54bcd994a62aab06..22ffae1e5b0ea77b9c9330f521e31af77fe0d276 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2170,7 +2170,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0544-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0534-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0544-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0534-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0545-Expose-protocol-version.patch b/patches/server/0535-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0545-Expose-protocol-version.patch
rename to patches/server/0535-Expose-protocol-version.patch
diff --git a/patches/server/0546-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0536-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0546-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0536-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0547-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0537-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 93%
rename from patches/server/0547-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0537-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 8b56804e90..0eee744cf6 100644
--- a/patches/server/0547-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0537-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a2ed9d38f66004d8e7affd5d8e6277076ea04b3d..c7070680373145caaa2d94df15590bb308361fea 100644
+index bcd1a608796065eb705363bdc246151b68553c0e..297fb36316df04903bd083af523c6b35c284ac7b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3859,6 +3859,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0548-Add-bypass-host-check.patch b/patches/server/0538-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0548-Add-bypass-host-check.patch
rename to patches/server/0538-Add-bypass-host-check.patch
diff --git a/patches/server/0549-Set-area-affect-cloud-rotation.patch b/patches/server/0539-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0549-Set-area-affect-cloud-rotation.patch
rename to patches/server/0539-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0550-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0540-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0550-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0540-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0551-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0541-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0551-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0541-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0552-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0542-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0552-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0542-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0553-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0543-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0553-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0543-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0554-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0544-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0554-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0544-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0555-Add-PlayerDeepSleepEvent.patch b/patches/server/0545-Add-PlayerDeepSleepEvent.patch
similarity index 91%
rename from patches/server/0555-Add-PlayerDeepSleepEvent.patch
rename to patches/server/0545-Add-PlayerDeepSleepEvent.patch
index 66243717fc..569cda8f10 100644
--- a/patches/server/0555-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0545-Add-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 1f5f27bea4afdab99bb41f87288f66b29d7c5264..14b96e150ea6c2068a48e1713ba98f81c8aabb54 100644
+index b4d1caa4c853ce4b88d53fb6f69ad437d3dcb381..d6960cfe647f7ad8c2279b30d8af8a0e11be829f 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -248,6 +248,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0556-More-World-API.patch b/patches/server/0546-More-World-API.patch
similarity index 95%
rename from patches/server/0556-More-World-API.patch
rename to patches/server/0546-More-World-API.patch
index 23d4acb673..1069d6e230 100644
--- a/patches/server/0556-More-World-API.patch
+++ b/patches/server/0546-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 e092afa65bc6d14c53a09175b0a8cd9ad50a7477..0f6d279475d296e644ff8be39644557afe683398 100644
+index 9ca85c53236528460441d2da7f2935438c6b0078..dc36b7686a3d06c07a00e319a2af872bd77d49ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2176,6 +2176,53 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2126,6 +2126,53 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value()), CraftLocation.toBukkit(found.getFirst(), this));
      }
  
diff --git a/patches/server/0557-Add-PlayerBedFailEnterEvent.patch b/patches/server/0547-Add-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0557-Add-PlayerBedFailEnterEvent.patch
rename to patches/server/0547-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0558-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0548-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0558-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0548-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0559-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0549-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
similarity index 100%
rename from patches/server/0559-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
rename to patches/server/0549-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0560-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0550-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0560-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0550-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0561-Add-Channel-initialization-listeners.patch b/patches/server/0551-Add-Channel-initialization-listeners.patch
similarity index 94%
rename from patches/server/0561-Add-Channel-initialization-listeners.patch
rename to patches/server/0551-Add-Channel-initialization-listeners.patch
index b863a22fc3..d3df58efe1 100644
--- a/patches/server/0561-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0551-Add-Channel-initialization-listeners.patch
@@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4
 +    COMPRESSION_DISABLED
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index dd7deb9175059857c59c85c745053cc88a922d3b..6e75a5e7eb51a5bbb7b73436bbd37df1519cb0fc 100644
+index 1e495daf53a53260e1a3b1c86365edb9abad1e80..c7e4d38f67a196b6334e0cc2b9ce9bd96fdc5b0a 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -717,6 +717,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -633,6 +633,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              } else {
                  this.channel.pipeline().addBefore("encoder", "compress", new CompressionEncoder(compressionThreshold));
              }
@@ -133,7 +133,7 @@ index dd7deb9175059857c59c85c745053cc88a922d3b..6e75a5e7eb51a5bbb7b73436bbd37df1
          } else {
              if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
                  this.channel.pipeline().remove("decompress");
-@@ -725,6 +726,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -641,6 +642,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              if (this.channel.pipeline().get("compress") instanceof CompressionEncoder) {
                  this.channel.pipeline().remove("compress");
              }
@@ -142,10 +142,10 @@ index dd7deb9175059857c59c85c745053cc88a922d3b..6e75a5e7eb51a5bbb7b73436bbd37df1
  
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index dfa07c9ede9d748a05ee47826bdbcf7390ec8219..b69483e248cd84293b9d4b9df2f5ccd2a80c14cd 100644
+index 3b6bafb242d2623c15f26acdacd036478c7dc214..25ddfe8e5da65e4ac70be2820ba139e7f3852c0c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -116,6 +116,7 @@ public class ServerConnectionListener {
+@@ -113,6 +113,7 @@ public class ServerConnectionListener {
                      pending.add(object); // Paper - prevent blocking on adding a new connection while the server is ticking
                      ((Connection) object).configurePacketHandler(channelpipeline);
                      ((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
diff --git a/patches/server/0562-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0552-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0562-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0552-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0563-Add-more-WanderingTrader-API.patch b/patches/server/0553-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0563-Add-more-WanderingTrader-API.patch
rename to patches/server/0553-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0564-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0554-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0564-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0554-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0565-Entity-load-save-limit-per-chunk.patch b/patches/server/0555-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0565-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0555-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0566-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0556-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0566-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0556-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0567-Inventory-close.patch b/patches/server/0557-Inventory-close.patch
similarity index 100%
rename from patches/server/0567-Inventory-close.patch
rename to patches/server/0557-Inventory-close.patch
diff --git a/patches/server/0568-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0558-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0568-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0558-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0569-Add-basic-Datapack-API.patch b/patches/server/0559-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0569-Add-basic-Datapack-API.patch
rename to patches/server/0559-Add-basic-Datapack-API.patch
index ae53379499..1c365df031 100644
--- a/patches/server/0569-Add-basic-Datapack-API.patch
+++ b/patches/server/0559-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 cd3131c2ebac59a1a2a05fe0216214d9b301abfe..6fff086f1a6ffd02945ac30d5041b61d289e8478 100644
+index 59935e2557ece2890cf0fc62096a01ef2c52e384..e776a28e9b7d817bde2ce57eb05bd0caed7c2b20 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/0570-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0560-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0570-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0560-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0571-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0561-Expand-PlayerGameModeChangeEvent.patch
similarity index 95%
rename from patches/server/0571-Expand-PlayerGameModeChangeEvent.patch
rename to patches/server/0561-Expand-PlayerGameModeChangeEvent.patch
index 8d6a1c2a7b..43f9246e99 100644
--- a/patches/server/0571-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0561-Expand-PlayerGameModeChangeEvent.patch
@@ -45,10 +45,10 @@ index aee8618e27b893b72931e925724dd683d2e6d2aa..f7c9127346261d83413ca03a1cdaa849
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 449bd6d823746b5d6bbcbde54eeb3105f9cf9f04..d295098c311b4a63bc1bb8a8b53e832c6ecf75cf 100644
+index 75bd3de7bc1596a4782b82e30162d89aa3e99211..d1d7f4c3963986031ea26562549ee15c8232a5a9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1989,8 +1989,16 @@ public class ServerPlayer extends Player {
+@@ -1985,8 +1985,16 @@ public class ServerPlayer extends Player {
      }
  
      public boolean setGameMode(GameType gameMode) {
@@ -67,7 +67,7 @@ index 449bd6d823746b5d6bbcbde54eeb3105f9cf9f04..d295098c311b4a63bc1bb8a8b53e832c
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
-@@ -2002,7 +2010,7 @@ public class ServerPlayer extends Player {
+@@ -1998,7 +2006,7 @@ public class ServerPlayer extends Player {
  
              this.onUpdateAbilities();
              this.updateEffectVisibility();
@@ -76,7 +76,7 @@ index 449bd6d823746b5d6bbcbde54eeb3105f9cf9f04..d295098c311b4a63bc1bb8a8b53e832c
          }
      }
  
-@@ -2414,6 +2422,16 @@ public class ServerPlayer extends Player {
+@@ -2410,6 +2418,16 @@ public class ServerPlayer extends Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
@@ -94,7 +94,7 @@ index 449bd6d823746b5d6bbcbde54eeb3105f9cf9f04..d295098c311b4a63bc1bb8a8b53e832c
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index a157ccbedb94f287c610975d6c3cfb66a3bddbe8..03b337ce5ccb1db61dc395b91b061a2aecf8fbf6 100644
+index f66ce9ae705b0fbe17a1bb437bad6808ff47ed92..37513cf5714afda6c552219c2eca8134c054d2bb 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 {
@@ -144,7 +144,7 @@ index cc393b070f6df598bd4523605d20900c622eac1b..e0e09e9d127cd54ece239c0c1e931bb8
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b23a8fbdc1db7043969ca0a36c59dffd92782d3..44a63ead4c00e82254de8d41a3711cf3e1c4f083 100644
+index a0e33c3b6e8134ec7570a8c160da41c4a92d5040..7b5fd058817f27ffefcdc7e3667e8258a87cbb4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1559,7 +1559,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0572-ItemStack-repair-check-API.patch b/patches/server/0562-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0572-ItemStack-repair-check-API.patch
rename to patches/server/0562-ItemStack-repair-check-API.patch
diff --git a/patches/server/0573-More-Enchantment-API.patch b/patches/server/0563-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0573-More-Enchantment-API.patch
rename to patches/server/0563-More-Enchantment-API.patch
diff --git a/patches/server/0574-Move-range-check-for-block-placing-up.patch b/patches/server/0564-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0574-Move-range-check-for-block-placing-up.patch
rename to patches/server/0564-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0575-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0565-Fix-and-optimise-world-force-upgrading.patch
similarity index 97%
rename from patches/server/0575-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0565-Fix-and-optimise-world-force-upgrading.patch
index 99e215313f..bd90d086b7 100644
--- a/patches/server/0575-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0565-Fix-and-optimise-world-force-upgrading.patch
@@ -267,7 +267,7 @@ index 1cad3585ca122a465572b16d4ecbb7231e87c7de..b0a0909fa9501dfacfbe70dc4118062d
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dimensionOptionsRegistry, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ccb26a6ccd7b5eb493d926ba0fcff22b924280d0..e789a6369c792e577e918fcb44bb59c6c5f71d49 100644
+index 22ffae1e5b0ea77b9c9330f521e31af77fe0d276..ad6a0f1a1a9ed11760098b700e8f305faf066fcd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -583,11 +583,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -298,10 +298,10 @@ index ccb26a6ccd7b5eb493d926ba0fcff22b924280d0..e789a6369c792e577e918fcb44bb59c6
  
              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 b0c61b274c24e2ced86a6acc0ea007a80e61fd3e..50db0a36c17791373fcae1c7b80f7353ef665f3c 100644
+index 27de84c6f58476ebf5357c03922e7399c02718b9..6dad081aa935cf3be19a0e0b913b2aaf97206230 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -186,6 +186,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -179,6 +179,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 - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here
  
@@ -318,7 +318,7 @@ index b0c61b274c24e2ced86a6acc0ea007a80e61fd3e..50db0a36c17791373fcae1c7b80f7353
          return this.world;
      }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 8563383d45f89ee01dd5df13af5bd0cf1b3d7b01..9e30b47ece5549c30f487e5542ae65d5faaa8c39 100644
+index e9cfbee008c1dda2eeac55196d490984fa62ab09..eeccc924dbba6f860245611eb943c9219471f670 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -60,6 +60,29 @@ public class RegionFileStorage implements AutoCloseable {
@@ -352,7 +352,7 @@ index 8563383d45f89ee01dd5df13af5bd0cf1b3d7b01..9e30b47ece5549c30f487e5542ae65d5
          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 6fff086f1a6ffd02945ac30d5041b61d289e8478..ffc6e2a5e2b6e3f4595249d470e531cd555789af 100644
+index e776a28e9b7d817bde2ce57eb05bd0caed7c2b20..980bf1f65db95533b757a757dcfda3d6970fcc8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1251,9 +1251,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0576-Add-Mob-lookAt-API.patch b/patches/server/0566-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0576-Add-Mob-lookAt-API.patch
rename to patches/server/0566-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0577-Add-Unix-domain-socket-support.patch b/patches/server/0567-Add-Unix-domain-socket-support.patch
similarity index 97%
rename from patches/server/0577-Add-Unix-domain-socket-support.patch
rename to patches/server/0567-Add-Unix-domain-socket-support.patch
index 1f06b5c59b..dc0ef24008 100644
--- a/patches/server/0577-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0567-Add-Unix-domain-socket-support.patch
@@ -47,10 +47,10 @@ index 143720bfa65e08262b96afbe53d6cf42bc326052..70fd0256a58f66122629572a72f90fb2
              DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
              DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index b69483e248cd84293b9d4b9df2f5ccd2a80c14cd..13fc9b88c06b0436d23039ef4686f3a88589447e 100644
+index 25ddfe8e5da65e4ac70be2820ba139e7f3852c0c..87abd6274f9da9367094bad0c28acfa47e01c50e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -78,7 +78,12 @@ public class ServerConnectionListener {
+@@ -76,7 +76,12 @@ public class ServerConnectionListener {
          this.running = true;
      }
  
@@ -63,7 +63,7 @@ index b69483e248cd84293b9d4b9df2f5ccd2a80c14cd..13fc9b88c06b0436d23039ef4686f3a8
          List list = this.channels;
  
          synchronized (this.channels) {
-@@ -86,7 +91,13 @@ public class ServerConnectionListener {
+@@ -84,7 +89,13 @@ public class ServerConnectionListener {
              EventLoopGroup eventloopgroup;
  
              if (Epoll.isAvailable() && this.server.isEpollEnabled()) {
@@ -77,7 +77,7 @@ index b69483e248cd84293b9d4b9df2f5ccd2a80c14cd..13fc9b88c06b0436d23039ef4686f3a8
                  eventloopgroup = (EventLoopGroup) ServerConnectionListener.SERVER_EPOLL_EVENT_GROUP.get();
                  ServerConnectionListener.LOGGER.info("Using epoll channel type");
              } else {
-@@ -118,7 +129,7 @@ public class ServerConnectionListener {
+@@ -115,7 +126,7 @@ public class ServerConnectionListener {
                      ((Connection) object).setListenerForServerboundHandshake(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
                      io.papermc.paper.network.ChannelInitializeListenerHolder.callListeners(channel); // Paper - Add Channel initialization listeners
                  }
diff --git a/patches/server/0578-Add-EntityInsideBlockEvent.patch b/patches/server/0568-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0578-Add-EntityInsideBlockEvent.patch
rename to patches/server/0568-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0579-Attributes-API-for-item-defaults.patch b/patches/server/0569-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0579-Attributes-API-for-item-defaults.patch
rename to patches/server/0569-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0580-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0570-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 93%
rename from patches/server/0580-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0570-Add-cause-to-Weather-ThunderChangeEvents.patch
index 4e867eaaa6..b05abf2ec8 100644
--- a/patches/server/0580-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0570-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,10 +5,10 @@ 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 a27dd0fe48f018e5e2f99e00d8ef5d1f61cea635..2abfa8df53a0cbb1abefd5ee121ccdc6524d8523 100644
+index 901d9f47a63f5c6ddd596c7d327abd06f5a17f16..497dd11d7965c9f9a2cf991712cd30d875537240 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -667,8 +667,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -668,8 +668,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.serverLevelData.setClearWeatherTime(clearDuration);
          this.serverLevelData.setRainTime(rainDuration);
          this.serverLevelData.setThunderTime(rainDuration);
@@ -19,7 +19,7 @@ index a27dd0fe48f018e5e2f99e00d8ef5d1f61cea635..2abfa8df53a0cbb1abefd5ee121ccdc6
      }
  
      @Override
-@@ -1104,8 +1104,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1105,8 +1105,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  this.serverLevelData.setThunderTime(j);
                  this.serverLevelData.setRainTime(k);
                  this.serverLevelData.setClearWeatherTime(i);
@@ -30,7 +30,7 @@ index a27dd0fe48f018e5e2f99e00d8ef5d1f61cea635..2abfa8df53a0cbb1abefd5ee121ccdc6
              }
  
              this.oThunderLevel = this.thunderLevel;
-@@ -1172,14 +1172,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1173,14 +1173,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @VisibleForTesting
      public void resetWeatherCycle() {
          // CraftBukkit start
@@ -95,10 +95,10 @@ index f5ac36fa54f3d3b39de103c95abb9ca3adfe8dda..59ba982dc96ce47e47399514e8f74d2b
              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 0f6d279475d296e644ff8be39644557afe683398..bce1253ce219db35bf31ec05e36dfede845bdf46 100644
+index dc36b7686a3d06c07a00e319a2af872bd77d49ef..2d1d2f8db7ebb0d813eea2fdb2fc0044e601aade 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1243,7 +1243,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1193,7 +1193,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setStorm(boolean hasStorm) {
@@ -107,7 +107,7 @@ index 0f6d279475d296e644ff8be39644557afe683398..bce1253ce219db35bf31ec05e36dfede
          this.setWeatherDuration(0); // Reset weather duration (legacy behaviour)
          this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
      }
-@@ -1265,7 +1265,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1215,7 +1215,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setThundering(boolean thundering) {
diff --git a/patches/server/0581-More-Lidded-Block-API.patch b/patches/server/0571-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0581-More-Lidded-Block-API.patch
rename to patches/server/0571-More-Lidded-Block-API.patch
diff --git a/patches/server/0582-Limit-item-frame-cursors-on-maps.patch b/patches/server/0572-Limit-item-frame-cursors-on-maps.patch
similarity index 88%
rename from patches/server/0582-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0572-Limit-item-frame-cursors-on-maps.patch
index d25538d723..8b38d8900a 100644
--- a/patches/server/0582-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0572-Limit-item-frame-cursors-on-maps.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 5992f450f01349ce49286c34b8af56737de01a45..45269115e63cfc3bd7dc740a5694e2cc7c35bcb1 100644
+index 0ca0808c5eeeba969c048b422af37a273217ff52..ed57ce12d4d1cc632431a654cad648a8015402b1 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-@@ -302,8 +302,10 @@ public class MapItemSavedData extends SavedData {
+@@ -299,8 +299,10 @@ public class MapItemSavedData extends SavedData {
  
              MapFrame worldmapframe1 = new MapFrame(blockposition, entityitemframe.getDirection().get2DDataValue() * 90, entityitemframe.getId());
  
@@ -19,7 +19,7 @@ index 5992f450f01349ce49286c34b8af56737de01a45..45269115e63cfc3bd7dc740a5694e2cc
          }
  
          CompoundTag nbttagcompound = stack.getTag();
-@@ -485,7 +487,7 @@ public class MapItemSavedData extends SavedData {
+@@ -482,7 +484,7 @@ public class MapItemSavedData extends SavedData {
                  return true;
              }
  
diff --git a/patches/server/0583-Add-PlayerKickEvent-causes.patch b/patches/server/0573-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0583-Add-PlayerKickEvent-causes.patch
rename to patches/server/0573-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0584-Add-PufferFishStateChangeEvent.patch b/patches/server/0574-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0584-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0574-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0585-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0575-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0585-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0575-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0586-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0576-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 71%
rename from patches/server/0586-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0576-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index e8ae16c851..4a44dd7ad0 100644
--- a/patches/server/0586-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0576-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 98e720a21432fff7fce8653095a56e2ef56f1d30..27122a06e172c8d54104c115dfda668a52ff1cde 100644
+index 1219200cd915d6239a32a2bd09d325cd8fa9b346..dfae0918079425df92d958b04275be8ae60d4b60 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-@@ -33,14 +33,14 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
-     private final T @org.jetbrains.annotations.Nullable [] presetValues; // Paper - Anti-Xray - Add preset values
+@@ -32,14 +32,14 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+     public final IdMap<T> registry;
      private volatile PalettedContainer.Data<T> data;
      private final PalettedContainer.Strategy strategy;
 -    private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer");
@@ -34,17 +34,17 @@ index 98e720a21432fff7fce8653095a56e2ef56f1d30..27122a06e172c8d54104c115dfda668a
 +        // this.threadingDetector.checkAndUnlock(); // Paper - disable this
      }
  
-     // Paper start - Anti-Xray - Add preset values
-@@ -130,7 +130,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+     public static <T> Codec<PalettedContainer<T>> codecRW(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue) {
+@@ -91,7 +91,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;
- 
-         // Paper start - Anti-Xray - Add preset values
-@@ -177,7 +177,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+         PalettedContainer.Data<T> data2 = this.createOrReuseData(data, newBits);
+         data2.copyFrom(data.palette, data.storage);
+@@ -116,7 +116,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
          return this.getAndSet(this.strategy.getIndex(x, y, z), value);
      }
  
@@ -53,7 +53,7 @@ index 98e720a21432fff7fce8653095a56e2ef56f1d30..27122a06e172c8d54104c115dfda668a
          int i = this.data.palette.idFor(value);
          int j = this.data.storage.getAndSet(index, i);
          return this.data.palette.valueFor(j);
-@@ -194,7 +194,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -133,7 +133,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
  
      }
  
@@ -62,7 +62,7 @@ index 98e720a21432fff7fce8653095a56e2ef56f1d30..27122a06e172c8d54104c115dfda668a
          int i = this.data.palette.idFor(value);
          this.data.storage.set(index, i);
      }
-@@ -219,7 +219,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -158,7 +158,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
          });
      }
  
@@ -71,16 +71,16 @@ index 98e720a21432fff7fce8653095a56e2ef56f1d30..27122a06e172c8d54104c115dfda668a
          this.acquire();
  
          try {
-@@ -239,7 +239,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -174,7 +174,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+     }
+ 
      @Override
-     @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
+-    public void write(FriendlyByteBuf buf) {
++    public synchronized void write(FriendlyByteBuf buf) { // Paper - synchronize
          this.acquire();
  
          try {
-@@ -299,7 +299,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
+@@ -229,7 +229,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
      }
  
      @Override
diff --git a/patches/server/0587-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0577-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0587-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0577-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0588-Add-BellRevealRaiderEvent.patch b/patches/server/0578-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0588-Add-BellRevealRaiderEvent.patch
rename to patches/server/0578-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0589-Fix-invulnerable-end-crystals.patch b/patches/server/0579-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0589-Fix-invulnerable-end-crystals.patch
rename to patches/server/0579-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0590-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0580-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0590-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0580-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0591-Fix-dangerous-end-portal-logic.patch b/patches/server/0581-Fix-dangerous-end-portal-logic.patch
similarity index 94%
rename from patches/server/0591-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0581-Fix-dangerous-end-portal-logic.patch
index c59b55b1ff..4d76ad7b0d 100644
--- a/patches/server/0591-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0581-Fix-dangerous-end-portal-logic.patch
@@ -11,10 +11,10 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d80d849e9991da00f6aa63913407bf7fd368cadf..4a0c8976df5164423daee48f2d9494e8eb8080a8 100644
+index d2c2dd79cc6f484306bd1ab523cb4d9283131d1b..002979f629798a8d39013c3a905f9b356abd115c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -487,6 +487,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -485,6 +485,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      public boolean updatingSectionStatus = false;
      // Paper end
@@ -51,7 +51,7 @@ index d80d849e9991da00f6aa63913407bf7fd368cadf..4a0c8976df5164423daee48f2d9494e8
  
      public Entity(EntityType<?> type, Level world) {
          this.id = Entity.ENTITY_COUNTER.incrementAndGet();
-@@ -2844,6 +2874,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2833,6 +2863,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0592-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0582-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0592-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0582-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0593-Make-item-validations-configurable.patch b/patches/server/0583-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0593-Make-item-validations-configurable.patch
rename to patches/server/0583-Make-item-validations-configurable.patch
diff --git a/patches/server/0594-Line-Of-Sight-Changes.patch b/patches/server/0584-Line-Of-Sight-Changes.patch
similarity index 91%
rename from patches/server/0594-Line-Of-Sight-Changes.patch
rename to patches/server/0584-Line-Of-Sight-Changes.patch
index 644ecc7044..b8bd894c74 100644
--- a/patches/server/0594-Line-Of-Sight-Changes.patch
+++ b/patches/server/0584-Line-Of-Sight-Changes.patch
@@ -5,16 +5,16 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c7070680373145caaa2d94df15590bb308361fea..c7752c20c8e83c21cf96e0cedf9a8269775f51e5 100644
+index 297fb36316df04903bd083af523c6b35c284ac7b..cedd1f8063504cc58b2735a8d53a3c39a605bf5f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3606,7 +3606,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
              Vec3 vec3d = new Vec3(this.getX(), this.getEyeY(), this.getZ());
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
  
--            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clipDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == HitResult.Type.MISS; // Paper
+-            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
 +            // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
-+            return vec3d1.distanceToSqr(vec3d) > 128.0D * 128.0D ? false : this.level().clipDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == HitResult.Type.MISS; // Paper - Perf: Use distance squared
++            return vec3d1.distanceToSqr(vec3d) > 128.0D * 128.0D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS; // Paper - Perf: Use distance squared
          }
      }
  
diff --git a/patches/server/0595-add-per-world-spawn-limits.patch b/patches/server/0585-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0595-add-per-world-spawn-limits.patch
rename to patches/server/0585-add-per-world-spawn-limits.patch
index 2be5b3262a..e1329a1ea6 100644
--- a/patches/server/0595-add-per-world-spawn-limits.patch
+++ b/patches/server/0585-add-per-world-spawn-limits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add per world spawn limits
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bce1253ce219db35bf31ec05e36dfede845bdf46..0fdc047f55473d9a208fe344b20787fdd6f23fd9 100644
+index 2d1d2f8db7ebb0d813eea2fdb2fc0044e601aade..a1557d6904304d510040b8c5ecb06b89cd2fe346 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -215,6 +215,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0596-Fix-potions-splash-events.patch b/patches/server/0586-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0596-Fix-potions-splash-events.patch
rename to patches/server/0586-Fix-potions-splash-events.patch
diff --git a/patches/server/0597-Add-more-LimitedRegion-API.patch b/patches/server/0587-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0597-Add-more-LimitedRegion-API.patch
rename to patches/server/0587-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0598-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0588-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 86%
rename from patches/server/0598-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0588-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 3fddefdb99..fd228bc63c 100644
--- a/patches/server/0598-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0588-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d295098c311b4a63bc1bb8a8b53e832c6ecf75cf..da43449e16ac281daf32df66cae5b23f35b160ee 100644
+index d1d7f4c3963986031ea26562549ee15c8232a5a9..64b31447847d3b40ba00c4e6708d68113f2ef2bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2391,7 +2391,7 @@ public class ServerPlayer extends Player {
+@@ -2387,7 +2387,7 @@ public class ServerPlayer extends Player {
  
              if (retainOwnership) {
                  if (!itemstack1.isEmpty()) {
@@ -18,7 +18,7 @@ index d295098c311b4a63bc1bb8a8b53e832c6ecf75cf..da43449e16ac281daf32df66cae5b23f
  
                  this.awardStat(Stats.DROP);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 14b96e150ea6c2068a48e1713ba98f81c8aabb54..fd28898a150a13d3e18bb46145e4b2e827b42aee 100644
+index d6960cfe647f7ad8c2279b30d8af8a0e11be829f..7899b55fd6f4099241d23be750669f7a9863cf0c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -725,6 +725,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0599-Missing-Entity-API.patch b/patches/server/0589-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0599-Missing-Entity-API.patch
rename to patches/server/0589-Missing-Entity-API.patch
diff --git a/patches/server/0600-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0590-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0600-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0590-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0601-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0591-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0601-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0591-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0602-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0592-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 86%
rename from patches/server/0602-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0592-Use-getChunkIfLoadedImmediately-in-places.patch
index 9652ea5ee7..f15ccf89a0 100644
--- a/patches/server/0602-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0592-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,10 +8,10 @@ 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 2abfa8df53a0cbb1abefd5ee121ccdc6524d8523..97abb99f6fd3e718771a928d3aacc9d0042c7250 100644
+index 497dd11d7965c9f9a2cf991712cd30d875537240..49c23f4fbafbae516f3546c200448c400a6b0d5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -224,7 +224,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -225,7 +225,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public boolean hasEntityMoveEvent; // Paper - Add EntityMoveEvent
  
      public LevelChunk getChunkIfLoaded(int x, int z) {
@@ -21,10 +21,10 @@ index 2abfa8df53a0cbb1abefd5ee121ccdc6524d8523..97abb99f6fd3e718771a928d3aacc9d0
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index cd01f33799436af1aeeb2d9cd2acff164c3118ce..479d14c8c6e8acf2586c2af875515405bea2843f 100644
+index 6dad081aa935cf3be19a0e0b913b2aaf97206230..fb2e1f1d9fcc3d2d1bd37f136f6a06ae5ccf79a1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -203,6 +203,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -196,6 +196,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return (CraftServer) Bukkit.getServer();
      }
  
@@ -37,7 +37,7 @@ index cd01f33799436af1aeeb2d9cd2acff164c3118ce..479d14c8c6e8acf2586c2af875515405
 +
      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, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
+     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 - create paper world config
 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 0d5ae91a9b43df7b412968ab5faf5498c09169f9..37ae0f928440af5b2fdfe68ad6c9c54e8c95c82c 100644
 --- a/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java
diff --git a/patches/server/0603-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0593-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0603-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0593-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0604-Add-PlayerArmSwingEvent.patch b/patches/server/0594-Add-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0604-Add-PlayerArmSwingEvent.patch
rename to patches/server/0594-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0605-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0595-Fix-kick-event-leave-message-not-being-sent.patch
similarity index 97%
rename from patches/server/0605-Fix-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0595-Fix-kick-event-leave-message-not-being-sent.patch
index d9feed0fa0..70477f1da1 100644
--- a/patches/server/0605-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0595-Fix-kick-event-leave-message-not-being-sent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index da43449e16ac281daf32df66cae5b23f35b160ee..17c11953df9308d228220e92736232376f02f248 100644
+index 64b31447847d3b40ba00c4e6708d68113f2ef2bd..5114543c1510d203bfa4e684357b94585919742f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -273,7 +273,6 @@ public class ServerPlayer extends Player {
+@@ -269,7 +269,6 @@ public class ServerPlayer extends Player {
      public boolean joining = true;
      public boolean sentListPacket = false;
      public boolean supressTrackerForLogin = false; // Paper - Fire PlayerJoinEvent when Player is actually ready
diff --git a/patches/server/0606-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0596-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 97%
rename from patches/server/0606-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0596-Add-config-for-mobs-immune-to-default-effects.patch
index 2ae8c665e8..b0f4052555 100644
--- a/patches/server/0606-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0596-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c7752c20c8e83c21cf96e0cedf9a8269775f51e5..8438ca0157d8a27f76858d8f5139a5f8a699a65c 100644
+index cedd1f8063504cc58b2735a8d53a3c39a605bf5f..378e5bfd58caf21e9ebecc900f02163c64a48073 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0607-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0597-Don-t-apply-cramming-damage-to-players.patch
similarity index 90%
rename from patches/server/0607-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0597-Don-t-apply-cramming-damage-to-players.patch
index f33a5fe053..de289eb5eb 100644
--- a/patches/server/0607-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0597-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 17c11953df9308d228220e92736232376f02f248..2535c002c45d2d92bc779d3c9198cf3c737bd7f2 100644
+index 5114543c1510d203bfa4e684357b94585919742f..415a48203aa150056cb224e3eb65a1f62f0741e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
@@ -22,7 +22,7 @@ index 17c11953df9308d228220e92736232376f02f248..2535c002c45d2d92bc779d3c9198cf3c
  import net.minecraft.world.effect.MobEffectInstance;
  import net.minecraft.world.effect.MobEffects;
  import net.minecraft.world.entity.Entity;
-@@ -1479,7 +1480,7 @@ public class ServerPlayer extends Player {
+@@ -1475,7 +1476,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isInvulnerableTo(DamageSource damageSource) {
diff --git a/patches/server/0608-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0598-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0608-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0598-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0609-Add-missing-forceDrop-toggles.patch b/patches/server/0599-Add-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0609-Add-missing-forceDrop-toggles.patch
rename to patches/server/0599-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0610-Stinger-API.patch b/patches/server/0600-Stinger-API.patch
similarity index 100%
rename from patches/server/0610-Stinger-API.patch
rename to patches/server/0600-Stinger-API.patch
diff --git a/patches/server/0611-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0601-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0611-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0601-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0612-Add-System.out-err-catcher.patch b/patches/server/0602-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0612-Add-System.out-err-catcher.patch
rename to patches/server/0602-Add-System.out-err-catcher.patch
index 9077dcbce7..2b01eabadb 100644
--- a/patches/server/0612-Add-System.out-err-catcher.patch
+++ b/patches/server/0602-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 ffc6e2a5e2b6e3f4595249d470e531cd555789af..0b780946ace3a5c644e3ad4ab89c1a6179892087 100644
+index 980bf1f65db95533b757a757dcfda3d6970fcc8b..e437dac193b6aa301b35b847647ca6004334a092 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -303,6 +303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0613-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0603-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0613-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0603-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0614-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0604-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0614-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0604-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0615-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0605-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0615-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0605-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0616-Add-PlayerSetSpawnEvent.patch b/patches/server/0606-Add-PlayerSetSpawnEvent.patch
similarity index 97%
rename from patches/server/0616-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0606-Add-PlayerSetSpawnEvent.patch
index 19210ea445..cd6f103ac2 100644
--- a/patches/server/0616-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0606-Add-PlayerSetSpawnEvent.patch
@@ -49,10 +49,10 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2535c002c45d2d92bc779d3c9198cf3c737bd7f2..165d75cdc40af7e35d41fed242e11eedfc385c3f 100644
+index 415a48203aa150056cb224e3eb65a1f62f0741e7..770f99014f3cccbbc666f0aa8530dfb545ced7b6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1356,7 +1356,7 @@ public class ServerPlayer extends Player {
+@@ -1352,7 +1352,7 @@ public class ServerPlayer extends Player {
              } else if (this.bedBlocked(blockposition, enumdirection)) {
                  return Either.left(Player.BedSleepingProblem.OBSTRUCTED);
              } else {
@@ -61,7 +61,7 @@ index 2535c002c45d2d92bc779d3c9198cf3c737bd7f2..165d75cdc40af7e35d41fed242e11eed
                  if (this.level().isDay()) {
                      return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW);
                  } else {
-@@ -2311,44 +2311,50 @@ public class ServerPlayer extends Player {
+@@ -2307,44 +2307,50 @@ public class ServerPlayer extends Player {
          return this.respawnForced;
      }
  
@@ -145,7 +145,7 @@ index 2535c002c45d2d92bc779d3c9198cf3c737bd7f2..165d75cdc40af7e35d41fed242e11eed
          } else {
              this.respawnPosition = null;
              this.respawnDimension = Level.OVERWORLD;
-@@ -2356,6 +2362,7 @@ public class ServerPlayer extends Player {
+@@ -2352,6 +2358,7 @@ public class ServerPlayer extends Player {
              this.respawnForced = false;
          }
  
diff --git a/patches/server/0617-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0607-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0617-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0607-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0618-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0608-Optimize-entity-tracker-passenger-checks.patch
similarity index 90%
rename from patches/server/0618-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0608-Optimize-entity-tracker-passenger-checks.patch
index 524e1fabfb..0908da4471 100644
--- a/patches/server/0618-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0608-Optimize-entity-tracker-passenger-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize entity tracker passenger checks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 90d2fa5b90d64ddb28075a50f4478b464a29a285..7cdebafd7a9f5606980ae89c8f3823f9ce560a9e 100644
+index fb16216b54eea81fceaf3edafa69b554ad01c807..c21cea7975844e0a04daeb1fcffc26d55fc62025 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -79,7 +79,7 @@ public class ServerEntity {
diff --git a/patches/server/0619-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0609-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0619-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0609-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0620-Add-EntityDamageItemEvent.patch b/patches/server/0610-Add-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0620-Add-EntityDamageItemEvent.patch
rename to patches/server/0610-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0621-Optimize-indirect-passenger-iteration.patch b/patches/server/0611-Optimize-indirect-passenger-iteration.patch
similarity index 91%
rename from patches/server/0621-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0611-Optimize-indirect-passenger-iteration.patch
index d554a6baa6..b9595fffe4 100644
--- a/patches/server/0621-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0611-Optimize-indirect-passenger-iteration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4a0c8976df5164423daee48f2d9494e8eb8080a8..cc72445c662107949d18ceec8285b7cf6871cc22 100644
+index 002979f629798a8d39013c3a905f9b356abd115c..22620662491547c2d689e5a703d80bfd723eaa77 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3889,20 +3889,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3878,20 +3878,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      private Stream<Entity> getIndirectPassengersStream() {
@@ -43,7 +43,7 @@ index 4a0c8976df5164423daee48f2d9494e8eb8080a8..cc72445c662107949d18ceec8285b7cf
          return () -> {
              return this.getIndirectPassengersStream().iterator();
          };
-@@ -3925,6 +3939,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3914,6 +3928,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      // Paper end - rewrite chunk system
  
      public boolean hasExactlyOnePlayerPassenger() {
diff --git a/patches/server/0622-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0612-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 93%
rename from patches/server/0622-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0612-Configurable-item-frame-map-cursor-update-interval.patch
index a1e4f933cb..382372348e 100644
--- a/patches/server/0622-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0612-Configurable-item-frame-map-cursor-update-interval.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 7cdebafd7a9f5606980ae89c8f3823f9ce560a9e..04ca37b872a1585c55ac0b64d776073bf678ab0d 100644
+index c21cea7975844e0a04daeb1fcffc26d55fc62025..a83b4d9b61230ecf5f776269cab228cf49c5f546 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -117,7 +117,7 @@ public class ServerEntity {
diff --git a/patches/server/0623-Clear-bucket-NBT-after-dispense.patch b/patches/server/0613-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0623-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0613-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0624-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0614-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0624-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0614-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0625-Add-BlockBreakBlockEvent.patch b/patches/server/0615-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0625-Add-BlockBreakBlockEvent.patch
rename to patches/server/0615-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0626-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0616-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0626-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0616-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0627-More-CommandBlock-API.patch b/patches/server/0617-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0627-More-CommandBlock-API.patch
rename to patches/server/0617-More-CommandBlock-API.patch
diff --git a/patches/server/0628-Add-missing-team-sidebar-display-slots.patch b/patches/server/0618-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0628-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0618-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0629-Add-back-EntityPortalExitEvent.patch b/patches/server/0619-Add-back-EntityPortalExitEvent.patch
similarity index 93%
rename from patches/server/0629-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0619-Add-back-EntityPortalExitEvent.patch
index 237027a306..562783378c 100644
--- a/patches/server/0629-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0619-Add-back-EntityPortalExitEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cc72445c662107949d18ceec8285b7cf6871cc22..5398bcce745c977aad083777e18c72fa93245107 100644
+index 22620662491547c2d689e5a703d80bfd723eaa77..e5f265d71fe10fe1c9cb1ec95958f0c42063e51c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3338,6 +3338,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3327,6 +3327,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              } else {
                  // CraftBukkit start
                  worldserver = shapedetectorshape.world;
@@ -37,7 +37,7 @@ index cc72445c662107949d18ceec8285b7cf6871cc22..5398bcce745c977aad083777e18c72fa
                  if (worldserver == this.level) {
                      // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in
                      this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot);
-@@ -3357,8 +3379,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3346,8 +3368,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
                  if (entity != null) {
                      entity.restoreFrom(this);
diff --git a/patches/server/0630-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0620-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 88%
rename from patches/server/0630-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0620-Add-methods-to-find-targets-for-lightning-strikes.patch
index ed62bced78..b94fe69063 100644
--- a/patches/server/0630-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0620-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,10 +7,10 @@ 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 97abb99f6fd3e718771a928d3aacc9d0042c7250..66b6cb42f2365b0d63cd8625715bdf997261b6ac 100644
+index 49c23f4fbafbae516f3546c200448c400a6b0d5d..669c9e43ee76ce2502ed49965aae2703b922f3b5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -993,6 +993,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -994,6 +994,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      protected BlockPos findLightningTargetAround(BlockPos pos) {
@@ -22,7 +22,7 @@ index 97abb99f6fd3e718771a928d3aacc9d0042c7250..66b6cb42f2365b0d63cd8625715bdf99
          BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
          Optional<BlockPos> optional = this.findLightningRod(blockposition1);
  
-@@ -1007,6 +1012,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1008,6 +1013,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (!list.isEmpty()) {
                  return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition();
              } else {
@@ -31,10 +31,10 @@ index 97abb99f6fd3e718771a928d3aacc9d0042c7250..66b6cb42f2365b0d63cd8625715bdf99
                      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 0fdc047f55473d9a208fe344b20787fdd6f23fd9..d1b77ffe565a112556c7a04057c82b827e8ea7aa 100644
+index a1557d6904304d510040b8c5ecb06b89cd2fe346..e03bd6419d4c28a329286edc5267b725de554105 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -651,6 +651,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (LightningStrike) lightning.getBukkitEntity();
      }
  
diff --git a/patches/server/0631-Get-entity-default-attributes.patch b/patches/server/0621-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0631-Get-entity-default-attributes.patch
rename to patches/server/0621-Get-entity-default-attributes.patch
diff --git a/patches/server/0632-Left-handed-API.patch b/patches/server/0622-Left-handed-API.patch
similarity index 100%
rename from patches/server/0632-Left-handed-API.patch
rename to patches/server/0622-Left-handed-API.patch
diff --git a/patches/server/0633-Add-more-advancement-API.patch b/patches/server/0623-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0633-Add-more-advancement-API.patch
rename to patches/server/0623-Add-more-advancement-API.patch
diff --git a/patches/server/0634-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0624-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0634-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0624-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0635-Add-critical-damage-API.patch b/patches/server/0625-Add-critical-damage-API.patch
similarity index 95%
rename from patches/server/0635-Add-critical-damage-API.patch
rename to patches/server/0625-Add-critical-damage-API.patch
index 2c744adb8e..5669c3dbdd 100644
--- a/patches/server/0635-Add-critical-damage-API.patch
+++ b/patches/server/0625-Add-critical-damage-API.patch
@@ -28,10 +28,10 @@ index df8c88bfa749e02f633350446101dcce05db7ac1..ed1277fad60992344b94f8a939febaca
 +    // Paper end - add critical damage API
  }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index fd28898a150a13d3e18bb46145e4b2e827b42aee..e248a519db685bc744a884f56ca1c13fb38aaebc 100644
+index 7899b55fd6f4099241d23be750669f7a9863cf0c..11cc72f764913de577ecd6293e5316ae8c2c679c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1263,7 +1263,7 @@ public abstract class Player extends LivingEntity {
+@@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity {
                          flag1 = true;
                      }
  
@@ -40,7 +40,7 @@ index fd28898a150a13d3e18bb46145e4b2e827b42aee..e248a519db685bc744a884f56ca1c13f
  
                      flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
                      flag2 = flag2 && !this.isSprinting();
-@@ -1303,7 +1303,7 @@ public abstract class Player extends LivingEntity {
+@@ -1295,7 +1295,7 @@ public abstract class Player extends LivingEntity {
                      }
  
                      Vec3 vec3d = target.getDeltaMovement();
@@ -49,7 +49,7 @@ index fd28898a150a13d3e18bb46145e4b2e827b42aee..e248a519db685bc744a884f56ca1c13f
  
                      if (flag5) {
                          if (i > 0) {
-@@ -1331,7 +1331,7 @@ public abstract class Player extends LivingEntity {
+@@ -1323,7 +1323,7 @@ public abstract class Player extends LivingEntity {
  
                                  if (entityliving != this && entityliving != target && !this.isAlliedTo((Entity) entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && this.distanceToSqr((Entity) entityliving) < 9.0D) {
                                      // CraftBukkit start - Only apply knockback if the damage hits
@@ -59,7 +59,7 @@ index fd28898a150a13d3e18bb46145e4b2e827b42aee..e248a519db685bc744a884f56ca1c13f
                                      }
                                      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 004c130fc03dc01ef75fabdb4ef1ef711e33cb95..ae4319c2532855315bc45995a39d7eb98961b939 100644
+index 0e1d4bd6f70e439b33eca57bf06e9e090825f58a..5f75e54cde19614461dd8375ded1d6b3c395f674 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -379,6 +379,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0636-Fix-issues-with-mob-conversion.patch b/patches/server/0626-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0636-Fix-issues-with-mob-conversion.patch
rename to patches/server/0626-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0637-Add-isCollidable-methods-to-various-places.patch b/patches/server/0627-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0637-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0627-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0638-Goat-ram-API.patch b/patches/server/0628-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0638-Goat-ram-API.patch
rename to patches/server/0628-Goat-ram-API.patch
diff --git a/patches/server/0639-Add-API-for-resetting-a-single-score.patch b/patches/server/0629-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0639-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0629-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0640-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0630-Add-Raw-Byte-Entity-Serialization.patch
similarity index 96%
rename from patches/server/0640-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0630-Add-Raw-Byte-Entity-Serialization.patch
index b5e0cc8f28..f84be24459 100644
--- a/patches/server/0640-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0630-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5398bcce745c977aad083777e18c72fa93245107..4335ba4821017a0f097d1664dbc8ef7ed957d807 100644
+index e5f265d71fe10fe1c9cb1ec95958f0c42063e51c..99b87b783dfb3d0e00e3e03e5721feaef1c1ecf0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2124,6 +2124,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2113,6 +2113,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          }
      }
  
diff --git a/patches/server/0641-Vanilla-command-permission-fixes.patch b/patches/server/0631-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0641-Vanilla-command-permission-fixes.patch
rename to patches/server/0631-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0642-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0632-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 89%
rename from patches/server/0642-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0632-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 8465c7d892..1a394dadf1 100644
--- a/patches/server/0642-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0632-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,10 +9,10 @@ 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 66b6cb42f2365b0d63cd8625715bdf997261b6ac..7da6bd04b6ea4f8bb99fe6dba9dd4ecaba96a284 100644
+index 669c9e43ee76ce2502ed49965aae2703b922f3b5..e6a3f377762db8f2f58cb6851b8f713ce591b29f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1558,9 +1558,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1540,9 +1540,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Spigot Start
          for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
@@ -28,10 +28,10 @@ index 66b6cb42f2365b0d63cd8625715bdf997261b6ac..7da6bd04b6ea4f8bb99fe6dba9dd4eca
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 165d75cdc40af7e35d41fed242e11eedfc385c3f..9cd64d14d4b6df92bb30d0ad610f8af85791962a 100644
+index 770f99014f3cccbbc666f0aa8530dfb545ced7b6..bb313280236fb5c7dd2713a21edd3694e01a4fd1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1630,6 +1630,18 @@ public class ServerPlayer extends Player {
+@@ -1626,6 +1626,18 @@ public class ServerPlayer extends Player {
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
          this.doCloseContainer();
      }
@@ -51,7 +51,7 @@ index 165d75cdc40af7e35d41fed242e11eedfc385c3f..9cd64d14d4b6df92bb30d0ad610f8af8
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index e248a519db685bc744a884f56ca1c13fb38aaebc..e33278611e4f52ff01cf628c570bd3378ff5c071 100644
+index 11cc72f764913de577ecd6293e5316ae8c2c679c..712249fa1c1ce9af0dd07e8705bf944ac57842b5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -508,6 +508,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0643-Fix-GameProfileCache-concurrency.patch b/patches/server/0633-Fix-GameProfileCache-concurrency.patch
similarity index 98%
rename from patches/server/0643-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0633-Fix-GameProfileCache-concurrency.patch
index dd06a021e4..9c0776cd51 100644
--- a/patches/server/0643-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0633-Fix-GameProfileCache-concurrency.patch
@@ -7,7 +7,7 @@ Separate lookup and state access locks prevent lookups
 from stalling simple state access/write calls
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 641cbe71064e9574e16e36f8107e1a08db25a24d..6fe9065c391804818b19fad2cf68d31aa8f1ae82 100644
+index 1ec0f3a7148c2f412421772f6e1dff0bb92a51bc..d45fe762941dd6da45c890706bc9e4c0438522c3 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -60,6 +60,11 @@ public class GameProfileCache {
diff --git a/patches/server/0644-Improve-and-expand-AsyncCatcher.patch b/patches/server/0634-Improve-and-expand-AsyncCatcher.patch
similarity index 96%
rename from patches/server/0644-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0634-Improve-and-expand-AsyncCatcher.patch
index bc8d25cf11..8f5e4158f8 100644
--- a/patches/server/0644-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0634-Improve-and-expand-AsyncCatcher.patch
@@ -29,7 +29,7 @@ index fa6783305aae385723d6bdb83166e147b8ebcfe9..27bcfe893db83bb369186ccf1d48f28e
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8438ca0157d8a27f76858d8f5139a5f8a699a65c..bcb842a40ab97b4920e4e32cb3e6c8e1ff3081bd 100644
+index 378e5bfd58caf21e9ebecc900f02163c64a48073..61c8d108122e27f063d677e1d3130a4d3eeecb94 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1118,7 +1118,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -166,10 +166,10 @@ index bbbf6dd8e566ecdca8794e3b03765fe7e426a2bd..66ab901956ca394c251c420338643d39
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d1b77ffe565a112556c7a04057c82b827e8ea7aa..989abde6b753a16b389c1145b3e6b337eb73c715 100644
+index e03bd6419d4c28a329286edc5267b725de554105..57b27317f28901df1bb3c10bf462d319d0c7b7c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1803,6 +1803,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1753,6 +1753,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void playSound(Location loc, Sound sound, org.bukkit.SoundCategory category, float volume, float pitch, long seed) {
@@ -177,7 +177,7 @@ index d1b77ffe565a112556c7a04057c82b827e8ea7aa..989abde6b753a16b389c1145b3e6b337
          if (loc == null || sound == null || category == null) return;
  
          double x = loc.getX();
-@@ -1814,6 +1815,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1764,6 +1765,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void playSound(Location loc, String sound, org.bukkit.SoundCategory category, float volume, float pitch, long seed) {
@@ -185,7 +185,7 @@ index d1b77ffe565a112556c7a04057c82b827e8ea7aa..989abde6b753a16b389c1145b3e6b337
          if (loc == null || sound == null || category == null) return;
  
          double x = loc.getX();
-@@ -1846,6 +1848,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1796,6 +1798,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void playSound(Entity entity, Sound sound, org.bukkit.SoundCategory category, float volume, float pitch, long seed) {
@@ -193,7 +193,7 @@ index d1b77ffe565a112556c7a04057c82b827e8ea7aa..989abde6b753a16b389c1145b3e6b337
          if (!(entity instanceof CraftEntity craftEntity) || entity.getWorld() != this || sound == null || category == null) return;
  
          ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(CraftSound.bukkitToMinecraftHolder(sound), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed);
-@@ -1857,6 +1860,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1807,6 +1810,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void playSound(Entity entity, String sound, org.bukkit.SoundCategory category, float volume, float pitch, long seed) {
diff --git a/patches/server/0645-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0635-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 96%
rename from patches/server/0645-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0635-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 2ed183d622..a006f92fb2 100644
--- a/patches/server/0645-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0635-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -257,10 +257,10 @@ index 0000000000000000000000000000000000000000..d3b39d88a72ca25057fd8574d32f28db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index b27e0f31d0b3f5c57157a27f1f1db0f847d42a0c..5a4db70543ab446630c1cf0252496b57edc4252a 100644
+index 4ad3a4403f497f4b437209a9e63445f0d29b09f1..28ec1cc4dec6d12627761a58d635fd51dbc398b3 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -190,6 +190,16 @@ public final class NaturalSpawner {
+@@ -157,6 +157,16 @@ public final class NaturalSpawner {
          world.getProfiler().pop();
      }
  
@@ -275,10 +275,10 @@ index b27e0f31d0b3f5c57157a27f1f1db0f847d42a0c..5a4db70543ab446630c1cf0252496b57
 +    // Paper end - Add mobcaps commands
 +
      public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) {
-         // Paper start - Optional per player mob spawns
-         spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
+         BlockPos blockposition = NaturalSpawner.getRandomPosWithin(world, chunk);
+ 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0b780946ace3a5c644e3ad4ab89c1a6179892087..b9e6d28d8eb982a404981ac4df71238bf30d0989 100644
+index e437dac193b6aa301b35b847647ca6004334a092..9ad1645c143d91ae9e08dfe3d875c9b0aa4d0844 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2279,6 +2279,11 @@ public final class CraftServer implements Server {
@@ -294,10 +294,10 @@ index 0b780946ace3a5c644e3ad4ab89c1a6179892087..b9e6d28d8eb982a404981ac4df71238b
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 989abde6b753a16b389c1145b3e6b337eb73c715..1977368c44212eb290a1b141216bb3a880b3742e 100644
+index 57b27317f28901df1bb3c10bf462d319d0c7b7c3..a059b426e2d0280a318bd1c697056352b24ee9c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1761,9 +1761,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1711,9 +1711,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null");
          Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory);
  
diff --git a/patches/server/0646-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0636-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0646-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0636-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0647-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0637-Manually-inline-methods-in-BlockPosition.patch
similarity index 96%
rename from patches/server/0647-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0637-Manually-inline-methods-in-BlockPosition.patch
index 5771a5a307..e97ce21f71 100644
--- a/patches/server/0647-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0637-Manually-inline-methods-in-BlockPosition.patch
@@ -45,7 +45,7 @@ index 3b3d81886d50ee6510ff366e11817a578c645089..541cef99113af865b995af2cfb7a1e47
          }
  
 diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index 6d760fa1dbd13a66bff4695edc28f4ab4b3e44a3..beadef19ee136c27601f0d116a86967344c2e403 100644
+index 5256ff18d992250e04a6180e196c2d5d3f0928ca..369b54b96c682717ef93d05312714b4d30efaceb 100644
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
 @@ -19,9 +19,9 @@ public class Vec3i implements Comparable<Vec3i> {
diff --git a/patches/server/0648-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0638-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0648-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0638-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0649-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0639-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 90%
rename from patches/server/0649-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0639-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index b550d336f0..945af5ac43 100644
--- a/patches/server/0649-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0639-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -10,10 +10,10 @@ chunks did get inlined, but the standard CPS.getChunkAt
 method was not inlined.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 80a5bd7a57ceb617752f645c1a4f046fea6e8de6..a9f963ba9306b840a3d97c9a39fc81b09340065f 100644
+index fb2e1f1d9fcc3d2d1bd37f136f6a06ae5ccf79a1..74cb6cf55ed9b4e31ac3c06d9612823f7ede9ff3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -457,6 +457,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -365,6 +365,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/0650-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0640-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0650-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0640-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0651-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0641-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 90%
rename from patches/server/0651-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
rename to patches/server/0641-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 20c27c4ea4..0ab3e48f48 100644
--- a/patches/server/0651-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0641-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
@@ -11,10 +11,10 @@ easy win. The remaining problems with this function
 are mostly with the block getting itself.
 
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 618d6a94d695a3bf114307f85f0f151ee24f1879..7df62a219d0bcffc793c1a8c55b6ed244fdeb199 100644
+index c3760e0c8ac0b3ea200f4e1c237e250137a78caf..c978f3b2d42f512e982f289e76c2422e41b7eec6 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -92,7 +92,8 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -79,7 +79,8 @@ public interface BlockGetter extends LevelHeightAccessor {
                  return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
              }
              // Paper end - Prevent raytrace from loading chunks
diff --git a/patches/server/0652-Time-scoreboard-search.patch b/patches/server/0642-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0652-Time-scoreboard-search.patch
rename to patches/server/0642-Time-scoreboard-search.patch
diff --git a/patches/server/0653-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0643-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 94%
rename from patches/server/0653-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0643-Send-full-pos-packets-for-hard-colliding-entities.patch
index f005ae7e71..60fd4ee073 100644
--- a/patches/server/0653-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0643-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 04ca37b872a1585c55ac0b64d776073bf678ab0d..e0802f1cb73a80b08482832c2b269ac8485d5c1a 100644
+index a83b4d9b61230ecf5f776269cab228cf49c5f546..75b722ebc6c1fc6a45a0d3a3e57b5f131f2cf815 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -177,7 +177,7 @@ public class ServerEntity {
diff --git a/patches/server/0654-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0644-Oprimise-map-impl-for-tracked-players.patch
similarity index 87%
rename from patches/server/0654-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0644-Oprimise-map-impl-for-tracked-players.patch
index c1df820c6a..b5dd0be2c3 100644
--- a/patches/server/0654-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0644-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 9ddad716d641d649e09c094795240bd2e8c926b9..fea9355a25ab42f81504f90be7b3448044fa76dd 100644
+index 1ad4e5a0a4d236012c1dfb0dbffdacd0f134b72c..c0bc7495109a8d727c913e7cdc98d75a30bc7a55 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1199,7 +1199,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1115,7 +1115,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          final Entity entity;
          private final int range;
          SectionPos lastSectionPos;
diff --git a/patches/server/0655-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0645-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 95%
rename from patches/server/0655-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0645-Optimise-BlockSoil-nearby-water-lookup.patch
index 467d7d58e7..b192406016 100644
--- a/patches/server/0655-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0645-Optimise-BlockSoil-nearby-water-lookup.patch
@@ -7,7 +7,7 @@ Apparently the abstract block iteration was taking about
 75% of the method call.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 6c1e8ba518c883aa5c079b4c94f068833609acc3..47eb8bf604a63259c0200cada1403dc005a6cbac 100644
+index 66106b821d7a384a2eb0f27993beb9f4257e6815..6e4c852c93f2418ea69e485ed3a10cbe3a6e3bd2 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 @@ -151,19 +151,28 @@ public class FarmBlock extends Block {
diff --git a/patches/server/0656-Distance-manager-tick-timings.patch b/patches/server/0646-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0656-Distance-manager-tick-timings.patch
rename to patches/server/0646-Distance-manager-tick-timings.patch
diff --git a/patches/server/0657-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0647-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 90%
rename from patches/server/0657-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0647-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index a728be5346..d4e141ad1b 100644
--- a/patches/server/0657-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0647-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,10 +5,10 @@ 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 7da6bd04b6ea4f8bb99fe6dba9dd4ecaba96a284..36ffc24778b307d239a8af43486ed54f78c7ea68 100644
+index e6a3f377762db8f2f58cb6851b8f713ce591b29f..6ece18d5429217ee53ca5ae5c0eb7450aa5f63ec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2629,6 +2629,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2610,6 +2610,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
diff --git a/patches/server/0658-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0648-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0658-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0648-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0659-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0649-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0659-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0649-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0660-Add-packet-limiter-config.patch b/patches/server/0650-Add-packet-limiter-config.patch
similarity index 96%
rename from patches/server/0660-Add-packet-limiter-config.patch
rename to patches/server/0650-Add-packet-limiter-config.patch
index 0771f0d552..38146c8342 100644
--- a/patches/server/0660-Add-packet-limiter-config.patch
+++ b/patches/server/0650-Add-packet-limiter-config.patch
@@ -24,10 +24,10 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 6e75a5e7eb51a5bbb7b73436bbd37df1519cb0fc..a0434b92615c10a319eb4528808a83d01df2c516 100644
+index c7e4d38f67a196b6334e0cc2b9ce9bd96fdc5b0a..e6a8f36fa07561b69b9d869022234182bdd62da0 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
-@@ -132,6 +132,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -128,6 +128,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          return null;
      }
      // Paper end - add utility methods
@@ -50,7 +50,7 @@ index 6e75a5e7eb51a5bbb7b73436bbd37df1519cb0fc..a0434b92615c10a319eb4528808a83d0
  
      public Connection(PacketFlow side) {
          this.receiving = side;
-@@ -224,6 +240,55 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -220,6 +236,55 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              if (packetlistener == null) {
                  throw new IllegalStateException("Received a packet before the packet listener was initialized");
              } else {
diff --git a/patches/server/0661-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0651-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0661-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0651-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0662-Ensure-valid-vehicle-status.patch b/patches/server/0652-Ensure-valid-vehicle-status.patch
similarity index 85%
rename from patches/server/0662-Ensure-valid-vehicle-status.patch
rename to patches/server/0652-Ensure-valid-vehicle-status.patch
index c5d3159b83..62d62c36bb 100644
--- a/patches/server/0662-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0652-Ensure-valid-vehicle-status.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9cd64d14d4b6df92bb30d0ad610f8af85791962a..c1dd624e03c85eaba8733769dc650d33142af714 100644
+index bb313280236fb5c7dd2713a21edd3694e01a4fd1..20cdb362592714891d7676fbea6096dfe30447b0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -576,7 +576,7 @@ public class ServerPlayer extends Player {
+@@ -572,7 +572,7 @@ public class ServerPlayer extends Player {
              }
          }
  
diff --git a/patches/server/0663-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0653-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0663-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0653-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0664-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0654-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0664-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0654-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0665-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0655-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0665-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0655-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0666-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0656-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0666-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0656-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0667-Preserve-overstacked-loot.patch b/patches/server/0657-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0667-Preserve-overstacked-loot.patch
rename to patches/server/0657-Preserve-overstacked-loot.patch
diff --git a/patches/server/0668-Update-head-rotation-in-missing-places.patch b/patches/server/0658-Update-head-rotation-in-missing-places.patch
similarity index 84%
rename from patches/server/0668-Update-head-rotation-in-missing-places.patch
rename to patches/server/0658-Update-head-rotation-in-missing-places.patch
index 580638dc44..d48b54c0ae 100644
--- a/patches/server/0668-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0658-Update-head-rotation-in-missing-places.patch
@@ -8,10 +8,10 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4335ba4821017a0f097d1664dbc8ef7ed957d807..4fed53d9b23da65bbf2a0243a64403d4472e8407 100644
+index 99b87b783dfb3d0e00e3e03e5721feaef1c1ecf0..0dd2fcc51b7d07f68fdc630f7c73dcdc32282e90 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1841,6 +1841,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1830,6 +1830,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F);
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
@@ -19,7 +19,7 @@ index 4335ba4821017a0f097d1664dbc8ef7ed957d807..4fed53d9b23da65bbf2a0243a64403d4
      }
  
      public void absMoveTo(double x, double y, double z) {
-@@ -1879,6 +1880,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1868,6 +1869,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          this.setXRot(pitch);
          this.setOldPosAndRot();
          this.reapplyPosition();
diff --git a/patches/server/0669-prevent-unintended-light-block-manipulation.patch b/patches/server/0659-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0669-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0659-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0670-Fix-CraftCriteria-defaults-map.patch b/patches/server/0660-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0670-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0660-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0671-Fix-upstreams-block-state-factories.patch b/patches/server/0661-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0671-Fix-upstreams-block-state-factories.patch
rename to patches/server/0661-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0672-Configurable-feature-seeds.patch b/patches/server/0662-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0672-Configurable-feature-seeds.patch
rename to patches/server/0662-Configurable-feature-seeds.patch
diff --git a/patches/server/0673-Add-root-admin-user-detection.patch b/patches/server/0663-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0673-Add-root-admin-user-detection.patch
rename to patches/server/0663-Add-root-admin-user-detection.patch
diff --git a/patches/server/0674-Always-allow-item-changing-in-Fireball.patch b/patches/server/0664-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0674-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0664-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0675-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0665-don-t-attempt-to-teleport-dead-entities.patch
similarity index 85%
rename from patches/server/0675-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0665-don-t-attempt-to-teleport-dead-entities.patch
index 49a5fc1283..a512dbd9ac 100644
--- a/patches/server/0675-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0665-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4fed53d9b23da65bbf2a0243a64403d4472e8407..e0e57b91abde69f37ce7e5c0dd8e1f9efc67069f 100644
+index 0dd2fcc51b7d07f68fdc630f7c73dcdc32282e90..1b9b3e8b2a85c6e921ec665c95061f2d3e3f678d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -759,7 +759,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -757,7 +757,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      // CraftBukkit start
      public void postTick() {
          // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle
diff --git a/patches/server/0676-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0666-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 94%
rename from patches/server/0676-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0666-Prevent-excessive-velocity-through-repeated-crits.patch
index d73be1c8a3..cc55e32c58 100644
--- a/patches/server/0676-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0666-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bcb842a40ab97b4920e4e32cb3e6c8e1ff3081bd..d6159b34c366d47a4eefd007032687a8d2557978 100644
+index 61c8d108122e27f063d677e1d3130a4d3eeecb94..24a7ded2966b5431bae938b4ac903683fa2a3da7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2676,13 +2676,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0677-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0667-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0677-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0667-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0678-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0668-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0678-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0668-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0679-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0669-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 96%
rename from patches/server/0679-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0669-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 0e7b3d4017..4afd14619c 100644
--- a/patches/server/0679-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0669-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -18,7 +18,7 @@ index f9e15908143f4453c2a5817b412e8a13554553f0..06498788c169133bd563c5a87192b718
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index e0802f1cb73a80b08482832c2b269ac8485d5c1a..945a0317e9e49a159a1f42882a0a267a2141e86d 100644
+index 75b722ebc6c1fc6a45a0d3a3e57b5f131f2cf815..0a86e72e50d4aab7d19f588c3f11d7465c6fe817 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -335,7 +335,10 @@ public class ServerEntity {
@@ -34,7 +34,7 @@ index e0802f1cb73a80b08482832c2b269ac8485d5c1a..945a0317e9e49a159a1f42882a0a267a
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d6159b34c366d47a4eefd007032687a8d2557978..140cf1fd4a9850e28c7fa0f0abef6122564474dc 100644
+index 24a7ded2966b5431bae938b4ac903683fa2a3da7..d43ac664cae11d2f7d0c6965a57234430086f8ca 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3187,7 +3187,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0680-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0670-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 97%
rename from patches/server/0680-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0670-Hide-unnecessary-itemmeta-from-clients.patch
index e853de6413..485e08deb0 100644
--- a/patches/server/0680-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0670-Hide-unnecessary-itemmeta-from-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Hide unnecessary itemmeta from clients
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 945a0317e9e49a159a1f42882a0a267a2141e86d..e9fd9590e90e58fd4c31985a704a4511b2663096 100644
+index 0a86e72e50d4aab7d19f588c3f11d7465c6fe817..c881d6ea6acbcbd1414a0b7d6b5a26076244e34e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -337,7 +337,7 @@ public class ServerEntity {
@@ -33,7 +33,7 @@ index 0280c215f4e502cd0471523b040d8b54c50f7ab8..5aa9f337e1e251485310436f87786b02
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 140cf1fd4a9850e28c7fa0f0abef6122564474dc..e0f70157655ab26f5c7330f305c3234f64f677d1 100644
+index d43ac664cae11d2f7d0c6965a57234430086f8ca..45ad7703da01bc2bac56bb9447925a9b2bb9ea81 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3189,7 +3189,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0681-Fix-Spigot-growth-modifiers.patch b/patches/server/0671-Fix-Spigot-growth-modifiers.patch
similarity index 98%
rename from patches/server/0681-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0671-Fix-Spigot-growth-modifiers.patch
index abf48a38c5..92cddad5f1 100644
--- a/patches/server/0681-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0671-Fix-Spigot-growth-modifiers.patch
@@ -102,7 +102,7 @@ index 690abba9d27ab4061de4dd3676292b1859036868..591f32f7c0a7a9c843933d17dad8a34b
              this.grow(world, state, pos, 1);
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 11ac344ef113732fa717b67c51f76692b9b247e7..62c1434018be5b5fb70f7019b3c06d4d9200661d 100644
+index 2a787b641fec29427963ac2bdc14df60f32af2bc..41f4416d820ed1ca2d02b457749cbb6c3dbb20af 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -96,6 +96,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0682-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0672-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0682-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0672-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0683-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0673-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0683-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0673-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0684-Optimize-HashMapPalette.patch b/patches/server/0674-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0684-Optimize-HashMapPalette.patch
rename to patches/server/0674-Optimize-HashMapPalette.patch
diff --git a/patches/server/0685-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0675-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 95%
rename from patches/server/0685-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0675-Allow-delegation-to-vanilla-chunk-gen.patch
index caa2d8631b..702533a18c 100644
--- a/patches/server/0685-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0675-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 b9e6d28d8eb982a404981ac4df71238bf30d0989..468756c24c9439fd6afe4f73f82e0094e41ade25 100644
+index 9ad1645c143d91ae9e08dfe3d875c9b0aa4d0844..492867fb2bf9a94f8fd5fac7d02f7d1538edcf21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2459,6 +2459,88 @@ public final class CraftServer implements Server {
-         return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME), world); // Paper - Anti-Xray - Add parameters
+         return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME));
      }
  
 +    // Paper start - Allow delegation to vanilla chunk gen
@@ -98,7 +98,7 @@ index b9e6d28d8eb982a404981ac4df71238bf30d0989..468756c24c9439fd6afe4f73f82e0094
      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 03eb35d5c67f125c44cf46595c93d124ac7892b8..44a010590e830fd238cf6fdda443e28b72022e66 100644
+index e7f7a246e9c03e676dadfee59de87b8b2ac55ba3..9b640705f2c810160aa7fea5006429ec41d0c858 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 03eb35d5c67f125c44cf46595c93d124ac7892b8..44a010590e830fd238cf6fdda443e28b
      private final Registry<net.minecraft.world.level.biome.Biome> biomes;
      private Set<BlockPos> tiles;
      private final Set<BlockPos> lights = new HashSet<>();
-@@ -194,7 +194,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
+@@ -189,7 +189,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData {
          return this.tiles;
      }
  
diff --git a/patches/server/0686-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0676-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 96%
rename from patches/server/0686-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0676-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index e5b19cc588..d6bf69f20b 100644
--- a/patches/server/0686-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0676-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 6dc7e23e96aaffb912611a9dbd41459cb8489056..fd702027e62eb38d51fb7c46ef268e9bb94e1e92 100644
+index 545b14f02ac72dda30891d681eba585d19fd5e1d..d4e0ef75dd12709a0dcf9193821c30b8943e6c36 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -291,13 +291,17 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0687-Add-more-Campfire-API.patch b/patches/server/0677-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0687-Add-more-Campfire-API.patch
rename to patches/server/0677-Add-more-Campfire-API.patch
diff --git a/patches/server/0688-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0678-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 78%
rename from patches/server/0688-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0678-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index cddfe79879..6de737ae8f 100644
--- a/patches/server/0688-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0678-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
@@ -8,23 +8,21 @@ This ensures at least a valid version of the chunk exists
 on disk, even if outdated
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index cd362c5ee40e6542a42ee7429072e312569e5999..bbb134d82b30905b3213df9b855e7cf94ad71279 100644
+index f3d169436ce05f1c56599cfe15a56671b7d13516..4d5ab1771129114ef1e4745c43a4fd1813df2e30 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -529,6 +529,9 @@ public class RegionFile implements AutoCloseable {
-         }
+@@ -430,6 +430,7 @@ public class RegionFile implements AutoCloseable {
  
      }
-+
+ 
 +    public static final int MAX_CHUNK_SIZE = 500 * 1024 * 1024; // Paper - don't write garbage data to disk if writing serialization fails
-+
-     // Paper end
      private class ChunkBuffer extends ByteArrayOutputStream {
  
-@@ -544,6 +547,24 @@ public class RegionFile implements AutoCloseable {
+         private final ChunkPos pos;
+@@ -443,6 +444,23 @@ public class RegionFile implements AutoCloseable {
+             super.write(RegionFile.this.version.getId());
              this.pos = chunkcoordintpair;
          }
- 
 +        // Paper start - don't write garbage data to disk if writing serialization fails
 +        @Override
 +        public void write(final int b) {
@@ -42,21 +40,20 @@ index cd362c5ee40e6542a42ee7429072e312569e5999..bbb134d82b30905b3213df9b855e7cf9
 +            super.write(b, off, len);
 +        }
 +        // Paper end - don't write garbage data to disk if writing serialization fails
-+
+ 
          public void close() throws IOException {
              ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count);
- 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 88e4efd686d64aa5049d92416fb27589d0e58753..753a9ddfabaab0014f68426c8e44213912faf021 100644
+index eeccc924dbba6f860245611eb943c9219471f670..c3bf911a76373dcd1c345a3091adefb0e550fd18 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -286,10 +286,17 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -241,10 +241,17 @@ public class RegionFileStorage implements AutoCloseable {
+ 
+             try {
                  NbtIo.write(nbt, (DataOutput) dataoutputstream);
-                 regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - Cache chunk status
-                 regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone
-+                dataoutputstream.close(); // Paper - only write if successful
 +                // Paper start - don't write garbage data to disk if writing serialization fails
-+            } catch (RegionFileSizeException e) {
++                dataoutputstream.close(); // Only write if successful
++            } catch (final RegionFileSizeException e) {
 +                attempts = 5; // Don't retry
 +                regionfile.clear(pos);
 +                throw e;
@@ -69,7 +66,7 @@ index 88e4efd686d64aa5049d92416fb27589d0e58753..753a9ddfabaab0014f68426c8e442139
                      } catch (Throwable throwable1) {
                          throwable.addSuppressed(throwable1);
                      }
-@@ -297,10 +304,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -252,10 +259,7 @@ public class RegionFileStorage implements AutoCloseable {
  
                  throw throwable;
              }
@@ -81,7 +78,7 @@ index 88e4efd686d64aa5049d92416fb27589d0e58753..753a9ddfabaab0014f68426c8e442139
          }
          // Paper start - Chunk save reattempt
          return;
-@@ -346,4 +350,13 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -301,4 +305,13 @@ public class RegionFileStorage implements AutoCloseable {
          }
  
      }
diff --git a/patches/server/0689-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0679-Forward-CraftEntity-in-teleport-command.patch
similarity index 89%
rename from patches/server/0689-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0679-Forward-CraftEntity-in-teleport-command.patch
index 7bbf951b76..d3b762e841 100644
--- a/patches/server/0689-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0679-Forward-CraftEntity-in-teleport-command.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e0e57b91abde69f37ce7e5c0dd8e1f9efc67069f..fc3963247a1751b2576aaf476529d2ffe2bdf72e 100644
+index 1b9b3e8b2a85c6e921ec665c95061f2d3e3f678d..d07e8305939e9bcf19578de8e7996f98af2a89ba 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3310,6 +3310,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3299,6 +3299,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index e0e57b91abde69f37ce7e5c0dd8e1f9efc67069f..fc3963247a1751b2576aaf476529d2ff
          CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
  
          nbttagcompound.remove("Dimension");
-@@ -3400,10 +3407,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3389,10 +3396,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                          }
                      }
                      // CraftBukkit end
diff --git a/patches/server/0690-Improve-scoreboard-entries.patch b/patches/server/0680-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0690-Improve-scoreboard-entries.patch
rename to patches/server/0680-Improve-scoreboard-entries.patch
diff --git a/patches/server/0691-Entity-powdered-snow-API.patch b/patches/server/0681-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0691-Entity-powdered-snow-API.patch
rename to patches/server/0681-Entity-powdered-snow-API.patch
diff --git a/patches/server/0692-Add-API-for-item-entity-health.patch b/patches/server/0682-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0692-Add-API-for-item-entity-health.patch
rename to patches/server/0682-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0693-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0683-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0693-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0683-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0694-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0684-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0694-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0684-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0695-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0685-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0695-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0685-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0696-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0686-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0696-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0686-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0697-Fix-bees-aging-inside-hives.patch b/patches/server/0687-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0697-Fix-bees-aging-inside-hives.patch
rename to patches/server/0687-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0698-Bucketable-API.patch b/patches/server/0688-Bucketable-API.patch
similarity index 100%
rename from patches/server/0698-Bucketable-API.patch
rename to patches/server/0688-Bucketable-API.patch
diff --git a/patches/server/0699-Validate-usernames.patch b/patches/server/0689-Validate-usernames.patch
similarity index 96%
rename from patches/server/0699-Validate-usernames.patch
rename to patches/server/0689-Validate-usernames.patch
index c2660b240b..eda992b6b2 100644
--- a/patches/server/0699-Validate-usernames.patch
+++ b/patches/server/0689-Validate-usernames.patch
@@ -39,10 +39,10 @@ index a4d2ddbb9cee1682fc5d91e90d2fd0b74a47aa3c..e67bcde933d8d64ca1d9d18b938f1189
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index e33278611e4f52ff01cf628c570bd3378ff5c071..dbecf65fdd4e094b9b8b8f9267618934642db40f 100644
+index 712249fa1c1ce9af0dd07e8705bf944ac57842b5..ff070dbb6c9fa525b484e4eb9ef58caad9f0f016 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2340,9 +2340,23 @@ public abstract class Player extends LivingEntity {
+@@ -2332,9 +2332,23 @@ public abstract class Player extends LivingEntity {
      }
  
      public static boolean isValidUsername(String name) {
diff --git a/patches/server/0700-Make-water-animal-spawn-height-configurable.patch b/patches/server/0690-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0700-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0690-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0701-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0691-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 96%
rename from patches/server/0701-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0691-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 3d0f5cf41c..7357944555 100644
--- a/patches/server/0701-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0691-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 88645ffa12f630daf9bd74bb5848ed9dd23d0c1f..20790203d6ceeacc13506469b64140d7f6adfd6a 100644
+index 6f7a55bc2379f28e17b7e3500959972bbff9830d..a6c515e5bba6f359da5d7547947033546c1e853f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -593,7 +593,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 88645ffa12f630daf9bd74bb5848ed9dd23d0c1f..20790203d6ceeacc13506469b64140d7
                  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 468756c24c9439fd6afe4f73f82e0094e41ade25..15e4eecdea44983d621debdbd7614f27b6ffb792 100644
+index 492867fb2bf9a94f8fd5fac7d02f7d1538edcf21..aa4b4504c95826ed7b0dd6dae8388e2280bd1a23 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1258,7 +1258,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index 468756c24c9439fd6afe4f73f82e0094e41ade25..15e4eecdea44983d621debdbd7614f27
              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 1977368c44212eb290a1b141216bb3a880b3742e..921cbadba393616a7169e708a60846eea20b3438 100644
+index a059b426e2d0280a318bd1c697056352b24ee9c3..6233e58820f12b6e0715a2f3c5ce448d24d864fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -205,6 +205,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0702-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0692-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0702-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0692-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0703-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0693-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0703-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0693-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0704-Multiple-Entries-with-Scoreboards.patch b/patches/server/0694-Multiple-Entries-with-Scoreboards.patch
similarity index 98%
rename from patches/server/0704-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0694-Multiple-Entries-with-Scoreboards.patch
index 554fe28799..9bfd7660c6 100644
--- a/patches/server/0704-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0694-Multiple-Entries-with-Scoreboards.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multiple Entries with Scoreboards
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
-index e52644010dc2cf41bbf508b16b8ec2f0003e9d0b..f06ee212528d5670fb83720c2b543f864b64e873 100644
+index cf31771648549ab6d7e4e38b30409ca48a976bea..e70decbcf87c2a57bfa34ad7be7120d546ff8e35 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java
 @@ -42,6 +42,12 @@ public class ClientboundSetPlayerTeamPacket implements Packet<ClientGamePacketLi
diff --git a/patches/server/0705-Reset-placed-block-on-exception.patch b/patches/server/0695-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0705-Reset-placed-block-on-exception.patch
rename to patches/server/0695-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0706-Add-configurable-height-for-slime-spawn.patch b/patches/server/0696-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0706-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0696-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0707-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0697-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0707-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0697-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0708-Multi-Block-Change-API-Implementation.patch b/patches/server/0698-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0708-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0698-Multi-Block-Change-API-Implementation.patch
index 610c021b71..992864a023 100644
--- a/patches/server/0708-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0698-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..ccdc2345465313991f065e1176b58fb7
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 149906e1ab9d1cf2d186fbe4a47ac258d7802dee..8be0588680c55c19de4e3f0ecf17b96338c3c7b7 100644
+index 75d06c92de46a8cb374985435e89bb3b03962ee4..b6bf7cf5515400a1f241ebef6cc76073f0a93bfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -886,6 +886,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0709-Fix-NotePlayEvent.patch b/patches/server/0699-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0709-Fix-NotePlayEvent.patch
rename to patches/server/0699-Fix-NotePlayEvent.patch
diff --git a/patches/server/0710-Freeze-Tick-Lock-API.patch b/patches/server/0700-Freeze-Tick-Lock-API.patch
similarity index 89%
rename from patches/server/0710-Freeze-Tick-Lock-API.patch
rename to patches/server/0700-Freeze-Tick-Lock-API.patch
index e05f9c4f5d..f862f6c9f2 100644
--- a/patches/server/0710-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0700-Freeze-Tick-Lock-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fc3963247a1751b2576aaf476529d2ffe2bdf72e..b4c184fa88ab66bda3e801cbaa87e94567050ae8 100644
+index d07e8305939e9bcf19578de8e7996f98af2a89ba..db8d83dee46d325c0c07c5320a20302e431c5fcc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -406,6 +406,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -404,6 +404,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      private org.bukkit.util.Vector origin;
      @javax.annotation.Nullable
      private UUID originWorld;
@@ -16,7 +16,7 @@ index fc3963247a1751b2576aaf476529d2ffe2bdf72e..b4c184fa88ab66bda3e801cbaa87e945
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -805,7 +806,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -803,7 +804,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  this.setRemainingFireTicks(this.remainingFireTicks - 1);
              }
  
@@ -25,7 +25,7 @@ index fc3963247a1751b2576aaf476529d2ffe2bdf72e..b4c184fa88ab66bda3e801cbaa87e945
                  this.setTicksFrozen(0);
                  this.level().levelEvent((Player) null, 1009, this.blockPosition, 1);
              }
-@@ -2292,6 +2293,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2281,6 +2282,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (fromNetherPortal) {
                  nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
              }
@@ -35,7 +35,7 @@ index fc3963247a1751b2576aaf476529d2ffe2bdf72e..b4c184fa88ab66bda3e801cbaa87e945
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -2436,6 +2440,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2425,6 +2429,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (spawnReason == null) {
                  spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT;
              }
@@ -46,7 +46,7 @@ index fc3963247a1751b2576aaf476529d2ffe2bdf72e..b4c184fa88ab66bda3e801cbaa87e945
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e0f70157655ab26f5c7330f305c3234f64f677d1..d45a58e09cf6e59dd147fc50bf36c9c20eafe6b1 100644
+index 45ad7703da01bc2bac56bb9447925a9b2bb9ea81..fbbddf856a0fbb0b88bdbf00fed79ebeb9f85a33 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3451,7 +3451,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0711-More-PotionEffectType-API.patch b/patches/server/0701-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0711-More-PotionEffectType-API.patch
rename to patches/server/0701-More-PotionEffectType-API.patch
diff --git a/patches/server/0712-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0702-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0712-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0702-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0713-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0703-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0713-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0703-API-for-creating-command-sender-which-forwards-feedb.patch
index 98d424fde6..9c6bdd1e20 100644
--- a/patches/server/0713-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0703-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 15e4eecdea44983d621debdbd7614f27b6ffb792..4e239b061db4b3d05804dd4fc44bb23bd803597a 100644
+index aa4b4504c95826ed7b0dd6dae8388e2280bd1a23..e4b3456bccbb0a3a0d5115c3d47de15352a834ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2110,6 +2110,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0714-Add-missing-structure-set-seed-configs.patch b/patches/server/0704-Add-missing-structure-set-seed-configs.patch
similarity index 99%
rename from patches/server/0714-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0704-Add-missing-structure-set-seed-configs.patch
index 12cc77ad3e..2248ec3351 100644
--- a/patches/server/0714-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0704-Add-missing-structure-set-seed-configs.patch
@@ -235,10 +235,10 @@ index 65dcb14241baadb2c9f8f16919d7b562198ad9c3..02e58161a0f5915084230831ee03050d
  
          @Override
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 62c1434018be5b5fb70f7019b3c06d4d9200661d..1cf6d4f854d89c515e48e1fb365eb95ff9340765 100644
+index 41f4416d820ed1ca2d02b457749cbb6c3dbb20af..5485df1a1b59e81f4dcedd21dd972e1fd2759573 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -368,6 +368,18 @@ public class SpigotWorldConfig
+@@ -322,6 +322,18 @@ public class SpigotWorldConfig
      public int mansionSeed;
      public int fossilSeed;
      public int portalSeed;
@@ -257,7 +257,7 @@ index 62c1434018be5b5fb70f7019b3c06d4d9200661d..1cf6d4f854d89c515e48e1fb365eb95f
      private void initWorldGenSeeds()
      {
          this.villageSeed = this.getInt( "seed-village", 10387312 );
-@@ -385,6 +397,14 @@ public class SpigotWorldConfig
+@@ -339,6 +351,14 @@ public class SpigotWorldConfig
          this.mansionSeed = this.getInt( "seed-mansion", 10387319 );
          this.fossilSeed = this.getInt( "seed-fossil", 14357921 );
          this.portalSeed = this.getInt( "seed-portal", 34222645 );
diff --git a/patches/server/0715-Implement-regenerateChunk.patch b/patches/server/0705-Implement-regenerateChunk.patch
similarity index 97%
rename from patches/server/0715-Implement-regenerateChunk.patch
rename to patches/server/0705-Implement-regenerateChunk.patch
index 53ba1bb4ff..593c5cbe31 100644
--- a/patches/server/0715-Implement-regenerateChunk.patch
+++ b/patches/server/0705-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 921cbadba393616a7169e708a60846eea20b3438..f59555c21014cf5ff0b0e1c2c5fd0f73ba689803 100644
+index 6233e58820f12b6e0715a2f3c5ce448d24d864fc..967ee7a4fed61d229599349d05f7a506aa26a3de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -144,6 +144,7 @@ import org.jetbrains.annotations.NotNull;
@@ -17,7 +17,7 @@ index 921cbadba393616a7169e708a60846eea20b3438..f59555c21014cf5ff0b0e1c2c5fd0f73
  
      private final ServerLevel world;
      private WorldBorder worldBorder;
-@@ -428,27 +429,61 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -414,27 +415,61 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean regenerateChunk(int x, int z) {
          org.spigotmc.AsyncCatcher.catchOp("chunk regenerate"); // Spigot
diff --git a/patches/server/0716-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0706-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0716-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0706-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0717-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0707-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 92%
rename from patches/server/0717-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0707-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 10ebcc7715..2377250695 100644
--- a/patches/server/0717-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0707-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 4e239b061db4b3d05804dd4fc44bb23bd803597a..c569ddd5ae932d172aa791efab5c92c1394caf02 100644
+index e4b3456bccbb0a3a0d5115c3d47de15352a834ca..145da771363242db9c0460ac9815359740ffbb3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2287,6 +2287,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0718-Add-GameEvent-tags.patch b/patches/server/0708-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0718-Add-GameEvent-tags.patch
rename to patches/server/0708-Add-GameEvent-tags.patch
index 55aaa582d5..54063e4b78 100644
--- a/patches/server/0718-Add-GameEvent-tags.patch
+++ b/patches/server/0708-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 c569ddd5ae932d172aa791efab5c92c1394caf02..8dc49151791b847aeec4f3f0341de0c6013ed757 100644
+index 145da771363242db9c0460ac9815359740ffbb3b..7233fd7a789e72b9fa978f9c23086e8a23270426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2708,6 +2708,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0719-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0709-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 94%
rename from patches/server/0719-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0709-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index a2ce560ccc..45f593e703 100644
--- a/patches/server/0719-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0709-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 20790203d6ceeacc13506469b64140d7f6adfd6a..3e18923079ed2def11d5d0b199b14275274e290e 100644
+index a6c515e5bba6f359da5d7547947033546c1e853f..846f5e341bc5bc3d286b1511dd87f54499b202d0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1290,6 +1290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0720-Furnace-RecipesUsed-API.patch b/patches/server/0710-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0720-Furnace-RecipesUsed-API.patch
rename to patches/server/0710-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0721-Configurable-sculk-sensor-listener-range.patch b/patches/server/0711-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0721-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0711-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0722-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0712-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0722-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0712-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0723-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0713-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 96%
rename from patches/server/0723-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0713-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 00af345d2d..6f9a3d741f 100644
--- a/patches/server/0723-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0713-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3e18923079ed2def11d5d0b199b14275274e290e..c577c0d0738ae25d6036c01cd88ed754baf5d7f2 100644
+index 846f5e341bc5bc3d286b1511dd87f54499b202d0..7a81101b17a39ad8f7b44453c26c3afda33ae94e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -620,7 +620,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0724-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0714-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 92%
rename from patches/server/0724-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0714-Put-world-into-worldlist-before-initing-the-world.patch
index 881551c756..0f94e2a738 100644
--- a/patches/server/0724-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0714-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c577c0d0738ae25d6036c01cd88ed754baf5d7f2..febf45127a9891823d939d43d0f3a05b7d79914a 100644
+index 7a81101b17a39ad8f7b44453c26c3afda33ae94e..5a1c19f7964f282217097d94c0a9e3cc376f70fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -632,9 +632,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index c577c0d0738ae25d6036c01cd88ed754baf5d7f2..febf45127a9891823d939d43d0f3a05b
  
              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 8dc49151791b847aeec4f3f0341de0c6013ed757..9fdf24d84ac7cc506f662c2eb82d582a13e42768 100644
+index 7233fd7a789e72b9fa978f9c23086e8a23270426..2ef62cc94b8884b4e7e70f9ca926a0c6cd82e321 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1288,10 +1288,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0725-Fix-Entity-Position-Desync.patch b/patches/server/0715-Fix-Entity-Position-Desync.patch
similarity index 93%
rename from patches/server/0725-Fix-Entity-Position-Desync.patch
rename to patches/server/0715-Fix-Entity-Position-Desync.patch
index 454d603827..b46e0b1041 100644
--- a/patches/server/0725-Fix-Entity-Position-Desync.patch
+++ b/patches/server/0715-Fix-Entity-Position-Desync.patch
@@ -9,7 +9,7 @@ This excludes hanging entities, as this fix caused problematic behavior due to t
 position field.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index e9fd9590e90e58fd4c31985a704a4511b2663096..78145f8dc50c64b1650bfa7e3ef867ca96f29ca9 100644
+index c881d6ea6acbcbd1414a0b7d6b5a26076244e34e..b52f86e23a35f8727d827155ebb20f847108d673 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -171,7 +171,7 @@ public class ServerEntity {
diff --git a/patches/server/0726-Custom-Potion-Mixes.patch b/patches/server/0716-Custom-Potion-Mixes.patch
similarity index 98%
rename from patches/server/0726-Custom-Potion-Mixes.patch
rename to patches/server/0716-Custom-Potion-Mixes.patch
index 655c724810..e2a88e9c70 100644
--- a/patches/server/0726-Custom-Potion-Mixes.patch
+++ b/patches/server/0716-Custom-Potion-Mixes.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index febf45127a9891823d939d43d0f3a05b7d79914a..96780b3a1a2f19b768f737202bdae5c80ac5bf98 100644
+index 5a1c19f7964f282217097d94c0a9e3cc376f70fd..35053ad6cdb071d3f256a23d532d1abb77f14858 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2087,6 +2087,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..bc01481ac5990ad1cfd1def5a16dd0ed
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9fdf24d84ac7cc506f662c2eb82d582a13e42768..884d3ba1be2d89da076b4cb63da6dd43c1c3ed95 100644
+index 2ef62cc94b8884b4e7e70f9ca926a0c6cd82e321..3651cdff8b5a489d57ffd39470510e0f2e413f71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -304,6 +304,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0727-Force-close-world-loading-screen.patch b/patches/server/0717-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0727-Force-close-world-loading-screen.patch
rename to patches/server/0717-Force-close-world-loading-screen.patch
index 713e4db4a6..47feea3319 100644
--- a/patches/server/0727-Force-close-world-loading-screen.patch
+++ b/patches/server/0717-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 3daa5cce3cfb438ef63f60ec84f3f54271fcdfe7..ab01a3af073a7bf3fcda9595929afabb80e0a4da 100644
+index e67bcde933d8d64ca1d9d18b938f118994bf222b..bc16ce7734fa328192a67491fac83f89e3e819f6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -398,6 +398,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0728-Fix-falling-block-spawn-methods.patch b/patches/server/0718-Fix-falling-block-spawn-methods.patch
similarity index 95%
rename from patches/server/0728-Fix-falling-block-spawn-methods.patch
rename to patches/server/0718-Fix-falling-block-spawn-methods.patch
index 4ca27654d7..2b1edd55e6 100644
--- a/patches/server/0728-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0718-Fix-falling-block-spawn-methods.patch
@@ -11,10 +11,10 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f59555c21014cf5ff0b0e1c2c5fd0f73ba689803..c0e7680bff3f65269a7031c08c06f38fdbaa4979 100644
+index 967ee7a4fed61d229599349d05f7a506aa26a3de..98a32754545bc8d27f3a10e8509c529e02bedee9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1453,7 +1453,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1403,7 +1403,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(material != null, "Material cannot be null");
          Preconditions.checkArgument(material.isBlock(), "Material.%s must be a block", material);
  
@@ -28,7 +28,7 @@ index f59555c21014cf5ff0b0e1c2c5fd0f73ba689803..c0e7680bff3f65269a7031c08c06f38f
          return (FallingBlock) entity.getBukkitEntity();
      }
  
-@@ -1462,7 +1467,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1412,7 +1417,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          Preconditions.checkArgument(location != null, "Location cannot be null");
          Preconditions.checkArgument(data != null, "BlockData cannot be null");
  
diff --git a/patches/server/0729-Expose-furnace-minecart-push-values.patch b/patches/server/0719-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0729-Expose-furnace-minecart-push-values.patch
rename to patches/server/0719-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0730-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0720-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 95%
rename from patches/server/0730-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0720-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 03471ecb7f..8e50aa42cd 100644
--- a/patches/server/0730-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0720-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
@@ -15,7 +15,7 @@ piercing arrows to avoid duplicate damage being applied.
 protected net.minecraft.world.entity.projectile.Projectile hitCancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index ae4319c2532855315bc45995a39d7eb98961b939..2b2ff2a187410ef9431b0396c05935ffd17fd108 100644
+index 5f75e54cde19614461dd8375ded1d6b3c395f674..618de60680de015bc68bf95a68eda98db7bab3c5 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -297,6 +297,19 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0731-More-Projectile-API.patch b/patches/server/0721-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0731-More-Projectile-API.patch
rename to patches/server/0721-More-Projectile-API.patch
diff --git a/patches/server/0732-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0722-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0732-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0722-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0733-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0723-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0733-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0723-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0734-Implement-getComputedBiome-API.patch b/patches/server/0724-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0734-Implement-getComputedBiome-API.patch
rename to patches/server/0724-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0735-Make-some-itemstacks-nonnull.patch b/patches/server/0725-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0735-Make-some-itemstacks-nonnull.patch
rename to patches/server/0725-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0736-Implement-enchantWithLevels-API.patch b/patches/server/0726-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0736-Implement-enchantWithLevels-API.patch
rename to patches/server/0726-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0737-Fix-saving-in-unloadWorld.patch b/patches/server/0727-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0737-Fix-saving-in-unloadWorld.patch
rename to patches/server/0727-Fix-saving-in-unloadWorld.patch
index 04a743911e..51a9cb25bf 100644
--- a/patches/server/0737-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0727-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 884d3ba1be2d89da076b4cb63da6dd43c1c3ed95..e94c4a5419806e35aaabb88624afe672f93ffa57 100644
+index 3651cdff8b5a489d57ffd39470510e0f2e413f71..49a29b5a84fb2c2a18adfbf788f10e6912518bd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1336,7 +1336,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0738-Buffer-OOB-setBlock-calls.patch b/patches/server/0728-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0738-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0728-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0739-Add-TameableDeathMessageEvent.patch b/patches/server/0729-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0739-Add-TameableDeathMessageEvent.patch
rename to patches/server/0729-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0740-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0730-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0740-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0730-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0741-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0731-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 88%
rename from patches/server/0741-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0731-fix-player-loottables-running-when-mob-loot-gamerule.patch
index 5345851a63..7e01b2803b 100644
--- a/patches/server/0741-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0731-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c1dd624e03c85eaba8733769dc650d33142af714..8332af6921e37d7dbf2a57a40f8413443a1706f8 100644
+index 20cdb362592714891d7676fbea6096dfe30447b0..2778c9a1d31f7798d6b536664418323f0f3c00cb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -924,12 +924,14 @@ public class ServerPlayer extends Player {
+@@ -920,12 +920,14 @@ public class ServerPlayer extends Player {
                  }
              }
          }
diff --git a/patches/server/0742-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0732-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 85%
rename from patches/server/0742-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0732-Ensure-entity-passenger-world-matches-ridden-entity.patch
index da00ce2881..c812f30edb 100644
--- a/patches/server/0742-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0732-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b4c184fa88ab66bda3e801cbaa87e94567050ae8..a0bd8a9ac362b5131ada29fc999a02003d47f990 100644
+index db8d83dee46d325c0c07c5320a20302e431c5fcc..a848448f14ad4aee3a36aa4ef52efd25d73ebbcb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2626,7 +2626,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2615,7 +2615,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      public boolean startRiding(Entity entity, boolean force) {
diff --git a/patches/server/0743-cache-resource-keys.patch b/patches/server/0733-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0743-cache-resource-keys.patch
rename to patches/server/0733-cache-resource-keys.patch
diff --git a/patches/server/0744-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0734-Allow-changing-the-EnderDragon-podium.patch
similarity index 100%
rename from patches/server/0744-Allow-changing-the-EnderDragon-podium.patch
rename to patches/server/0734-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0745-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0735-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0745-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0735-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0746-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0736-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0746-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0736-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0747-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0737-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0747-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0737-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0748-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0738-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0748-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0738-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0749-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0739-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0749-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0739-Pass-ServerLevel-for-gamerule-callbacks.patch
index 58d97ba7c4..d7ade8d2aa 100644
--- a/patches/server/0749-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0739-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -167,10 +167,10 @@ index f3cdf1fa7731eb7bb1cb89aa6a37204d81257cb0..0112ef51815c4fab38b95d5e917d335e
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c0e7680bff3f65269a7031c08c06f38fdbaa4979..f22048c66f28a0c2cb6edb6afda4d3cf1469d913 100644
+index 98a32754545bc8d27f3a10e8509c529e02bedee9..561ed3b93ba09f17f0f263b90993a7b13ce3f468 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2038,7 +2038,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1988,7 +1988,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper end - Add WorldGameRuleChangeEvent
          GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule));
          handle.deserialize(event.getValue()); // Paper - Add WorldGameRuleChangeEvent
@@ -179,7 +179,7 @@ index c0e7680bff3f65269a7031c08c06f38fdbaa4979..f22048c66f28a0c2cb6edb6afda4d3cf
          return true;
      }
  
-@@ -2079,7 +2079,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2029,7 +2029,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper end - Add WorldGameRuleChangeEvent
          GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule.getName()));
          handle.deserialize(event.getValue()); // Paper - Add WorldGameRuleChangeEvent
diff --git a/patches/server/0750-Expand-PlayerItemDamageEvent.patch b/patches/server/0740-Expand-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0750-Expand-PlayerItemDamageEvent.patch
rename to patches/server/0740-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0751-WorldCreator-keepSpawnLoaded.patch b/patches/server/0741-WorldCreator-keepSpawnLoaded.patch
similarity index 94%
rename from patches/server/0751-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0741-WorldCreator-keepSpawnLoaded.patch
index fb14f7b798..b58bfdc439 100644
--- a/patches/server/0751-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0741-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 e94c4a5419806e35aaabb88624afe672f93ffa57..583e3cfcd223561d1733c503f84b99edbb4b365e 100644
+index 49a29b5a84fb2c2a18adfbf788f10e6912518bd7..28b7694d3ff59cdad838382e207eff6fdc8face7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1283,7 +1283,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0752-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0742-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0752-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0742-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0753-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0743-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 94%
rename from patches/server/0753-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0743-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index b23922a4d1..88ff6e1546 100644
--- a/patches/server/0753-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0743-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 03b337ce5ccb1db61dc395b91b061a2aecf8fbf6..c783e0cbc2f124eeacebc7c7cabb9c38f720a328 100644
+index 37513cf5714afda6c552219c2eca8134c054d2bb..be25ea71cb3a3bd324935754604c9f7473a88d0a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -423,12 +423,16 @@ public class ServerPlayerGameMode {
+@@ -421,12 +421,16 @@ public class ServerPlayerGameMode {
                      block.destroy(this.level, pos, iblockdata1);
                  }
  
@@ -25,7 +25,7 @@ index 03b337ce5ccb1db61dc395b91b061a2aecf8fbf6..c783e0cbc2f124eeacebc7c7cabb9c38
  
                      itemstack.mineBlock(this.level, iblockdata1, pos, this.player);
                      if (flag && flag1 && event.isDropItems()) { // CraftBukkit - Check if block should drop items
-@@ -449,6 +453,13 @@ public class ServerPlayerGameMode {
+@@ -447,6 +451,13 @@ public class ServerPlayerGameMode {
                  if (flag && event != null) {
                      iblockdata.getBlock().popExperience(this.level, pos, event.getExpToDrop(), this.player); // Paper
                  }
diff --git a/patches/server/0754-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0744-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0754-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0744-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0755-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0745-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0755-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0745-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0756-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0746-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0756-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0746-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0757-Add-PlayerStopUsingItemEvent.patch b/patches/server/0747-Add-PlayerStopUsingItemEvent.patch
similarity index 91%
rename from patches/server/0757-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0747-Add-PlayerStopUsingItemEvent.patch
index 1e8db058ab..dda50b3846 100644
--- a/patches/server/0757-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0747-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d45a58e09cf6e59dd147fc50bf36c9c20eafe6b1..c14699d0deb19b8d92fb72132ecc7cd5e99ec2b8 100644
+index fbbddf856a0fbb0b88bdbf00fed79ebeb9f85a33..f5bed73a079e022eeb3b05e4c49532044852fd22 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4024,6 +4024,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0758-Don-t-tick-markers.patch b/patches/server/0748-Don-t-tick-markers.patch
similarity index 91%
rename from patches/server/0758-Don-t-tick-markers.patch
rename to patches/server/0748-Don-t-tick-markers.patch
index 2935ea8511..3b66b6d373 100644
--- a/patches/server/0758-Don-t-tick-markers.patch
+++ b/patches/server/0748-Don-t-tick-markers.patch
@@ -23,10 +23,10 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5e5a018433414af76eaa1e781f61612d
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 36ffc24778b307d239a8af43486ed54f78c7ea68..6cd9f531b3c92641d8452a6d7a807ea8f9a61e8f 100644
+index 6ece18d5429217ee53ca5ae5c0eb7450aa5f63ec..9fffd60371500b05c009e0c8ac7d83126fbde866 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2538,6 +2538,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2520,6 +2520,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          public void onTickingStart(Entity entity) {
@@ -35,10 +35,10 @@ index 36ffc24778b307d239a8af43486ed54f78c7ea68..6cd9f531b3c92641d8452a6d7a807ea8
          }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 3495981419a75efe42bce45a89a32378dd6b8372..fafc8b84d6b6368c70b8eedfdb4c3a9deace9c26 100644
+index d5374072a97f791964033d107f023b3cc657b343..aaa997613a991a9fc5ed276a7e7e61448f34ef64 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -213,8 +213,14 @@ public class ActivationRange
+@@ -135,8 +135,14 @@ public class ActivationRange
  
              // Paper start
              java.util.List<Entity> entities = world.getEntities((Entity)null, ActivationRange.maxBB, null);
diff --git a/patches/server/0759-Expand-FallingBlock-API.patch b/patches/server/0749-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0759-Expand-FallingBlock-API.patch
rename to patches/server/0749-Expand-FallingBlock-API.patch
diff --git a/patches/server/0760-Do-not-accept-invalid-client-settings.patch b/patches/server/0750-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0760-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0750-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0761-Add-support-for-Proxy-Protocol.patch b/patches/server/0751-Add-support-for-Proxy-Protocol.patch
similarity index 95%
rename from patches/server/0761-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0751-Add-support-for-Proxy-Protocol.patch
index ef9bc5a74d..1580298fa5 100644
--- a/patches/server/0761-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0751-Add-support-for-Proxy-Protocol.patch
@@ -17,10 +17,10 @@ index c6241f858209ed662d8720217d143340916024e9..7c563ef33d12b227856e65392905bffa
      implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
      implementation("org.ow2.asm:asm-commons:9.5")
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 13fc9b88c06b0436d23039ef4686f3a88589447e..a4a29a7ea0035ecf4c61ee8547a9eb24acb667d0 100644
+index 87abd6274f9da9367094bad0c28acfa47e01c50e..4f330a44c77a7ec3237a86fda04921a8c4a1c00f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -124,6 +124,29 @@ public class ServerConnectionListener {
+@@ -121,6 +121,29 @@ public class ServerConnectionListener {
                      Connection object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND); // CraftBukkit - decompile error
  
                      //ServerConnectionListener.this.connections.add(object); // Paper
diff --git a/patches/server/0762-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0752-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0762-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0752-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0763-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0753-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0763-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0753-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0764-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0754-Sanitize-sent-BlockEntity-NBT.patch
similarity index 94%
rename from patches/server/0764-Sanitize-sent-BlockEntity-NBT.patch
rename to patches/server/0754-Sanitize-sent-BlockEntity-NBT.patch
index d79abc0a00..9f25d88865 100644
--- a/patches/server/0764-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0754-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 8ffb99aedaa57c1e96ddcc05143776b59c9700a3..998deae645b4497c3285bfba3260c636439f9ecf 100644
+index dda7151d333144399ba5602e1b651b1f5b8f8f0d..582a3e5e45dd10068eeb25a3e37bdece3ddbc296 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-@@ -186,6 +186,7 @@ public class ClientboundLevelChunkPacketData {
+@@ -170,6 +170,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/0765-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0755-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0765-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0755-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0766-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0756-Prevent-entity-loading-causing-async-lookups.patch
similarity index 95%
rename from patches/server/0766-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0756-Prevent-entity-loading-causing-async-lookups.patch
index 9961e95b87..a118054447 100644
--- a/patches/server/0766-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0756-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a0bd8a9ac362b5131ada29fc999a02003d47f990..b0822dcc819a4001e8a6db83ec6931b44a2b040b 100644
+index a848448f14ad4aee3a36aa4ef52efd25d73ebbcb..0d23c58fec4c7a93093107833baeec0936f03641 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -768,6 +768,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -766,6 +766,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      public void baseTick() {
          this.level().getProfiler().push("entityBaseTick");
diff --git a/patches/server/0767-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0757-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 97%
rename from patches/server/0767-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0757-Throw-exception-on-world-create-while-being-ticked.patch
index d1ed752d71..1cf3de0781 100644
--- a/patches/server/0767-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0757-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,7 +45,7 @@ index 35053ad6cdb071d3f256a23d532d1abb77f14858..fb86e510dc3197cf47b999d80a34a60c
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 583e3cfcd223561d1733c503f84b99edbb4b365e..6a7ae215b901b4d8afdb2ee6166f89aa9943c8fb 100644
+index 28b7694d3ff59cdad838382e207eff6fdc8face7..13f266dd4f6b47947eb9b1282d64647a93e5430e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -874,6 +874,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0768-Dont-resent-entity-on-art-update.patch b/patches/server/0758-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0768-Dont-resent-entity-on-art-update.patch
rename to patches/server/0758-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0769-Add-WardenAngerChangeEvent.patch b/patches/server/0759-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0769-Add-WardenAngerChangeEvent.patch
rename to patches/server/0759-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0770-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0760-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 94%
rename from patches/server/0770-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0760-Add-option-for-strict-advancement-dimension-checks.patch
index 07480bbe95..a58aef43bc 100644
--- a/patches/server/0770-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0760-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,10 +24,10 @@ index 5f9cb2c7a2874e423087d04d3360af0364692b5c..428e0afef2cac9f2a19d8cfe8f2504dd
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8332af6921e37d7dbf2a57a40f8413443a1706f8..1b9459aeb7a676cb3ac1fbee3561f21923d9b20d 100644
+index 2778c9a1d31f7798d6b536664418323f0f3c00cb..cc4954ceceeb8636ac1d6f0f0459816d2a98c317 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1321,6 +1321,12 @@ public class ServerPlayer extends Player {
+@@ -1317,6 +1317,12 @@ public class ServerPlayer extends Player {
          ResourceKey<Level> maindimensionkey = CraftDimensionUtil.getMainDimensionKey(origin);
          ResourceKey<Level> maindimensionkey1 = CraftDimensionUtil.getMainDimensionKey(this.level());
  
diff --git a/patches/server/0771-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0761-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0771-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0761-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0772-Nameable-Banner-API.patch b/patches/server/0762-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0772-Nameable-Banner-API.patch
rename to patches/server/0762-Nameable-Banner-API.patch
diff --git a/patches/server/0773-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0763-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0773-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0763-Don-t-broadcast-messages-to-command-blocks.patch
index a18b8c207a..3e8edb955c 100644
--- a/patches/server/0773-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0763-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index c56f5173fda6b38c2dcaea196217f2f5a7d7c641..524b0f1086c01888fe0b76e180c40915
              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 6a7ae215b901b4d8afdb2ee6166f89aa9943c8fb..0d1fbb78394e60666d17fb7be67d5716d02a3099 100644
+index 13f266dd4f6b47947eb9b1282d64647a93e5430e..f1544ea9d189a8aa81e7f742c04173f8bf2b0209 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1873,7 +1873,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0774-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0764-Prevent-empty-items-from-being-added-to-world.patch
similarity index 89%
rename from patches/server/0774-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0764-Prevent-empty-items-from-being-added-to-world.patch
index dc47bed407..521e3bb803 100644
--- a/patches/server/0774-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0764-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,10 +7,10 @@ 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 6cd9f531b3c92641d8452a6d7a807ea8f9a61e8f..68537510653ac189cde1e4f8b9ef542532300a67 100644
+index 9fffd60371500b05c009e0c8ac7d83126fbde866..ca3ee200c80047aca3c8856b057e5c77840d849c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1519,6 +1519,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1501,6 +1501,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0775-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0765-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0775-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0765-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0776-Add-Player-getFishHook.patch b/patches/server/0766-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0776-Add-Player-getFishHook.patch
rename to patches/server/0766-Add-Player-getFishHook.patch
diff --git a/patches/server/0777-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0767-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0777-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0767-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0778-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0768-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 96%
rename from patches/server/0778-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0768-Add-various-missing-EntityDropItemEvent-calls.patch
index ad72730ee9..95c8881890 100644
--- a/patches/server/0778-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0768-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b0822dcc819a4001e8a6db83ec6931b44a2b040b..7c57dccea6a5b960dc805b24908d1e099ed77bfd 100644
+index 0d23c58fec4c7a93093107833baeec0936f03641..5c6111c224eb92de071ff9e588e97c4fee64432b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2537,6 +2537,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2526,6 +2526,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe
  
              entityitem.setDefaultPickUpDelay();
diff --git a/patches/server/0779-Fix-Bee-flower-NPE.patch b/patches/server/0769-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0779-Fix-Bee-flower-NPE.patch
rename to patches/server/0769-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0780-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0770-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0780-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0770-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0781-More-Teleport-API.patch b/patches/server/0771-More-Teleport-API.patch
similarity index 99%
rename from patches/server/0781-More-Teleport-API.patch
rename to patches/server/0771-More-Teleport-API.patch
index 52a6386535..69a0d1d9ae 100644
--- a/patches/server/0781-More-Teleport-API.patch
+++ b/patches/server/0771-More-Teleport-API.patch
@@ -72,7 +72,7 @@ index b7df71633527dce2e4f954caee249e3b31b82226..ee1dc74b2f48bf8d684562de895ab631
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8be0588680c55c19de4e3f0ecf17b96338c3c7b7..417c0d6942dd7e55629ba5926415a5274bde2dad 100644
+index b6bf7cf5515400a1f241ebef6cc76073f0a93bfa..aad9e9d0a832df412d1835998c3537d7279c9421 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1207,13 +1207,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0782-Add-EntityPortalReadyEvent.patch b/patches/server/0772-Add-EntityPortalReadyEvent.patch
similarity index 88%
rename from patches/server/0782-Add-EntityPortalReadyEvent.patch
rename to patches/server/0772-Add-EntityPortalReadyEvent.patch
index 6f0e3bc921..bf56e46924 100644
--- a/patches/server/0782-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0772-Add-EntityPortalReadyEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7c57dccea6a5b960dc805b24908d1e099ed77bfd..eb8d1a04887a38142d9695dc96a46d76e26cf866 100644
+index 5c6111c224eb92de071ff9e588e97c4fee64432b..9ec4143c8f9c257d12233b9ae92147f6c2e28634 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2878,6 +2878,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2867,6 +2867,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
                      this.level().getProfiler().push("portal");
                      this.portalTime = i;
@@ -22,7 +22,7 @@ index 7c57dccea6a5b960dc805b24908d1e099ed77bfd..eb8d1a04887a38142d9695dc96a46d76
                      this.setPortalCooldown();
                      // CraftBukkit start
                      if (this instanceof ServerPlayer) {
-@@ -2885,6 +2892,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2874,6 +2881,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                      } else {
                          this.changeDimension(worldserver1);
                      }
diff --git a/patches/server/0783-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0773-Don-t-use-level-random-in-entity-constructors.patch
similarity index 96%
rename from patches/server/0783-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0773-Don-t-use-level-random-in-entity-constructors.patch
index bc78c6a474..1223c386c3 100644
--- a/patches/server/0783-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0773-Don-t-use-level-random-in-entity-constructors.patch
@@ -27,7 +27,7 @@ index 459f793a6603d4f98c84df4e549f069298c54985..8aaca29b115a55bf48306e71432c4c20
  
      public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index d9ed22e9853eebdf6c517b41787a27a1a56a0871..2274541c9386e4f1bbae489a1f123d502ccbf9cc 100644
+index fe51d34f9d764ed4bff4a2a0c566e132dde36e55..2498f942ab55a2ee9af4822c300ec6f45811ef3f 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -43,7 +43,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
diff --git a/patches/server/0784-Send-block-entities-after-destroy-prediction.patch b/patches/server/0774-Send-block-entities-after-destroy-prediction.patch
similarity index 97%
rename from patches/server/0784-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0774-Send-block-entities-after-destroy-prediction.patch
index 4d84d9c447..d0cf025998 100644
--- a/patches/server/0784-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0774-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 c783e0cbc2f124eeacebc7c7cabb9c38f720a328..c24701ed78824dc5377f8517dedf6a5aeff0614d 100644
+index be25ea71cb3a3bd324935754604c9f7473a88d0a..75967b3526f3f946ffc6784b87b787396ab15368 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 c783e0cbc2f124eeacebc7c7cabb9c38f720a328..c24701ed78824dc5377f8517dedf6a5a
                      return;
                  }
                  // CraftBukkit end
-@@ -389,10 +385,12 @@ public class ServerPlayerGameMode {
+@@ -387,10 +383,12 @@ public class ServerPlayerGameMode {
                  }
  
                  // Update any tile entity data for this block
diff --git a/patches/server/0785-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0775-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 83%
rename from patches/server/0785-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0775-Warn-on-plugins-accessing-faraway-chunks.patch
index 7148c5665f..dce15cbf48 100644
--- a/patches/server/0785-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0775-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 a9f963ba9306b840a3d97c9a39fc81b09340065f..d84e1f2f085e83ff394e8dfe8bf42add64c9ee6d 100644
+index 74cb6cf55ed9b4e31ac3c06d9612823f7ede9ff3..95800047e4c6d84a6f4bc7b643ca6ff302fda5ed 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -444,7 +444,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -352,7 +352,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      private static boolean isInWorldBoundsHorizontal(BlockPos pos) {
@@ -18,7 +18,7 @@ index a9f963ba9306b840a3d97c9a39fc81b09340065f..d84e1f2f085e83ff394e8dfe8bf42add
  
      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 f22048c66f28a0c2cb6edb6afda4d3cf1469d913..7899e9c905dd420821f1c422c6c07e63ac4d3121 100644
+index 561ed3b93ba09f17f0f263b90993a7b13ce3f468..4a6fe040e3eeaabaa84946c49482b03b63e6eccc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -312,9 +312,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -46,7 +46,7 @@ index f22048c66f28a0c2cb6edb6afda4d3cf1469d913..7899e9c905dd420821f1c422c6c07e63
          // Paper start - add ticket to hold chunk for a little while longer if plugin accesses it
          net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkSource().getChunkAtIfLoadedImmediately(x, z);
          if (chunk == null) {
-@@ -429,6 +444,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -415,6 +430,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      @Override
      public boolean regenerateChunk(int x, int z) {
          org.spigotmc.AsyncCatcher.catchOp("chunk regenerate"); // Spigot
@@ -54,15 +54,15 @@ index f22048c66f28a0c2cb6edb6afda4d3cf1469d913..7899e9c905dd420821f1c422c6c07e63
          // Paper start - implement regenerateChunk method
          final ServerLevel serverLevel = this.world;
          final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource();
-@@ -524,6 +540,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -505,6 +521,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
 +        warnUnsafeChunk("loading a faraway chunk", x, z); // Paper
-         // Paper start - Optimize this method
-         ChunkPos chunkPos = new ChunkPos(x, z);
-         ChunkAccess immediate = world.getChunkSource().getChunkAtIfLoadedImmediately(x, z); // Paper
-@@ -587,6 +604,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+         ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
+ 
+         // If generate = false, but the chunk already exists, we will get this back.
+@@ -537,6 +554,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean addPluginChunkTicket(int x, int z, Plugin plugin) {
@@ -70,7 +70,7 @@ index f22048c66f28a0c2cb6edb6afda4d3cf1469d913..7899e9c905dd420821f1c422c6c07e63
          Preconditions.checkArgument(plugin != null, "null plugin");
          Preconditions.checkArgument(plugin.isEnabled(), "plugin is not enabled");
  
-@@ -655,6 +673,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -605,6 +623,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public void setChunkForceLoaded(int x, int z, boolean forced) {
@@ -78,7 +78,7 @@ index f22048c66f28a0c2cb6edb6afda4d3cf1469d913..7899e9c905dd420821f1c422c6c07e63
          this.getHandle().setChunkForced(x, z, forced);
      }
  
-@@ -967,6 +986,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -917,6 +936,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 f22048c66f28a0c2cb6edb6afda4d3cf1469d913..7899e9c905dd420821f1c422c6c07e63
          // Transient load for this tick
          return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
      }
-@@ -2415,6 +2435,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2365,6 +2385,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/0786-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0776-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/server/0786-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0776-Custom-Chat-Completion-Suggestions-API.patch
index 1f20bc7a88..5e20e5e035 100644
--- a/patches/server/0786-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0776-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 417c0d6942dd7e55629ba5926415a5274bde2dad..434e3e92bd483de5a35e2f7c96f3c78c4e085239 100644
+index aad9e9d0a832df412d1835998c3537d7279c9421..6366fc2ae7944f90bcc25780c4e11e25c13f77b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -647,6 +647,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0787-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0777-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0787-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0777-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0788-Collision-API.patch b/patches/server/0778-Collision-API.patch
similarity index 100%
rename from patches/server/0788-Collision-API.patch
rename to patches/server/0778-Collision-API.patch
diff --git a/patches/server/0789-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0779-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0789-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0779-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0790-Block-Ticking-API.patch b/patches/server/0780-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0790-Block-Ticking-API.patch
rename to patches/server/0780-Block-Ticking-API.patch
diff --git a/patches/server/0791-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0781-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0791-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0781-Add-Velocity-IP-Forwarding-Support.patch
index 3518ceb444..2d3d408777 100644
--- a/patches/server/0791-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0781-Add-Velocity-IP-Forwarding-Support.patch
@@ -228,7 +228,7 @@ index ebda34825bbd10145a81d54c345e31c2a4fb5de4..42ae62bdbe11fdfbacebf621d64e7c49
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0d1fbb78394e60666d17fb7be67d5716d02a3099..fd31a716ec66235970af4854dd7d83c1f88e229d 100644
+index f1544ea9d189a8aa81e7f742c04173f8bf2b0209..cda293ee6281ba01f9f924ad5c65d8ad96ab50f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -803,7 +803,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0792-Add-NamespacedKey-biome-methods.patch b/patches/server/0782-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0792-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0782-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0793-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0783-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 96%
rename from patches/server/0793-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0783-Fix-plugin-loggers-on-server-shutdown.patch
index 1dae8c1591..dfdc415fba 100644
--- a/patches/server/0793-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0783-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 44f5d7b359f172521be30c464d7acf6881dbeef0..681acc1ec995d9dbd5cfd30445b967093a3e4466 100644
+index fb86e510dc3197cf47b999d80a34a60c37f1d3c8..14393bd35c3c77ee8d7bad0c71e880f6dd9c1be5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1212,6 +1212,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0794-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0784-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 96%
rename from patches/server/0794-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0784-Stop-large-look-changes-from-crashing-the-server.patch
index e7ec6dc35d..bbac4cc96e 100644
--- a/patches/server/0794-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0784-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c14699d0deb19b8d92fb72132ecc7cd5e99ec2b8..626012f925ae7e7e99fe86f4d57e6b063fe14904 100644
+index f5bed73a079e022eeb3b05e4c49532044852fd22..39d9f33e49cc8099e0f6dc9822e6d471b46d6e28 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3055,37 +3055,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0795-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0785-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0795-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0785-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0796-Missing-eating-regain-reason.patch b/patches/server/0786-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0796-Missing-eating-regain-reason.patch
rename to patches/server/0786-Missing-eating-regain-reason.patch
diff --git a/patches/server/0797-Missing-effect-cause.patch b/patches/server/0787-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0797-Missing-effect-cause.patch
rename to patches/server/0787-Missing-effect-cause.patch
diff --git a/patches/server/0798-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0788-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0798-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0788-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0799-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0789-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0799-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0789-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0800-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0790-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0800-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0790-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0801-Configurable-chat-thread-limit.patch b/patches/server/0791-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0801-Configurable-chat-thread-limit.patch
rename to patches/server/0791-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0802-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0792-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0802-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0792-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0803-fix-Jigsaw-block-kicking-user.patch b/patches/server/0793-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0803-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0793-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0804-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0794-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0804-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0794-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0805-Add-getDrops-to-BlockState.patch b/patches/server/0795-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0805-Add-getDrops-to-BlockState.patch
rename to patches/server/0795-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0806-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0796-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 97%
rename from patches/server/0806-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0796-Fix-a-bunch-of-vanilla-bugs.patch
index dc69cd76b7..2c4b7976ec 100644
--- a/patches/server/0806-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0796-Fix-a-bunch-of-vanilla-bugs.patch
@@ -113,12 +113,12 @@ index 6cd6d69a20e95e344fc18ab67dc300824537a59b..2e2a7c2cf3081187da817479a9da3eb1
              }
          }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index fea9355a25ab42f81504f90be7b3448044fa76dd..c164e222e1eaeee06cacf0c46edc32e41694b852 100644
+index c0bc7495109a8d727c913e7cdc98d75a30bc7a55..61d6c2be8595d54a68b0c53c1898068f568c2a97 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -814,7 +814,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -730,7 +730,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         // CraftBukkit end
      }
-     // Paper end - Cache chunk status on disk
  
 -    boolean anyPlayerCloseEnoughForSpawning(ChunkPos pos) {
 +    public boolean anyPlayerCloseEnoughForSpawning(ChunkPos pos) { // Paper - public
@@ -126,10 +126,10 @@ index fea9355a25ab42f81504f90be7b3448044fa76dd..c164e222e1eaeee06cacf0c46edc32e4
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 68537510653ac189cde1e4f8b9ef542532300a67..dfb4e538a9cb05124dc49db940ea44e3fac478cf 100644
+index ca3ee200c80047aca3c8856b057e5c77840d849c..366670bf2e843b91519fbff2b0515e66debcd855 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1006,7 +1006,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1007,7 +1007,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          } else {
              AABB axisalignedbb = AABB.encapsulatingFullBlocks(blockposition1, new BlockPos(blockposition1.atY(this.getMaxBuildHeight()))).inflate(3.0D);
              List<LivingEntity> list = this.getEntitiesOfClass(LivingEntity.class, axisalignedbb, (entityliving) -> {
@@ -139,10 +139,10 @@ index 68537510653ac189cde1e4f8b9ef542532300a67..dfb4e538a9cb05124dc49db940ea44e3
  
              if (!list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1b9459aeb7a676cb3ac1fbee3561f21923d9b20d..b43baee9a03f17801712e8a1af3317e1297248ab 100644
+index cc4954ceceeb8636ac1d6f0f0459816d2a98c317..f6701e597ad43d44e6f5809d9cc2b670863df67e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -468,14 +468,14 @@ public class ServerPlayer extends Player {
+@@ -464,14 +464,14 @@ public class ServerPlayer extends Player {
                  BlockPos blockposition1 = PlayerRespawnLogic.getOverworldRespawnPos(world, blockposition.getX() + j2 - i, blockposition.getZ() + k2 - i);
  
                  if (blockposition1 != null) {
@@ -160,7 +160,7 @@ index 1b9459aeb7a676cb3ac1fbee3561f21923d9b20d..b43baee9a03f17801712e8a1af3317e1
              while (!world.noCollision((Entity) this) && this.getY() < (double) (world.getMaxBuildHeight() - 1)) {
                  this.setPos(this.getX(), this.getY() + 1.0D, this.getZ());
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index c24701ed78824dc5377f8517dedf6a5aeff0614d..a38cda0029af022eccb12c12f1652fa8053b2aa6 100644
+index 75967b3526f3f946ffc6784b87b787396ab15368..da8a60fbbba3866780615e65d6e242774a965bc6 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/0807-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0797-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 88%
rename from patches/server/0807-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0797-Remove-unnecessary-onTrackingStart-during-navigation.patch
index d21cb0f72e..646baf136f 100644
--- a/patches/server/0807-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0797-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,10 +5,10 @@ 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 dfb4e538a9cb05124dc49db940ea44e3fac478cf..61e68f9479b1bf9570eac012170b28e4b8322b1e 100644
+index 366670bf2e843b91519fbff2b0515e66debcd855..6531c844c8ffef52f4be985c1b0b73a236219bc5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2566,7 +2566,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2548,7 +2548,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (entity instanceof Mob) {
                  Mob entityinsentient = (Mob) entity;
  
@@ -17,7 +17,7 @@ index dfb4e538a9cb05124dc49db940ea44e3fac478cf..61e68f9479b1bf9570eac012170b28e4
                      String s = "onTrackingStart called during navigation iteration";
  
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
-@@ -2652,7 +2652,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2633,7 +2633,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (entity instanceof Mob) {
                  Mob entityinsentient = (Mob) entity;
  
diff --git a/patches/server/0808-Fix-custom-piglin-loved-items.patch b/patches/server/0798-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0808-Fix-custom-piglin-loved-items.patch
rename to patches/server/0798-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0809-EntityPickupItemEvent-fixes.patch b/patches/server/0799-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0809-EntityPickupItemEvent-fixes.patch
rename to patches/server/0799-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0810-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0800-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 94%
rename from patches/server/0810-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0800-Correctly-handle-interactions-with-items-on-cooldown.patch
index 88286e5950..54490f6aae 100644
--- a/patches/server/0810-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0800-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 a38cda0029af022eccb12c12f1652fa8053b2aa6..521fc5fd6b66c7095c729dd4aaf49bbc443f0200 100644
+index da8a60fbbba3866780615e65d6e242774a965bc6..88b71210d0845e8a4a2cd424ba238c4b5e27933b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -516,6 +516,7 @@ public class ServerPlayerGameMode {
+@@ -514,6 +514,7 @@ public class ServerPlayerGameMode {
          BlockState iblockdata = world.getBlockState(blockposition);
          InteractionResult enuminteractionresult = InteractionResult.PASS;
          boolean cancelledBlock = false;
@@ -16,7 +16,7 @@ index a38cda0029af022eccb12c12f1652fa8053b2aa6..521fc5fd6b66c7095c729dd4aaf49bbc
  
          if (!iblockdata.getBlock().isEnabled(world.enabledFeatures())) {
              return InteractionResult.FAIL;
-@@ -525,10 +526,10 @@ public class ServerPlayerGameMode {
+@@ -523,10 +524,10 @@ public class ServerPlayerGameMode {
          }
  
          if (player.getCooldowns().isOnCooldown(stack.getItem())) {
diff --git a/patches/server/0811-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0801-Add-PlayerInventorySlotChangeEvent.patch
similarity index 95%
rename from patches/server/0811-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0801-Add-PlayerInventorySlotChangeEvent.patch
index 08eb692747..7f618d01e7 100644
--- a/patches/server/0811-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0801-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b43baee9a03f17801712e8a1af3317e1297248ab..de80b618efcf9f0ceae40ed0b53d3436afca27b8 100644
+index f6701e597ad43d44e6f5809d9cc2b670863df67e..160e8ed25c7fcf60b1a9c4188ad636e7fc671ab7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -379,6 +379,25 @@ public class ServerPlayer extends Player {
+@@ -375,6 +375,25 @@ public class ServerPlayer extends Player {
  
                  }
              }
diff --git a/patches/server/0812-Elder-Guardian-appearance-API.patch b/patches/server/0802-Elder-Guardian-appearance-API.patch
similarity index 90%
rename from patches/server/0812-Elder-Guardian-appearance-API.patch
rename to patches/server/0802-Elder-Guardian-appearance-API.patch
index 6b3feb4446..ed1d0138cd 100644
--- a/patches/server/0812-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0802-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 434e3e92bd483de5a35e2f7c96f3c78c4e085239..a65284d453e2bb436db1ce12f008e7e98f84f9f6 100644
+index 6366fc2ae7944f90bcc25780c4e11e25c13f77b7..947612bb606fd24423857a42021ef89e73a083e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3189,6 +3189,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0813-Allow-changing-bed-s-occupied-property.patch b/patches/server/0803-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0813-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0803-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0814-Add-entity-knockback-API.patch b/patches/server/0804-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0814-Add-entity-knockback-API.patch
rename to patches/server/0804-Add-entity-knockback-API.patch
diff --git a/patches/server/0815-Detect-headless-JREs.patch b/patches/server/0805-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0815-Detect-headless-JREs.patch
rename to patches/server/0805-Detect-headless-JREs.patch
diff --git a/patches/server/0816-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0806-fix-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0816-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0806-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0817-Add-EntityToggleSitEvent.patch b/patches/server/0807-Add-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0817-Add-EntityToggleSitEvent.patch
rename to patches/server/0807-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0818-Add-fire-tick-delay-option.patch b/patches/server/0808-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0818-Add-fire-tick-delay-option.patch
rename to patches/server/0808-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0819-Add-Moving-Piston-API.patch b/patches/server/0809-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0819-Add-Moving-Piston-API.patch
rename to patches/server/0809-Add-Moving-Piston-API.patch
diff --git a/patches/server/0820-Ignore-impossible-spawn-tick.patch b/patches/server/0810-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0820-Ignore-impossible-spawn-tick.patch
rename to patches/server/0810-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0821-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0811-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0821-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0811-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0822-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0812-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0822-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0812-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0823-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0813-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 92%
rename from patches/server/0823-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0813-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index c3bb8f0204..ceb0618b4b 100644
--- a/patches/server/0823-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0813-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb8d1a04887a38142d9695dc96a46d76e26cf866..eb416aa2ca3c905692fa82cc29ec5eb32dee79a6 100644
+index 9ec4143c8f9c257d12233b9ae92147f6c2e28634..77365a374a9e702ca9d6b3b1bf97937921455f60 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3157,6 +3157,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3146,6 +3146,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              pluginManager.callEvent(entityCombustEvent);
              if (!entityCombustEvent.isCancelled()) {
                  this.setSecondsOnFire(entityCombustEvent.getDuration(), false);
diff --git a/patches/server/0824-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0814-Add-PrePlayerAttackEntityEvent.patch
similarity index 89%
rename from patches/server/0824-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0814-Add-PrePlayerAttackEntityEvent.patch
index 99884e7e78..2bce7e6fb3 100644
--- a/patches/server/0824-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0814-Add-PrePlayerAttackEntityEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index dbecf65fdd4e094b9b8b8f9267618934642db40f..06aef23895f486efc7eb00c35df356d0a88d58ed 100644
+index ff070dbb6c9fa525b484e4eb9ef58caad9f0f016..c766de11e4495328224a1f47a69e4d54d26d7254 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1240,8 +1240,17 @@ public abstract class Player extends LivingEntity {
+@@ -1232,8 +1232,17 @@ public abstract class Player extends LivingEntity {
      }
  
      public void attack(Entity target) {
diff --git a/patches/server/0825-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0815-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0825-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0815-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0826-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0816-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0826-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0816-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0827-Add-Player-Warden-Warning-API.patch b/patches/server/0817-Add-Player-Warden-Warning-API.patch
similarity index 95%
rename from patches/server/0827-Add-Player-Warden-Warning-API.patch
rename to patches/server/0817-Add-Player-Warden-Warning-API.patch
index 48462712ee..954f55dae8 100644
--- a/patches/server/0827-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0817-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a65284d453e2bb436db1ce12f008e7e98f84f9f6..03b2df036d3618c1ff8291fbf70879aff4a65324 100644
+index 947612bb606fd24423857a42021ef89e73a083e5..b47c5c81ebc160a7a767b1d22436d39820ffb595 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3194,6 +3194,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0828-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0818-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 94%
rename from patches/server/0828-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0818-More-vanilla-friendly-methods-to-update-trades.patch
index 7bb1eafa6b..559443224d 100644
--- a/patches/server/0828-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0818-More-vanilla-friendly-methods-to-update-trades.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More vanilla friendly methods to update trades
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index fb5d4b1a86d00fce9482ed4fd4ae71fdcdb63781..1aae466e3e334d7f4bbb3ea9365a255afcc3dd3a 100644
+index 3653193effdecd969b5ac159b6d5ce633451d706..4a19e6b83147ae22ade70fdd445c5d7df3b07a0f 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -944,6 +944,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -926,6 +926,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
      @Override
      protected void updateTrades() {
@@ -21,7 +21,7 @@ index fb5d4b1a86d00fce9482ed4fd4ae71fdcdb63781..1aae466e3e334d7f4bbb3ea9365a255a
          VillagerData villagerdata = this.getVillagerData();
          Int2ObjectMap int2objectmap;
  
-@@ -961,9 +967,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -943,9 +949,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              if (avillagertrades_imerchantrecipeoption != null) {
                  MerchantOffers merchantrecipelist = this.getOffers();
  
diff --git a/patches/server/0829-Add-paper-dumplisteners-command.patch b/patches/server/0819-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0829-Add-paper-dumplisteners-command.patch
rename to patches/server/0819-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0830-check-global-player-list-where-appropriate.patch b/patches/server/0820-check-global-player-list-where-appropriate.patch
similarity index 94%
rename from patches/server/0830-check-global-player-list-where-appropriate.patch
rename to patches/server/0820-check-global-player-list-where-appropriate.patch
index 447233c67d..0fd5e80c30 100644
--- a/patches/server/0830-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0820-check-global-player-list-where-appropriate.patch
@@ -7,10 +7,10 @@ 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 61e68f9479b1bf9570eac012170b28e4b8322b1e..1506483f7d02f94ad1b00d9d3f94b7a0d99e2ca6 100644
+index 6531c844c8ffef52f4be985c1b0b73a236219bc5..b20f0da6b27fe1753ae8283ace2b5df96ee74a77 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2689,4 +2689,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2670,4 +2670,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::move);
          }
      }
@@ -24,7 +24,7 @@ index 61e68f9479b1bf9570eac012170b28e4b8322b1e..1506483f7d02f94ad1b00d9d3f94b7a0
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1cbbbfc691830195679f8371d9db5d69eed28f3d..6b4f51e0d3324afbab85c9d96833ee145cc54caf 100644
+index 39d9f33e49cc8099e0f6dc9822e6d471b46d6e28..5cc93ed8e082324c12ba55e7d388a8cdc7f67f1a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3677,7 +3677,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0831-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0821-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0831-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0821-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0832-ItemStack-damage-API.patch b/patches/server/0822-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0832-ItemStack-damage-API.patch
rename to patches/server/0822-ItemStack-damage-API.patch
diff --git a/patches/server/0833-Friction-API.patch b/patches/server/0823-Friction-API.patch
similarity index 98%
rename from patches/server/0833-Friction-API.patch
rename to patches/server/0823-Friction-API.patch
index 96945cc9a3..147e76dc4c 100644
--- a/patches/server/0833-Friction-API.patch
+++ b/patches/server/0823-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 6b4f51e0d3324afbab85c9d96833ee145cc54caf..85fe9bb49ca687cdd8b1fe35fb168c21f08d5593 100644
+index 5cc93ed8e082324c12ba55e7d388a8cdc7f67f1a..2d8404f4b78ab9a25a3e6be8cf8bf5bb0b1ea090 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -261,6 +261,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0834-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0824-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0834-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0824-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0835-Fix-player-kick-on-shutdown.patch b/patches/server/0825-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0835-Fix-player-kick-on-shutdown.patch
rename to patches/server/0825-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0836-Sync-offhand-slot-in-menus.patch b/patches/server/0826-Sync-offhand-slot-in-menus.patch
similarity index 95%
rename from patches/server/0836-Sync-offhand-slot-in-menus.patch
rename to patches/server/0826-Sync-offhand-slot-in-menus.patch
index 3035b7f2e4..6fec301aa3 100644
--- a/patches/server/0836-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0826-Sync-offhand-slot-in-menus.patch
@@ -8,10 +8,10 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index de80b618efcf9f0ceae40ed0b53d3436afca27b8..46a69ef6794065e144e4948ad165a1ea0f0e2f33 100644
+index 160e8ed25c7fcf60b1a9c4188ad636e7fc671ab7..50400964b30952fcaae04536bff906e44c9a3a3d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -348,6 +348,13 @@ public class ServerPlayer extends Player {
+@@ -344,6 +344,13 @@ public class ServerPlayer extends Player {
  
              }
  
diff --git a/patches/server/0837-Player-Entity-Tracking-Events.patch b/patches/server/0827-Player-Entity-Tracking-Events.patch
similarity index 87%
rename from patches/server/0837-Player-Entity-Tracking-Events.patch
rename to patches/server/0827-Player-Entity-Tracking-Events.patch
index adab6a787e..18b7aa1dc2 100644
--- a/patches/server/0837-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0827-Player-Entity-Tracking-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Entity Tracking Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index c164e222e1eaeee06cacf0c46edc32e41694b852..39c8f3c694904905f946d30ea4b149c8c0545989 100644
+index 61d6c2be8595d54a68b0c53c1898068f568c2a97..94a0e0d1cdbb96a12acd1a23833242d9676d21a0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1271,7 +1271,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1187,7 +1187,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // CraftBukkit end
                  if (flag) {
                      if (this.seenBy.add(player.connection)) {
@@ -21,10 +21,10 @@ index c164e222e1eaeee06cacf0c46edc32e41694b852..39c8f3c694904905f946d30ea4b149c8
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb416aa2ca3c905692fa82cc29ec5eb32dee79a6..e8fab882d8668f4afc565356b7beb0bebe8d5faf 100644
+index 77365a374a9e702ca9d6b3b1bf97937921455f60..48d7378cdfa3b15607aec21666487dd4a55e4a91 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3884,7 +3884,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3873,7 +3873,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      public void startSeenByPlayer(ServerPlayer player) {}
  
diff --git a/patches/server/0838-Limit-pet-look-distance.patch b/patches/server/0828-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0838-Limit-pet-look-distance.patch
rename to patches/server/0828-Limit-pet-look-distance.patch
diff --git a/patches/server/0839-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0829-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0839-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0829-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0840-fix-Instruments.patch b/patches/server/0830-fix-Instruments.patch
similarity index 96%
rename from patches/server/0840-fix-Instruments.patch
rename to patches/server/0830-fix-Instruments.patch
index c55f770244..312d90a306 100644
--- a/patches/server/0840-fix-Instruments.patch
+++ b/patches/server/0830-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 03b2df036d3618c1ff8291fbf70879aff4a65324..d2ddc69d94cd5d78563896015053364013bb151a 100644
+index b47c5c81ebc160a7a767b1d22436d39820ffb595..2affa1477ad2994b6083c294e78ded3ff8e4086b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -724,7 +724,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0841-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0831-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0841-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0831-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0842-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0832-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0842-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0832-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0843-Add-BlockLockCheckEvent.patch b/patches/server/0833-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0843-Add-BlockLockCheckEvent.patch
rename to patches/server/0833-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0844-Add-Sneaking-API-for-Entities.patch b/patches/server/0834-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0844-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0834-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0845-Improve-logging-and-errors.patch b/patches/server/0835-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0845-Improve-logging-and-errors.patch
rename to patches/server/0835-Improve-logging-and-errors.patch
diff --git a/patches/server/0846-Improve-PortalEvents.patch b/patches/server/0836-Improve-PortalEvents.patch
similarity index 89%
rename from patches/server/0846-Improve-PortalEvents.patch
rename to patches/server/0836-Improve-PortalEvents.patch
index 9e612b388a..30b0e74178 100644
--- a/patches/server/0846-Improve-PortalEvents.patch
+++ b/patches/server/0836-Improve-PortalEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e8fab882d8668f4afc565356b7beb0bebe8d5faf..085471073643d851e3b08e2282ab37a64ebd732d 100644
+index 48d7378cdfa3b15607aec21666487dd4a55e4a91..ce52cd5d11e4422cb236761b5dff06daa9cad56b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3542,7 +3542,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -3531,7 +3531,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          Location enter = bukkitEntity.getLocation();
          Location exit = CraftLocation.toBukkit(exitPosition, exitWorldServer.getWorld());
  
diff --git a/patches/server/0847-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0837-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0847-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0837-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0848-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0838-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0848-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0838-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0849-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0839-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0849-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0839-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0850-Flying-Fall-Damage.patch b/patches/server/0840-Flying-Fall-Damage.patch
similarity index 89%
rename from patches/server/0850-Flying-Fall-Damage.patch
rename to patches/server/0840-Flying-Fall-Damage.patch
index 4a0d52fb18..bce120dfcb 100644
--- a/patches/server/0850-Flying-Fall-Damage.patch
+++ b/patches/server/0840-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 06aef23895f486efc7eb00c35df356d0a88d58ed..a629755f07415997e6dbdd96f9b447b90e20b1d5 100644
+index c766de11e4495328224a1f47a69e4d54d26d7254..4baf585d4b339d5a608a1723518267eef3c10c5f 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity {
@@ -16,7 +16,7 @@ index 06aef23895f486efc7eb00c35df356d0a88d58ed..a629755f07415997e6dbdd96f9b447b9
      // Paper end
  
      // CraftBukkit start
-@@ -1679,7 +1680,7 @@ public abstract class Player extends LivingEntity {
+@@ -1671,7 +1672,7 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -26,7 +26,7 @@ index 06aef23895f486efc7eb00c35df356d0a88d58ed..a629755f07415997e6dbdd96f9b447b9
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d2ddc69d94cd5d78563896015053364013bb151a..1d4b098564ace12dac15506d9f192f6ed27ec864 100644
+index 2affa1477ad2994b6083c294e78ded3ff8e4086b..285ac126baf0a9be36fad2ea114c167c357ef118 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2472,6 +2472,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0851-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0841-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0851-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0841-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0852-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0842-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 86%
rename from patches/server/0852-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0842-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 1f0a9d6d10..c42d340335 100644
--- a/patches/server/0852-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0842-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 085471073643d851e3b08e2282ab37a64ebd732d..9c998f4a9c73a807930e5b106d2ff6cc2d6afe77 100644
+index ce52cd5d11e4422cb236761b5dff06daa9cad56b..bbeab184bfd4b8541c97281d3328e9622c8227b6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1092,7 +1092,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1081,7 +1081,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                      }
  
                      if (!bl.getType().isAir()) {
diff --git a/patches/server/0853-config-for-disabling-entity-tag-tags.patch b/patches/server/0843-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0853-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0843-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0854-Use-single-player-info-update-packet-on-join.patch b/patches/server/0844-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0854-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0844-Use-single-player-info-update-packet-on-join.patch
index e68ff316b4..57b905f4a9 100644
--- a/patches/server/0854-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0844-Use-single-player-info-update-packet-on-join.patch
@@ -18,7 +18,7 @@ index 07850cf4117f05bfbd96a4f02fd57db1566f90af..50f2c11d98dc4e8aa2e6f577fc802279
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 48211cdc96aab8db73a097f6899d7a9408595bf4..14bcf8b155139dcfe3b397b3b516402b3c05e09c 100644
+index 551ceff75bc36a75bb992f1081d7343d1a956fd8..f9cb05de12c938ea6d44a806f73bc0ae48b4394f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -358,6 +358,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0855-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0845-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 95%
rename from patches/server/0855-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0845-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 2aa84cc8e5..a376c07bd0 100644
--- a/patches/server/0855-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0845-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3ef0b5b1e105c973e8b135f504581625256545f9..bf611c86fc095d9e9a6087d5436ddc3511835398 100644
+index 2d8404f4b78ab9a25a3e6be8cf8bf5bb0b1ea090..b6a8530074c898392879405e8ae774ce15c05776 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1610,7 +1610,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0856-Win-Screen-API.patch b/patches/server/0846-Win-Screen-API.patch
similarity index 93%
rename from patches/server/0856-Win-Screen-API.patch
rename to patches/server/0846-Win-Screen-API.patch
index e699a45b6a..c6ffc4441c 100644
--- a/patches/server/0856-Win-Screen-API.patch
+++ b/patches/server/0846-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1d4b098564ace12dac15506d9f192f6ed27ec864..65bcc0b4a864c26a3167273230f642e0603c0702 100644
+index 285ac126baf0a9be36fad2ea114c167c357ef118..4b85c6bfd9398da369fbe22f090c21fc1217eae3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1226,6 +1226,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0857-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0847-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0857-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0847-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0858-Fix-force-opening-enchantment-tables.patch b/patches/server/0848-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0858-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0848-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0859-Add-Entity-Body-Yaw-API.patch b/patches/server/0849-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0859-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0849-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0860-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0850-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0860-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0850-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0861-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0851-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 83%
rename from patches/server/0861-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0851-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 0b06f11a10..f785ac01e7 100644
--- a/patches/server/0861-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0851-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 d84e1f2f085e83ff394e8dfe8bf42add64c9ee6d..898a7bf653e4d213104eb339ea4bc30bc9b26455 100644
+index 95800047e4c6d84a6f4bc7b643ca6ff302fda5ed..ee1ba73796816e15437a2a2331d86494b3674ce7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -550,6 +550,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -458,6 +458,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/0862-Add-EntityFertilizeEggEvent.patch b/patches/server/0852-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0862-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0852-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0863-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0853-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0863-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0853-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0864-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0854-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0864-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0854-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0865-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0855-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0865-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0855-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0866-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0856-Fix-advancement-triggers-for-entity-damage.patch
similarity index 97%
rename from patches/server/0866-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0856-Fix-advancement-triggers-for-entity-damage.patch
index 3a1d3cc88c..cb8de1cc65 100644
--- a/patches/server/0866-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0856-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,7 +23,7 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bf611c86fc095d9e9a6087d5436ddc3511835398..5e796702aca0024044b445e1dca05794e439fa44 100644
+index b6a8530074c898392879405e8ae774ce15c05776..f6592d997a4cfd9d3ca86cd955e3de0a49743bfa 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2301,7 +2301,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0867-Fix-text-display-error-on-spawn.patch b/patches/server/0857-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0867-Fix-text-display-error-on-spawn.patch
rename to patches/server/0857-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0868-Fix-inventories-returning-null-Locations.patch b/patches/server/0858-Fix-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0868-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0858-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0869-Add-Shearable-API.patch b/patches/server/0859-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0869-Add-Shearable-API.patch
rename to patches/server/0859-Add-Shearable-API.patch
diff --git a/patches/server/0870-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0860-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0870-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0860-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0871-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0861-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0871-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0861-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0872-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0862-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0872-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0862-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0873-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0863-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0873-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0863-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0874-remove-duplicate-animate-packet-for-records.patch b/patches/server/0864-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0874-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0864-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0875-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0865-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0875-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0865-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0876-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0866-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 86%
rename from patches/server/0876-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0866-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index dae4e411a6..12f3bb6e64 100644
--- a/patches/server/0876-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0866-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,10 +5,10 @@ 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 1506483f7d02f94ad1b00d9d3f94b7a0d99e2ca6..7660a9eac7a2aff48b32c42e56633dd7202c2e01 100644
+index b20f0da6b27fe1753ae8283ace2b5df96ee74a77..c711c7221ae001c46dcb82def726c6ed9cca1ac9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1656,6 +1656,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1638,6 +1638,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void gameEvent(GameEvent event, Vec3 emitterPos, GameEvent.Context emitter) {
diff --git a/patches/server/0877-Use-array-for-gamerule-storage.patch b/patches/server/0867-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0877-Use-array-for-gamerule-storage.patch
rename to patches/server/0867-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0878-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0868-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0878-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0868-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0879-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0869-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0879-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0869-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0880-Add-Mob-Experience-reward-API.patch b/patches/server/0870-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0880-Add-Mob-Experience-reward-API.patch
rename to patches/server/0870-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0881-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0871-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0881-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0871-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0882-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0872-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0882-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0872-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0883-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0873-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0883-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0873-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0884-More-accurate-isInOpenWater-impl.patch b/patches/server/0874-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0884-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0874-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0885-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0875-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0885-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0875-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0886-Expand-PlayerItemMendEvent.patch b/patches/server/0876-Expand-PlayerItemMendEvent.patch
similarity index 98%
rename from patches/server/0886-Expand-PlayerItemMendEvent.patch
rename to patches/server/0876-Expand-PlayerItemMendEvent.patch
index ee6e1d3c4c..a211bf3a3a 100644
--- a/patches/server/0886-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0876-Expand-PlayerItemMendEvent.patch
@@ -33,7 +33,7 @@ index 36d5d1736bf826f3abc756277de431c94cabb744..e814b2ef2577f032d6760de2f798d4fe
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 65bcc0b4a864c26a3167273230f642e0603c0702..c49d3448866caae8a2ceb51a45c3a056124f8f57 100644
+index 4b85c6bfd9398da369fbe22f090c21fc1217eae3..94878e0e44ade28e84c95f4ea1837679ed5bcd1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1754,11 +1754,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0887-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0877-Refresh-ProjectileSource-for-projectiles.patch
similarity index 97%
rename from patches/server/0887-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0877-Refresh-ProjectileSource-for-projectiles.patch
index db03e91e7e..5143e11e3f 100644
--- a/patches/server/0887-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0877-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9c998f4a9c73a807930e5b106d2ff6cc2d6afe77..9fa04f43b527a1796cb849fa7ac03619dd9e19da 100644
+index bbeab184bfd4b8541c97281d3328e9622c8227b6..16a4eaa49878a42f12d07ef172762a58cfa16579 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -383,6 +383,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0888-Add-transient-modifier-API.patch b/patches/server/0878-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0888-Add-transient-modifier-API.patch
rename to patches/server/0878-Add-transient-modifier-API.patch
diff --git a/patches/server/0889-Fix-block-place-logic.patch b/patches/server/0879-Fix-block-place-logic.patch
similarity index 96%
rename from patches/server/0889-Fix-block-place-logic.patch
rename to patches/server/0879-Fix-block-place-logic.patch
index e527f2531f..df7bca6217 100644
--- a/patches/server/0889-Fix-block-place-logic.patch
+++ b/patches/server/0879-Fix-block-place-logic.patch
@@ -41,10 +41,10 @@ index 0e9d515381a673e683b63a12c1a9e79a5eedd80b..096eb30dcfdd62b1d946891f7480e9d9
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 17351ef19ced295ec4fe5aa684b9fa4db1dadf27..d3ac9442a3073fe9207b6a1f74333502c7da6105 100644
+index ee1ba73796816e15437a2a2331d86494b3674ce7..24aafda4ec034b5baa544704f8faf5ff6fcd2827 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -665,17 +665,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -572,17 +572,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0890-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0880-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0890-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0880-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0891-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0881-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0891-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0881-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0892-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0882-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 94%
rename from patches/server/0892-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0882-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 9b243f8876..f507353a95 100644
--- a/patches/server/0892-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0882-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fd31a716ec66235970af4854dd7d83c1f88e229d..fd1245ae71b05d283d2c56d05bc1959788f77a91 100644
+index cda293ee6281ba01f9f924ad5c65d8ad96ab50f6..534d250da9fa7715ff25e3e1b1e7362940e82056 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -352,7 +352,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0893-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0883-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0893-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0883-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0894-Fix-sniffer-removeExploredLocation.patch b/patches/server/0884-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0894-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0884-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0895-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0885-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0895-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0885-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0896-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0886-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0896-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0886-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0897-Properly-cancel-usable-items.patch b/patches/server/0887-Properly-cancel-usable-items.patch
similarity index 92%
rename from patches/server/0897-Properly-cancel-usable-items.patch
rename to patches/server/0887-Properly-cancel-usable-items.patch
index f99bb170d9..0509a09395 100644
--- a/patches/server/0897-Properly-cancel-usable-items.patch
+++ b/patches/server/0887-Properly-cancel-usable-items.patch
@@ -10,10 +10,10 @@ The underlying issue of this is that the client modifies their synced data value
 them in order for the client to reset their using item state.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 521fc5fd6b66c7095c729dd4aaf49bbc443f0200..93ae151375608b6bbaa5e68a7384a04dc30a9502 100644
+index 88b71210d0845e8a4a2cd424ba238c4b5e27933b..3b93db1e23266c6ee3d2e22825c7668ef5b81f95 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -557,6 +557,7 @@ public class ServerPlayerGameMode {
+@@ -555,6 +555,7 @@ public class ServerPlayerGameMode {
              }
              // Paper end - extend Player Interact cancellation
              player.getBukkitEntity().updateInventory(); // SPIGOT-2867
@@ -21,7 +21,7 @@ index 521fc5fd6b66c7095c729dd4aaf49bbc443f0200..93ae151375608b6bbaa5e68a7384a04d
              enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? InteractionResult.SUCCESS : InteractionResult.PASS;
          } else if (this.gameModeForPlayer == GameType.SPECTATOR) {
              MenuProvider itileinventory = iblockdata.getMenuProvider(world, blockposition);
-@@ -600,6 +601,11 @@ public class ServerPlayerGameMode {
+@@ -598,6 +599,11 @@ public class ServerPlayerGameMode {
  
                  return enuminteractionresult1;
              }
@@ -46,7 +46,7 @@ index d2916743981c6632957ab8bed5ae7a2334c5646b..33bdfb66f36cce5e89be1a0de8b5a334
                  return;
              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5e796702aca0024044b445e1dca05794e439fa44..825e586af663b363645586470b53e92e38774bce 100644
+index f6592d997a4cfd9d3ca86cd955e3de0a49743bfa..0a2e87a53df8611a5cd0d70dae2eb35ff5406745 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3813,6 +3813,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0898-Add-event-for-player-editing-sign.patch b/patches/server/0888-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0898-Add-event-for-player-editing-sign.patch
rename to patches/server/0888-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0899-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0889-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 92%
rename from patches/server/0899-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0889-Only-tick-item-frames-if-players-can-see-it.patch
index 7a1f001a2e..80407ae8c8 100644
--- a/patches/server/0899-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0889-Only-tick-item-frames-if-players-can-see-it.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Only tick item frames if players can see it
 In the event that an item frame cannot be seen by any players, ticking the item frame every tick is unnecessary. This can be a very hot section of the entity tracker when lots of item frames are present on a server, so this reduces the logic which speeds it up.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 78145f8dc50c64b1650bfa7e3ef867ca96f29ca9..937ce55812375f2952c2dab86918ab73b0f3a2d3 100644
+index b52f86e23a35f8727d827155ebb20f847108d673..72e7c44946ef02fcb744f2a4d265706e21b33c10 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -111,7 +111,7 @@ public class ServerEntity {
diff --git a/patches/server/0900-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0890-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0900-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0890-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0901-Add-option-to-disable-block-updates.patch b/patches/server/0891-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0901-Add-option-to-disable-block-updates.patch
rename to patches/server/0891-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0902-Call-missing-BlockDispenseEvent.patch b/patches/server/0892-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0902-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0892-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0903-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0893-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 84%
rename from patches/server/0903-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0893-Don-t-load-chunks-for-supporting-block-checks.patch
index dec88dbbc8..ce43b9a2d6 100644
--- a/patches/server/0903-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0893-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9fa04f43b527a1796cb849fa7ac03619dd9e19da..fda3aa0c11d86270e96d345cf8a8b249f817dfa3 100644
+index 16a4eaa49878a42f12d07ef172762a58cfa16579..3c2b7adcdeeb513ce6697accd2bd81d1c4810448 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1250,7 +1250,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1239,7 +1239,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      }
  
      protected BlockPos getOnPos(float offset) {
diff --git a/patches/server/0904-Optimize-player-lookups-for-beacons.patch b/patches/server/0894-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0904-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0894-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0905-Add-Sign-getInteractableSideFor.patch b/patches/server/0895-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0905-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0895-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0906-Array-backed-synched-entity-data.patch b/patches/server/0896-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0906-Array-backed-synched-entity-data.patch
rename to patches/server/0896-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0907-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0897-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0907-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0897-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0908-Fix-BanList-API.patch b/patches/server/0898-Fix-BanList-API.patch
similarity index 99%
rename from patches/server/0908-Fix-BanList-API.patch
rename to patches/server/0898-Fix-BanList-API.patch
index 2636191597..a4ec581da1 100644
--- a/patches/server/0908-Fix-BanList-API.patch
+++ b/patches/server/0898-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c49d3448866caae8a2ceb51a45c3a056124f8f57..5527f6745d4d721666c6fa78f33a56d8d7c3d3fa 100644
+index 94878e0e44ade28e84c95f4ea1837679ed5bcd1f..5dbd2a22497b40d4accbe0909e4482d9bd229a1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1652,23 +1652,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0909-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0899-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0909-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0899-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0910-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0900-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0910-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0900-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0911-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0901-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0911-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0901-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0912-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0902-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0912-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0902-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0913-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0903-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0913-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0903-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0914-Add-whitelist-events.patch b/patches/server/0904-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0914-Add-whitelist-events.patch
rename to patches/server/0904-Add-whitelist-events.patch
diff --git a/patches/server/0915-Implement-PlayerFailMoveEvent.patch b/patches/server/0905-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0915-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0905-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0916-Folia-scheduler-and-owned-region-API.patch b/patches/server/0906-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0916-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0906-Folia-scheduler-and-owned-region-API.patch
index 9f42a23ad6..f237e82cec 100644
--- a/patches/server/0916-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0906-Folia-scheduler-and-owned-region-API.patch
@@ -1185,7 +1185,7 @@ index f9cb05de12c938ea6d44a806f73bc0ae48b4394f..70c89dee884838983070d3cca7bc3e2e
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a3ac7e5df3eb4fd3a76453d3837fb83ed07abc22..155886a611e49cb6d1204c675b4f44a85ec60d33 100644
+index 3c2b7adcdeeb513ce6697accd2bd81d1c4810448..30585256911a6c57205e217b3f3b4663cd0101d8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -246,11 +246,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1213,7 +1213,7 @@ index a3ac7e5df3eb4fd3a76453d3837fb83ed07abc22..155886a611e49cb6d1204c675b4f44a8
      @Override
      public CommandSender getBukkitSender(CommandSourceStack wrapper) {
          return this.getBukkitEntity();
-@@ -4509,6 +4521,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4498,6 +4510,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              return;
          }
          // Paper end - rewrite chunk system
@@ -1221,7 +1221,7 @@ index a3ac7e5df3eb4fd3a76453d3837fb83ed07abc22..155886a611e49cb6d1204c675b4f44a8
          if (this.removalReason == null) {
              this.removalReason = reason;
          }
-@@ -4519,12 +4532,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -4508,12 +4521,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
          if (reason != RemovalReason.UNLOADED_TO_CHUNK) this.getPassengers().forEach(Entity::stopRiding); // Paper - chunk system - don't adjust passenger state when unloading, it's just not safe (and messes with our logic in entity chunk unload)
          this.levelCallback.onRemove(reason);
@@ -1251,7 +1251,7 @@ index a3ac7e5df3eb4fd3a76453d3837fb83ed07abc22..155886a611e49cb6d1204c675b4f44a8
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fd1245ae71b05d283d2c56d05bc1959788f77a91..84d98fd048e15f43db02c1f5c52ca35f153be1a1 100644
+index 534d250da9fa7715ff25e3e1b1e7362940e82056..4d8575a82849c378eda17cdfb12a45af54dd337d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,76 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0917-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0907-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0917-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0907-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0918-API-for-updating-recipes-on-clients.patch b/patches/server/0908-API-for-updating-recipes-on-clients.patch
similarity index 97%
rename from patches/server/0918-API-for-updating-recipes-on-clients.patch
rename to patches/server/0908-API-for-updating-recipes-on-clients.patch
index 4d5bfd57af..822afe4fce 100644
--- a/patches/server/0918-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0908-API-for-updating-recipes-on-clients.patch
@@ -39,7 +39,7 @@ index 70c89dee884838983070d3cca7bc3e2ef13674d7..1e0cc8051f0a36a21b277eab15daf612
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 84d98fd048e15f43db02c1f5c52ca35f153be1a1..da5eaf620612b65e7851ec299082c60ea5613b09 100644
+index 4d8575a82849c378eda17cdfb12a45af54dd337d..66b1690c68a9c419061b7f1a85e3c8cb56817928 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1129,6 +1129,18 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0919-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0909-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0919-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0909-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0920-Only-capture-actual-tree-growth.patch b/patches/server/0910-Only-capture-actual-tree-growth.patch
similarity index 97%
rename from patches/server/0920-Only-capture-actual-tree-growth.patch
rename to patches/server/0910-Only-capture-actual-tree-growth.patch
index 07c756c7ce..91c73a049e 100644
--- a/patches/server/0920-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0910-Only-capture-actual-tree-growth.patch
@@ -29,10 +29,10 @@ index e14d928e8bf484c61f2687621623942a27f30db1..0fd5decb0790423aba80a7c1e55ce39a
                      }
                      entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5a1d53bf288069040837995e72ef0f16b79f9ecc..8fac839ea8131060a29c326a9530a21fbf47dfa3 100644
+index 24aafda4ec034b5baa544704f8faf5ff6fcd2827..6dfff3e991436df62babc8b3398d39d58d03baee 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1489,4 +1489,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1396,4 +1396,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return range <= 0 ? 64.0 * 64.0 : range * range; // 64 is taken from default in ServerLevel#levelEvent
      }
      // Paper end - respect global sound events gamerule
diff --git a/patches/server/0921-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0911-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0921-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0911-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0922-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0912-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0922-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0912-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0923-Use-correct-seed-on-api-world-load.patch b/patches/server/0913-Use-correct-seed-on-api-world-load.patch
similarity index 91%
rename from patches/server/0923-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0913-Use-correct-seed-on-api-world-load.patch
index 5db2383afb..90b662d17d 100644
--- a/patches/server/0923-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0913-Use-correct-seed-on-api-world-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index da5eaf620612b65e7851ec299082c60ea5613b09..a92f92f63366fd1d23d80e82863141150ff9d4e3 100644
+index 66b1690c68a9c419061b7f1a85e3c8cb56817928..369458e42ed787d75e35bddd4d8514a5d49503bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1347,7 +1347,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0924-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0914-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0924-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0914-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0925-Cache-map-ids-on-item-frames.patch b/patches/server/0915-Cache-map-ids-on-item-frames.patch
similarity index 96%
rename from patches/server/0925-Cache-map-ids-on-item-frames.patch
rename to patches/server/0915-Cache-map-ids-on-item-frames.patch
index f04e56a45f..b8a8eeda73 100644
--- a/patches/server/0925-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0915-Cache-map-ids-on-item-frames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache map ids on item frames
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 937ce55812375f2952c2dab86918ab73b0f3a2d3..166554b0153b0afb3432150274c01a053238125d 100644
+index 72e7c44946ef02fcb744f2a4d265706e21b33c10..dc6d2ebbce9ccda5aa4a80dadcc34d48b67b9368 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -118,7 +118,7 @@ public class ServerEntity {
diff --git a/patches/server/0926-Fix-custom-statistic-criteria-creation.patch b/patches/server/0916-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0926-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0916-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0927-Bandaid-fix-for-Effect.patch b/patches/server/0917-Bandaid-fix-for-Effect.patch
similarity index 96%
rename from patches/server/0927-Bandaid-fix-for-Effect.patch
rename to patches/server/0917-Bandaid-fix-for-Effect.patch
index 86ebc65cfd..835ace1a3a 100644
--- a/patches/server/0927-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0917-Bandaid-fix-for-Effect.patch
@@ -60,10 +60,10 @@ index a4519762175c68256b1f303daca8b9408ac182bb..457e9093adb99d31ffc7f061d8c858f9
          case COMPOSTER_FILL_ATTEMPT:
              datavalue = ((Boolean) data) ? 1 : 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7899e9c905dd420821f1c422c6c07e63ac4d3121..654267fcb560c45ad2db8712c056d097b1bf4904 100644
+index 4a6fe040e3eeaabaa84946c49482b03b63e6eccc..e148688bd49a0e8a63b2999dd22dc69db1f07856 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1430,7 +1430,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1380,7 +1380,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public <T> void playEffect(Location loc, Effect effect, T data, int radius) {
          if (data != null) {
              Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect);
@@ -73,7 +73,7 @@ index 7899e9c905dd420821f1c422c6c07e63ac4d3121..654267fcb560c45ad2db8712c056d097
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5527f6745d4d721666c6fa78f33a56d8d7c3d3fa..c6055020d279892d42c6869c71150849300ef34c 100644
+index 5dbd2a22497b40d4accbe0909e4482d9bd229a1f..ef496fb67afe7aef56df06385ff39ee9c33b0dc6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -873,7 +873,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0928-SculkCatalyst-bloom-API.patch b/patches/server/0918-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0928-SculkCatalyst-bloom-API.patch
rename to patches/server/0918-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0929-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0919-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0929-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0919-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0931-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0920-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 96%
rename from patches/server/0931-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0920-Deprecate-and-replace-methods-with-old-StructureType.patch
index 960d7f1716..12c37fb854 100644
--- a/patches/server/0931-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0920-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a92f92f63366fd1d23d80e82863141150ff9d4e3..28b02fee73a3ab604f6921800a7ede59e2e6f414 100644
+index 369458e42ed787d75e35bddd4d8514a5d49503bc..7803e3b9d18e213b0d9159b1be4536734cc6e88b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1951,6 +1951,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0932-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0921-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0932-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0921-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0933-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0922-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 98%
rename from patches/server/0933-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0922-Properly-handle-BlockBreakEvent-isDropItems.patch
index 37f0ede135..12a1d598b2 100644
--- a/patches/server/0933-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0922-Properly-handle-BlockBreakEvent-isDropItems.patch
@@ -9,10 +9,10 @@ food consumption, turtle egg count decreases, ice to water
 conversions and beehive releases
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 93ae151375608b6bbaa5e68a7384a04dc30a9502..b48663de0d749f2a6b53c7ad6ff7941e9e8072d6 100644
+index 3b93db1e23266c6ee3d2e22825c7668ef5b81f95..7fa8041b12b8398a1d4838142c61cdc0f5bd51ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -433,8 +433,8 @@ public class ServerPlayerGameMode {
+@@ -431,8 +431,8 @@ public class ServerPlayerGameMode {
                      isCorrectTool = flag1; // Paper - Trigger bee_nest_destroyed trigger in the correct place
  
                      itemstack.mineBlock(this.level, iblockdata1, pos, this.player);
diff --git a/patches/server/0934-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0923-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0934-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0923-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0935-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0924-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 91%
rename from patches/server/0935-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0924-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 6498bc26d1..f4c6558dce 100644
--- a/patches/server/0935-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0924-Configurable-entity-tracking-range-by-Y-coordinate.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable entity tracking range by Y coordinate
 Options to configure entity tracking by Y coordinate, also for each entity category.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5d85bcfe98134d37ee7b1180734426c28ff3af8f..32bbea0e65176d3a05ed02ce5351f7fea00bf53f 100644
+index 94a0e0d1cdbb96a12acd1a23833242d9676d21a0..fcbb74c56e4315ed197e9adfdbd2c6b76ba9f5e0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1281,6 +1281,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1179,6 +1179,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  double d1 = vec3d.x * vec3d.x + vec3d.z * vec3d.z;
                  double d2 = d0 * d0;
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
diff --git a/patches/server/0936-Add-Listing-API-for-Player.patch b/patches/server/0925-Add-Listing-API-for-Player.patch
similarity index 98%
rename from patches/server/0936-Add-Listing-API-for-Player.patch
rename to patches/server/0925-Add-Listing-API-for-Player.patch
index dc31161533..0f97eb50b8 100644
--- a/patches/server/0936-Add-Listing-API-for-Player.patch
+++ b/patches/server/0925-Add-Listing-API-for-Player.patch
@@ -74,7 +74,7 @@ index d43106eb89b14667e85cd6e8fa047d64f2e8ec87..56eddd28429cf42c02d88b8bf79f8b61
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 02aaa2abd1815bc8505a09033025cf64bc4662b2..17573871e13affb72e282da02eaba395808b3d9d 100644
+index 1e0cc8051f0a36a21b277eab15daf612e04e4c9d..d1ca2b75d82653064b905b94a638abbb2d0e710d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -356,14 +356,22 @@ public abstract class PlayerList {
@@ -111,7 +111,7 @@ index 02aaa2abd1815bc8505a09033025cf64bc4662b2..17573871e13affb72e282da02eaba395
          // Paper end - Use single player info update packet on join
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c6055020d279892d42c6869c71150849300ef34c..b0b18fcc2ec8769831860596823b362fe0fd9313 100644
+index ef496fb67afe7aef56df06385ff39ee9c33b0dc6..d46a7ed737a18a65f04b38bb1354cea6f3839974 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -182,6 +182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0937-Configurable-Region-Compression-Format.patch b/patches/server/0926-Configurable-Region-Compression-Format.patch
similarity index 90%
rename from patches/server/0937-Configurable-Region-Compression-Format.patch
rename to patches/server/0926-Configurable-Region-Compression-Format.patch
index facebba0b6..a6dfa66f09 100644
--- a/patches/server/0937-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0926-Configurable-Region-Compression-Format.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Configurable Region Compression Format
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 6ca572500a3bb36acf481e54262e811295d64136..c5dbab099a328b37f5a59824384ee6e4be2f3482 100644
+index 4d5ab1771129114ef1e4745c43a4fd1813df2e30..bc8038da65f834249c61a262fc1a5abb7cc91a63 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-@@ -75,7 +75,7 @@ public class RegionFile implements AutoCloseable {
-     // Paper end - Cache chunk status
+@@ -47,7 +47,7 @@ public class RegionFile implements AutoCloseable {
+     public final java.util.concurrent.locks.ReentrantLock fileLock = new java.util.concurrent.locks.ReentrantLock(); // Paper
  
      public RegionFile(Path file, Path directory, boolean dsync) throws IOException {
 -        this(file, directory, RegionFileVersion.VERSION_DEFLATE, dsync);
diff --git a/patches/server/0938-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0927-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 96%
rename from patches/server/0938-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0927-Add-BlockFace-to-BlockDamageEvent.patch
index 6a0a891d90..aff36106fb 100644
--- a/patches/server/0938-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0927-Add-BlockFace-to-BlockDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockFace to BlockDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index b48663de0d749f2a6b53c7ad6ff7941e9e8072d6..a8c723c718aeb8e2aec997503a071c4cfedcd8ae 100644
+index 7fa8041b12b8398a1d4838142c61cdc0f5bd51ad..334f3bc7f4a08fbbca7e03e75acf1bc46eb6479c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -253,7 +253,7 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0939-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0928-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0939-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0928-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0940-Expand-Pose-API.patch b/patches/server/0929-Expand-Pose-API.patch
similarity index 90%
rename from patches/server/0940-Expand-Pose-API.patch
rename to patches/server/0929-Expand-Pose-API.patch
index c4bdb8c632..6616afa067 100644
--- a/patches/server/0940-Expand-Pose-API.patch
+++ b/patches/server/0929-Expand-Pose-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c709049deccc8218d603382e4f628e493a99c5ae..633a709d3f7768dce644affc4ce9b75711e971f1 100644
+index 30585256911a6c57205e217b3f3b4663cd0101d8..ba9a1f9bd38f8ac58449787a9697c28fe300193a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -420,6 +420,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -418,6 +418,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      @javax.annotation.Nullable
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
@@ -16,7 +16,7 @@ index c709049deccc8218d603382e4f628e493a99c5ae..633a709d3f7768dce644affc4ce9b757
  
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
-@@ -672,6 +673,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -670,6 +671,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      public void onClientRemoval() {}
  
      public void setPose(net.minecraft.world.entity.Pose pose) {
diff --git a/patches/server/0941-More-DragonBattle-API.patch b/patches/server/0930-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0941-More-DragonBattle-API.patch
rename to patches/server/0930-More-DragonBattle-API.patch
diff --git a/patches/server/0942-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0931-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0942-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0931-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0943-Add-PlayerPickItemEvent.patch b/patches/server/0932-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/0943-Add-PlayerPickItemEvent.patch
rename to patches/server/0932-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0944-Allow-trident-custom-damage.patch b/patches/server/0933-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0944-Allow-trident-custom-damage.patch
rename to patches/server/0933-Allow-trident-custom-damage.patch
diff --git a/patches/server/0945-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0934-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0945-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0934-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0946-Optimize-nearest-structure-border-iteration.patch b/patches/server/0935-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0946-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0935-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0947-Implement-OfflinePlayer-isConnected.patch b/patches/server/0936-Implement-OfflinePlayer-isConnected.patch
similarity index 94%
rename from patches/server/0947-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0936-Implement-OfflinePlayer-isConnected.patch
index b6c36d01f0..fd4a5c9e47 100644
--- a/patches/server/0947-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0936-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b0b18fcc2ec8769831860596823b362fe0fd9313..52879f6ae48c568ffa554772507449d7908179d1 100644
+index d46a7ed737a18a65f04b38bb1354cea6f3839974..798c1af5fb6768661f67ef87039a55ea3acb572a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -279,6 +279,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0948-Fix-inventory-desync.patch b/patches/server/0937-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0948-Fix-inventory-desync.patch
rename to patches/server/0937-Fix-inventory-desync.patch
diff --git a/patches/server/0949-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0938-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 97%
rename from patches/server/0949-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0938-Add-titleOverride-to-InventoryOpenEvent.patch
index 7e24ee9238..0385797706 100644
--- a/patches/server/0949-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0938-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4520a6dddddb3857245c4dc8a0260664fba2dde6..361541e8c152a9311634411d434cc29ec87c17e2 100644
+index 50400964b30952fcaae04536bff906e44c9a3a3d..649e175b6d656fa89c1a59c36230b793c8d07e15 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1573,12 +1573,17 @@ public class ServerPlayer extends Player {
+@@ -1568,12 +1568,17 @@ public class ServerPlayer extends Player {
              this.nextContainerCounter();
              AbstractContainerMenu container = factory.createMenu(this.containerCounter, this.getInventory(), this);
  
@@ -27,7 +27,7 @@ index 4520a6dddddb3857245c4dc8a0260664fba2dde6..361541e8c152a9311634411d434cc29e
                  if (container == null && !cancelled) { // Let pre-cancelled events fall through
                      // SPIGOT-5263 - close chest if cancelled
                      if (factory instanceof Container) {
-@@ -1600,7 +1605,7 @@ public class ServerPlayer extends Player {
+@@ -1595,7 +1600,7 @@ public class ServerPlayer extends Player {
              } else {
                  // CraftBukkit start
                  this.containerMenu = container;
diff --git a/patches/server/0950-Configure-sniffer-egg-hatch-time.patch b/patches/server/0939-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0950-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0939-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0951-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0940-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0951-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0940-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0952-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0941-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0952-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0941-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0953-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0942-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/0953-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0942-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0954-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0943-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0954-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0943-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0955-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0944-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/0955-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0944-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0956-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0945-Fix-silent-equipment-change-for-mobs.patch
similarity index 96%
rename from patches/server/0956-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0945-Fix-silent-equipment-change-for-mobs.patch
index c56a73642f..f1f8845702 100644
--- a/patches/server/0956-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0945-Fix-silent-equipment-change-for-mobs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix silent equipment change for mobs
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 59b776c591af3e890b81f9c2ca67c119ba89695e..c411b692ba71400e4e3d2ed7af4f35c4a4fed4be 100644
+index 6482dc12324524b92e0161055ad13d27dfb7f97d..704f63bb90b4268f25c24b724e08d9d74583e818 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1059,13 +1059,20 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1046,13 +1046,20 @@ public abstract class Mob extends LivingEntity implements Targeting {
  
      @Override
      public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
diff --git a/patches/server/0957-Fix-spigot-s-Forced-Stats.patch b/patches/server/0946-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0957-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0946-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0958-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0947-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/0958-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0947-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0959-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0948-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 93%
rename from patches/server/0959-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0948-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 058652cce8..c518d54ea7 100644
--- a/patches/server/0959-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0948-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
@@ -10,10 +10,10 @@ which would cause a crash on Folia but would appear to function
 fine on Paper.
 
 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 0ef8ecc7932107029d85e961e2e747d7312d816e..bb5da9ddcd3030c8d6148902f3c649227430baab 100644
+index 1650541abeedce04ddeddfed15411b64a01be452..e45141ea0cc26c6c903edb5ff714bafa38d3189c 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
-@@ -369,6 +369,13 @@ public class ChunkSerializer {
+@@ -365,6 +365,13 @@ public class ChunkSerializer {
              for (int k1 = 0; k1 < nbttaglist3.size(); ++k1) {
                  CompoundTag nbttagcompound4 = nbttaglist3.getCompound(k1);
  
@@ -27,7 +27,7 @@ index 0ef8ecc7932107029d85e961e2e747d7312d816e..bb5da9ddcd3030c8d6148902f3c64922
                  ((ChunkAccess) object1).setBlockEntityNbt(nbttagcompound4);
              }
  
-@@ -667,10 +674,19 @@ public class ChunkSerializer {
+@@ -663,10 +670,19 @@ public class ChunkSerializer {
                      CompoundTag nbttagcompound1 = nbttaglist1.getCompound(i);
                      boolean flag = nbttagcompound1.getBoolean("keepPacked");
  
diff --git a/patches/server/0960-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0949-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/0960-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0949-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0961-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0950-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 92%
rename from patches/server/0961-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/0950-Remove-Spigot-Bug-Fix-for-MC-109346.patch
index c6ad51bead..485f7359e3 100644
--- a/patches/server/0961-Remove-Spigot-Bug-Fix-for-MC-109346.patch
+++ b/patches/server/0950-Remove-Spigot-Bug-Fix-for-MC-109346.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Spigot Bug Fix for MC-109346
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 166554b0153b0afb3432150274c01a053238125d..ba9843cd0e922fb2fee3b3ff753767ec1bc1816b 100644
+index dc6d2ebbce9ccda5aa4a80dadcc34d48b67b9368..8cd52a6172fc7bdd5dc980329fed1d765e3750f2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -348,12 +348,6 @@ public class ServerEntity {
diff --git a/patches/server/0962-Fix-SuspiciousStewMeta.patch b/patches/server/0951-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/0962-Fix-SuspiciousStewMeta.patch
rename to patches/server/0951-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/0963-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0952-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/0963-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/0952-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0964-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0953-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/0964-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/0953-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0965-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0954-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/0965-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/0954-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0966-Fix-missing-map-initialize-event-call.patch b/patches/server/0955-Fix-missing-map-initialize-event-call.patch
similarity index 93%
rename from patches/server/0966-Fix-missing-map-initialize-event-call.patch
rename to patches/server/0955-Fix-missing-map-initialize-event-call.patch
index 407ab838a6..3789e0b4bc 100644
--- a/patches/server/0966-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0955-Fix-missing-map-initialize-event-call.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix missing map initialize event call
 public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7660a9eac7a2aff48b32c42e56633dd7202c2e01..afafc216ac3e2a8233d4227f63ff85b3287fd12d 100644
+index c711c7221ae001c46dcb82def726c6ed9cca1ac9..2ab478e0940eae27e6e886a36ed3c1278b3f8ae1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1945,13 +1945,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1927,13 +1927,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Nullable
      @Override
      public MapItemSavedData getMapData(String id) {
diff --git a/patches/server/0967-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0956-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/0967-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/0956-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0968-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/0957-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/0968-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/0957-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/0969-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/0958-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/0969-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/0958-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/0970-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0959-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/0970-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/0959-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0971-Add-player-idle-duration-API.patch b/patches/server/0960-Add-player-idle-duration-API.patch
similarity index 91%
rename from patches/server/0971-Add-player-idle-duration-API.patch
rename to patches/server/0960-Add-player-idle-duration-API.patch
index 4a0cf2445b..f08742e8a8 100644
--- a/patches/server/0971-Add-player-idle-duration-API.patch
+++ b/patches/server/0960-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 52879f6ae48c568ffa554772507449d7908179d1..7b75e248926dfef67533f3454017ed1d24df4a56 100644
+index 798c1af5fb6768661f67ef87039a55ea3acb572a..2b305a66e3f7d9ac6d144219dd943a01dbf6729c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3311,6 +3311,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0972-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0961-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 85%
rename from patches/server/0972-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/0961-Don-t-check-if-we-can-see-non-visible-entities.patch
index f646d9df51..fe23e35cee 100644
--- a/patches/server/0972-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0961-Don-t-check-if-we-can-see-non-visible-entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't check if we can see non-visible entities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 32bbea0e65176d3a05ed02ce5351f7fea00bf53f..fa29444c43925eabe5c26cafaefb46ebb246b006 100644
+index fcbb74c56e4315ed197e9adfdbd2c6b76ba9f5e0..e4f055e935bb0b31e6ee60e57b48ce7ea7ac360d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1292,7 +1292,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1190,7 +1190,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // Paper end - Configurable entity tracking range by Y
  
                  // CraftBukkit start - respect vanish API
diff --git a/patches/server/0973-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0962-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/0973-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/0962-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0974-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0963-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 90%
rename from patches/server/0974-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/0963-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 8d351f9a68..3e45d7c093 100644
--- a/patches/server/0974-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0963-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7b75e248926dfef67533f3454017ed1d24df4a56..d1a15bd280fdd90c282d8badfdee5b944b75b2de 100644
+index 2b305a66e3f7d9ac6d144219dd943a01dbf6729c..9c4b46bb319c7f0b0831d37cff657d9563956ca5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1083,7 +1083,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0975-Optimize-VarInts.patch b/patches/server/0964-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/0975-Optimize-VarInts.patch
rename to patches/server/0964-Optimize-VarInts.patch
diff --git a/patches/server/0976-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0965-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/0976-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/0965-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0977-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0966-Add-predicate-for-blocks-when-raytracing.patch
similarity index 93%
rename from patches/server/0977-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/0966-Add-predicate-for-blocks-when-raytracing.patch
index ea4a275eaf..08e456cd0c 100644
--- a/patches/server/0977-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0966-Add-predicate-for-blocks-when-raytracing.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add predicate for blocks when raytracing
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 7df62a219d0bcffc793c1a8c55b6ed244fdeb199..3c54b32886c608ce91654d18e198cac83d2d2d6a 100644
+index c978f3b2d42f512e982f289e76c2422e41b7eec6..bb8e962e63c7a2d931f9bd7f7c002aa35cfa5fd3 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -83,6 +83,12 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -70,6 +70,12 @@ public interface BlockGetter extends LevelHeightAccessor {
  
      // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
      default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
@@ -21,7 +21,7 @@ index 7df62a219d0bcffc793c1a8c55b6ed244fdeb199..3c54b32886c608ce91654d18e198cac8
              // Paper start - Prevent raytrace from loading chunks
              BlockState iblockdata = this.getBlockStateIfLoaded(blockposition);
              if (iblockdata == null) {
-@@ -92,7 +98,7 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -79,7 +85,7 @@ public interface BlockGetter extends LevelHeightAccessor {
                  return BlockHitResult.miss(raytrace1.getTo(), Direction.getNearest(vec3d.x, vec3d.y, vec3d.z), BlockPos.containing(raytrace1.getTo()));
              }
              // Paper end - Prevent raytrace from loading chunks
@@ -30,7 +30,7 @@ index 7df62a219d0bcffc793c1a8c55b6ed244fdeb199..3c54b32886c608ce91654d18e198cac8
              FluidState fluid = iblockdata.getFluidState(); // Paper - Perf: don't need to go to world state again
              Vec3 vec3d = raytrace1.getFrom();
              Vec3 vec3d1 = raytrace1.getTo();
-@@ -108,8 +114,14 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -95,8 +101,14 @@ public interface BlockGetter extends LevelHeightAccessor {
      // CraftBukkit end
  
      default BlockHitResult clip(ClipContext context) {
@@ -47,10 +47,10 @@ index 7df62a219d0bcffc793c1a8c55b6ed244fdeb199..3c54b32886c608ce91654d18e198cac8
              Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 654267fcb560c45ad2db8712c056d097b1bf4904..0d66ad3728eb31bb1dbf9f35b4f9193ed3c1f880 100644
+index e148688bd49a0e8a63b2999dd22dc69db1f07856..bec84fe26e684f1c09ab6b1e143d3ced15b04914 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1125,9 +1125,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1075,9 +1075,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public RayTraceResult rayTraceEntities(Location start, Vector direction, double maxDistance, double raySize, Predicate<? super Entity> filter) {
@@ -68,7 +68,7 @@ index 654267fcb560c45ad2db8712c056d097b1bf4904..0d66ad3728eb31bb1dbf9f35b4f9193e
  
          Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
          direction.checkFinite();
-@@ -1177,9 +1183,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1127,9 +1133,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public RayTraceResult rayTraceBlocks(Location start, Vector direction, double maxDistance, FluidCollisionMode fluidCollisionMode, boolean ignorePassableBlocks) {
@@ -87,7 +87,7 @@ index 654267fcb560c45ad2db8712c056d097b1bf4904..0d66ad3728eb31bb1dbf9f35b4f9193e
  
          Preconditions.checkArgument(direction != null, "Vector direction cannot be null");
          direction.checkFinite();
-@@ -1192,16 +1205,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1142,16 +1155,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          }
  
          Vector dir = direction.clone().normalize().multiply(maxDistance);
diff --git a/patches/server/0978-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0967-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 92%
rename from patches/server/0978-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/0967-Broadcast-take-item-packets-with-collector-as-source.patch
index bcd63d3b65..2c79a6087b 100644
--- a/patches/server/0978-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0967-Broadcast-take-item-packets-with-collector-as-source.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Broadcast take item packets with collector as source
 This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 825e586af663b363645586470b53e92e38774bce..e11eb4b3796debeadde58e43d9176aef029228bd 100644
+index 0a2e87a53df8611a5cd0d70dae2eb35ff5406745..60841e31c65ba8e95fbb3b5a16a7a0d1c2eb831d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3703,7 +3703,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0979-Expand-LingeringPotion-API.patch b/patches/server/0968-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/0979-Expand-LingeringPotion-API.patch
rename to patches/server/0968-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0980-Add-MaterialTagsTest.patch b/patches/server/0969-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/0980-Add-MaterialTagsTest.patch
rename to patches/server/0969-Add-MaterialTagsTest.patch
diff --git a/patches/server/0981-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0970-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 96%
rename from patches/server/0981-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/0970-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index 50459d0a12..b821180899 100644
--- a/patches/server/0981-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0970-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
@@ -45,10 +45,10 @@ index 0db0d67f9ac15372becc1166c37f7f0aede4a4da..a9e70484b01fc082ea25d43d1d428334
              BlockState iblockdata = BaseFireBlock.getState(this.level(), blockposition);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0d66ad3728eb31bb1dbf9f35b4f9193ed3c1f880..4303c4bd263356d9f4ab44226bbc485f4b260413 100644
+index bec84fe26e684f1c09ab6b1e143d3ced15b04914..1d17131b9b3dc57218e07d3045439634255a2260 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -773,7 +773,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -723,7 +723,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          LightningBolt lightning = EntityType.LIGHTNING_BOLT.create(this.world);
          lightning.moveTo(loc.getX(), loc.getY(), loc.getZ());
diff --git a/patches/server/0982-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0971-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/0982-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/0971-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0983-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0972-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/0983-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/0972-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0984-Add-UUID-attribute-modifier-API.patch b/patches/server/0973-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/0984-Add-UUID-attribute-modifier-API.patch
rename to patches/server/0973-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0985-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0974-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/0985-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/0974-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0986-Lazily-create-LootContext-for-criterions.patch b/patches/server/0975-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/0986-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/0975-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0987-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0976-Don-t-fire-sync-events-during-worldgen.patch
similarity index 96%
rename from patches/server/0987-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/0976-Don-t-fire-sync-events-during-worldgen.patch
index 3c1a836d4c..0f30d31b68 100644
--- a/patches/server/0987-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0976-Don-t-fire-sync-events-during-worldgen.patch
@@ -19,10 +19,10 @@ where generation happened directly to a ServerLevel and the
 entity still has the flag set.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index afafc216ac3e2a8233d4227f63ff85b3287fd12d..0793c75dccc765b14718392fbc136b8f8ffc8f91 100644
+index 2ab478e0940eae27e6e886a36ed3c1278b3f8ae1..b54e89d68ba32f2a79e16d49f86a258b5f6df133 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1508,6 +1508,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1490,6 +1490,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      // CraftBukkit start
      private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
@@ -31,10 +31,10 @@ index afafc216ac3e2a8233d4227f63ff85b3287fd12d..0793c75dccc765b14718392fbc136b8f
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 633917f96c03336218a247401b3953b890acfc2e..4df2d7ae5c0cb82aa7ca1dd8c1b6e0b2991b28b3 100644
+index ba9a1f9bd38f8ac58449787a9697c28fe300193a..3c3f9a51256acb6ee4f005a08757d7ae0d27860e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -678,7 +678,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -676,7 +676,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          if (pose == this.getPose()) {
              return;
          }
@@ -68,7 +68,7 @@ index a6e20b5ee4fe1841dfc2350264b5935b968fe3f3..9da8d56ff3768fb37d1ab89300da4eca
          }, () -> {
              EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a51f16f01a05860f4188b2b777a015908adbd120..dcbcd97f4b16083c1c56ffdccdc35bc3ad1e20dc 100644
+index 60841e31c65ba8e95fbb3b5a16a7a0d1c2eb831d..5e1d02d67c56644c0aa7060d567515fd88b72c9d 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1134,6 +1134,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0988-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0977-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/0988-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/0977-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0989-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0978-Restore-vanilla-entity-drops-behavior.patch
similarity index 96%
rename from patches/server/0989-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/0978-Restore-vanilla-entity-drops-behavior.patch
index df93739baf..2fdc5056e9 100644
--- a/patches/server/0989-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0978-Restore-vanilla-entity-drops-behavior.patch
@@ -9,10 +9,10 @@ on dropping the item instead of generalizing it for all dropped
 items like CB does.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 361541e8c152a9311634411d434cc29ec87c17e2..bd1a53e2ce2644681c23f8cf678afa2a99166d9b 100644
+index 649e175b6d656fa89c1a59c36230b793c8d07e15..dcd69b2b054222d1749aab599caca8340bddf345 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -941,22 +941,20 @@ public class ServerPlayer extends Player {
+@@ -936,22 +936,20 @@ public class ServerPlayer extends Player {
          if (this.isRemoved()) {
              return;
          }
@@ -38,7 +38,7 @@ index 361541e8c152a9311634411d434cc29ec87c17e2..bd1a53e2ce2644681c23f8cf678afa2a
          this.drops.clear(); // SPIGOT-5188: make sure to clear
          } // Paper - fix player loottables running when mob loot gamerule is false
  
-@@ -2439,8 +2437,8 @@ public class ServerPlayer extends Player {
+@@ -2434,8 +2432,8 @@ public class ServerPlayer extends Player {
      }
  
      @Override
@@ -50,10 +50,10 @@ index 361541e8c152a9311634411d434cc29ec87c17e2..bd1a53e2ce2644681c23f8cf678afa2a
          if (entityitem == null) {
              return null;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index da52068d063f5dd978454e3b516384df25eb204b..3d7c6d38dba3e74bc0b868ee5efb7cc80bc0352c 100644
+index 3c3f9a51256acb6ee4f005a08757d7ae0d27860e..6946137dc476d79ccaa27608a482e6ad8b7bae1a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2541,6 +2541,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2530,6 +2530,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
  
      @Nullable
      public ItemEntity spawnAtLocation(ItemStack stack, float yOffset) {
@@ -79,7 +79,7 @@ index da52068d063f5dd978454e3b516384df25eb204b..3d7c6d38dba3e74bc0b868ee5efb7cc8
          if (stack.isEmpty()) {
              return null;
          } else if (this.level().isClientSide) {
-@@ -2548,14 +2567,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -2537,14 +2556,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          } else {
              // CraftBukkit start - Capture drops for death event
              if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) {
@@ -104,7 +104,7 @@ index da52068d063f5dd978454e3b516384df25eb204b..3d7c6d38dba3e74bc0b868ee5efb7cc8
              return this.spawnAtLocation(entityitem);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 228e8233caf3653d6411e4d85e5dcfd6a012b40f..5741fb18e9538c161c8516de6322b2e4dbe2cb4d 100644
+index 5e1d02d67c56644c0aa7060d567515fd88b72c9d..8d45b2c47aba08c330ec869eba633347e0572477 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -254,7 +254,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0990-Add-Structure-check-API.patch b/patches/server/0979-Add-Structure-check-API.patch
similarity index 91%
rename from patches/server/0990-Add-Structure-check-API.patch
rename to patches/server/0979-Add-Structure-check-API.patch
index 032a08ac1e..6d493fd4a5 100644
--- a/patches/server/0990-Add-Structure-check-API.patch
+++ b/patches/server/0979-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4303c4bd263356d9f4ab44226bbc485f4b260413..835ad8dc64f2342da7fd26e6ef2ea4603c115ae6 100644
+index 1d17131b9b3dc57218e07d3045439634255a2260..031db5f0bcf4a7d0930a7d376e7f6806d34da4e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -230,6 +230,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0991-Dont-resend-blocks-on-interactions.patch b/patches/server/0980-Dont-resend-blocks-on-interactions.patch
similarity index 98%
rename from patches/server/0991-Dont-resend-blocks-on-interactions.patch
rename to patches/server/0980-Dont-resend-blocks-on-interactions.patch
index b9bd693428..21d50f2d49 100644
--- a/patches/server/0991-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0980-Dont-resend-blocks-on-interactions.patch
@@ -8,7 +8,7 @@ In general, the client now has an acknowledgment system which will prevent block
 It should be noted that this system does not yet support block entities, so those still need to resynced when needed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index a8c723c718aeb8e2aec997503a071c4cfedcd8ae..83e017efd15d0ecaffc327f02d6d5330c8ed6937 100644
+index 334f3bc7f4a08fbbca7e03e75acf1bc46eb6479c..70c83a5631faed95183e15080fb3e5d8c3b817c0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -199,7 +199,7 @@ public class ServerPlayerGameMode {
@@ -74,7 +74,7 @@ index a8c723c718aeb8e2aec997503a071c4cfedcd8ae..83e017efd15d0ecaffc327f02d6d5330
                      return;
                  }
  
-@@ -350,7 +352,7 @@ public class ServerPlayerGameMode {
+@@ -348,7 +350,7 @@ public class ServerPlayerGameMode {
  
              // Tell client the block is gone immediately then process events
              // Don't tell the client if its a creative sword break because its not broken!
@@ -83,7 +83,7 @@ index a8c723c718aeb8e2aec997503a071c4cfedcd8ae..83e017efd15d0ecaffc327f02d6d5330
                  ClientboundBlockUpdatePacket packet = new ClientboundBlockUpdatePacket(pos, Blocks.AIR.defaultBlockState());
                  this.player.connection.send(packet);
              }
-@@ -376,13 +378,15 @@ public class ServerPlayerGameMode {
+@@ -374,13 +376,15 @@ public class ServerPlayerGameMode {
                  if (isSwordNoBreak) {
                      return false;
                  }
@@ -103,7 +103,7 @@ index a8c723c718aeb8e2aec997503a071c4cfedcd8ae..83e017efd15d0ecaffc327f02d6d5330
  
                  // Update any tile entity data for this block
                  if (!captureSentBlockEntities) { // Paper - Send block entities after destroy prediction
-@@ -539,16 +543,18 @@ public class ServerPlayerGameMode {
+@@ -537,16 +541,18 @@ public class ServerPlayerGameMode {
          if (event.useInteractedBlock() == Event.Result.DENY) {
              // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
              if (iblockdata.getBlock() instanceof DoorBlock) {
diff --git a/patches/server/0992-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/0981-Keep-previous-behavior-for-setResourcePack.patch
similarity index 94%
rename from patches/server/0992-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/0981-Keep-previous-behavior-for-setResourcePack.patch
index edb8c62895..68447429bd 100644
--- a/patches/server/0992-Keep-previous-behavior-for-setResourcePack.patch
+++ b/patches/server/0981-Keep-previous-behavior-for-setResourcePack.patch
@@ -10,7 +10,7 @@ packs before sending the new pack. Other API exists
 for adding a new pack to the existing packs on a client.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d1a15bd280fdd90c282d8badfdee5b944b75b2de..fd67e7571841b345630078892e321283760341dd 100644
+index 9c4b46bb319c7f0b0831d37cff657d9563956ca5..2fb263502b61d6a66aa30ef42e1514447bf4f3fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2351,8 +2351,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0993-properly-read-and-store-sus-effect-duration.patch b/patches/server/0982-properly-read-and-store-sus-effect-duration.patch
similarity index 100%
rename from patches/server/0993-properly-read-and-store-sus-effect-duration.patch
rename to patches/server/0982-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/0994-Use-correct-max-stack-size-in-crafter.patch b/patches/server/0983-Use-correct-max-stack-size-in-crafter.patch
similarity index 100%
rename from patches/server/0994-Use-correct-max-stack-size-in-crafter.patch
rename to patches/server/0983-Use-correct-max-stack-size-in-crafter.patch
diff --git a/patches/server/0995-add-more-scoreboard-API.patch b/patches/server/0984-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/0995-add-more-scoreboard-API.patch
rename to patches/server/0984-add-more-scoreboard-API.patch
diff --git a/patches/server/0996-Improve-Registry.patch b/patches/server/0985-Improve-Registry.patch
similarity index 100%
rename from patches/server/0996-Improve-Registry.patch
rename to patches/server/0985-Improve-Registry.patch
diff --git a/patches/server/0997-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0986-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 97%
rename from patches/server/0997-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/0986-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index ecdce557fe..b20b38f2d9 100644
--- a/patches/server/0997-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0986-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
@@ -26,7 +26,7 @@ index 3fec07b250a8f145e30c8c41888e47d2a3c902e1..2ddd033e1c3a2e5c8950b93c83849192
                  x = to.getX();
                  y = to.getY();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5741fb18e9538c161c8516de6322b2e4dbe2cb4d..ec495c0080e15b1baeeb57cd7c80d2e6b06e7d2e 100644
+index 8d45b2c47aba08c330ec869eba633347e0572477..72ff9e6ec6d9640556292f010bed3a71a39bdc20 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4185,7 +4185,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0998-Add-experience-points-API.patch b/patches/server/0987-Add-experience-points-API.patch
similarity index 93%
rename from patches/server/0998-Add-experience-points-API.patch
rename to patches/server/0987-Add-experience-points-API.patch
index f7a36a99c9..189efaa14f 100644
--- a/patches/server/0998-Add-experience-points-API.patch
+++ b/patches/server/0987-Add-experience-points-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a629755f07415997e6dbdd96f9b447b90e20b1d5..4713ed2d407e1425d7f5f18d0b43c6917ef876ec 100644
+index 4baf585d4b339d5a608a1723518267eef3c10c5f..c743189b1facfbfec692d300a8e15ab214ae2fcd 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1833,7 +1833,7 @@ public abstract class Player extends LivingEntity {
+@@ -1825,7 +1825,7 @@ public abstract class Player extends LivingEntity {
      }
  
      public int getXpNeededForNextLevel() {
@@ -18,7 +18,7 @@ index a629755f07415997e6dbdd96f9b447b90e20b1d5..4713ed2d407e1425d7f5f18d0b43c691
      // Paper start - send while respecting visibility
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fd67e7571841b345630078892e321283760341dd..b8d3398b349d9294de6b8a8594b054d3c84dbe0a 100644
+index 2fb263502b61d6a66aa30ef42e1514447bf4f3fa..c11b974cf4dee385d0730ecc20715feac0f20352 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1821,6 +1821,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0999-Add-missing-InventoryType.patch b/patches/server/0988-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/0999-Add-missing-InventoryType.patch
rename to patches/server/0988-Add-missing-InventoryType.patch
diff --git a/patches/server/1000-Add-drops-to-shear-events.patch b/patches/server/0989-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/server/1000-Add-drops-to-shear-events.patch
rename to patches/server/0989-Add-drops-to-shear-events.patch
diff --git a/patches/server/1001-Add-PlayerShieldDisableEvent.patch b/patches/server/0990-Add-PlayerShieldDisableEvent.patch
similarity index 89%
rename from patches/server/1001-Add-PlayerShieldDisableEvent.patch
rename to patches/server/0990-Add-PlayerShieldDisableEvent.patch
index 14308e1970..f1a468fac2 100644
--- a/patches/server/1001-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0990-Add-PlayerShieldDisableEvent.patch
@@ -16,10 +16,10 @@ sideeffects, meaning the disable event cannot share a handlerlist with
 the cooldown event
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index c411b692ba71400e4e3d2ed7af4f35c4a4fed4be..dc941429b047d33fe39c1e4664371bc0ce8d5245 100644
+index 704f63bb90b4268f25c24b724e08d9d74583e818..6d21d478a32ef8aff3961cba7441a0be384663b0 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1703,7 +1703,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -1690,7 +1690,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
              float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F;
  
              if (this.random.nextFloat() < f) {
@@ -33,10 +33,10 @@ index c411b692ba71400e4e3d2ed7af4f35c4a4fed4be..dc941429b047d33fe39c1e4664371bc0
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4713ed2d407e1425d7f5f18d0b43c6917ef876ec..35869e655a7488f7b5868895287b8045b03f2d63 100644
+index c743189b1facfbfec692d300a8e15ab214ae2fcd..4ddbe3d22198bafc0a5cdef8605a0c1a62faaa8a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -979,7 +979,7 @@ public abstract class Player extends LivingEntity {
+@@ -971,7 +971,7 @@ public abstract class Player extends LivingEntity {
      protected void blockUsingShield(LivingEntity attacker) {
          super.blockUsingShield(attacker);
          if (attacker.canDisableShield()) {
@@ -45,7 +45,7 @@ index 4713ed2d407e1425d7f5f18d0b43c6917ef876ec..35869e655a7488f7b5868895287b8045
          }
  
      }
-@@ -1462,7 +1462,14 @@ public abstract class Player extends LivingEntity {
+@@ -1454,7 +1454,14 @@ public abstract class Player extends LivingEntity {
          this.attack(target);
      }
  
@@ -60,7 +60,7 @@ index 4713ed2d407e1425d7f5f18d0b43c6917ef876ec..35869e655a7488f7b5868895287b8045
          float f = 0.25F + (float) EnchantmentHelper.getBlockEfficiency(this) * 0.05F;
  
          if (sprinting) {
-@@ -1470,7 +1477,16 @@ public abstract class Player extends LivingEntity {
+@@ -1462,7 +1469,16 @@ public abstract class Player extends LivingEntity {
          }
  
          if (this.random.nextFloat() < f) {
diff --git a/patches/server/1002-Add-HiddenPotionEffect-API.patch b/patches/server/0991-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/1002-Add-HiddenPotionEffect-API.patch
rename to patches/server/0991-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/1003-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0992-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/1003-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/0992-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/1004-fix-ItemMeta-removing-CustomModelData.patch b/patches/server/0993-fix-ItemMeta-removing-CustomModelData.patch
similarity index 100%
rename from patches/server/1004-fix-ItemMeta-removing-CustomModelData.patch
rename to patches/server/0993-fix-ItemMeta-removing-CustomModelData.patch
diff --git a/patches/server/1005-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0994-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 95%
rename from patches/server/1005-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/0994-Validate-ResourceLocation-in-NBT-reading.patch
index 6cf68dcdf7..12f95acee8 100644
--- a/patches/server/1005-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0994-Validate-ResourceLocation-in-NBT-reading.patch
@@ -53,10 +53,10 @@ index 9da8d56ff3768fb37d1ab89300da4eca19e6218d..edc723ea5ca3a325106e7af38c60dbf9
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index dc941429b047d33fe39c1e4664371bc0ce8d5245..22506c5c823c65e65034a962312c1dbd44356e23 100644
+index 6d21d478a32ef8aff3961cba7441a0be384663b0..2c4916982add2e8d1fbafd13efc82c6be30e9b70 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -620,7 +620,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
+@@ -607,7 +607,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
  
          this.setLeftHanded(nbt.getBoolean("LeftHanded"));
          if (nbt.contains("DeathLootTable", 8)) {
@@ -66,7 +66,7 @@ index dc941429b047d33fe39c1e4664371bc0ce8d5245..22506c5c823c65e65034a962312c1dbd
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 2b2ff2a187410ef9431b0396c05935ffd17fd108..5a2144417783f859729fc93281edd9d577c59ca2 100644
+index 618de60680de015bc68bf95a68eda98db7bab3c5..d14eab0d83d629a4522bf3f7d789d2853eb84f06 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -560,7 +560,7 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/1006-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0995-Properly-handle-experience-dropping-on-block-break.patch
similarity index 97%
rename from patches/server/1006-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/0995-Properly-handle-experience-dropping-on-block-break.patch
index cba1154441..6b0e0d8913 100644
--- a/patches/server/1006-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0995-Properly-handle-experience-dropping-on-block-break.patch
@@ -7,10 +7,10 @@ This causes spawnAfterBreak to spawn xp by default, removing the need to manuall
 For classes that use custom xp amounts, they can drop the resources with disabling
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8fac839ea8131060a29c326a9530a21fbf47dfa3..25ed0f62058fa531d8bf9cf1e8fb99651ee46a67 100644
+index 6dfff3e991436df62babc8b3398d39d58d03baee..5ba31afdf371e88dd320e9a19a92d222e9de2e71 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -730,7 +730,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -637,7 +637,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (drop) {
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
diff --git a/patches/server/1007-Fixup-NamespacedKey-handling.patch b/patches/server/0996-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/1007-Fixup-NamespacedKey-handling.patch
rename to patches/server/0996-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/1008-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0997-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 93%
rename from patches/server/1008-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0997-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index b72c50ec11..fa980a7d88 100644
--- a/patches/server/1008-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0997-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -18,10 +18,10 @@ index 3c4ac79c094dc2fff7de94150a34b7bf814ac0de..38b56923a642afc1cb411480ba03cc78
      @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 fa29444c43925eabe5c26cafaefb46ebb246b006..370747aefba28dbfce59f45d303d47db9bfceb42 100644
+index e4f055e935bb0b31e6ee60e57b48ce7ea7ac360d..364d958dda220c2699b9448cd88f58f9e0e93e02 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1275,10 +1275,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1173,10 +1173,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) {
@@ -39,7 +39,7 @@ index fa29444c43925eabe5c26cafaefb46ebb246b006..370747aefba28dbfce59f45d303d47db
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
                  // Paper start - Configurable entity tracking range by Y
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index ba9843cd0e922fb2fee3b3ff753767ec1bc1816b..ae188ae314336d971303023c7b7b8ecf32bae253 100644
+index 8cd52a6172fc7bdd5dc980329fed1d765e3750f2..529ab44baaf573b97cf7e89560c548642733188f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -164,7 +164,13 @@ public class ServerEntity {
diff --git a/patches/server/0072-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 86%
rename from patches/server/0072-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index ac072360f0..6d394ebc64 100644
--- a/patches/server/0072-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0998-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -26,23 +26,23 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 08ffa37aaf23c410c670ed1703c5eb2c10efa0f4..b76ac10fe0d4b860a4b30fae365cf38400afb456 100644
+index 72ff9e6ec6d9640556292f010bed3a71a39bdc20..f4b90cf5f6044793e69e50392ec6e89dbab018b7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3466,7 +3466,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-             Vec3 vec3d = new Vec3(this.getX(), this.getEyeY(), this.getZ());
+@@ -3724,7 +3724,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
  
--            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS;
-+            return vec3d1.distanceTo(vec3d) > 128.0D ? false : this.level().clipDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == HitResult.Type.MISS; // Paper
+             // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
+-            return vec3d1.distanceToSqr(vec3d) > 128.0D * 128.0D ? false : this.level().clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS; // Paper - Perf: Use distance squared
++            return vec3d1.distanceToSqr(vec3d) > 128.0D * 128.0D ? false : this.level().clipDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == HitResult.Type.MISS; // Paper - Perf: Use distance squared & strip raytracing
          }
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index d6d8bbc98fc71997cb52521d59ebb59d727d3c22..3b31a1927aaed7fffc1b4f4bcefc12120d66af3d 100644
+index bb8e962e63c7a2d931f9bd7f7c002aa35cfa5fd3..0fa131a6c98adb498fc8d534e0e39647e80c6923 100644
 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java
 +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -68,6 +68,19 @@ public interface BlockGetter extends LevelHeightAccessor {
+@@ -68,6 +68,18 @@ public interface BlockGetter extends LevelHeightAccessor {
          });
      }
  
@@ -58,15 +58,14 @@ index d6d8bbc98fc71997cb52521d59ebb59d727d3c22..3b31a1927aaed7fffc1b4f4bcefc1212
 +        return hitResult == null ? null : hitResult.getType();
 +    }
 +    // Paper end
-+
      // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
      default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
-             BlockState iblockdata = this.getBlockState(blockposition);
+         // Paper start - Add predicate for blocks when raytracing
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ed38ad96b9344903097962a5bf94fb861651fcba..272679dbd643487cf7b096828bb52b36031086a3 100644
+index 5ba31afdf371e88dd320e9a19a92d222e9de2e71..4ea6945e949c63949b7832ce95501c4a801e840d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -286,6 +286,90 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -343,6 +343,90 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
  
diff --git a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0999-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 93%
rename from patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0999-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 807dd80521..0c9874a5a5 100644
--- a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0999-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls
 
 diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..40950db0c242c65dfd4de247c86249354d12108f 100644
+index 369b54b96c682717ef93d05312714b4d30efaceb..beadef19ee136c27601f0d116a86967344c2e403 100644
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
 @@ -31,6 +31,12 @@ public class Vec3i implements Comparable<Vec3i> {
@@ -29,10 +29,10 @@ index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..40950db0c242c65dfd4de247c8624935
          this.x = x;
          this.y = y;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 272679dbd643487cf7b096828bb52b36031086a3..a589b70303bf66c41e6ea1dbf493d14304df25ab 100644
+index 4ea6945e949c63949b7832ce95501c4a801e840d..43dece0870da5c857592647c3e0e51c83b2b99b1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -371,7 +371,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -428,7 +428,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      // Paper end
  
      public boolean isInWorldBounds(BlockPos pos) {
@@ -88,10 +88,10 @@ index 60e760b42dd6471a229dfd45490dcf8c51979d35..4a3ac7dedf5cb1e76f16ec4f18e82afc
      @Override
      public FluidState getFluidState(BlockPos pos) {
 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 c050a5d39087722dad6bb31f95b7b04fe7e8b767..47815824811a0ca82d70e585cc4d66a521129380 100644
+index 90d6376f0441505a4c5f32d620827dfe233a5783..808ccbd141a3fb1073abb4817ec1fb82fe46e69b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -292,12 +292,29 @@ public class LevelChunk extends ChunkAccess {
+@@ -299,12 +299,29 @@ public class LevelChunk extends ChunkAccess {
          }
      }
  
@@ -125,7 +125,7 @@ index c050a5d39087722dad6bb31f95b7b04fe7e8b767..47815824811a0ca82d70e585cc4d66a5
              BlockState iblockdata = null;
  
 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 d59392c322936ce89b759ac9787c8f4f0b228af6..2c3ea88bac229df67bd742e16d2106d80bcc8889 100644
+index ea2fb64ff15af1cbb7b3f59386fb7a40f54e9b4f..edb0a5c9f7ee6ca9502b3bb7886f2d32d718169d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 @@ -19,7 +19,7 @@ public class LevelChunkSection {
diff --git a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/1000-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 88%
rename from patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/1000-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 7c234c7104..dbe875d295 100644
--- a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/1000-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -13,10 +13,10 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ad9b4e88e2aaa5d7e70f65536c86742beafc91df..adb4e72652605f25b25dcd5690fbe7bb499c8809 100644
+index b54e89d68ba32f2a79e16d49f86a258b5f6df133..a2a9535a6667d290198ef8d6332d317c8ffffe2e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2436,6 +2436,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2620,6 +2620,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                              {
                                  if ( iter.next().player == entity )
                                  {
@@ -25,10 +25,10 @@ index ad9b4e88e2aaa5d7e70f65536c86742beafc91df..adb4e72652605f25b25dcd5690fbe7bb
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 86d187cadb73dbe0757f9417c4549e358ff303ca..c2725113b3ec36a79c88bcf9837c0ef2955b613e 100644
+index 4ddbe3d22198bafc0a5cdef8605a0c1a62faaa8a..35869e655a7488f7b5868895287b8045b03f2d63 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -764,6 +764,14 @@ public abstract class Player extends LivingEntity {
+@@ -788,6 +788,14 @@ public abstract class Player extends LivingEntity {
                  return null;
              }
              // CraftBukkit end
@@ -44,10 +44,10 @@ index 86d187cadb73dbe0757f9417c4549e358ff303ca..c2725113b3ec36a79c88bcf9837c0ef2
              return entityitem;
          }
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 8f144a357174bbe096ac9b38a5e67a61127d7b87..e1623ade449fe56ec51955ee9594a93f85660c51 100644
+index ed57ce12d4d1cc632431a654cad648a8015402b1..45269115e63cfc3bd7dc740a5694e2cc7c35bcb1 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-@@ -64,6 +64,7 @@ public class MapItemSavedData extends SavedData {
+@@ -66,6 +66,7 @@ public class MapItemSavedData extends SavedData {
      public final Map<String, MapDecoration> decorations = Maps.newLinkedHashMap();
      private final Map<String, MapFrame> frameMarkers = Maps.newHashMap();
      private int trackedDecorationCount;
@@ -55,7 +55,7 @@ index 8f144a357174bbe096ac9b38a5e67a61127d7b87..e1623ade449fe56ec51955ee9594a93f
  
      // CraftBukkit start
      public final CraftMapView mapView;
-@@ -90,6 +91,7 @@ public class MapItemSavedData extends SavedData {
+@@ -92,6 +93,7 @@ public class MapItemSavedData extends SavedData {
          // CraftBukkit start
          this.mapView = new CraftMapView(this);
          this.server = (CraftServer) org.bukkit.Bukkit.getServer();
@@ -63,7 +63,7 @@ index 8f144a357174bbe096ac9b38a5e67a61127d7b87..e1623ade449fe56ec51955ee9594a93f
          // CraftBukkit end
      }
  
-@@ -145,6 +147,7 @@ public class MapItemSavedData extends SavedData {
+@@ -166,6 +168,7 @@ public class MapItemSavedData extends SavedData {
          if (abyte.length == 16384) {
              worldmap.colors = abyte;
          }
@@ -71,7 +71,7 @@ index 8f144a357174bbe096ac9b38a5e67a61127d7b87..e1623ade449fe56ec51955ee9594a93f
  
          ListTag nbttaglist = nbt.getList("banners", 10);
  
-@@ -555,6 +558,21 @@ public class MapItemSavedData extends SavedData {
+@@ -578,6 +581,21 @@ public class MapItemSavedData extends SavedData {
  
      public class HoldingPlayer {
  
@@ -93,7 +93,7 @@ index 8f144a357174bbe096ac9b38a5e67a61127d7b87..e1623ade449fe56ec51955ee9594a93f
          public final Player player;
          private boolean dirtyData = true;
          private int minDirtyX;
-@@ -588,7 +606,9 @@ public class MapItemSavedData extends SavedData {
+@@ -611,7 +629,9 @@ public class MapItemSavedData extends SavedData {
          @Nullable
          Packet<?> nextUpdatePacket(int mapId) {
              MapItemSavedData.MapPatch worldmap_b;
@@ -104,7 +104,7 @@ index 8f144a357174bbe096ac9b38a5e67a61127d7b87..e1623ade449fe56ec51955ee9594a93f
  
              if (this.dirtyData) {
                  this.dirtyData = false;
-@@ -604,6 +624,8 @@ public class MapItemSavedData extends SavedData {
+@@ -627,6 +647,8 @@ public class MapItemSavedData extends SavedData {
                  // CraftBukkit start
                  java.util.Collection<MapDecoration> icons = new java.util.ArrayList<MapDecoration>();
  
diff --git a/patches/server/0293-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/1001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 93%
rename from patches/server/0293-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/1001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 895e2138ad..4c83d00b56 100644
--- a/patches/server/0293-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/1001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
@@ -28,11 +28,11 @@ and then catch exceptions and close if they fire.
 Part of this commit was authored by: Spottedleaf, sandtechnology
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3bfb463812 100644
+index e6a8f36fa07561b69b9d869022234182bdd62da0..a0434b92615c10a319eb4528808a83d01df2c516 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -84,7 +84,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         return new DefaultEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Client IO #%d").setDaemon(true).build());
+         return new DefaultEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Local Client IO #%d").setDaemon(true).setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(LOGGER)).build()); // Paper
      });
      private final PacketFlow receiving;
 -    private final Queue<Consumer<Connection>> pendingActions = Queues.newConcurrentLinkedQueue();
@@ -51,7 +51,7 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
  
      // Paper start - add utility methods
      public final net.minecraft.server.level.ServerPlayer getPlayer() {
-@@ -307,15 +311,39 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -375,15 +379,39 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      }
  
      public void send(Packet<?> packet, @Nullable PacketSendListener callbacks, boolean flush) {
@@ -97,7 +97,7 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
      }
  
      public void runOnceConnected(Consumer<Connection> task) {
-@@ -323,7 +351,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -391,7 +419,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              this.flushQueue();
              task.accept(this);
          } else {
@@ -106,7 +106,7 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
          }
  
      }
-@@ -341,6 +369,14 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -409,6 +437,14 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      }
  
      private void doSendPacket(Packet<?> packet, @Nullable PacketSendListener callbacks, boolean flush) {
@@ -121,7 +121,7 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
          ChannelFuture channelfuture = flush ? this.channel.writeAndFlush(packet) : this.channel.write(packet);
  
          if (callbacks != null) {
-@@ -360,14 +396,24 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -428,14 +464,24 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
              });
          }
  
@@ -147,7 +147,7 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
          }
  
      }
-@@ -400,20 +446,57 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -468,20 +514,57 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          return attributekey;
      }
  
@@ -210,9 +210,9 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
      }
 +    // Paper end - Optimize network
  
-     public void tick() {
-         this.flushQueue();
-@@ -461,6 +544,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+     private static final int MAX_PER_TICK = io.papermc.paper.configuration.GlobalConfiguration.get().misc.maxJoinsPerTick; // Paper - Buffer joins to world
+     private static int joinAttemptsThisTick; // Paper - Buffer joins to world
+@@ -544,6 +627,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      public void disconnect(Component disconnectReason) {
          // Spigot Start
          this.preparing = false;
@@ -220,7 +220,7 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
          // Spigot End
          if (this.channel == null) {
              this.delayedDisconnect = disconnectReason;
-@@ -630,7 +714,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -715,7 +799,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      public void handleDisconnection() {
          if (this.channel != null && !this.channel.isOpen()) {
              if (this.disconnectionHandled) {
@@ -229,7 +229,7 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
              } else {
                  this.disconnectionHandled = true;
                  PacketListener packetlistener = this.getPacketListener();
-@@ -643,7 +727,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -728,7 +812,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
  
                      packetlistener1.onDisconnect(ichatbasecomponent);
                  }
@@ -238,7 +238,7 @@ index cd9ed68079abf103759865a3e2a038ac629a18ea..128debf837da32d27ba37184162e7b3b
                  // Paper start - Add PlayerConnectionCloseEvent
                  final PacketListener packetListener = this.getPacketListener();
                  if (packetListener instanceof net.minecraft.server.network.ServerCommonPacketListenerImpl commonPacketListener) {
-@@ -680,4 +764,93 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -765,4 +849,93 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      public void setBandwidthLogger(SampleLogger log) {
          this.bandwidthDebugMonitor = new BandwidthDebugMonitor(log);
      }
@@ -368,7 +368,7 @@ index cc658a61065d5c0021a4b88fa58b40211b94f8ec..da11266a0a23f446196e6facf2c358cf
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 187b2cf175ba5cea94158d29b53993dc5a7c5b94..9db7fc8c053aa9e929fa6dddf70290a8f7ad5273 100644
+index 4f330a44c77a7ec3237a86fda04921a8c4a1c00f..a4a29a7ea0035ecf4c61ee8547a9eb24acb667d0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -63,10 +63,12 @@ public class ServerConnectionListener {
@@ -384,7 +384,7 @@ index 187b2cf175ba5cea94158d29b53993dc5a7c5b94..9db7fc8c053aa9e929fa6dddf70290a8
          }
      }
      // Paper end - prevent blocking on adding a new connection while the server is ticking
-@@ -103,6 +105,7 @@ public class ServerConnectionListener {
+@@ -114,6 +116,7 @@ public class ServerConnectionListener {
                          ;
                      }
  
diff --git a/patches/server/0306-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/1002-Allow-Saving-of-Oversized-Chunks.patch
similarity index 91%
rename from patches/server/0306-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/1002-Allow-Saving-of-Oversized-Chunks.patch
index 538175e05b..6a131f4dd4 100644
--- a/patches/server/0306-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/1002-Allow-Saving-of-Oversized-Chunks.patch
@@ -33,7 +33,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 2a7f17726a161ddbcd0397fb4332de6980199c38..69ed808ca5fbfb9191d0818bb0f1c839d11d9d11 100644
+index bc8038da65f834249c61a262fc1a5abb7cc91a63..6c89b92cac521808873e9e1eccc363695275cd7a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -18,8 +18,11 @@ import java.nio.file.LinkOption;
@@ -55,7 +55,7 @@ index 2a7f17726a161ddbcd0397fb4332de6980199c38..69ed808ca5fbfb9191d0818bb0f1c839
 +    public final Path regionFile; // Paper
  
      public RegionFile(Path file, Path directory, boolean dsync) throws IOException {
-         this(file, directory, RegionFileVersion.VERSION_DEFLATE, dsync);
+         this(file, directory, RegionFileVersion.getCompressionFormat(), dsync); // Paper - Configurable region compression format
 @@ -52,6 +56,8 @@ public class RegionFile implements AutoCloseable {
  
      public RegionFile(Path file, Path directory, RegionFileVersion outputChunkStreamVersion, boolean dsync) throws IOException {
@@ -65,10 +65,10 @@ index 2a7f17726a161ddbcd0397fb4332de6980199c38..69ed808ca5fbfb9191d0818bb0f1c839
          this.usedSectors = new RegionBitmap();
          this.version = outputChunkStreamVersion;
          if (!Files.isDirectory(directory, new LinkOption[0])) {
-@@ -430,6 +436,74 @@ public class RegionFile implements AutoCloseable {
- 
+@@ -431,6 +437,74 @@ public class RegionFile implements AutoCloseable {
      }
  
+     public static final int MAX_CHUNK_SIZE = 500 * 1024 * 1024; // Paper - don't write garbage data to disk if writing serialization fails
 +    // Paper start
 +    private final byte[] oversized = new byte[1024];
 +    private int oversizedCount;
@@ -141,10 +141,10 @@ index 2a7f17726a161ddbcd0397fb4332de6980199c38..69ed808ca5fbfb9191d0818bb0f1c839
  
          private final ChunkPos pos;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 465ad0bae446a20e941e8f2dbf2d85f2627482b9..affd43308ac565066cefa799238e46b75a28b270 100644
+index c3bf911a76373dcd1c345a3091adefb0e550fd18..6900e52d3e24ba64cebcd409b5fb3a8f5e15ef1d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -121,6 +121,43 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -144,6 +144,43 @@ public class RegionFileStorage implements AutoCloseable {
          }
      }
  
@@ -188,7 +188,7 @@ index 465ad0bae446a20e941e8f2dbf2d85f2627482b9..affd43308ac565066cefa799238e46b7
      @Nullable
      public CompoundTag read(ChunkPos pos) throws IOException {
          // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
-@@ -132,6 +169,12 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -155,6 +192,12 @@ public class RegionFileStorage implements AutoCloseable {
          try { // Paper
          DataInputStream datainputstream = regionfile.getChunkDataInputStream(pos);
  
@@ -201,11 +201,11 @@ index 465ad0bae446a20e941e8f2dbf2d85f2627482b9..affd43308ac565066cefa799238e46b7
          CompoundTag nbttagcompound;
          label43:
          {
-@@ -218,6 +261,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -241,6 +284,7 @@ public class RegionFileStorage implements AutoCloseable {
  
              try {
                  NbtIo.write(nbt, (DataOutput) dataoutputstream);
 +                regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone
-             } catch (Throwable throwable) {
-                 if (dataoutputstream != null) {
-                     try {
+                 // Paper start - don't write garbage data to disk if writing serialization fails
+                 dataoutputstream.close(); // Only write if successful
+             } catch (final RegionFileSizeException e) {
diff --git a/patches/server/0308-Fix-World-isChunkGenerated-calls.patch b/patches/server/1003-Fix-World-isChunkGenerated-calls.patch
similarity index 86%
rename from patches/server/0308-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/1003-Fix-World-isChunkGenerated-calls.patch
index 5fe36e4e67..0952370922 100644
--- a/patches/server/0308-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/1003-Fix-World-isChunkGenerated-calls.patch
@@ -8,10 +8,10 @@ This patch also adds a chunk status cache on region files (note that
 its only purpose is to cache the status on DISK)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 45ee0cd242271883412284625230822d9c8a5452..56f52d4b9c1af6a04d464640ed06b841a47b4cd9 100644
+index 364d958dda220c2699b9448cd88f58f9e0e93e02..ca58aedecf80eba442aca6e6cd0a1428db899268 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -679,9 +679,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -719,9 +719,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      // Paper end
  
      private CompletableFuture<Optional<CompoundTag>> readChunk(ChunkPos chunkPos) {
@@ -28,7 +28,7 @@ index 45ee0cd242271883412284625230822d9c8a5452..56f52d4b9c1af6a04d464640ed06b841
      }
  
      // CraftBukkit start
-@@ -690,6 +694,63 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -730,6 +734,60 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          // CraftBukkit end
      }
  
@@ -36,7 +36,6 @@ index 45ee0cd242271883412284625230822d9c8a5452..56f52d4b9c1af6a04d464640ed06b841
 +    @Nullable
 +    public CompoundTag readConvertChunkSync(ChunkPos pos) throws IOException {
 +        CompoundTag nbttagcompound = this.readSync(pos);
-+        // Paper start - Cache chunk status on disk
 +        if (nbttagcompound == null) {
 +            return null;
 +        }
@@ -49,10 +48,8 @@ index 45ee0cd242271883412284625230822d9c8a5452..56f52d4b9c1af6a04d464640ed06b841
 +        this.updateChunkStatusOnDisk(pos, nbttagcompound);
 +
 +        return nbttagcompound;
-+        // Paper end
 +    }
 +
-+    // Paper start - chunk status cache "api"
 +    public ChunkStatus getChunkStatusOnDiskIfCached(ChunkPos chunkPos) {
 +        net.minecraft.world.level.chunk.storage.RegionFile regionFile = regionFileCache.getRegionFileIfLoaded(chunkPos);
 +
@@ -89,11 +86,11 @@ index 45ee0cd242271883412284625230822d9c8a5452..56f52d4b9c1af6a04d464640ed06b841
 +    }
 +    // Paper end - Cache chunk status on disk
 +
-     boolean anyPlayerCloseEnoughForSpawning(ChunkPos pos) {
+     public boolean anyPlayerCloseEnoughForSpawning(ChunkPos pos) { // Paper - public
          // Spigot start
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 69ed808ca5fbfb9191d0818bb0f1c839d11d9d11..0ae3d1ea6f00efcdea5da5bf1a0f984f4473f5a2 100644
+index 6c89b92cac521808873e9e1eccc363695275cd7a..92ba75254f6ffca40abd5485dbb4789de59edebd 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -50,6 +50,30 @@ public class RegionFile implements AutoCloseable {
@@ -125,7 +122,7 @@ index 69ed808ca5fbfb9191d0818bb0f1c839d11d9d11..0ae3d1ea6f00efcdea5da5bf1a0f984f
 +    // Paper end - Cache chunk status
 +
      public RegionFile(Path file, Path directory, boolean dsync) throws IOException {
-         this(file, directory, RegionFileVersion.VERSION_DEFLATE, dsync);
+         this(file, directory, RegionFileVersion.getCompressionFormat(), dsync); // Paper - Configurable region compression format
      }
 @@ -397,6 +421,7 @@ public class RegionFile implements AutoCloseable {
          return this.getOffset(pos) != 0;
@@ -144,22 +141,22 @@ index 69ed808ca5fbfb9191d0818bb0f1c839d11d9d11..0ae3d1ea6f00efcdea5da5bf1a0f984f
              this.padToFullSector();
          } finally {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index affd43308ac565066cefa799238e46b75a28b270..8563383d45f89ee01dd5df13af5bd0cf1b3d7b01 100644
+index 6900e52d3e24ba64cebcd409b5fb3a8f5e15ef1d..eeb596a357ca9a18199596af665bc308ff706b70 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -261,6 +261,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -284,6 +284,7 @@ public class RegionFileStorage implements AutoCloseable {
  
              try {
                  NbtIo.write(nbt, (DataOutput) dataoutputstream);
 +                regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - Cache chunk status
                  regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone
-             } catch (Throwable throwable) {
-                 if (dataoutputstream != null) {
+                 // Paper start - don't write garbage data to disk if writing serialization fails
+                 dataoutputstream.close(); // Only write if successful
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0b7f3c3df526372e5c249ba3c1bb04343fe86e48..86f31b8356e1632537d34b39c105d01958eba23a 100644
+index 031db5f0bcf4a7d0930a7d376e7f6806d34da4e2..29fa4ebcb1375a64023ada3d7055bc8085846bf4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -310,9 +310,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -376,9 +376,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean isChunkGenerated(int x, int z) {
@@ -185,36 +182,39 @@ index 0b7f3c3df526372e5c249ba3c1bb04343fe86e48..86f31b8356e1632537d34b39c105d019
              throw new RuntimeException(ex);
          }
      }
-@@ -426,20 +440,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-     @Override
+@@ -528,20 +542,48 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public boolean loadChunk(int x, int z, boolean generate) {
          org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
+         warnUnsafeChunk("loading a faraway chunk", x, z); // Paper
 -        ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper
-+        // Paper start - Optimize this method
-+        ChunkPos chunkPos = new ChunkPos(x, z);
- 
+-
 -        // If generate = false, but the chunk already exists, we will get this back.
 -        if (chunk instanceof ImposterProtoChunk) {
 -            // We then cycle through again to get the full chunk immediately, rather than after the ticket addition
 -            chunk = this.world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
 -        }
+-
+-        if (chunk instanceof net.minecraft.world.level.chunk.LevelChunk) {
+-            this.world.getChunkSource().addRegionTicket(TicketType.PLUGIN, new ChunkPos(x, z), 0, Unit.INSTANCE); // Paper
++        // Paper start - Optimize this method
++        ChunkPos chunkPos = new ChunkPos(x, z);
++        ChunkAccess immediate = world.getChunkSource().getChunkAtIfLoadedImmediately(x, z);
++        if (immediate != null) {
++            // Plugins should use plugin tickets instead of this method to keep a chunk perpetually loaded
+             return true;
+         }
+ 
+-        return false;
 +        if (!generate) {
-+            ChunkAccess immediate = world.getChunkSource().getChunkAtImmediately(x, z);
-+            if (immediate == null) {
-+                immediate = world.getChunkSource().chunkMap.getUnloadingChunk(x, z);
-+            }
++            immediate = world.getChunkSource().chunkMap.getUnloadingChunk(x, z);
 +            if (immediate != null) {
 +                if (!(immediate instanceof ImposterProtoChunk) && !(immediate instanceof net.minecraft.world.level.chunk.LevelChunk)) {
 +                    return false; // not full status
 +                }
-+                world.getChunkSource().addRegionTicket(TicketType.PLUGIN, chunkPos, 1, Unit.INSTANCE);
++                world.getChunkSource().addRegionTicket(TicketType.PLUGIN, chunkPos, 0, Unit.INSTANCE); // Paper
 +                world.getChunk(x, z); // make sure we're at ticket level 32 or lower
 +                return true;
 +            }
- 
--        if (chunk instanceof net.minecraft.world.level.chunk.LevelChunk) {
--            this.world.getChunkSource().addRegionTicket(TicketType.PLUGIN, new ChunkPos(x, z), 1, Unit.INSTANCE);
--            return true;
 +            net.minecraft.world.level.chunk.storage.RegionFile file;
 +            try {
 +                file = world.getChunkSource().chunkMap.regionFileCache.getRegionFile(chunkPos, false);
@@ -234,10 +234,8 @@ index 0b7f3c3df526372e5c249ba3c1bb04343fe86e48..86f31b8356e1632537d34b39c105d019
 +
 +            // fall through to load
 +            // we do this so we do not re-read the chunk data on disk
-         }
- 
--        return false;
-+        world.getChunkSource().addRegionTicket(TicketType.PLUGIN, chunkPos, 1, Unit.INSTANCE);
++        }
++        world.getChunkSource().addRegionTicket(TicketType.PLUGIN, chunkPos, 0, Unit.INSTANCE); // Paper
 +        world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
 +        return true;
 +        // Paper end - Optimize this method
diff --git a/patches/server/0316-Flat-bedrock-generator-settings.patch b/patches/server/1004-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0316-Flat-bedrock-generator-settings.patch
rename to patches/server/1004-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0327-Entity-Activation-Range-2.0.patch b/patches/server/1005-Entity-Activation-Range-2.0.patch
similarity index 95%
rename from patches/server/0327-Entity-Activation-Range-2.0.patch
rename to patches/server/1005-Entity-Activation-Range-2.0.patch
index e82e576a0c..7e04f83f63 100644
--- a/patches/server/0327-Entity-Activation-Range-2.0.patch
+++ b/patches/server/1005-Entity-Activation-Range-2.0.patch
@@ -18,7 +18,7 @@ public net.minecraft.world.entity.Entity isInsidePortal
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 262335dfd4ea0315e43e0a055a7259916bb6ee37..77cd3c3381c7aa12fbde8fbced0b830aabadf42f 100644
+index a2a9535a6667d290198ef8d6332d317c8ffffe2e..0c8282683a02087ec0631d1fb5edb13759853486 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
@@ -29,7 +29,7 @@ index 262335dfd4ea0315e43e0a055a7259916bb6ee37..77cd3c3381c7aa12fbde8fbced0b830a
  import com.google.common.collect.Lists;
  import com.mojang.datafixers.DataFixer;
  import com.mojang.datafixers.util.Pair;
-@@ -1208,17 +1207,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1222,17 +1221,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
@@ -51,7 +51,7 @@ index 262335dfd4ea0315e43e0a055a7259916bb6ee37..77cd3c3381c7aa12fbde8fbced0b830a
          try {
          // Paper end - timings
          entity.setOldPosAndRot();
-@@ -1229,9 +1228,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1243,9 +1242,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString();
          });
          gameprofilerfiller.incrementCounter("tickNonPassenger");
@@ -65,7 +65,7 @@ index 262335dfd4ea0315e43e0a055a7259916bb6ee37..77cd3c3381c7aa12fbde8fbced0b830a
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1239,13 +1242,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1253,13 +1256,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              this.tickPassenger(entity, entity1);
          }
@@ -85,7 +85,7 @@ index 262335dfd4ea0315e43e0a055a7259916bb6ee37..77cd3c3381c7aa12fbde8fbced0b830a
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
                  ProfilerFiller gameprofilerfiller = this.getProfiler();
-@@ -1254,8 +1262,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1268,8 +1276,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      return BuiltInRegistries.ENTITY_TYPE.getKey(passenger.getType()).toString();
                  });
                  gameprofilerfiller.incrementCounter("tickPassenger");
@@ -103,7 +103,7 @@ index 262335dfd4ea0315e43e0a055a7259916bb6ee37..77cd3c3381c7aa12fbde8fbced0b830a
                  gameprofilerfiller.pop();
                  Iterator iterator = passenger.getPassengers().iterator();
  
-@@ -1265,6 +1282,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1279,6 +1296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      this.tickPassenger(passenger, entity2);
                  }
  
@@ -112,19 +112,19 @@ index 262335dfd4ea0315e43e0a055a7259916bb6ee37..77cd3c3381c7aa12fbde8fbced0b830a
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7abdfeacec4787819e2e66d3b8a322b750d203f7..10b338c9feae7d1360573d4be58be42a0b3203f5 100644
+index 6946137dc476d79ccaa27608a482e6ad8b7bae1a..f080a688eeeaa8ed30690026a483930b7b9e0344 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -397,6 +397,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
-     // Spigot end
+@@ -412,6 +412,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
      // Paper start
      protected int numCollisions = 0; // Paper - Cap entity collisions
-+    public long activatedImmunityTick = Integer.MIN_VALUE; // Paper
-+    public boolean isTemporarilyActive; // Paper
+     public boolean fromNetherPortal; // Paper - Add option to nerf pigmen from nether portals
++    public long activatedImmunityTick = Integer.MIN_VALUE; // Paper - EAR
++    public boolean isTemporarilyActive; // Paper - EAR
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      @javax.annotation.Nullable
      private org.bukkit.util.Vector origin;
-@@ -968,6 +970,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1021,6 +1023,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
          } else {
              this.wasOnFire = this.isOnFire();
              if (movementType == MoverType.PISTON) {
@@ -133,7 +133,7 @@ index 7abdfeacec4787819e2e66d3b8a322b750d203f7..10b338c9feae7d1360573d4be58be42a
                  movement = this.limitPistonMovement(movement);
                  if (movement.equals(Vec3.ZERO)) {
                      return;
-@@ -980,6 +984,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
+@@ -1033,6 +1037,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
                  this.stuckSpeedMultiplier = Vec3.ZERO;
                  this.setDeltaMovement(Vec3.ZERO);
              }
@@ -148,7 +148,7 @@ index 7abdfeacec4787819e2e66d3b8a322b750d203f7..10b338c9feae7d1360573d4be58be42a
              movement = this.maybeBackOffFromEdge(movement, movementType);
              Vec3 vec3d1 = this.collide(movement);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 7d0ccdd4b144afed8a93256941b3d8618c847f4d..a04240f64541009f342bcdeb725ccb04c65b697b 100644
+index 2c4916982add2e8d1fbafd13efc82c6be30e9b70..22506c5c823c65e65034a962312c1dbd44356e23 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -221,6 +221,19 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -172,7 +172,7 @@ index 7d0ccdd4b144afed8a93256941b3d8618c847f4d..a04240f64541009f342bcdeb725ccb04
          Entity entity = this.getControlledVehicle();
  
 diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
-index 5e9cf929674888b3a143a0691dc6936b304467f1..b5964614823059261c28eb2e998ad54249f07e7b 100644
+index d6393210cfee53685f83c8491bea8b9c13b01eea..3d95257d2203fe40bb1fab58ad2a1f9e815184a9 100644
 --- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 +++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java
 @@ -21,6 +21,7 @@ public abstract class PathfinderMob extends Mob {
@@ -244,7 +244,7 @@ index 9fc374c17f6b3ee4ab3c582d05e96321b772f2d6..07519c817cc6de04a98198c43a0c2b02
                          }
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index bfd156acbae31619234fffb1804726090802fbae..7956c1ec7bf6b9fe224ec14bb695c0b8ca9dcf2d 100644
+index 4a19e6b83147ae22ade70fdd445c5d7df3b07a0f..1aae466e3e334d7f4bbb3ea9365a255afcc3dd3a 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -227,17 +227,34 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -340,11 +340,11 @@ index b149e8bcac034bb3fc118a9adcb0de45e18ed5e9..fc35cfc9d045f3e5b6a50af1d0ba83b6
 +
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 53cbe0e86acf2c5b329e4805875a8b1db94c0a25..fe500eb9ec252a213bd45746f984288a64eb6056 100644
+index 43dece0870da5c857592647c3e0e51c83b2b99b1..3b9833c7d7513a5b0afe36da82ba52cfe336bc58 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -162,6 +162,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     public Map<BlockPos, BlockEntity> capturedTileEntities = new HashMap<>();
+     public Map<BlockPos, BlockEntity> capturedTileEntities = new java.util.LinkedHashMap<>(); // Paper - Retain block place order when capturing blockstates
      public List<ItemEntity> captureDrops;
      public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<SpawnCategory> ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();
 +    // Paper start
@@ -357,7 +357,7 @@ index 53cbe0e86acf2c5b329e4805875a8b1db94c0a25..fe500eb9ec252a213bd45746f984288a
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
      // Paper start - add paper world config
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-index 45f55c79a9d105f732054d61c4cf83eb5db49762..17a6327ab7b26dfab38881bbc0689b0b25f8f025 100644
+index b1061db1d9b3bfde61d5016e10556c4320095827..c71690dbc3dc52803945f1608f0ee3ba94146354 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 @@ -143,6 +143,10 @@ public class PistonMovingBlockEntity extends BlockEntity {
@@ -372,7 +372,7 @@ index 45f55c79a9d105f732054d61c4cf83eb5db49762..17a6327ab7b26dfab38881bbc0689b0b
                              }
                          }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d5374072a97f791964033d107f023b3cc657b343..3495981419a75efe42bce45a89a32378dd6b8372 100644
+index aaa997613a991a9fc5ed276a7e7e61448f34ef64..fafc8b84d6b6368c70b8eedfdb4c3a9deace9c26 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -1,39 +1,52 @@
@@ -558,7 +558,7 @@ index d5374072a97f791964033d107f023b3cc657b343..3495981419a75efe42bce45a89a32378
  
              // Paper start
              java.util.List<Entity> entities = world.getEntities((Entity)null, ActivationRange.maxBB, null);
-@@ -172,60 +250,118 @@ public class ActivationRange
+@@ -178,60 +256,118 @@ public class ActivationRange
       * @param entity
       * @return
       */
@@ -694,7 +694,7 @@ index d5374072a97f791964033d107f023b3cc657b343..3495981419a75efe42bce45a89a32378
      }
  
      /**
-@@ -240,8 +376,19 @@ public class ActivationRange
+@@ -246,8 +382,19 @@ public class ActivationRange
          if ( entity instanceof FireworkRocketEntity ) {
              return true;
          }
@@ -715,7 +715,7 @@ index d5374072a97f791964033d107f023b3cc657b343..3495981419a75efe42bce45a89a32378
  
          // Should this entity tick?
          if ( !isActive )
-@@ -249,15 +396,19 @@ public class ActivationRange
+@@ -255,15 +402,19 @@ public class ActivationRange
              if ( ( MinecraftServer.currentTick - entity.activatedTick - 1 ) % 20 == 0 )
              {
                  // Check immunities every 20 ticks.
@@ -741,10 +741,10 @@ index d5374072a97f791964033d107f023b3cc657b343..3495981419a75efe42bce45a89a32378
              isActive = false;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 81c76360e8c7389bafd61f38e6782668e8c65d27..50e57486d49694396816122504028e410ebb602d 100644
+index 5485df1a1b59e81f4dcedd21dd972e1fd2759573..1cf6d4f854d89c515e48e1fb365eb95ff9340765 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -205,14 +205,60 @@ public class SpigotWorldConfig
+@@ -211,14 +211,60 @@ public class SpigotWorldConfig
      public int monsterActivationRange = 32;
      public int raiderActivationRange = 48;
      public int miscActivationRange = 16;
diff --git a/patches/server/0332-Optional-per-player-mob-spawns.patch b/patches/server/1006-Optional-per-player-mob-spawns.patch
similarity index 94%
rename from patches/server/0332-Optional-per-player-mob-spawns.patch
rename to patches/server/1006-Optional-per-player-mob-spawns.patch
index 26db4845b9..0c3e064dbb 100644
--- a/patches/server/0332-Optional-per-player-mob-spawns.patch
+++ b/patches/server/1006-Optional-per-player-mob-spawns.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optional per player mob spawns
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b9c345d056ea8b14f19dc033cf3e7e9502b63eda..2b9a1a178233fb7cfb4d58853ff3176cb1236d3a 100644
+index ca58aedecf80eba442aca6e6cd0a1428db899268..e575350d5af1c605ccadb67e4f0fdc28662caba0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -288,6 +288,29 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -39,10 +39,10 @@ index b9c345d056ea8b14f19dc033cf3e7e9502b63eda..2b9a1a178233fb7cfb4d58853ff3176c
          double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8);
          double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index de1d5da6318958e11a9da56ddd8fef1174d0a537..c05beb24972e6633e2d61ba47dcfa0189ea249b6 100644
+index 35f463e5237d12e42f7a8b8c177af3236d2e7986..25009accd401fc3860c57cac1ef628b233e746e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -549,7 +549,19 @@ public class ServerChunkCache extends ChunkSource {
+@@ -533,7 +533,19 @@ public class ServerChunkCache extends ChunkSource {
                  gameprofilerfiller.popPush("naturalSpawnCount");
                  this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
                  int k = this.distanceManager.getNaturalSpawnChunkCount();
@@ -64,10 +64,10 @@ index de1d5da6318958e11a9da56ddd8fef1174d0a537..c05beb24972e6633e2d61ba47dcfa018
  
                  this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0eace8fabb01083327b34e39ec47c51dbedf87ec..181b1896f5bed99c4c4e2e092f72b1a8e1551832 100644
+index dcd69b2b054222d1749aab599caca8340bddf345..c17750ca3254530c9858e82df7e064bbd855b551 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -253,6 +253,10 @@ public class ServerPlayer extends Player {
+@@ -256,6 +256,10 @@ public class ServerPlayer extends Player {
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
      // Paper end
@@ -79,7 +79,7 @@ index 0eace8fabb01083327b34e39ec47c51dbedf87ec..181b1896f5bed99c4c4e2e092f72b1a8
      // CraftBukkit start
      public String displayName;
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 30327580bfa00dda2b87171b2bf3c7de2600ba68..b27e0f31d0b3f5c57157a27f1f1db0f847d42a0c 100644
+index 28ec1cc4dec6d12627761a58d635fd51dbc398b3..da9f091e1c2dd8b025e806f53a4708b623ee4cd8 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -70,6 +70,12 @@ public final class NaturalSpawner {
@@ -151,8 +151,8 @@ index 30327580bfa00dda2b87171b2bf3c7de2600ba68..b27e0f31d0b3f5c57157a27f1f1db0f8
              }
          }
  
-@@ -158,11 +191,17 @@ public final class NaturalSpawner {
-     }
+@@ -168,11 +201,17 @@ public final class NaturalSpawner {
+     // Paper end - Add mobcaps commands
  
      public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) {
 +        // Paper start - Optional per player mob spawns
@@ -170,7 +170,7 @@ index 30327580bfa00dda2b87171b2bf3c7de2600ba68..b27e0f31d0b3f5c57157a27f1f1db0f8
      }
  
      @VisibleForDebug
-@@ -173,15 +212,21 @@ public final class NaturalSpawner {
+@@ -183,15 +222,21 @@ public final class NaturalSpawner {
          });
      }
  
@@ -193,7 +193,7 @@ index 30327580bfa00dda2b87171b2bf3c7de2600ba68..b27e0f31d0b3f5c57157a27f1f1db0f8
              int k = 0;
  
              while (k < 3) {
-@@ -223,14 +268,14 @@ public final class NaturalSpawner {
+@@ -233,14 +278,14 @@ public final class NaturalSpawner {
                                      // Paper start - PreCreatureSpawnEvent
                                      PreSpawnStatus doSpawning = isValidSpawnPostitionForType(world, group, structuremanager, chunkgenerator, biomesettingsmobs_c, blockposition_mutableblockposition, d2);
                                      if (doSpawning == PreSpawnStatus.ABORT) {
@@ -210,7 +210,7 @@ index 30327580bfa00dda2b87171b2bf3c7de2600ba68..b27e0f31d0b3f5c57157a27f1f1db0f8
                                          }
  
                                          entityinsentient.moveTo(d0, (double) i, d1, world.random.nextFloat() * 360.0F, 0.0F);
-@@ -243,10 +288,15 @@ public final class NaturalSpawner {
+@@ -253,10 +298,15 @@ public final class NaturalSpawner {
                                                  ++j;
                                                  ++k1;
                                                  runner.run(entityinsentient, chunk);
@@ -228,7 +228,7 @@ index 30327580bfa00dda2b87171b2bf3c7de2600ba68..b27e0f31d0b3f5c57157a27f1f1db0f8
                                              }
  
                                              if (entityinsentient.isMaxGroupSizeReached(k1)) {
-@@ -268,6 +318,7 @@ public final class NaturalSpawner {
+@@ -278,6 +328,7 @@ public final class NaturalSpawner {
              }
  
          }
@@ -236,7 +236,7 @@ index 30327580bfa00dda2b87171b2bf3c7de2600ba68..b27e0f31d0b3f5c57157a27f1f1db0f8
      }
  
      private static boolean isRightDistanceToPlayerAndSpawnPoint(ServerLevel world, ChunkAccess chunk, BlockPos.MutableBlockPos pos, double squaredDistance) {
-@@ -567,7 +618,7 @@ public final class NaturalSpawner {
+@@ -577,7 +628,7 @@ public final class NaturalSpawner {
              MobCategory enumcreaturetype = entitytypes.getCategory();
  
              this.mobCategoryCounts.addTo(enumcreaturetype, 1);
@@ -245,7 +245,7 @@ index 30327580bfa00dda2b87171b2bf3c7de2600ba68..b27e0f31d0b3f5c57157a27f1f1db0f8
          }
  
          public int getSpawnableChunkCount() {
-@@ -583,6 +634,7 @@ public final class NaturalSpawner {
+@@ -593,6 +644,7 @@ public final class NaturalSpawner {
              int i = limit * this.spawnableChunkCount / NaturalSpawner.MAGIC_NUMBER;
              // CraftBukkit end
  
diff --git a/patches/server/0333-Anti-Xray.patch b/patches/server/1007-Anti-Xray.patch
similarity index 96%
rename from patches/server/0333-Anti-Xray.patch
rename to patches/server/1007-Anti-Xray.patch
index 38b2564285..a53ceaa47d 100644
--- a/patches/server/0333-Anti-Xray.patch
+++ b/patches/server/1007-Anti-Xray.patch
@@ -1017,7 +1017,7 @@ index 6cff1a98dc7cf33947ec760dbc3d3d0ec5db5f6c..51f647de153255c919b1440338cf1b3e
  
          }
 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 dda7151d333144399ba5602e1b651b1f5b8f8f0d..8ffb99aedaa57c1e96ddcc05143776b59c9700a3 100644
+index 582a3e5e45dd10068eeb25a3e37bdece3ddbc296..998deae645b4497c3285bfba3260c636439f9ecf 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 {
@@ -1104,10 +1104,10 @@ index 90ec22d35edb2874417bbea590e0d3c37ad93d64..fc230d835f9aa526a4b179d36d921f0f
  
      public ClientboundLevelChunkWithLightPacket(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 77cd3c3381c7aa12fbde8fbced0b830aabadf42f..f4262817adfcbf1fa2db4e930b8b3a2879d99baf 100644
+index 0c8282683a02087ec0631d1fb5edb13759853486..0793c75dccc765b14718392fbc136b8f8ffc8f91 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -569,7 +569,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -570,7 +570,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
  
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
@@ -1117,7 +1117,7 @@ index 77cd3c3381c7aa12fbde8fbced0b830aabadf42f..f4262817adfcbf1fa2db4e930b8b3a28
          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 deef24ad28ecf7895aa03bf8dae085814d307ece..99784bac05ea0d2ea1e9053466e21c1175fe0a4b 100644
+index 70c83a5631faed95183e15080fb3e5d8c3b817c0..83e017efd15d0ecaffc327f02d6d5330c8ed6937 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;
@@ -1129,7 +1129,7 @@ index deef24ad28ecf7895aa03bf8dae085814d307ece..99784bac05ea0d2ea1e9053466e21c11
      protected final ServerPlayer player;
      private GameType gameModeForPlayer;
      @Nullable
-@@ -321,6 +321,8 @@ public class ServerPlayerGameMode {
+@@ -326,6 +326,8 @@ public class ServerPlayerGameMode {
              }
  
          }
@@ -1139,10 +1139,10 @@ index deef24ad28ecf7895aa03bf8dae085814d307ece..99784bac05ea0d2ea1e9053466e21c11
  
      public void destroyAndAck(BlockPos pos, int sequence, String reason) {
 diff --git a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
-index 5de5209e04d631bd6a50e28e8d3abebf148252c1..19b3f4fa7678a038bf25efc2a8b46ddad0193fde 100644
+index 43e3c99eafaed42161664e31827dfd0abb127ad2..fb1863d235a61ec977e8ad87a289d935a9c5d0e4 100644
 --- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
 +++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java
-@@ -85,7 +85,10 @@ public class PlayerChunkSender {
+@@ -90,7 +90,10 @@ public class PlayerChunkSender {
  
      public static void sendChunk(ServerGamePacketListenerImpl handler, ServerLevel world, LevelChunk chunk) { // Paper - rewrite chunk loader - public
          handler.player.serverLevel().chunkSource.chunkMap.getVisibleChunkIfPresent(chunk.getPos().toLong()).addPlayer(handler.player);
@@ -1151,11 +1151,11 @@ index 5de5209e04d631bd6a50e28e8d3abebf148252c1..19b3f4fa7678a038bf25efc2a8b46dda
 +        final boolean shouldModify = world.chunkPacketBlockController.shouldModify(handler.player, chunk);
 +        handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null, shouldModify));
 +        // Paper end - Anti-Xray
-         ChunkPos chunkPos = chunk.getPos();
-         DebugPackets.sendPoiPacketsForChunk(world, chunkPos);
-     }
+         // Paper start - PlayerChunkLoadEvent
+         if (io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0) {
+             new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), handler.getPlayer().getBukkitEntity()).callEvent();
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index fe500eb9ec252a213bd45746f984288a64eb6056..1540a00e28e95f74dd46b62bdb30840d0e674e01 100644
+index 3b9833c7d7513a5b0afe36da82ba52cfe336bc58..7116e2b98a8c6cc026fd9ea8c5f2c00764906a8c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -177,6 +177,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1166,7 +1166,7 @@ index fe500eb9ec252a213bd45746f984288a64eb6056..1540a00e28e95f74dd46b62bdb30840d
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPos lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -195,7 +196,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -211,7 +212,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
@@ -1175,7 +1175,7 @@ index fe500eb9ec252a213bd45746f984288a64eb6056..1540a00e28e95f74dd46b62bdb30840d
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
          this.generator = gen;
-@@ -281,6 +282,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -297,6 +298,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper
          this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
@@ -1183,7 +1183,7 @@ index fe500eb9ec252a213bd45746f984288a64eb6056..1540a00e28e95f74dd46b62bdb30840d
      }
  
      // Paper start - Cancel hit for vanished players
-@@ -546,6 +548,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -572,6 +574,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
@@ -1217,7 +1217,7 @@ index 5e8d2e4245757a0889645ea79ee68afb53f7dde4..f7e5e016a7028a9196e689e950805b0d
          }
  
 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 2f4eccd75479562060c3ce8208ae0d55bb744f65..f76ed2035fb08143e70cd9962c368cf8f3d5af8c 100644
+index 808ccbd141a3fb1073abb4817ec1fb82fe46e69b..6e1006675339551ca499a57a8f8553020f16a4fa 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -91,7 +91,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1230,7 +1230,7 @@ index 2f4eccd75479562060c3ce8208ae0d55bb744f65..f76ed2035fb08143e70cd9962c368cf8
          this.level = (ServerLevel) world; // CraftBukkit - type
          this.gameEventListenerRegistrySections = new Int2ObjectOpenHashMap();
 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..4eeb719b40ff1c18a7cdda7ecc6b135dbedd626e 100644
+index edb0a5c9f7ee6ca9502b3bb7886f2d32d718169d..3efd0a462306fbd02a506a3f952d609645b1f874 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 @@ -33,9 +33,12 @@ public class LevelChunkSection {
@@ -1267,7 +1267,7 @@ index 2c3ea88bac229df67bd742e16d2106d80bcc8889..4eeb719b40ff1c18a7cdda7ecc6b135d
  
      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 1219200cd915d6239a32a2bd09d325cd8fa9b346..98e720a21432fff7fce8653095a56e2ef56f1d30 100644
+index dfae0918079425df92d958b04275be8ae60d4b60..0f930f8355ea99d1cb1a8d27edc1c224588f852f 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -30,6 +30,7 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
@@ -1277,9 +1277,9 @@ index 1219200cd915d6239a32a2bd09d325cd8fa9b346..98e720a21432fff7fce8653095a56e2e
 +    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");
+     // private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer"); // Paper - unused
 @@ -42,14 +43,19 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
-         this.threadingDetector.checkAndUnlock();
+         // this.threadingDetector.checkAndUnlock(); // Paper - disable this
      }
  
 -    public static <T> Codec<PalettedContainer<T>> codecRW(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue) {
@@ -1359,7 +1359,7 @@ index 1219200cd915d6239a32a2bd09d325cd8fa9b346..98e720a21432fff7fce8653095a56e2e
          this.data = this.createOrReuseData((PalettedContainer.Data<T>)null, 0);
 @@ -93,11 +132,33 @@ 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;
 +
 +        // Paper start - Anti-Xray - Add preset values
@@ -1403,12 +1403,12 @@ index 1219200cd915d6239a32a2bd09d325cd8fa9b346..98e720a21432fff7fce8653095a56e2e
  
      }
  
-+    // Paper start - Anti-Xray - Add chunk packet info
++    // Paper start - Anti-Xray; Add chunk packet info
 +    @Override
 +    @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 chunkSectionIndex) {
+-    public synchronized void write(FriendlyByteBuf buf) { // Paper - synchronize
++    public synchronized void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int chunkSectionIndex) { // Paper - Synchronize
          this.acquire();
  
          try {
@@ -1491,7 +1491,7 @@ index 9a2bf744abd8916d492e901be889223591bac3fd..1dd415c96d17eff8e7555c33d3c52e57
      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 7862caa0f787634cec14af81fe1f39803a43f115..0341d9e951366b77e7eeac7cdaa950af62c88aab 100644
+index e45141ea0cc26c6c903edb5ff714bafa38d3189c..bb5da9ddcd3030c8d6148902f3c649227430baab 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;
@@ -1503,7 +1503,7 @@ index 7862caa0f787634cec14af81fe1f39803a43f115..0341d9e951366b77e7eeac7cdaa950af
      private static final Logger LOGGER = LogUtils.getLogger();
      private static final String TAG_UPGRADE_DATA = "UpgradeData";
      private static final String BLOCK_TICKS_TAG = "block_ticks";
-@@ -162,16 +162,20 @@ public class ChunkSerializer {
+@@ -174,16 +174,20 @@ public class ChunkSerializer {
              if (k >= 0 && k < achunksection.length) {
                  Logger logger;
                  PalettedContainer datapaletteblock;
@@ -1526,7 +1526,7 @@ index 7862caa0f787634cec14af81fe1f39803a43f115..0341d9e951366b77e7eeac7cdaa950af
                  }
  
                  PalettedContainer object; // CraftBukkit - read/write
-@@ -184,7 +188,7 @@ public class ChunkSerializer {
+@@ -196,7 +200,7 @@ public class ChunkSerializer {
                      Objects.requireNonNull(logger);
                      object = ((DataResult<PalettedContainer<Holder<Biome>>>) dataresult).getOrThrow(false, logger::error); // CraftBukkit - decompile error
                  } else {
@@ -1535,7 +1535,7 @@ index 7862caa0f787634cec14af81fe1f39803a43f115..0341d9e951366b77e7eeac7cdaa950af
                  }
  
                  LevelChunkSection chunksection = new LevelChunkSection(datapaletteblock, (PalettedContainer) object); // CraftBukkit - read/write
-@@ -412,7 +416,7 @@ public class ChunkSerializer {
+@@ -431,7 +435,7 @@ public class ChunkSerializer {
  
      // CraftBukkit start - read/write
      private static Codec<PalettedContainer<Holder<Biome>>> makeBiomeCodecRW(Registry<Biome> iregistry) {
@@ -1545,7 +1545,7 @@ index 7862caa0f787634cec14af81fe1f39803a43f115..0341d9e951366b77e7eeac7cdaa950af
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 545b14f02ac72dda30891d681eba585d19fd5e1d..6dc7e23e96aaffb912611a9dbd41459cb8489056 100644
+index d4e0ef75dd12709a0dcf9193821c30b8943e6c36..fd702027e62eb38d51fb7c46ef268e9bb94e1e92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -53,7 +53,7 @@ public class CraftChunk implements Chunk {
@@ -1558,10 +1558,10 @@ index 545b14f02ac72dda30891d681eba585d19fd5e1d..6dc7e23e96aaffb912611a9dbd41459c
      private static final byte[] EMPTY_LIGHT = new byte[2048];
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eba4767efb8ebe373c8f8898d6dd7f9f759d4ce3..4ba05f0448bcb75d9c334758a5482b0cab8cc9d7 100644
+index 7803e3b9d18e213b0d9159b1be4536734cc6e88b..28b02fee73a3ab604f6921800a7ede59e2e6f414 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2373,7 +2373,7 @@ public final class CraftServer implements Server {
+@@ -2616,7 +2616,7 @@ public final class CraftServer implements Server {
      public ChunkGenerator.ChunkData createChunkData(World world) {
          Preconditions.checkArgument(world != null, "World cannot be null");
          ServerLevel handle = ((CraftWorld) world).getHandle();
@@ -1569,12 +1569,12 @@ index eba4767efb8ebe373c8f8898d6dd7f9f759d4ce3..4ba05f0448bcb75d9c334758a5482b0c
 +        return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME), world); // Paper - Anti-Xray - Add parameters
      }
  
-     @Override
+     // Paper start - Allow delegation to vanilla chunk gen
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 76dd24fe01b0b7052db60fa531c977fe2a361254..40c9f9a0e1a2b126160428124b3430b56f5a0b83 100644
+index 29fa4ebcb1375a64023ada3d7055bc8085846bf4..cd559e6aaf4bd2bd322c953bbb186135489ddcaa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -421,11 +421,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -522,11 +522,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
  
@@ -1594,7 +1594,7 @@ index 76dd24fe01b0b7052db60fa531c977fe2a361254..40c9f9a0e1a2b126160428124b3430b5
          // 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 e7f7a246e9c03e676dadfee59de87b8b2ac55ba3..03eb35d5c67f125c44cf46595c93d124ac7892b8 100644
+index 9b640705f2c810160aa7fea5006429ec41d0c858..44a010590e830fd238cf6fdda443e28b72022e66 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 {
diff --git a/patches/server/0930-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 95%
rename from patches/server/0930-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 7b4c5d79f2..236a256621 100644
--- a/patches/server/0930-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 39c8f3c694904905f946d30ea4b149c8c0545989..5d85bcfe98134d37ee7b1180734426c28ff3af8f 100644
+index e575350d5af1c605ccadb67e4f0fdc28662caba0..0b80e73593a24c008b2ae8d09be59787e39ef0e6 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -306,8 +306,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -61,7 +61,7 @@ index 25009accd401fc3860c57cac1ef628b233e746e7..15139198a02e366c0bbfcd5495a21c48
                      spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 46a69ef6794065e144e4948ad165a1ea0f0e2f33..4520a6dddddb3857245c4dc8a0260664fba2dde6 100644
+index c17750ca3254530c9858e82df7e064bbd855b551..bd1a53e2ce2644681c23f8cf678afa2a99166d9b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -73,7 +73,7 @@ index 46a69ef6794065e144e4948ad165a1ea0f0e2f33..4520a6dddddb3857245c4dc8a0260664
      // CraftBukkit start
      public String displayName;
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 5a4db70543ab446630c1cf0252496b57edc4252a..1712bd7c3a9b515c7bf8909f7392a385ef243ff9 100644
+index da9f091e1c2dd8b025e806f53a4708b623ee4cd8..17e9f3a30e287faf210e08dc7eb177a70f049f43 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -277,6 +277,11 @@ public final class NaturalSpawner {
diff --git a/patches/server/1015-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1015-Use-distance-map-to-optimise-entity-tracker.patch
index 03063e59b4..1e13473a87 100644
--- a/patches/server/1015-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/1015-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 370747aefba28dbfce59f45d303d47db9bfceb42..90393101fddd54f60b0b173beffd8650ad23349e 100644
+index 0b80e73593a24c008b2ae8d09be59787e39ef0e6..b5bdec141b52dcb1ec37db228d831cab58473c7b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -146,6 +146,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -124,7 +124,7 @@ index 370747aefba28dbfce59f45d303d47db9bfceb42..90393101fddd54f60b0b173beffd8650
      }
  
      // Paper start
-@@ -943,17 +1023,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -940,17 +1020,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      }
  
      public void move(ServerPlayer player) {
@@ -143,7 +143,7 @@ index 370747aefba28dbfce59f45d303d47db9bfceb42..90393101fddd54f60b0b173beffd8650
  
          SectionPos sectionposition = player.getLastSectionPos();
          SectionPos sectionposition1 = SectionPos.of((EntityAccess) player);
-@@ -1030,7 +1100,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1027,7 +1097,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
                      entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
                      this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
@@ -152,7 +152,7 @@ index 370747aefba28dbfce59f45d303d47db9bfceb42..90393101fddd54f60b0b173beffd8650
                      if (entity instanceof ServerPlayer) {
                          ServerPlayer entityplayer = (ServerPlayer) entity;
  
-@@ -1074,9 +1144,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1071,9 +1141,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          entity.tracker = null; // Paper - We're no longer tracked
      }
  
@@ -192,7 +192,7 @@ index 370747aefba28dbfce59f45d303d47db9bfceb42..90393101fddd54f60b0b173beffd8650
          List<ServerPlayer> list = Lists.newArrayList();
          List<ServerPlayer> list1 = this.level.players();
          ObjectIterator objectiterator = this.entityMap.values().iterator();
-@@ -1226,6 +1324,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1223,6 +1321,42 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              this.lastSectionPos = SectionPos.of((EntityAccess) entity);
          }
  
@@ -236,7 +236,7 @@ index 370747aefba28dbfce59f45d303d47db9bfceb42..90393101fddd54f60b0b173beffd8650
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c20a9fb40a2c3f555096299de662b5488c00ee26..199624dee66e0d47d110ee077646111cbdf2ccbd 100644
+index 3eaa3c34eca6e4ed26a77e3fd5da772a39eddff8..df02a2b0dc58650644db07ad8f91aabb64be3938 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/scripts/moveback.py b/scripts/moveback.py
index ee8d04838a..ca2a47481d 100644
--- a/scripts/moveback.py
+++ b/scripts/moveback.py
@@ -3,7 +3,7 @@ import sys
 
 # Use inside of server patch dir
 # py ../../scripts/moveback.py ''
-patch_target = 1009 # TODO: Update this
+patch_target = 998 # TODO: Update this
 
 
 def increment_number(filename):