From 405ab6388e4e0825d21438494cf7ca293618a572 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 13 Jun 2021 23:41:01 -0700
Subject: [PATCH] add entity debug info patch back

---
 ...ies-option-to-debug-dupe-uuid-issues.patch | 133 -----------------
 ...ies-option-to-debug-dupe-uuid-issues.patch | 139 ++++++++++++++++++
 ...d-Early-Warning-Feature-to-WatchDog.patch} |   0
 ...0245-Make-EnderDragon-implement-Mob.patch} |   0
 ...6-Use-ConcurrentHashMap-in-JsonList.patch} |   0
 ...7-Use-a-Queue-for-Queueing-Commands.patch} |   0
 ...le-Entities-from-a-chunk-without-sn.patch} |   0
 ...timize-BlockPosition-helper-methods.patch} |   0
 ...fault-mob-spawn-range-and-water-ani.patch} |   0
 ...tch => 0251-Slime-Pathfinder-Events.patch} |   0
 ...e-speed-for-water-flowing-over-lava.patch} |   0
 ...53-Optimize-CraftBlockData-Creation.patch} |   0
 ...tch => 0254-Optimize-MappedRegistry.patch} |   0
 ...ch => 0255-Add-PhantomPreSpawnEvent.patch} |   0
 ....patch => 0256-Add-More-Creeper-API.patch} |   0
 ...=> 0257-Inventory-removeItemAnySlot.patch} |   0
 ...oadChunk-int-int-false-load-unconve.patch} |   0
 ...9-Asynchronous-chunk-IO-and-loading.patch} |  10 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |   0
 ...-attack-cooldown-methods-for-Player.patch} |   0
 ....patch => 0262-Improve-death-events.patch} |   0
 ...w-chests-to-be-placed-with-NBT-data.patch} |   0
 ...I.patch => 0264-Mob-Pathfinding-API.patch} |   0
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |   0
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |   0
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |   0
 ...ning-from-loading-generating-chunks.patch} |   0
 ...t-furnace-cook-speed-multiplier-API.patch} |   0
 ...rseException-in-Entity-and-TE-names.patch} |   0
 ...=> 0271-Honor-EntityAgeable.ageLock.patch} |   0
 ...le-connection-throttle-kick-message.patch} |   0
 ...> 0273-Hook-into-CB-plugin-rewrites.patch} |   0
 ...I.patch => 0274-Add-sun-related-API.patch} |   0
 ...75-Add-LivingEntity-getTargetEntity.patch} |   4 +-
 ...Turtle-API.patch => 0276-Turtle-API.patch} |   0
 ...her-worlds-for-shooter-of-projectil.patch} |   0
 ...ator-target-events-and-improve-impl.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   0
 ...PI.patch => 0280-Add-more-Witch-API.patch} |   0
 ...wned-for-Villager-Aggression-Config.patch} |   0
 ...-Johnny.patch => 0282-Here-s-Johnny.patch} |   0
 ...vent-players-from-moving-into-unloa.patch} |   0
 ...4-Reset-players-airTicks-on-respawn.patch} |   4 +-
 ...after-profile-lookups-if-not-needed.patch} |   0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |   0
 ...=> 0287-Optimize-World-Time-Updates.patch} |   0
 ...tore-custom-InventoryHolder-support.patch} |   0
 ...=> 0289-Use-Vanilla-Minecart-Speeds.patch} |   0
 ...0290-Fix-SpongeAbsortEvent-handling.patch} |   0
 ...-allow-digging-into-unloaded-chunks.patch} |   0
 ...ult-permission-message-configurable.patch} |   0
 ...revent-rayTrace-from-loading-chunks.patch} |   0
 ...-Large-Packets-disconnecting-client.patch} |   0
 ...ntity-dismount-during-teleportation.patch} |  10 +-
 ...I.patch => 0296-Add-more-Zombie-API.patch} |   0
 ...mits.patch => 0297-Book-Size-Limits.patch} |   0
 ...0298-Add-PlayerConnectionCloseEvent.patch} |   0
 ...revent-Enderman-from-loading-chunks.patch} |   0
 ...replace-OfflinePlayer-getLastPlayed.patch} |   0
 ...ehicle-tracking-issue-on-disconnect.patch} |   0
 ...nRetractEvent-for-all-empty-pistons.patch} |   0
 ...remove-from-being-called-on-Players.patch} |   0
 ...ent.patch => 0304-BlockDestroyEvent.patch} |   4 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |   0
 ... 0306-Limit-Client-Sign-length-more.patch} |   0
 ...onvertSigns-boolean-every-sign-save.patch} |   0
 ...Manager-and-add-advanced-packet-sup.patch} |   0
 ...e-Oversized-Tile-Entities-in-chunks.patch} |   0
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |   0
 ...t-tick-at-start-of-drowning-process.patch} |   0
 ...ggleEvent-when-whitelist-is-toggled.patch} |   0
 ...ngth-when-serialising-BungeeCord-te.patch} |   0
 ...=> 0314-Entity-getEntitySpawnReason.patch} |  20 +--
 ...ty-Metadata-for-all-tracked-players.patch} |  33 -----
 ...tch => 0316-Fire-event-on-GS4-query.patch} |   0
 ...17-Implement-PlayerPostRespawnEvent.patch} |   0
 ...for-pickupDelay-breaks-picking-up-i.patch} |   0
 ...ts.patch => 0319-Server-Tick-Events.patch} |   0
 ...320-PlayerDeathEvent-getItemsToKeep.patch} |   0
 ...Optimize-Captured-TileEntity-Lookup.patch} |   4 +-
 ...API.patch => 0322-Add-Heightmap-API.patch} |   0
 ...> 0323-Mob-Spawner-API-Enhancements.patch} |   0
 ...-to-changed-postToMainThread-method.patch} |   0
 ...-item-frames-are-modified-MC-123450.patch} |   0
 ...sPrimaryThread-and-MinecraftServer-.patch} |   0
 ...27-improve-CraftWorld-isChunkLoaded.patch} |   0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |   4 +-
 ....patch => 0329-ChunkMapDistance-CME.patch} |   0
 ...0330-Implement-CraftBlockSoundGroup.patch} |   0
 ...d.patch => 0331-Chunk-debug-command.patch} |   2 +-
 ...32-Fix-World-isChunkGenerated-calls.patch} |   0
 ...te-location-if-we-failed-to-read-it.patch} |   0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |   0
 ...urable-projectile-relative-velocity.patch} |   0
 ...h => 0336-offset-item-frame-ticking.patch} |   0
 ...f-we-have-a-custom-Bukkit-generator.patch} |   0
 ...-158900.patch => 0338-Fix-MC-158900.patch} |   0
 ...event-consuming-the-wrong-itemstack.patch} |   0
 ...gs.patch => 0340-Generator-Settings.patch} |   0
 ...-161754.patch => 0341-Fix-MC-161754.patch} |   0
 ...anging-entities-that-are-not-ItemFr.patch} |   0
 ...43-Expose-the-internal-current-tick.patch} |   0
 ...sneak-when-changing-worlds-MC-10657.patch} |   0
 ...-option-to-disable-pillager-patrols.patch} |   0
 ...r-when-player-hand-set-to-empty-typ.patch} |   0
 ...k-loads-when-villagers-try-to-find-.patch} |   0
 ...656-Fix-Follow-Range-Initial-Target.patch} |   0
 ...pers.patch => 0349-Optimize-Hoppers.patch} |   0
 ...ayerDeathEvent-shouldDropExperience.patch} |   0
 ...ading-chunks-checking-hive-position.patch} |   0
 ...hunks-from-Hoppers-and-other-things.patch} |   0
 ...ializing-mismatching-chunk-coordina.patch} |   0
 ...imise-IEntityAccess-getPlayerByUUID.patch} |   4 +-
 ...355-Fix-items-not-falling-correctly.patch} |   0
 ...patch => 0356-Lag-compensate-eating.patch} |   0
 ...ize-call-to-getFluid-for-explosions.patch} |   0
 ...-in-stack-not-having-effects-when-d.patch} |   0
 ...Add-effect-to-block-break-naturally.patch} |   0
 ...=> 0360-Entity-Activation-Range-2.0.patch} |  26 ++--
 ...h => 0361-Increase-Light-Queue-Size.patch} |   0
 ...and.patch => 0362-Fix-Light-Command.patch} |   0
 ...o-Tick-view-distance-implementation.patch} |   4 +-
 ...ement-alternative-item-despawn-rate.patch} |   0
 ...=> 0365-Tracking-Range-Improvements.patch} |   0
 ...-items-vanishing-through-end-portal.patch} |   4 +-
 ...ment-optional-per-player-mob-spawns.patch} |   0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |   0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |   0
 ...w-overriding-the-java-version-check.patch} |   0
 ...tch => 0371-Add-ThrownEggHatchEvent.patch} |   0
 ... 0372-Optimise-random-block-ticking.patch} |  12 +-
 ...p-API.patch => 0373-Entity-Jump-API.patch} |   0
 ...-to-nerf-pigmen-from-nether-portals.patch} |   8 +-
 ... => 0375-Make-the-GUI-graph-fancier.patch} |   0
 ...76-add-hand-to-BlockMultiPlaceEvent.patch} |   0
 ...7-Prevent-teleporting-dead-entities.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 => 0381-Optimise-Chunk-getFluid.patch} |   0
 ...mise-TickListServer-by-rewriting-it.patch} |   8 +-
 ...pawn-settings-and-per-player-option.patch} |   0
 ...nections-shouldn-t-hold-up-shutdown.patch} |   0
 ...ow-bees-to-load-chunks-for-beehives.patch} |   0
 ...PlayerChunkMap-adds-crashing-server.patch} |   6 +-
 ...timize-Collision-to-not-load-chunks.patch} |   4 +-
 ...tch => 0388-Don-t-tick-dead-players.patch} |   0
 ...-Player-s-shouldn-t-be-able-to-move.patch} |   0
 ...unkMap-memory-use-for-visibleChunks.patch} |   0
 ...sks-Speed-up-processing-of-chunk-lo.patch} |   8 +-
 ...ove-existing-players-to-world-spawn.patch} |   0
 ...Add-tick-times-API-and-mspt-command.patch} |   0
 ...94-Expose-MinecraftServer-isRunning.patch} |   0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |   0
 ...6-Remove-streams-from-Mob-AI-System.patch} |   0
 ... => 0397-Async-command-map-building.patch} |   0
 ...h => 0398-Improved-Watchdog-Support.patch} |   4 +-
 ....patch => 0399-Optimize-Pathfinding.patch} |   0
 ...0-Reduce-Either-Optional-allocation.patch} |   0
 ...401-Remove-streams-from-PairedQueue.patch} |   0
 ...-memory-footprint-of-NBTTagCompound.patch} |   0
 ...ent-opening-inventories-when-frozen.patch} |   0
 ...04-Optimise-ArraySetSorted-removeIf.patch} |   0
 ...entity-collision-code-if-not-needed.patch} |   0
 ...teleport-command-to-valid-locations.patch} |   0
 ...Implement-Player-Client-Options-API.patch} |   0
 ...Chunk-Post-Processing-deadlock-risk.patch} |   0
 ...ayer-is-attempted-to-be-removed-fro.patch} |   0
 ...0-Broadcast-join-message-to-console.patch} |   0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |   0
 ...oad-Chunks-for-Login-Asynchronously.patch} |   4 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |   4 +-
 ...layerAttackEntityCooldownResetEvent.patch} |   0
 ...llbacks-to-schedule-for-Callback-Ex.patch} |   0
 ...-fire-BlockFade-on-worldgen-threads.patch} |   0
 ...tom-creative-and-insomniac-controls.patch} |   0
 ...-duplication-issues-and-teleport-is.patch} |  12 +-
 ...0419-Implement-Brigadier-Mojang-API.patch} |   0
 ...patch => 0420-Villager-Restocks-API.patch} |   0
 ...ickItem-Packet-and-kick-for-invalid.patch} |   0
 ...n.patch => 0422-Expose-game-version.patch} |   0
 ...> 0423-Optimize-Voxel-Shape-Merging.patch} |   0
 ...per-thread-native-byte-buffer-cache.patch} |   0
 ...atch => 0425-Implement-Mob-Goal-API.patch} |   0
 ...ance-map-to-optimise-entity-tracker.patch} |   4 +-
 ...isOutsideRange-to-use-distance-maps.patch} |   0
 ...=> 0428-Add-villager-reputation-API.patch} |   0
 ...maximum-exp-value-when-merging-orbs.patch} |   0
 ...tch => 0430-ExperienceOrbMergeEvent.patch} |   0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |   0
 ...brigadier-child-sorting-performance.patch} |   0
 ...API.patch => 0433-Potential-bed-API.patch} |   0
 ...ait-for-Async-Tasks-during-shutdown.patch} |   0
 ...er-respects-game-and-entity-rules-f.patch} |   0
 ...nd-End-Portal-Frames-from-being-des.patch} |   4 +-
 ...leInt-allocations-from-light-engine.patch} |   0
 ...location-of-Vec3D-by-entity-tracker.patch} |   0
 ...> 0439-Ensure-safe-gateway-teleport.patch} |   0
 ...-for-console-having-all-permissions.patch} |   0
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |   0
 ...packets-to-nearby-locations-sounds-.patch} |   0
 ...x-villager-trading-demand-MC-163962.patch} |   0
 ... => 0444-Maps-shouldn-t-load-chunks.patch} |   0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |   0
 ...Optimize-Bit-Operations-by-inlining.patch} |   0
 ...ch => 0447-incremental-chunk-saving.patch} |   4 +-
 206 files changed, 230 insertions(+), 257 deletions(-)
 delete mode 100644 patches/removed/1.17/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
 create mode 100644 patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
 rename patches/server/{0243-Add-Early-Warning-Feature-to-WatchDog.patch => 0244-Add-Early-Warning-Feature-to-WatchDog.patch} (100%)
 rename patches/server/{0244-Make-EnderDragon-implement-Mob.patch => 0245-Make-EnderDragon-implement-Mob.patch} (100%)
 rename patches/server/{0245-Use-ConcurrentHashMap-in-JsonList.patch => 0246-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename patches/server/{0246-Use-a-Queue-for-Queueing-Commands.patch => 0247-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename patches/server/{0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0248-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename patches/server/{0248-Optimize-BlockPosition-helper-methods.patch => 0249-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename patches/server/{0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch => 0250-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch} (100%)
 rename patches/server/{0250-Slime-Pathfinder-Events.patch => 0251-Slime-Pathfinder-Events.patch} (100%)
 rename patches/server/{0251-Configurable-speed-for-water-flowing-over-lava.patch => 0252-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0252-Optimize-CraftBlockData-Creation.patch => 0253-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0253-Optimize-MappedRegistry.patch => 0254-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0254-Add-PhantomPreSpawnEvent.patch => 0255-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/server/{0255-Add-More-Creeper-API.patch => 0256-Add-More-Creeper-API.patch} (100%)
 rename patches/server/{0256-Inventory-removeItemAnySlot.patch => 0257-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0258-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename patches/server/{0258-Asynchronous-chunk-IO-and-loading.patch => 0259-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename patches/server/{0259-Add-ray-tracing-methods-to-LivingEntity.patch => 0260-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/server/{0260-Expose-attack-cooldown-methods-for-Player.patch => 0261-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/server/{0261-Improve-death-events.patch => 0262-Improve-death-events.patch} (100%)
 rename patches/server/{0262-Allow-chests-to-be-placed-with-NBT-data.patch => 0263-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0263-Mob-Pathfinding-API.patch => 0264-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0264-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0265-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0265-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0266-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename patches/server/{0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0267-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0267-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0268-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename patches/server/{0268-Implement-furnace-cook-speed-multiplier-API.patch => 0269-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0269-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0270-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename patches/server/{0270-Honor-EntityAgeable.ageLock.patch => 0271-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0271-Configurable-connection-throttle-kick-message.patch => 0272-Configurable-connection-throttle-kick-message.patch} (100%)
 rename patches/server/{0272-Hook-into-CB-plugin-rewrites.patch => 0273-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0273-Add-sun-related-API.patch => 0274-Add-sun-related-API.patch} (100%)
 rename patches/server/{0274-Add-LivingEntity-getTargetEntity.patch => 0275-Add-LivingEntity-getTargetEntity.patch} (97%)
 rename patches/server/{0275-Turtle-API.patch => 0276-Turtle-API.patch} (100%)
 rename patches/server/{0276-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0277-Call-player-spectator-target-events-and-improve-impl.patch => 0278-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename patches/server/{0278-Add-Velocity-IP-Forwarding-Support.patch => 0279-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0279-Add-more-Witch-API.patch => 0280-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0280-Check-Drowned-for-Villager-Aggression-Config.patch => 0281-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0281-Here-s-Johnny.patch => 0282-Here-s-Johnny.patch} (100%)
 rename patches/server/{0282-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0283-Add-option-to-prevent-players-from-moving-into-unloa.patch} (100%)
 rename patches/server/{0283-Reset-players-airTicks-on-respawn.patch => 0284-Reset-players-airTicks-on-respawn.patch} (89%)
 rename patches/server/{0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename patches/server/{0286-Optimize-World-Time-Updates.patch => 0287-Optimize-World-Time-Updates.patch} (100%)
 rename patches/server/{0287-Restore-custom-InventoryHolder-support.patch => 0288-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0288-Use-Vanilla-Minecart-Speeds.patch => 0289-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0289-Fix-SpongeAbsortEvent-handling.patch => 0290-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0290-Don-t-allow-digging-into-unloaded-chunks.patch => 0291-Don-t-allow-digging-into-unloaded-chunks.patch} (100%)
 rename patches/server/{0291-Make-the-default-permission-message-configurable.patch => 0292-Make-the-default-permission-message-configurable.patch} (100%)
 rename patches/server/{0292-Prevent-rayTrace-from-loading-chunks.patch => 0293-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0293-Handle-Large-Packets-disconnecting-client.patch => 0294-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0294-force-entity-dismount-during-teleportation.patch => 0295-force-entity-dismount-during-teleportation.patch} (94%)
 rename patches/server/{0295-Add-more-Zombie-API.patch => 0296-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0296-Book-Size-Limits.patch => 0297-Book-Size-Limits.patch} (100%)
 rename patches/server/{0297-Add-PlayerConnectionCloseEvent.patch => 0298-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/server/{0298-Prevent-Enderman-from-loading-chunks.patch => 0299-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename patches/server/{0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename patches/server/{0301-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0302-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename patches/server/{0302-Block-Entity-remove-from-being-called-on-Players.patch => 0303-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename patches/server/{0303-BlockDestroyEvent.patch => 0304-BlockDestroyEvent.patch} (93%)
 rename patches/server/{0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename patches/server/{0305-Limit-Client-Sign-length-more.patch => 0306-Limit-Client-Sign-length-more.patch} (100%)
 rename patches/server/{0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename patches/server/{0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0308-Handle-Oversized-Tile-Entities-in-chunks.patch => 0309-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0309-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0310-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (100%)
 rename patches/server/{0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename patches/server/{0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename patches/server/{0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename patches/server/{0313-Entity-getEntitySpawnReason.patch => 0314-Entity-getEntitySpawnReason.patch} (89%)
 rename patches/server/{0314-Update-entity-Metadata-for-all-tracked-players.patch => 0315-Update-entity-Metadata-for-all-tracked-players.patch} (54%)
 rename patches/server/{0315-Fire-event-on-GS4-query.patch => 0316-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0316-Implement-PlayerPostRespawnEvent.patch => 0317-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename patches/server/{0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0318-Server-Tick-Events.patch => 0319-Server-Tick-Events.patch} (100%)
 rename patches/server/{0319-PlayerDeathEvent-getItemsToKeep.patch => 0320-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename patches/server/{0320-Optimize-Captured-TileEntity-Lookup.patch => 0321-Optimize-Captured-TileEntity-Lookup.patch} (90%)
 rename patches/server/{0321-Add-Heightmap-API.patch => 0322-Add-Heightmap-API.patch} (100%)
 rename patches/server/{0322-Mob-Spawner-API-Enhancements.patch => 0323-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/server/{0323-Fix-CB-call-to-changed-postToMainThread-method.patch => 0324-Fix-CB-call-to-changed-postToMainThread-method.patch} (100%)
 rename patches/server/{0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename patches/server/{0326-improve-CraftWorld-isChunkLoaded.patch => 0327-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename patches/server/{0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (98%)
 rename patches/server/{0328-ChunkMapDistance-CME.patch => 0329-ChunkMapDistance-CME.patch} (100%)
 rename patches/server/{0329-Implement-CraftBlockSoundGroup.patch => 0330-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0330-Chunk-debug-command.patch => 0331-Chunk-debug-command.patch} (99%)
 rename patches/server/{0331-Fix-World-isChunkGenerated-calls.patch => 0332-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename patches/server/{0332-Show-blockstate-location-if-we-failed-to-read-it.patch => 0333-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0333-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename patches/server/{0334-Configurable-projectile-relative-velocity.patch => 0335-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0335-offset-item-frame-ticking.patch => 0336-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0336-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0337-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (100%)
 rename patches/server/{0337-Fix-MC-158900.patch => 0338-Fix-MC-158900.patch} (100%)
 rename patches/server/{0338-Prevent-consuming-the-wrong-itemstack.patch => 0339-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename patches/server/{0339-Generator-Settings.patch => 0340-Generator-Settings.patch} (100%)
 rename patches/server/{0340-Fix-MC-161754.patch => 0341-Fix-MC-161754.patch} (100%)
 rename patches/server/{0341-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0342-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename patches/server/{0342-Expose-the-internal-current-tick.patch => 0343-Expose-the-internal-current-tick.patch} (100%)
 rename patches/server/{0343-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0344-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (100%)
 rename patches/server/{0344-Add-option-to-disable-pillager-patrols.patch => 0345-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0345-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0346-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (100%)
 rename patches/server/{0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0347-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0347-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0348-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0348-Optimize-Hoppers.patch => 0349-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0349-PlayerDeathEvent-shouldDropExperience.patch => 0350-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename patches/server/{0350-Prevent-bees-loading-chunks-checking-hive-position.patch => 0351-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0352-Guard-against-serializing-mismatching-chunk-coordina.patch => 0353-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0353-Optimise-IEntityAccess-getPlayerByUUID.patch => 0354-Optimise-IEntityAccess-getPlayerByUUID.patch} (90%)
 rename patches/server/{0354-Fix-items-not-falling-correctly.patch => 0355-Fix-items-not-falling-correctly.patch} (100%)
 rename patches/server/{0355-Lag-compensate-eating.patch => 0356-Lag-compensate-eating.patch} (100%)
 rename patches/server/{0356-Optimize-call-to-getFluid-for-explosions.patch => 0357-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0358-Add-effect-to-block-break-naturally.patch => 0359-Add-effect-to-block-break-naturally.patch} (100%)
 rename patches/server/{0359-Entity-Activation-Range-2.0.patch => 0360-Entity-Activation-Range-2.0.patch} (97%)
 rename patches/server/{0360-Increase-Light-Queue-Size.patch => 0361-Increase-Light-Queue-Size.patch} (100%)
 rename patches/server/{0361-Fix-Light-Command.patch => 0362-Fix-Light-Command.patch} (100%)
 rename patches/server/{0362-No-Tick-view-distance-implementation.patch => 0363-No-Tick-view-distance-implementation.patch} (99%)
 rename patches/server/{0363-Implement-alternative-item-despawn-rate.patch => 0364-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0364-Tracking-Range-Improvements.patch => 0365-Tracking-Range-Improvements.patch} (100%)
 rename patches/server/{0365-Fix-items-vanishing-through-end-portal.patch => 0366-Fix-items-vanishing-through-end-portal.patch} (89%)
 rename patches/server/{0366-implement-optional-per-player-mob-spawns.patch => 0367-implement-optional-per-player-mob-spawns.patch} (100%)
 rename patches/server/{0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename patches/server/{0369-Allow-overriding-the-java-version-check.patch => 0370-Allow-overriding-the-java-version-check.patch} (100%)
 rename patches/server/{0370-Add-ThrownEggHatchEvent.patch => 0371-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0371-Optimise-random-block-ticking.patch => 0372-Optimise-random-block-ticking.patch} (97%)
 rename patches/server/{0372-Entity-Jump-API.patch => 0373-Entity-Jump-API.patch} (100%)
 rename patches/server/{0373-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0374-Add-option-to-nerf-pigmen-from-nether-portals.patch} (92%)
 rename patches/server/{0374-Make-the-GUI-graph-fancier.patch => 0375-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0375-add-hand-to-BlockMultiPlaceEvent.patch => 0376-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0376-Prevent-teleporting-dead-entities.patch => 0377-Prevent-teleporting-dead-entities.patch} (100%)
 rename patches/server/{0377-Validate-tripwire-hook-placement-before-update.patch => 0378-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0378-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0379-Configurable-chance-of-villager-zombie-infection.patch => 0380-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0380-Optimise-Chunk-getFluid.patch => 0381-Optimise-Chunk-getFluid.patch} (100%)
 rename patches/server/{0381-Optimise-TickListServer-by-rewriting-it.patch => 0382-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename patches/server/{0382-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0383-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename patches/server/{0383-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0384-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0385-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (92%)
 rename patches/server/{0386-Optimize-Collision-to-not-load-chunks.patch => 0387-Optimize-Collision-to-not-load-chunks.patch} (97%)
 rename patches/server/{0387-Don-t-tick-dead-players.patch => 0388-Don-t-tick-dead-players.patch} (100%)
 rename patches/server/{0388-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0389-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0389-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0390-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (100%)
 rename patches/server/{0390-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0391-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (97%)
 rename patches/server/{0391-Don-t-move-existing-players-to-world-spawn.patch => 0392-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename patches/server/{0392-Add-tick-times-API-and-mspt-command.patch => 0393-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename patches/server/{0393-Expose-MinecraftServer-isRunning.patch => 0394-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/server/{0394-Add-Raw-Byte-ItemStack-Serialization.patch => 0395-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0395-Remove-streams-from-Mob-AI-System.patch => 0396-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename patches/server/{0396-Async-command-map-building.patch => 0397-Async-command-map-building.patch} (100%)
 rename patches/server/{0397-Improved-Watchdog-Support.patch => 0398-Improved-Watchdog-Support.patch} (99%)
 rename patches/server/{0398-Optimize-Pathfinding.patch => 0399-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0399-Reduce-Either-Optional-allocation.patch => 0400-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0400-Remove-streams-from-PairedQueue.patch => 0401-Remove-streams-from-PairedQueue.patch} (100%)
 rename patches/server/{0401-Reduce-memory-footprint-of-NBTTagCompound.patch => 0402-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0402-Prevent-opening-inventories-when-frozen.patch => 0403-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename patches/server/{0403-Optimise-ArraySetSorted-removeIf.patch => 0404-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename patches/server/{0404-Don-t-run-entity-collision-code-if-not-needed.patch => 0405-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0405-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0406-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename patches/server/{0406-Implement-Player-Client-Options-API.patch => 0407-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0407-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0408-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename patches/server/{0408-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0409-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0409-Broadcast-join-message-to-console.patch => 0410-Broadcast-join-message-to-console.patch} (100%)
 rename patches/server/{0410-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0411-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename patches/server/{0411-Load-Chunks-for-Login-Asynchronously.patch => 0412-Load-Chunks-for-Login-Asynchronously.patch} (99%)
 rename patches/server/{0412-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0413-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (89%)
 rename patches/server/{0413-Add-PlayerAttackEntityCooldownResetEvent.patch => 0414-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0414-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0415-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (100%)
 rename patches/server/{0415-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0416-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0416-Add-phantom-creative-and-insomniac-controls.patch => 0417-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0417-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0418-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (94%)
 rename patches/server/{0418-Implement-Brigadier-Mojang-API.patch => 0419-Implement-Brigadier-Mojang-API.patch} (100%)
 rename patches/server/{0419-Villager-Restocks-API.patch => 0420-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0420-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0421-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename patches/server/{0421-Expose-game-version.patch => 0422-Expose-game-version.patch} (100%)
 rename patches/server/{0422-Optimize-Voxel-Shape-Merging.patch => 0423-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0423-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0424-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0424-Implement-Mob-Goal-API.patch => 0425-Implement-Mob-Goal-API.patch} (100%)
 rename patches/server/{0425-Use-distance-map-to-optimise-entity-tracker.patch => 0426-Use-distance-map-to-optimise-entity-tracker.patch} (99%)
 rename patches/server/{0426-Optimize-isOutsideRange-to-use-distance-maps.patch => 0427-Optimize-isOutsideRange-to-use-distance-maps.patch} (100%)
 rename patches/server/{0427-Add-villager-reputation-API.patch => 0428-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0428-Option-for-maximum-exp-value-when-merging-orbs.patch => 0429-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0429-ExperienceOrbMergeEvent.patch => 0430-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0430-Fix-PotionEffect-ignores-icon-flag.patch => 0431-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0431-Optimize-brigadier-child-sorting-performance.patch => 0432-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0432-Potential-bed-API.patch => 0433-Potential-bed-API.patch} (100%)
 rename patches/server/{0433-Wait-for-Async-Tasks-during-shutdown.patch => 0434-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0434-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0435-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0435-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0436-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (98%)
 rename patches/server/{0436-Reduce-MutableInt-allocations-from-light-engine.patch => 0437-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0437-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0438-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename patches/server/{0438-Ensure-safe-gateway-teleport.patch => 0439-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0439-Add-option-for-console-having-all-permissions.patch => 0440-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0440-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0441-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename patches/server/{0441-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0442-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (100%)
 rename patches/server/{0442-Fix-villager-trading-demand-MC-163962.patch => 0443-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0443-Maps-shouldn-t-load-chunks.patch => 0444-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0444-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0445-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0445-Optimize-Bit-Operations-by-inlining.patch => 0446-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0446-incremental-chunk-saving.patch => 0447-incremental-chunk-saving.patch} (99%)

diff --git a/patches/removed/1.17/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/removed/1.17/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
deleted file mode 100644
index 4f79f9fe1..000000000
--- a/patches/removed/1.17/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 21 Jul 2018 08:25:40 -0400
-Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
-
-Add -Ddebug.entities=true to your JVM flags to gain more information
-
-1.17: Needs to be reworked for new entity storage system
-
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 97d5437df10a6d0124e944404e88650547b7d8a8..083db6c1899b5391231b6d5d5044a334212f148c 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1145,6 +1145,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             } else {
-                 ChunkMap.TrackedEntity playerchunkmap_entitytracker = new ChunkMap.TrackedEntity(entity, i, j, entitytypes.trackDeltas());
- 
-+                entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
-                 this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
-                 playerchunkmap_entitytracker.updatePlayers(this.level.players());
-                 if (entity instanceof ServerPlayer) {
-@@ -1186,7 +1187,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         if (playerchunkmap_entitytracker1 != null) {
-             playerchunkmap_entitytracker1.broadcastRemoved();
-         }
--
-+        entity.tracker = null; // Paper - We're no longer tracked
-     }
- 
-     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 914241a57c304fde220bc546261d6e959445772a..a5d7781b13a6d61238d026f064512f7162e1e868 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -191,6 +191,9 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
-     public final LevelStorageSource.LevelStorageAccess convertable;
-     public final UUID uuid;
-     public boolean hasPhysicsEvent = true; // Paper
-+    private static Throwable getAddToWorldStackTrace(Entity entity) {
-+        return new Throwable(entity + " Added to world at " + new java.util.Date());
-+    }
- 
-     @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
-         return this.chunkSource.getChunk(x, z, false);
-@@ -1032,8 +1035,28 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
-     // CraftBukkit start
-     private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
-         org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
--        if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
-+        // Paper start
-+        if (entity.valid) {
-+            MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
-+
-+            if (DEBUG_ENTITIES) {
-+                Throwable thr = entity.addedToWorldStack;
-+                if (thr == null) {
-+                    MinecraftServer.LOGGER.error("Double add entity has no add stacktrace");
-+                } else {
-+                    MinecraftServer.LOGGER.error("Double add stacktrace: ", thr);
-+                }
-+            }
-+            return true;
-+        }
-+        // Paper end
-         if (entity.removed) {
-+            // Paper start
-+            if (DEBUG_ENTITIES) {
-+                new Throwable("Tried to add entity " + entity + " but it was marked as removed already").printStackTrace(); // CraftBukkit
-+                getAddToWorldStackTrace(entity).printStackTrace();
-+            }
-+            // Paper end
-             // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
-             return false;
-         } else if (this.isUUIDUsed(entity)) {
-@@ -1231,7 +1254,24 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
-                 }
-             }
- 
--            this.entitiesByUuid.put(entity.getUUID(), entity);
-+            if (DEBUG_ENTITIES) {
-+                entity.addedToWorldStack = getAddToWorldStackTrace(entity);
-+            }
-+
-+            Entity old = this.entitiesByUuid.put(entity.getUUID(), entity);
-+            if (old != null && old.getId() != entity.getId() && old.valid) {
-+                Logger logger = LogManager.getLogger();
-+                logger.error("Overwrote an existing entity " + old + " with " + entity);
-+                if (DEBUG_ENTITIES) {
-+                    if (old.addedToWorldStack != null) {
-+                        old.addedToWorldStack.printStackTrace();
-+                    } else {
-+                        logger.error("Oddly, the old entity was not added to the world in the normal way. Plugins?");
-+                    }
-+                    entity.addedToWorldStack.printStackTrace();
-+                }
-+            }
-+
-             this.getChunkSource().addEntity(entity);
-             // CraftBukkit start - SPIGOT-5278
-             if (entity instanceof Drowned) {
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e49fe2de6a53bdd16f0cd09b691f01f1866ffb4f..9d8682d367522bd85894947ad2f2a53cf0aa123a 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -47,6 +47,7 @@ import net.minecraft.network.syncher.SynchedEntityData;
- import net.minecraft.resources.ResourceKey;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.MinecraftServer;
-+import net.minecraft.server.level.ChunkMap;
- import net.minecraft.server.level.ServerLevel;
- import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.server.level.TicketType;
-@@ -160,6 +161,8 @@ public abstract class Entity implements Nameable, CommandSource, net.minecraft.s
-     public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
-     private CraftEntity bukkitEntity;
- 
-+    ChunkMap.TrackedEntity tracker; // Paper
-+    public Throwable addedToWorldStack; // Paper - entity debug
-     public CraftEntity getBukkitEntity() {
-         if (bukkitEntity == null) {
-             bukkitEntity = CraftEntity.getEntity(level.getCraftServer(), this);
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b4248d46ccb1a95e21601bca1198512287edcabf..0c6c3b211b05eda8f9ab47ef0a01cc520ae28201 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -121,6 +121,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     public boolean pvpMode;
-     public boolean keepSpawnInMemory = true;
-     public org.bukkit.generator.ChunkGenerator generator;
-+    public static final boolean DEBUG_ENTITIES = Boolean.getBoolean("debug.entities"); // Paper
- 
-     public boolean captureBlockStates = false;
-     public boolean captureTreeGeneration = false;
diff --git a/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
new file mode 100644
index 000000000..f59488bae
--- /dev/null
+++ b/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -0,0 +1,139 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 21 Jul 2018 08:25:40 -0400
+Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
+
+Add -Ddebug.entities=true to your JVM flags to gain more information
+
+1.17: Needs to be reworked for new entity storage system
+
+diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
+index 4b349960daaacd87c042b055adf36c0a66748f7f..a0f8f341e0cd6a2ac28e12d0824b694ac4fbc7ae 100644
+--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
++++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
+@@ -1156,6 +1156,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+                 } else {
+                     ChunkMap.TrackedEntity playerchunkmap_entitytracker = new ChunkMap.TrackedEntity(entity, i, j, entitytypes.trackDeltas());
+ 
++                    entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
+                     this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
+                     playerchunkmap_entitytracker.updatePlayers(this.level.players());
+                     if (entity instanceof ServerPlayer) {
+@@ -1198,7 +1199,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         if (playerchunkmap_entitytracker1 != null) {
+             playerchunkmap_entitytracker1.broadcastRemoved();
+         }
+-
++        entity.tracker = null; // Paper - We're no longer tracked
+     }
+ 
+     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 8989b3153b0c849e189a8ff4ac4de6085e3a3db2..73da340ab8782efc7d97c3a3e29ea9cd9a830799 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -202,6 +202,9 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+     public final LevelStorageSource.LevelStorageAccess convertable;
+     public final UUID uuid;
+     public boolean hasPhysicsEvent = true; // Paper
++    public static Throwable getAddToWorldStackTrace(Entity entity) {
++        return new Throwable(entity + " Added to world at " + new java.util.Date());
++    }
+ 
+     @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
+         return this.chunkSource.getChunk(x, z, false);
+@@ -1018,7 +1021,28 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+     // CraftBukkit start
+     private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
+         org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
++        // Paper start
++        if (entity.valid) {
++            MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
++
++            if (DEBUG_ENTITIES) {
++                Throwable thr = entity.addedToWorldStack;
++                if (thr == null) {
++                    MinecraftServer.LOGGER.error("Double add entity has no add stacktrace");
++                } else {
++                    MinecraftServer.LOGGER.error("Double add stacktrace: ", thr);
++                }
++            }
++            return true;
++        }
++        // Paper end
+         if (entity.isRemoved()) {
++            // Paper start
++            if (DEBUG_ENTITIES) {
++                new Throwable("Tried to add entity " + entity + " but it was marked as removed already").printStackTrace(); // CraftBukkit
++                getAddToWorldStackTrace(entity).printStackTrace();
++            }
++            // Paper end
+             // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
+             return false;
+         } else {
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 960c3e75a60ef33141e615bd8b256528eeaf399c..0d4ab7a469b2ce643b80e7912e20d126a251960a 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -171,6 +171,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+     public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
+     private CraftEntity bukkitEntity;
+ 
++    public net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper
++    public Throwable addedToWorldStack; // Paper - entity debug
+     public CraftEntity getBukkitEntity() {
+         if (this.bukkitEntity == null) {
+             this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this);
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index 8d4f8719b30a66fbb68c9407ee8484312f05b3fb..b978a6d44416ce89addaafb54a71fcb06e635b30 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -141,6 +141,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+     public boolean pvpMode;
+     public boolean keepSpawnInMemory = true;
+     public org.bukkit.generator.ChunkGenerator generator;
++    public static final boolean DEBUG_ENTITIES = Boolean.getBoolean("debug.entities"); // Paper
+ 
+     public boolean captureBlockStates = false;
+     public boolean captureTreeGeneration = false;
+diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
+index c8cf7da4224dccd9b9e8a73bcfc3ff5babfb8f8c..1d04f35b6755b3a7ee77f93c1a30513a5af7d6cf 100644
+--- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
++++ b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
+@@ -20,7 +20,7 @@ public class EntityLookup<T extends EntityAccess> {
+         for(T entityAccess : this.byId.values()) {
+             U entityAccess2 = (U)((EntityAccess)filter.tryCast(entityAccess));
+             if (entityAccess2 != null) {
+-                action.accept((T)entityAccess2);
++                action.accept(entityAccess2); // Paper - decompile fix
+             }
+         }
+ 
+@@ -34,6 +34,27 @@ public class EntityLookup<T extends EntityAccess> {
+         UUID uUID = entity.getUUID();
+         if (this.byUuid.containsKey(uUID)) {
+             LOGGER.warn("Duplicate entity UUID {}: {}", uUID, entity);
++            // Paper start - extra debug info
++            if (entity instanceof net.minecraft.world.entity.Entity) {
++                if (net.minecraft.server.level.ServerLevel.DEBUG_ENTITIES) {
++                    ((net.minecraft.world.entity.Entity) entity).addedToWorldStack = net.minecraft.server.level.ServerLevel.getAddToWorldStackTrace((net.minecraft.world.entity.Entity) entity);
++                }
++
++                T old = this.byUuid.get(entity.getUUID());
++                if (old instanceof net.minecraft.world.entity.Entity && old != null && old.getId() != entity.getId() && ((net.minecraft.world.entity.Entity) old).valid) {
++                    Logger logger = LogManager.getLogger();
++                    logger.error("Overwrote an existing entity " + old + " with " + entity);
++                    if (net.minecraft.server.level.ServerLevel.DEBUG_ENTITIES) {
++                        if (((net.minecraft.world.entity.Entity) old).addedToWorldStack != null) {
++                            ((net.minecraft.world.entity.Entity) old).addedToWorldStack.printStackTrace();
++                        } else {
++                            logger.error("Oddly, the old entity was not added to the world in the normal way. Plugins?");
++                        }
++                        ((net.minecraft.world.entity.Entity) entity).addedToWorldStack.printStackTrace();
++                    }
++                }
++            }
++            // Paper end
+         } else {
+             this.byUuid.put(uUID, entity);
+             this.byId.put(entity.getId(), entity);
diff --git a/patches/server/0243-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from patches/server/0243-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0244-Make-EnderDragon-implement-Mob.patch b/patches/server/0245-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from patches/server/0244-Make-EnderDragon-implement-Mob.patch
rename to patches/server/0245-Make-EnderDragon-implement-Mob.patch
diff --git a/patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0246-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0246-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0247-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0247-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0248-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0248-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0248-Optimize-BlockPosition-helper-methods.patch b/patches/server/0249-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0248-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0249-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/server/0250-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
similarity index 100%
rename from patches/server/0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
rename to patches/server/0250-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
diff --git a/patches/server/0250-Slime-Pathfinder-Events.patch b/patches/server/0251-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0250-Slime-Pathfinder-Events.patch
rename to patches/server/0251-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0252-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0252-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0252-Optimize-CraftBlockData-Creation.patch b/patches/server/0253-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0252-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0253-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0253-Optimize-MappedRegistry.patch b/patches/server/0254-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0253-Optimize-MappedRegistry.patch
rename to patches/server/0254-Optimize-MappedRegistry.patch
diff --git a/patches/server/0254-Add-PhantomPreSpawnEvent.patch b/patches/server/0255-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0254-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0255-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0255-Add-More-Creeper-API.patch b/patches/server/0256-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0255-Add-More-Creeper-API.patch
rename to patches/server/0256-Add-More-Creeper-API.patch
diff --git a/patches/server/0256-Inventory-removeItemAnySlot.patch b/patches/server/0257-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0256-Inventory-removeItemAnySlot.patch
rename to patches/server/0257-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0258-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0258-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0259-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from patches/server/0258-Asynchronous-chunk-IO-and-loading.patch
rename to patches/server/0259-Asynchronous-chunk-IO-and-loading.patch
index ea7e8e8fa..f362446c4 100644
--- a/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0259-Asynchronous-chunk-IO-and-loading.patch
@@ -2357,7 +2357,7 @@ index ce4296ab7e6f1ccc735d619eacabdf2ef2f4e361..00f5cd29170e3594fe2ac194e04e403c
                  completablefuture = (CompletableFuture) this.futures.get(i);
                  if (completablefuture == null) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4b349960daaacd87c042b055adf36c0a66748f7f..8311d921ded1c81a1f561dc13db2010d2b7ce5d6 100644
+index a0f8f341e0cd6a2ac28e12d0824b694ac4fbc7ae..95ac30f56a9268f14d2518974c5a52e08f40ea18 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -115,7 +115,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2668,7 +2668,7 @@ index 4b349960daaacd87c042b055adf36c0a66748f7f..8311d921ded1c81a1f561dc13db2010d
      @Nullable
      private CompoundTag readChunk(ChunkPos pos) throws IOException {
          CompoundTag nbttagcompound = this.read(pos);
-@@ -1310,6 +1435,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1311,6 +1436,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
  
      }
  
@@ -2865,10 +2865,10 @@ index 4a343fa19566f468aca17228379f4d75f3f56f28..71ac5cf0fdedcfe422bf6f5e6ffb15ce
          } finally {
              chunkMap.callbackExecutor.run();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8989b3153b0c849e189a8ff4ac4de6085e3a3db2..731c8e38c8daf04fee40a5ccfb0715b20f4d890f 100644
+index 73da340ab8782efc7d97c3a3e29ea9cd9a830799..043869948201c728bf168855d260b0dca42a0b3a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -207,6 +207,79 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -210,6 +210,79 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          return this.chunkSource.getChunk(x, z, false);
      }
  
@@ -2948,7 +2948,7 @@ index 8989b3153b0c849e189a8ff4ac4de6085e3a3db2..731c8e38c8daf04fee40a5ccfb0715b2
      // Add env and gen to constructor, WorldData -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, ServerLevelData iworlddataserver, ResourceKey<net.minecraft.world.level.Level> resourcekey, DimensionType dimensionmanager, ChunkProgressListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
-@@ -278,6 +351,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -281,6 +354,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
  
          this.sleepStatus = new SleepStatus();
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
diff --git a/patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0261-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0261-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0261-Improve-death-events.patch b/patches/server/0262-Improve-death-events.patch
similarity index 100%
rename from patches/server/0261-Improve-death-events.patch
rename to patches/server/0262-Improve-death-events.patch
diff --git a/patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0263-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0263-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0263-Mob-Pathfinding-API.patch b/patches/server/0264-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0263-Mob-Pathfinding-API.patch
rename to patches/server/0264-Mob-Pathfinding-API.patch
diff --git a/patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0265-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0266-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0265-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0266-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0267-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0267-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0268-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0268-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0269-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0269-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0270-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0270-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0270-Honor-EntityAgeable.ageLock.patch b/patches/server/0271-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0270-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0271-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0271-Configurable-connection-throttle-kick-message.patch b/patches/server/0272-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0271-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0272-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0272-Hook-into-CB-plugin-rewrites.patch b/patches/server/0273-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0272-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0273-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0273-Add-sun-related-API.patch b/patches/server/0274-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0273-Add-sun-related-API.patch
rename to patches/server/0274-Add-sun-related-API.patch
diff --git a/patches/server/0274-Add-LivingEntity-getTargetEntity.patch b/patches/server/0275-Add-LivingEntity-getTargetEntity.patch
similarity index 97%
rename from patches/server/0274-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0275-Add-LivingEntity-getTargetEntity.patch
index 3b34a48c1..e2cacd176 100644
--- a/patches/server/0274-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0275-Add-LivingEntity-getTargetEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 960c3e75a60ef33141e615bd8b256528eeaf399c..0974781e2f7fc541eaf397de033fb12b87dbf8ba 100644
+index 0d4ab7a469b2ce643b80e7912e20d126a251960a..b75a7f702ca6166c1f869a138ac4b93ba3870c62 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2339,6 +2339,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2341,6 +2341,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          this.setYHeadRot(yaw);
      }
  
diff --git a/patches/server/0275-Turtle-API.patch b/patches/server/0276-Turtle-API.patch
similarity index 100%
rename from patches/server/0275-Turtle-API.patch
rename to patches/server/0276-Turtle-API.patch
diff --git a/patches/server/0276-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0276-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0278-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0278-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0279-Add-more-Witch-API.patch b/patches/server/0280-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0279-Add-more-Witch-API.patch
rename to patches/server/0280-Add-more-Witch-API.patch
diff --git a/patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0281-Here-s-Johnny.patch b/patches/server/0282-Here-s-Johnny.patch
similarity index 100%
rename from patches/server/0281-Here-s-Johnny.patch
rename to patches/server/0282-Here-s-Johnny.patch
diff --git a/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0283-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0283-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0283-Reset-players-airTicks-on-respawn.patch b/patches/server/0284-Reset-players-airTicks-on-respawn.patch
similarity index 89%
rename from patches/server/0283-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0284-Reset-players-airTicks-on-respawn.patch
index 562a2e234..5ce220ca2 100644
--- a/patches/server/0283-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0284-Reset-players-airTicks-on-respawn.patch
@@ -17,10 +17,10 @@ index b2324b53b3cec3e577a8ec8c45b113c232d220a6..5eb37fb1ae861940839fe6815b571118
          this.fallDistance = 0;
          this.foodData = new FoodData(this);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0974781e2f7fc541eaf397de033fb12b87dbf8ba..c3bbe8429ee792b881953c5894a55505cdba63d3 100644
+index b75a7f702ca6166c1f869a138ac4b93ba3870c62..f9f51b84036f522cdfc4ca6d47c074d51c14bf08 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2585,6 +2585,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2587,6 +2587,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
  
      }
  
diff --git a/patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0286-Optimize-World-Time-Updates.patch b/patches/server/0287-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0286-Optimize-World-Time-Updates.patch
rename to patches/server/0287-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0287-Restore-custom-InventoryHolder-support.patch b/patches/server/0288-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0287-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0288-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0288-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0289-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0288-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0289-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0289-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0290-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0289-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0290-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0291-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0291-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0291-Make-the-default-permission-message-configurable.patch b/patches/server/0292-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/0291-Make-the-default-permission-message-configurable.patch
rename to patches/server/0292-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0293-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0293-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0293-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0294-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0293-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0294-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0294-force-entity-dismount-during-teleportation.patch b/patches/server/0295-force-entity-dismount-during-teleportation.patch
similarity index 94%
rename from patches/server/0294-force-entity-dismount-during-teleportation.patch
rename to patches/server/0295-force-entity-dismount-during-teleportation.patch
index a3e4049fb..73280109b 100644
--- a/patches/server/0294-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0295-force-entity-dismount-during-teleportation.patch
@@ -41,10 +41,10 @@ index 5eb37fb1ae861940839fe6815b57111812d6b3ec..963a3c159e912a39b98dfcb3fdb8c384
  
          if (entity1 != entity && this.connection != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c3bbe8429ee792b881953c5894a55505cdba63d3..8df9bd656374d0b43af378c61c1df7b951085b58 100644
+index f9f51b84036f522cdfc4ca6d47c074d51c14bf08..fcfee0f2b2b073b0c642684fddfb8d3c4eacf4f9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2212,12 +2212,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2214,12 +2214,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
  
      }
  
@@ -62,7 +62,7 @@ index c3bbe8429ee792b881953c5894a55505cdba63d3..8df9bd656374d0b43af378c61c1df7b9
          }
  
      }
-@@ -2280,7 +2283,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2282,7 +2285,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return true; // CraftBukkit
      }
  
@@ -74,7 +74,7 @@ index c3bbe8429ee792b881953c5894a55505cdba63d3..8df9bd656374d0b43af378c61c1df7b9
          if (entity.getVehicle() == this) {
              throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
          } else {
-@@ -2290,7 +2296,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2292,7 +2298,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              if (this.getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
                  VehicleExitEvent event = new VehicleExitEvent(
                          (Vehicle) this.getBukkitEntity(),
@@ -83,7 +83,7 @@ index c3bbe8429ee792b881953c5894a55505cdba63d3..8df9bd656374d0b43af378c61c1df7b9
                  );
                  // Suppress during worldgen
                  if (this.valid) {
-@@ -2304,7 +2310,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2306,7 +2312,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              }
              // CraftBukkit end
              // Spigot start
diff --git a/patches/server/0295-Add-more-Zombie-API.patch b/patches/server/0296-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0295-Add-more-Zombie-API.patch
rename to patches/server/0296-Add-more-Zombie-API.patch
diff --git a/patches/server/0296-Book-Size-Limits.patch b/patches/server/0297-Book-Size-Limits.patch
similarity index 100%
rename from patches/server/0296-Book-Size-Limits.patch
rename to patches/server/0297-Book-Size-Limits.patch
diff --git a/patches/server/0297-Add-PlayerConnectionCloseEvent.patch b/patches/server/0298-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0297-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0298-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0298-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0299-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0298-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0299-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0301-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/server/0302-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from patches/server/0301-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to patches/server/0302-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0303-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0303-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0303-BlockDestroyEvent.patch b/patches/server/0304-BlockDestroyEvent.patch
similarity index 93%
rename from patches/server/0303-BlockDestroyEvent.patch
rename to patches/server/0304-BlockDestroyEvent.patch
index 1f3060877..ba8f2e39c 100644
--- a/patches/server/0303-BlockDestroyEvent.patch
+++ b/patches/server/0304-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 8d4f8719b30a66fbb68c9407ee8484312f05b3fb..a1b713391c2445967c3b5a645304f193c013d551 100644
+index b978a6d44416ce89addaafb54a71fcb06e635b30..834bbd63b4e45e8c89b4ece4eaf357f3cbe8e8ca 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -28,6 +28,7 @@ import net.minecraft.nbt.CompoundTag;
@@ -22,7 +22,7 @@ index 8d4f8719b30a66fbb68c9407ee8484312f05b3fb..a1b713391c2445967c3b5a645304f193
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.ChunkHolder;
  import net.minecraft.server.level.ServerLevel;
-@@ -567,8 +568,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -568,8 +569,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;
          } else {
              FluidState fluid = this.getFluidState(pos);
diff --git a/patches/server/0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0305-Limit-Client-Sign-length-more.patch b/patches/server/0306-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from patches/server/0305-Limit-Client-Sign-length-more.patch
rename to patches/server/0306-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0308-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0309-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0308-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0309-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0309-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/patches/server/0310-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from patches/server/0309-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to patches/server/0310-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/server/0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from patches/server/0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to patches/server/0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0313-Entity-getEntitySpawnReason.patch b/patches/server/0314-Entity-getEntitySpawnReason.patch
similarity index 89%
rename from patches/server/0313-Entity-getEntitySpawnReason.patch
rename to patches/server/0314-Entity-getEntitySpawnReason.patch
index 20c369e13..33f056c7f 100644
--- a/patches/server/0313-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0314-Entity-getEntitySpawnReason.patch
@@ -10,17 +10,17 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 731c8e38c8daf04fee40a5ccfb0715b20f4d890f..940e6587125df1f203cdeeefc31658635badea81 100644
+index 043869948201c728bf168855d260b0dca42a0b3a..c64557c70122bff6ea0c8d0b34f62daf680e4334 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1093,6 +1093,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
-     // CraftBukkit start
-     private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
-         org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
+@@ -1111,6 +1111,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+             return true;
+         }
+         // Paper end
 +        if (entity.spawnReason == null) entity.spawnReason = spawnReason; // Paper
          if (entity.isRemoved()) {
-             // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
-             return false;
+             // Paper start
+             if (DEBUG_ENTITIES) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
 index ea336bdf2f15aabe74de82ef6c29b93573254e31..da3100d6577166e222164c174b28020541dd8e3a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -35,7 +35,7 @@ index ea336bdf2f15aabe74de82ef6c29b93573254e31..da3100d6577166e222164c174b280205
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8df9bd656374d0b43af378c61c1df7b951085b58..fcd3e6bfb4b1d0aefcb34eaec1212b08498dd5af 100644
+index fcfee0f2b2b073b0c642684fddfb8d3c4eacf4f9..47503fa2feabf6615f250d13f25f080d19c2f560 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -67,6 +67,8 @@ import net.minecraft.world.InteractionHand;
@@ -55,7 +55,7 @@ index 8df9bd656374d0b43af378c61c1df7b951085b58..fcd3e6bfb4b1d0aefcb34eaec1212b08
      // Paper end
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
-@@ -1841,6 +1844,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1843,6 +1846,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  nbt.setUUID("Paper.OriginWorld", origin.getWorld().getUID());
                  nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -65,7 +65,7 @@ index 8df9bd656374d0b43af378c61c1df7b951085b58..fcd3e6bfb4b1d0aefcb34eaec1212b08
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
                  nbt.putBoolean("Paper.FromMobSpawner", true);
-@@ -1983,6 +1989,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1985,6 +1991,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 54%
rename from patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch
index 5b0902aa3..8804fcd54 100644
--- a/patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch
@@ -4,27 +4,6 @@ Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players
 
 
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 8311d921ded1c81a1f561dc13db2010d2b7ce5d6..95ac30f56a9268f14d2518974c5a52e08f40ea18 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1281,6 +1281,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-                 } else {
-                     ChunkMap.TrackedEntity playerchunkmap_entitytracker = new ChunkMap.TrackedEntity(entity, i, j, entitytypes.trackDeltas());
- 
-+                    entity.tracker = playerchunkmap_entitytracker; // Paper - Fast access to tracker
-                     this.entityMap.put(entity.getId(), playerchunkmap_entitytracker);
-                     playerchunkmap_entitytracker.updatePlayers(this.level.players());
-                     if (entity instanceof ServerPlayer) {
-@@ -1323,7 +1324,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         if (playerchunkmap_entitytracker1 != null) {
-             playerchunkmap_entitytracker1.broadcastRemoved();
-         }
--
-+        entity.tracker = null; // Paper - We're no longer tracked
-     }
- 
-     protected void tick() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
 index ad9bbda31a4cdb306ca40f2b99e4b815c4f136bd..28afe2f238ded241acf77c3272a44068646b9133 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -62,15 +41,3 @@ index defebf7b45e4f006fa7e575b5dbd01ac1e231d5a..6c4266d847b1181a055fa425d5734032
                          }
  
                          if (event.isCancelled()) {
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fcd3e6bfb4b1d0aefcb34eaec1212b08498dd5af..a5159198003e43ce272ae73941d2be47d50eedc9 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -300,6 +300,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-     public boolean forceExplosionKnockback; // SPIGOT-949
-     public boolean persistentInvisibility = false;
-     public org.bukkit.Location origin; // Paper
-+    public net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper - fast access to tracker
-     // Spigot start
-     public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
-     public final boolean defaultActivationState;
diff --git a/patches/server/0315-Fire-event-on-GS4-query.patch b/patches/server/0316-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0315-Fire-event-on-GS4-query.patch
rename to patches/server/0316-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0316-Implement-PlayerPostRespawnEvent.patch b/patches/server/0317-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0316-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0317-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0318-Server-Tick-Events.patch b/patches/server/0319-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0318-Server-Tick-Events.patch
rename to patches/server/0319-Server-Tick-Events.patch
diff --git a/patches/server/0319-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0319-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
similarity index 90%
rename from patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
index 12b5730d5..222154acf 100644
--- a/patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a1b713391c2445967c3b5a645304f193c013d551..9891e40972c1dc6bebe8ccec2bf82123dcdd7e94 100644
+index 834bbd63b4e45e8c89b4ece4eaf357f3cbe8e8ca..982029f2927b034835e95f45bb2937fff28f1cdf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -869,9 +869,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -870,9 +870,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getTileEntity(BlockPos blockposition, boolean validate) {
diff --git a/patches/server/0321-Add-Heightmap-API.patch b/patches/server/0322-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0321-Add-Heightmap-API.patch
rename to patches/server/0322-Add-Heightmap-API.patch
diff --git a/patches/server/0322-Mob-Spawner-API-Enhancements.patch b/patches/server/0323-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0322-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0323-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0323-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0323-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from patches/server/0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/server/0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/0326-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0327-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from patches/server/0326-improve-CraftWorld-isChunkLoaded.patch
rename to patches/server/0327-improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 98%
rename from patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 82b32a8df..bbd5eacb2 100644
--- a/patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -85,7 +85,7 @@ index c8a59de4673d430fc8ec2e53315f107293122e7e..40e48c3f1199b127066732e3c8a6d40c
          // CraftBukkit start
          // this.updateSpawnFlags();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 940e6587125df1f203cdeeefc31658635badea81..74a5dcde184c20129cb5fdcfb34ef1c3aecb1842 100644
+index c64557c70122bff6ea0c8d0b34f62daf680e4334..c778ce951c1ca648faa5d6c02b331d34ffc71156 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -61,6 +61,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
@@ -96,7 +96,7 @@ index 940e6587125df1f203cdeeefc31658635badea81..74a5dcde184c20129cb5fdcfb34ef1c3
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.ServerScoreboard;
  import net.minecraft.server.level.progress.ChunkProgressListener;
-@@ -1486,12 +1487,88 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1510,12 +1511,88 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          return ((MapIndex) this.getServer().overworld().getDataStorage().computeIfAbsent(MapIndex::load, MapIndex::new, "idcounts")).getFreeAuxValueForMap();
      }
  
diff --git a/patches/server/0328-ChunkMapDistance-CME.patch b/patches/server/0329-ChunkMapDistance-CME.patch
similarity index 100%
rename from patches/server/0328-ChunkMapDistance-CME.patch
rename to patches/server/0329-ChunkMapDistance-CME.patch
diff --git a/patches/server/0329-Implement-CraftBlockSoundGroup.patch b/patches/server/0330-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0329-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0330-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0330-Chunk-debug-command.patch b/patches/server/0331-Chunk-debug-command.patch
similarity index 99%
rename from patches/server/0330-Chunk-debug-command.patch
rename to patches/server/0331-Chunk-debug-command.patch
index 5e3097224..fc2006bbb 100644
--- a/patches/server/0330-Chunk-debug-command.patch
+++ b/patches/server/0331-Chunk-debug-command.patch
@@ -468,7 +468,7 @@ index 71ac5cf0fdedcfe422bf6f5e6ffb15ce4138aa04..77bb2fb280293da4a38f9acc6503e849
      public final ChunkGenerator generator;
      final ServerLevel level;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 74a5dcde184c20129cb5fdcfb34ef1c3aecb1842..736521c0925339dc74c2648641932104a947708e 100644
+index c778ce951c1ca648faa5d6c02b331d34ffc71156..1e09fdfbc1a8f1014ad0f7c5db7c709fc454270e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -174,7 +174,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0331-Fix-World-isChunkGenerated-calls.patch b/patches/server/0332-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0331-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0332-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0332-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0333-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0332-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0333-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0333-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0333-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0334-Configurable-projectile-relative-velocity.patch b/patches/server/0335-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0334-Configurable-projectile-relative-velocity.patch
rename to patches/server/0335-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0335-offset-item-frame-ticking.patch b/patches/server/0336-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0335-offset-item-frame-ticking.patch
rename to patches/server/0336-offset-item-frame-ticking.patch
diff --git a/patches/server/0336-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/server/0337-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from patches/server/0336-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to patches/server/0337-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/patches/server/0337-Fix-MC-158900.patch b/patches/server/0338-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0337-Fix-MC-158900.patch
rename to patches/server/0338-Fix-MC-158900.patch
diff --git a/patches/server/0338-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0339-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0338-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0339-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0339-Generator-Settings.patch b/patches/server/0340-Generator-Settings.patch
similarity index 100%
rename from patches/server/0339-Generator-Settings.patch
rename to patches/server/0340-Generator-Settings.patch
diff --git a/patches/server/0340-Fix-MC-161754.patch b/patches/server/0341-Fix-MC-161754.patch
similarity index 100%
rename from patches/server/0340-Fix-MC-161754.patch
rename to patches/server/0341-Fix-MC-161754.patch
diff --git a/patches/server/0341-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/patches/server/0342-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from patches/server/0341-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to patches/server/0342-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/patches/server/0342-Expose-the-internal-current-tick.patch b/patches/server/0343-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0342-Expose-the-internal-current-tick.patch
rename to patches/server/0343-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0343-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/server/0344-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from patches/server/0343-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to patches/server/0344-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/patches/server/0344-Add-option-to-disable-pillager-patrols.patch b/patches/server/0345-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0344-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0345-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0345-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0346-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from patches/server/0345-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/server/0346-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/patches/server/0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0347-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0346-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0347-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0347-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0348-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0347-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0348-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0348-Optimize-Hoppers.patch b/patches/server/0349-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0348-Optimize-Hoppers.patch
rename to patches/server/0349-Optimize-Hoppers.patch
diff --git a/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0350-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0351-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0351-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0352-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0353-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0353-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 90%
rename from patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch
index 7ec891558..9b8cfb93e 100644
--- a/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0354-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity 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 736521c0925339dc74c2648641932104a947708e..eabf8fa6e8802ebea8dbe124363bb085849af5d9 100644
+index 1e09fdfbc1a8f1014ad0f7c5db7c709fc454270e..fe98fa03548922903e4fb352fbdfeeaac87450df 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -281,6 +281,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -284,6 +284,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
      public final com.destroystokyo.paper.io.chunk.ChunkTaskManager asyncChunkTaskManager;
      // Paper end
  
diff --git a/patches/server/0354-Fix-items-not-falling-correctly.patch b/patches/server/0355-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0354-Fix-items-not-falling-correctly.patch
rename to patches/server/0355-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0355-Lag-compensate-eating.patch b/patches/server/0356-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0355-Lag-compensate-eating.patch
rename to patches/server/0356-Lag-compensate-eating.patch
diff --git a/patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0357-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0357-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0358-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0358-Add-effect-to-block-break-naturally.patch b/patches/server/0359-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0358-Add-effect-to-block-break-naturally.patch
rename to patches/server/0359-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0359-Entity-Activation-Range-2.0.patch b/patches/server/0360-Entity-Activation-Range-2.0.patch
similarity index 97%
rename from patches/server/0359-Entity-Activation-Range-2.0.patch
rename to patches/server/0360-Entity-Activation-Range-2.0.patch
index 426f54cef..8496b9c17 100644
--- a/patches/server/0359-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0360-Entity-Activation-Range-2.0.patch
@@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
 Adds villagers as separate config
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index eabf8fa6e8802ebea8dbe124363bb085849af5d9..67b9daee8d7e55fdf2015e6616f393f176b1ca96 100644
+index fe98fa03548922903e4fb352fbdfeeaac87450df..8d72e68fe8f7d0a770264f54c539ea11f5e1d8da 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;
@@ -41,7 +41,7 @@ index eabf8fa6e8802ebea8dbe124363bb085849af5d9..67b9daee8d7e55fdf2015e6616f393f1
  import net.minecraft.world.level.entity.EntityPersistentStorage;
  import net.minecraft.world.level.entity.EntityTickList;
  import net.minecraft.world.level.entity.EntityTypeTest;
-@@ -888,17 +885,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -891,17 +888,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
@@ -63,7 +63,7 @@ index eabf8fa6e8802ebea8dbe124363bb085849af5d9..67b9daee8d7e55fdf2015e6616f393f1
          try {
          // Paper end - timings
          entity.isInLava();
-@@ -909,9 +906,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -912,9 +909,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              return Registry.ENTITY_TYPE.getKey(entity.getType()).toString();
          });
          gameprofilerfiller.incrementCounter("tickNonPassenger");
@@ -77,7 +77,7 @@ index eabf8fa6e8802ebea8dbe124363bb085849af5d9..67b9daee8d7e55fdf2015e6616f393f1
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -920,13 +921,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -923,13 +924,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              this.tickPassenger(entity, entity1);
          }
  
@@ -97,7 +97,7 @@ index eabf8fa6e8802ebea8dbe124363bb085849af5d9..67b9daee8d7e55fdf2015e6616f393f1
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
                  ProfilerFiller gameprofilerfiller = this.getProfiler();
-@@ -935,8 +941,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -938,8 +944,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
                      return Registry.ENTITY_TYPE.getKey(passenger.getType()).toString();
                  });
                  gameprofilerfiller.incrementCounter("tickPassenger");
@@ -115,7 +115,7 @@ index eabf8fa6e8802ebea8dbe124363bb085849af5d9..67b9daee8d7e55fdf2015e6616f393f1
                  gameprofilerfiller.pop();
                  Iterator iterator = passenger.getPassengers().iterator();
  
-@@ -946,6 +961,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -949,6 +964,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
                      this.tickPassenger(passenger, entity2);
                  }
  
@@ -124,10 +124,10 @@ index eabf8fa6e8802ebea8dbe124363bb085849af5d9..67b9daee8d7e55fdf2015e6616f393f1
          } 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 a5159198003e43ce272ae73941d2be47d50eedc9..fffeba61e9af5c69876921b48241edb881af2a64 100644
+index 47503fa2feabf6615f250d13f25f080d19c2f560..6b93b4e7717efbe68de3f1afe4843023e22c06bb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -275,7 +275,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -277,7 +277,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public boolean noCulling;
      public boolean hasImpulse;
      public int portalCooldown;
@@ -136,7 +136,7 @@ index a5159198003e43ce272ae73941d2be47d50eedc9..fffeba61e9af5c69876921b48241edb8
      protected int portalTime;
      protected BlockPos portalEntrancePos;
      private boolean invulnerable;
-@@ -305,6 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -306,6 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
      public long activatedTick = Integer.MIN_VALUE;
@@ -144,7 +144,7 @@ index a5159198003e43ce272ae73941d2be47d50eedc9..fffeba61e9af5c69876921b48241edb8
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
-@@ -746,6 +747,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -747,6 +748,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          } else {
              this.wasOnFire = this.isOnFire();
              if (movementType == MoverType.PISTON) {
@@ -152,7 +152,7 @@ index a5159198003e43ce272ae73941d2be47d50eedc9..fffeba61e9af5c69876921b48241edb8
                  movement = this.limitPistonMovement(movement);
                  if (movement.equals(Vec3.ZERO)) {
                      return;
-@@ -758,6 +760,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -759,6 +761,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  this.stuckSpeedMultiplier = Vec3.ZERO;
                  this.setDeltaMovement(Vec3.ZERO);
              }
@@ -348,10 +348,10 @@ index aec77679584a2acab5818e26e2586b5316118e84..9c7cb4f11c429ca5006cf5e178326ead
          super.customServerAiStep();
      }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9891e40972c1dc6bebe8ccec2bf82123dcdd7e94..ddcde88a8c8b748b4dc2583b4dfd0fb8ea9e201e 100644
+index 982029f2927b034835e95f45bb2937fff28f1cdf..aa198e9f2755734eac591bd3f94679518e9d7270 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -153,6 +153,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -154,6 +154,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public long ticksPerWaterSpawns;
      public long ticksPerWaterAmbientSpawns;
      public long ticksPerAmbientSpawns;
diff --git a/patches/server/0360-Increase-Light-Queue-Size.patch b/patches/server/0361-Increase-Light-Queue-Size.patch
similarity index 100%
rename from patches/server/0360-Increase-Light-Queue-Size.patch
rename to patches/server/0361-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0361-Fix-Light-Command.patch b/patches/server/0362-Fix-Light-Command.patch
similarity index 100%
rename from patches/server/0361-Fix-Light-Command.patch
rename to patches/server/0362-Fix-Light-Command.patch
diff --git a/patches/server/0362-No-Tick-view-distance-implementation.patch b/patches/server/0363-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from patches/server/0362-No-Tick-view-distance-implementation.patch
rename to patches/server/0363-No-Tick-view-distance-implementation.patch
index 3087bd1ec..50391a3d4 100644
--- a/patches/server/0362-No-Tick-view-distance-implementation.patch
+++ b/patches/server/0363-No-Tick-view-distance-implementation.patch
@@ -556,10 +556,10 @@ index bcc946d2747443c34ee8ac2485a5ab41773c93af..2730923bd0bf3b0f928765b9e09e2299
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ddcde88a8c8b748b4dc2583b4dfd0fb8ea9e201e..07e81fa1119bba4981e34e70b9e67f43280f8071 100644
+index aa198e9f2755734eac591bd3f94679518e9d7270..507a70521a97c463d6fd22b788c39e9f458971c3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -521,8 +521,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -522,8 +522,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  this.setBlocksDirty(blockposition, iblockdata1, iblockdata2);
              }
  
diff --git a/patches/server/0363-Implement-alternative-item-despawn-rate.patch b/patches/server/0364-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0363-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0364-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0364-Tracking-Range-Improvements.patch b/patches/server/0365-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0364-Tracking-Range-Improvements.patch
rename to patches/server/0365-Tracking-Range-Improvements.patch
diff --git a/patches/server/0365-Fix-items-vanishing-through-end-portal.patch b/patches/server/0366-Fix-items-vanishing-through-end-portal.patch
similarity index 89%
rename from patches/server/0365-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0366-Fix-items-vanishing-through-end-portal.patch
index e32fc1978..d64b93474 100644
--- a/patches/server/0365-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0366-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 fffeba61e9af5c69876921b48241edb881af2a64..3d3286070c9c4db6d6487e119070794dadf493bd 100644
+index 6b93b4e7717efbe68de3f1afe4843023e22c06bb..999cf6f54133fb70bff56f93347e9916b58e1e3a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2983,6 +2983,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2984,6 +2984,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              BlockPos blockposition1;
  
              if (flag1) {
diff --git a/patches/server/0366-implement-optional-per-player-mob-spawns.patch b/patches/server/0367-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0366-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0367-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0369-Allow-overriding-the-java-version-check.patch b/patches/server/0370-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from patches/server/0369-Allow-overriding-the-java-version-check.patch
rename to patches/server/0370-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0370-Add-ThrownEggHatchEvent.patch b/patches/server/0371-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0370-Add-ThrownEggHatchEvent.patch
rename to patches/server/0371-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0371-Optimise-random-block-ticking.patch b/patches/server/0372-Optimise-random-block-ticking.patch
similarity index 97%
rename from patches/server/0371-Optimise-random-block-ticking.patch
rename to patches/server/0372-Optimise-random-block-ticking.patch
index e6d451fad..d8b334052 100644
--- a/patches/server/0371-Optimise-random-block-ticking.patch
+++ b/patches/server/0372-Optimise-random-block-ticking.patch
@@ -71,10 +71,10 @@ index 0000000000000000000000000000000000000000..3edc8e52e06a62ce9f8cc734fd7458b3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 67b9daee8d7e55fdf2015e6616f393f176b1ca96..ecb9c5a1958c89494417bdb3e6c6363f3fc84534 100644
+index 8d72e68fe8f7d0a770264f54c539ea11f5e1d8da..50efe1bd6a62b71007bf3274f323704be1477ce7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -664,7 +664,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -667,7 +667,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          });
      }
  
@@ -88,7 +88,7 @@ index 67b9daee8d7e55fdf2015e6616f393f176b1ca96..ecb9c5a1958c89494417bdb3e6c6363f
          ChunkPos chunkcoordintpair = chunk.getPos();
          boolean flag = this.isRaining();
          int j = chunkcoordintpair.getMinBlockX();
-@@ -672,10 +677,10 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -675,10 +680,10 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
@@ -101,7 +101,7 @@ index 67b9daee8d7e55fdf2015e6616f393f176b1ca96..ecb9c5a1958c89494417bdb3e6c6363f
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * paperConfig.skeleHorseSpawnChance && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
-@@ -698,66 +703,81 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -701,66 +706,81 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          }
  
          gameprofilerfiller.popPush("iceandsnow");
@@ -266,10 +266,10 @@ index e638d982b4bd1d261a7282cad6dab98ad0b55213..e305173fd1652a8b88ae8a9b94d0fae0
  
      public BlockPos getHomePos() { // Paper - public
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 07e81fa1119bba4981e34e70b9e67f43280f8071..5fccec12c0325dd9873905c5c3559128c3b4d9ad 100644
+index 507a70521a97c463d6fd22b788c39e9f458971c3..ea455e8aa7db5e9c397875e1fc8716cd52044c05 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1299,10 +1299,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1300,10 +1300,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public abstract TagContainer getTagManager();
  
      public BlockPos getBlockRandomPos(int x, int y, int z, int l) {
diff --git a/patches/server/0372-Entity-Jump-API.patch b/patches/server/0373-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0372-Entity-Jump-API.patch
rename to patches/server/0373-Entity-Jump-API.patch
diff --git a/patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 92%
rename from patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch
index bd3b08c4c..f33d6ed44 100644
--- a/patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -21,10 +21,10 @@ index 16f013ffe992a934e9d0b32e764a14a8fd204449..6c7e90f9939d42fdf8d40dd7ec0a6a86
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3d3286070c9c4db6d6487e119070794dadf493bd..facb09e49d92d22dbcde7d187d4ba1c9a04202a9 100644
+index 999cf6f54133fb70bff56f93347e9916b58e1e3a..d97319136d6cded2a12cb9ae4f9aa921ff59882c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -307,6 +307,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -308,6 +308,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      public long activatedTick = Integer.MIN_VALUE;
      public boolean isTemporarilyActive = false; // Paper
      public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
@@ -32,7 +32,7 @@ index 3d3286070c9c4db6d6487e119070794dadf493bd..facb09e49d92d22dbcde7d187d4ba1c9
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1861,6 +1862,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1862,6 +1863,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              if (spawnedViaMobSpawner) {
                  nbt.putBoolean("Paper.FromMobSpawner", true);
              }
@@ -42,7 +42,7 @@ index 3d3286070c9c4db6d6487e119070794dadf493bd..facb09e49d92d22dbcde7d187d4ba1c9
              // Paper end
              return nbt;
          } catch (Throwable throwable) {
-@@ -1999,6 +2003,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2000,6 +2004,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
              }
  
              spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
diff --git a/patches/server/0374-Make-the-GUI-graph-fancier.patch b/patches/server/0375-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0374-Make-the-GUI-graph-fancier.patch
rename to patches/server/0375-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0375-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0375-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0376-Prevent-teleporting-dead-entities.patch b/patches/server/0377-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0376-Prevent-teleporting-dead-entities.patch
rename to patches/server/0377-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0377-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0378-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0377-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0378-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0378-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0378-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0379-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0379-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0380-Optimise-Chunk-getFluid.patch b/patches/server/0381-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0380-Optimise-Chunk-getFluid.patch
rename to patches/server/0381-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0381-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0382-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from patches/server/0381-Optimise-TickListServer-by-rewriting-it.patch
rename to patches/server/0382-Optimise-TickListServer-by-rewriting-it.patch
index 20aa3203b..40dbc4fec 100644
--- a/patches/server/0381-Optimise-TickListServer-by-rewriting-it.patch
+++ b/patches/server/0382-Optimise-TickListServer-by-rewriting-it.patch
@@ -941,10 +941,10 @@ index 56aa640eb0096e5c5f1a34d6f11a4dd9ac8770df..a81c773cc281ba390d3ce44c52c43710
      public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureManager structureManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, boolean flag, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier<DimensionDataStorage> supplier) {
          this.level = world;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ecb9c5a1958c89494417bdb3e6c6363f3fc84534..385b8e707406173ea5258aff87af719ce93aecf3 100644
+index 50efe1bd6a62b71007bf3274f323704be1477ce7..a43839ddd468d7b61d5609f22fb1e9fcd873590a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -286,6 +286,15 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -289,6 +289,15 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
      }
      // Paper end
  
@@ -960,7 +960,7 @@ index ecb9c5a1958c89494417bdb3e6c6363f3fc84534..385b8e707406173ea5258aff87af719c
      // Add env and gen to constructor, WorldData -> WorldDataServer
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, ServerLevelData iworlddataserver, ResourceKey<net.minecraft.world.level.Level> resourcekey, DimensionType dimensionmanager, ChunkProgressListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
-@@ -302,13 +311,19 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -305,13 +314,19 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          DefaultedRegistry registryblocks = Registry.BLOCK;
  
          Objects.requireNonNull(registryblocks);
@@ -981,7 +981,7 @@ index ecb9c5a1958c89494417bdb3e6c6363f3fc84534..385b8e707406173ea5258aff87af719c
          this.navigatingMobs = new ObjectOpenHashSet();
          this.blockEvents = new ObjectLinkedOpenHashSet();
          this.dragonParts = new Int2ObjectOpenHashMap();
-@@ -629,7 +644,9 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -632,7 +647,9 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          if (this.tickTime) {
              long i = this.levelData.getGameTime() + 1L;
  
diff --git a/patches/server/0382-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0383-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0382-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0383-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0383-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0383-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0384-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0384-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0385-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 92%
rename from patches/server/0385-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 9f991f3e0..6a201d935 100644
--- a/patches/server/0385-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -26,10 +26,10 @@ index e1498a5a8e664b922c77a8524ed2ea38c91834ce..71d5c298e14869d9d44226aeb6ffe3f0
              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 385b8e707406173ea5258aff87af719ce93aecf3..5944c44eadca550671d7740af5756985afede39d 100644
+index a43839ddd468d7b61d5609f22fb1e9fcd873590a..da85bfe5de9dcd6d51605ce9b023265b5a5f2936 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2100,7 +2100,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -2124,7 +2124,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
  
          public void onTrackingStart(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -38,7 +38,7 @@ index 385b8e707406173ea5258aff87af719ce93aecf3..5944c44eadca550671d7740af5756985
              if (entity instanceof ServerPlayer) {
                  ServerLevel.this.players.add((ServerPlayer) entity);
                  ServerLevel.this.updateSleepingPlayerList();
-@@ -2122,6 +2122,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -2146,6 +2146,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              }
  
              entity.valid = true; // CraftBukkit
diff --git a/patches/server/0386-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0387-Optimize-Collision-to-not-load-chunks.patch
similarity index 97%
rename from patches/server/0386-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0387-Optimize-Collision-to-not-load-chunks.patch
index d2e15c682..2387b545f 100644
--- a/patches/server/0386-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0387-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index 2730923bd0bf3b0f928765b9e09e2299fa9a393d..f98a1c32e0c209473cf7268cbd8245ab
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index facb09e49d92d22dbcde7d187d4ba1c9a04202a9..85c0656ee8c91cab1e269daea631977c4284295f 100644
+index d97319136d6cded2a12cb9ae4f9aa921ff59882c..21bcb811eb002714db7a9be70133bda7a722ba65 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -172,6 +172,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -36,7 +36,7 @@ index facb09e49d92d22dbcde7d187d4ba1c9a04202a9..85c0656ee8c91cab1e269daea631977c
 +    public boolean collisionLoadChunks = false; // Paper
      private CraftEntity bukkitEntity;
  
-     public CraftEntity getBukkitEntity() {
+     public net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper
 diff --git a/src/main/java/net/minecraft/world/level/CollisionGetter.java b/src/main/java/net/minecraft/world/level/CollisionGetter.java
 index b980c26ab5cac02e03525177a9dc4fb0b6a2f9f6..2a784a8342e708e0813c7076a2ca8e429446ffd3 100644
 --- a/src/main/java/net/minecraft/world/level/CollisionGetter.java
diff --git a/patches/server/0387-Don-t-tick-dead-players.patch b/patches/server/0388-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0387-Don-t-tick-dead-players.patch
rename to patches/server/0388-Don-t-tick-dead-players.patch
diff --git a/patches/server/0388-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0388-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0389-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0390-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from patches/server/0389-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to patches/server/0390-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/patches/server/0390-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0391-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 97%
rename from patches/server/0390-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to patches/server/0391-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
index 6f6470fd0..7f241bc38 100644
--- a/patches/server/0390-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
+++ b/patches/server/0391-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
@@ -226,10 +226,10 @@ index 34183527a23650706a9249ffac0182cb77b18086..90decfade57b2f17cdcc9188962c2d21
          // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task
          public boolean pollTask() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5944c44eadca550671d7740af5756985afede39d..fd3159f7767faaa55ed49eba237e30a2dbd4fa92 100644
+index da85bfe5de9dcd6d51605ce9b023265b5a5f2936..f10fad84e4f36f9158383b327170593f273cecd9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -578,6 +578,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -581,6 +581,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          }
          timings.scheduledBlocks.stopTiming(); // Paper
  
@@ -237,7 +237,7 @@ index 5944c44eadca550671d7740af5756985afede39d..fd3159f7767faaa55ed49eba237e30a2
          gameprofilerfiller.popPush("raid");
          this.timings.raids.startTiming(); // Paper - timings
          this.raids.tick();
-@@ -586,6 +587,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -589,6 +590,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          timings.doSounds.startTiming(); // Spigot
          this.runBlockEvents();
          timings.doSounds.stopTiming(); // Spigot
@@ -245,7 +245,7 @@ index 5944c44eadca550671d7740af5756985afede39d..fd3159f7767faaa55ed49eba237e30a2
          this.handlingTick = false;
          gameprofilerfiller.pop();
          boolean flag3 = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
-@@ -632,10 +634,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -635,10 +637,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              timings.entityTick.stopTiming(); // Spigot
              timings.tickEntities.stopTiming(); // Spigot
              gameprofilerfiller.pop();
diff --git a/patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0392-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0392-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0392-Add-tick-times-API-and-mspt-command.patch b/patches/server/0393-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0392-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0393-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0393-Expose-MinecraftServer-isRunning.patch b/patches/server/0394-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0393-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0394-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0394-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0395-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0394-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0395-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0395-Remove-streams-from-Mob-AI-System.patch b/patches/server/0396-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from patches/server/0395-Remove-streams-from-Mob-AI-System.patch
rename to patches/server/0396-Remove-streams-from-Mob-AI-System.patch
diff --git a/patches/server/0396-Async-command-map-building.patch b/patches/server/0397-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0396-Async-command-map-building.patch
rename to patches/server/0397-Async-command-map-building.patch
diff --git a/patches/server/0397-Improved-Watchdog-Support.patch b/patches/server/0398-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0397-Improved-Watchdog-Support.patch
rename to patches/server/0398-Improved-Watchdog-Support.patch
index 52408524a..77f803c03 100644
--- a/patches/server/0397-Improved-Watchdog-Support.patch
+++ b/patches/server/0398-Improved-Watchdog-Support.patch
@@ -299,10 +299,10 @@ index 0ef3c4982df88a7991a56d983ac733daa8adc507..cdd797c6fc7507a0e6376f7d9c521be8
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5fccec12c0325dd9873905c5c3559128c3b4d9ad..03271675b4997588bd8f6774856aef25cdd4fa05 100644
+index ea455e8aa7db5e9c397875e1fc8716cd52044c05..6aeb3ff79f08ade7ddd0d328d1a01514a91f671a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -836,6 +836,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -837,6 +837,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
diff --git a/patches/server/0398-Optimize-Pathfinding.patch b/patches/server/0399-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0398-Optimize-Pathfinding.patch
rename to patches/server/0399-Optimize-Pathfinding.patch
diff --git a/patches/server/0399-Reduce-Either-Optional-allocation.patch b/patches/server/0400-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0399-Reduce-Either-Optional-allocation.patch
rename to patches/server/0400-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0400-Remove-streams-from-PairedQueue.patch b/patches/server/0401-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from patches/server/0400-Remove-streams-from-PairedQueue.patch
rename to patches/server/0401-Remove-streams-from-PairedQueue.patch
diff --git a/patches/server/0401-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0402-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0401-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0402-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0402-Prevent-opening-inventories-when-frozen.patch b/patches/server/0403-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0402-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0403-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0403-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0404-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0403-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0404-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0404-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0405-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0404-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0405-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0405-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0406-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from patches/server/0405-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to patches/server/0406-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/patches/server/0406-Implement-Player-Client-Options-API.patch b/patches/server/0407-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0406-Implement-Player-Client-Options-API.patch
rename to patches/server/0407-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0407-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0408-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/0407-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0408-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0408-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0409-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0408-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0409-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0409-Broadcast-join-message-to-console.patch b/patches/server/0410-Broadcast-join-message-to-console.patch
similarity index 100%
rename from patches/server/0409-Broadcast-join-message-to-console.patch
rename to patches/server/0410-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0410-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0411-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0410-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0411-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0411-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0412-Load-Chunks-for-Login-Asynchronously.patch
similarity index 99%
rename from patches/server/0411-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0412-Load-Chunks-for-Login-Asynchronously.patch
index 22009dda6..e5ea65127 100644
--- a/patches/server/0411-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0412-Load-Chunks-for-Login-Asynchronously.patch
@@ -263,10 +263,10 @@ index 3a13c151066c8784fdc844e1d6310f77ff32e7f1..c4242a1602bbb02541c330bc02016f15
          Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 85c0656ee8c91cab1e269daea631977c4284295f..ac5f0bf573cbb5aa19dd3326f412010286de4378 100644
+index 21bcb811eb002714db7a9be70133bda7a722ba65..326241a4669aa771db9d91ddd205576599110c2d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1490,7 +1490,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1491,7 +1491,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          this.yo = y;
          this.zo = d4;
          this.setPos(d3, y, d4);
diff --git a/patches/server/0412-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0413-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 89%
rename from patches/server/0412-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0413-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index ed5d792be..dd8d0f985 100644
--- a/patches/server/0412-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0413-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -7,10 +7,10 @@ The code following this has better support for null worlds to move
 them back to the world spawn.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ac5f0bf573cbb5aa19dd3326f412010286de4378..1ab073aaacbf6af35f97a7d3b0d8ae078335f9a6 100644
+index 326241a4669aa771db9d91ddd205576599110c2d..62b16f0cedc90af6842c981cf0d8390675fc7201 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1979,9 +1979,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -1980,9 +1980,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                      bworld = server.getWorld(worldName);
                  }
  
diff --git a/patches/server/0413-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0414-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0413-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0414-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0414-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0415-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from patches/server/0414-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to patches/server/0415-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/patches/server/0415-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0416-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0415-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0416-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0416-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0417-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0416-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0417-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0417-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0418-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 94%
rename from patches/server/0417-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0418-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index b1c5df36e..98d85e37e 100644
--- a/patches/server/0417-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/patches/server/0418-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -16,10 +16,10 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1ab073aaacbf6af35f97a7d3b0d8ae078335f9a6..9897a0ac66dd788b0b22a88b20ca86a386e397e4 100644
+index 62b16f0cedc90af6842c981cf0d8390675fc7201..a80a1a54a66de45aaf4974be56aecbafeb477825 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2125,11 +2125,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2126,11 +2126,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          } 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 1ab073aaacbf6af35f97a7d3b0d8ae078335f9a6..9897a0ac66dd788b0b22a88b20ca86a3
  
              entityitem.setDefaultPickUpDelay();
              // CraftBukkit start
-@@ -2873,6 +2874,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2874,6 +2875,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      @Nullable
      public Entity teleportTo(ServerLevel worldserver, BlockPos location) {
          // CraftBukkit end
@@ -47,7 +47,7 @@ index 1ab073aaacbf6af35f97a7d3b0d8ae078335f9a6..9897a0ac66dd788b0b22a88b20ca86a3
          if (this.level instanceof ServerLevel && !this.isRemoved()) {
              this.level.getProfiler().push("changeDimension");
              // CraftBukkit start
-@@ -2893,6 +2900,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2894,6 +2901,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  // CraftBukkit end
  
                  this.level.getProfiler().popPush("reloading");
@@ -59,7 +59,7 @@ index 1ab073aaacbf6af35f97a7d3b0d8ae078335f9a6..9897a0ac66dd788b0b22a88b20ca86a3
                  Entity entity = this.getType().create((Level) worldserver);
  
                  if (entity != null) {
-@@ -2906,10 +2918,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2907,10 +2919,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                      // CraftBukkit start - Forward the CraftEntity to the new entity
                      this.getBukkitEntity().setHandle(entity);
                      entity.bukkitEntity = this.getBukkitEntity();
@@ -70,7 +70,7 @@ index 1ab073aaacbf6af35f97a7d3b0d8ae078335f9a6..9897a0ac66dd788b0b22a88b20ca86a3
                      // CraftBukkit end
                  }
  
-@@ -3034,7 +3042,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -3035,7 +3043,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      }
  
      public boolean canChangeDimensions() {
diff --git a/patches/server/0418-Implement-Brigadier-Mojang-API.patch b/patches/server/0419-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0418-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0419-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0419-Villager-Restocks-API.patch b/patches/server/0420-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0419-Villager-Restocks-API.patch
rename to patches/server/0420-Villager-Restocks-API.patch
diff --git a/patches/server/0420-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0421-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0420-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0421-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0421-Expose-game-version.patch b/patches/server/0422-Expose-game-version.patch
similarity index 100%
rename from patches/server/0421-Expose-game-version.patch
rename to patches/server/0422-Expose-game-version.patch
diff --git a/patches/server/0422-Optimize-Voxel-Shape-Merging.patch b/patches/server/0423-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0422-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0423-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0423-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0424-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0423-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0424-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0424-Implement-Mob-Goal-API.patch b/patches/server/0425-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0424-Implement-Mob-Goal-API.patch
rename to patches/server/0425-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0426-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0426-Use-distance-map-to-optimise-entity-tracker.patch
index 9c57b2512..0312a5228 100644
--- a/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0426-Use-distance-map-to-optimise-entity-tracker.patch
@@ -312,7 +312,7 @@ index 28afe2f238ded241acf77c3272a44068646b9133..6b492b72b177e3c58580561585609b17
          List<Entity> list = this.entity.getPassengers();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9897a0ac66dd788b0b22a88b20ca86a386e397e4..dec5690bd90830bace704b553dbcd1d2633ab668 100644
+index a80a1a54a66de45aaf4974be56aecbafeb477825..11ae525a5d2bd29bfe658d683c53a0ab2626616a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -50,6 +50,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
@@ -323,7 +323,7 @@ index 9897a0ac66dd788b0b22a88b20ca86a386e397e4..dec5690bd90830bace704b553dbcd1d2
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.ServerLevel;
  import net.minecraft.server.level.ServerPlayer;
-@@ -322,6 +323,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -323,6 +324,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
      }
      // CraftBukkit end
  
diff --git a/patches/server/0426-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0427-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from patches/server/0426-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to patches/server/0427-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/patches/server/0427-Add-villager-reputation-API.patch b/patches/server/0428-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0427-Add-villager-reputation-API.patch
rename to patches/server/0428-Add-villager-reputation-API.patch
diff --git a/patches/server/0428-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0429-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0428-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0429-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0429-ExperienceOrbMergeEvent.patch b/patches/server/0430-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0429-ExperienceOrbMergeEvent.patch
rename to patches/server/0430-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0430-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0431-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0430-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0431-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0431-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0432-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0431-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0432-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0432-Potential-bed-API.patch b/patches/server/0433-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0432-Potential-bed-API.patch
rename to patches/server/0433-Potential-bed-API.patch
diff --git a/patches/server/0433-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0434-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0433-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0434-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0434-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0435-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0434-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0435-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0435-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0436-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 98%
rename from patches/server/0435-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0436-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 5a8eb18df..2c13e4ac2 100644
--- a/patches/server/0435-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0436-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -56,10 +56,10 @@ index cdf214fca3b0055efa56702470d9d2f890a8aead..a12af10e28f2d023ba6f916b5e7a5353
  
                      this.level.getProfiler().push("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 03271675b4997588bd8f6774856aef25cdd4fa05..581e7975c4bfcc902e262003843fe54212bc5b61 100644
+index 6aeb3ff79f08ade7ddd0d328d1a01514a91f671a..b969e7f2087aed5b1f97ce8593a25ada737daec9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -419,6 +419,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -420,6 +420,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
diff --git a/patches/server/0436-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0437-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0436-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0437-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0437-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0438-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0437-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0438-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0438-Ensure-safe-gateway-teleport.patch b/patches/server/0439-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0438-Ensure-safe-gateway-teleport.patch
rename to patches/server/0439-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0439-Add-option-for-console-having-all-permissions.patch b/patches/server/0440-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0439-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0440-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0440-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0441-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from patches/server/0440-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to patches/server/0441-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/patches/server/0441-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0442-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from patches/server/0441-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to patches/server/0442-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/patches/server/0442-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0443-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0442-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0443-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0443-Maps-shouldn-t-load-chunks.patch b/patches/server/0444-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0443-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0444-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0444-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0445-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0444-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0445-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0445-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0446-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0445-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0446-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0446-incremental-chunk-saving.patch b/patches/server/0447-incremental-chunk-saving.patch
similarity index 99%
rename from patches/server/0446-incremental-chunk-saving.patch
rename to patches/server/0447-incremental-chunk-saving.patch
index 8856801d1..36c566304 100644
--- a/patches/server/0446-incremental-chunk-saving.patch
+++ b/patches/server/0447-incremental-chunk-saving.patch
@@ -260,10 +260,10 @@ index 3faa808f41f057a9956c697ec1323330f5920b86..7ab28e9bd3f785838b7fa4ac5811c0e7
      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 fd3159f7767faaa55ed49eba237e30a2dbd4fa92..9fb7345a8c3985aa3e0f4575d680b82379d2cc5a 100644
+index f10fad84e4f36f9158383b327170593f273cecd9..bdabcdb60dbfb803ead13c42c8dd5e100b37dc00 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1014,6 +1014,38 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1017,6 +1017,38 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
          return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
      }