From 6f064f928efdba35b3ad3d3263d063f0cbb1022f Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 15 Jun 2021 21:53:50 -0700
Subject: [PATCH] add more patches back

---
 build-data/paper.at                           |  3 ++
 ...66-Fix-MC-117075-TE-Unload-Lag-Spike.patch | 23 ----------
 ...66-Fix-MC-117075-TE-Unload-Lag-Spike.patch | 42 +++++++++++++++++++
 ...-implementations-for-captured-block.patch} |  2 +-
 ...get-a-BlockState-without-a-snapshot.patch} |  2 +-
 ...patch => 0169-AsyncTabCompleteEvent.patch} |  0
 ...=> 0170-PlayerPickupExperienceEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...max-squid-spawn-height-configurable.patch} |  2 +-
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  6 +--
 ...patch => 0174-PreCreatureSpawnEvent.patch} |  2 +-
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0176-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0178-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0180-Tameable-getOwnerUniqueId-API.patch} |  0
 ...-crits-helps-mitigate-hacked-client.patch} |  2 +-
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  0
 ... 0184-Improved-Async-Task-Scheduler.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  2 +-
 ...=> 0186-Player.setPlayerProfile-API.patch} |  4 +-
 ...patch => 0187-getPlayerUniqueId-API.patch} |  0
 ...ake-player-data-saving-configurable.patch} |  0
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...1-Flag-to-disable-the-channel-limit.patch} |  0
 ...-method-to-open-already-placed-sign.patch} |  0
 ...rable-sprint-interruption-on-attack.patch} |  2 +-
 ...allowed-colored-signs-to-be-created.patch} |  2 +-
 ...t.patch => 0195-EndermanEscapeEvent.patch} |  0
 ...h => 0196-Enderman.teleportRandomly.patch} |  0
 ...197-Block-Enderpearl-Travel-Exploit.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  2 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  0
 ...h => 0200-EndermanAttackPlayerEvent.patch} |  0
 ...tch => 0201-WitchConsumePotionEvent.patch} |  0
 ...patch => 0202-WitchThrowPotionEvent.patch} |  0
 ...tem-entities-with-World.spawnEntity.patch} |  0
 ...patch => 0204-WitchReadyPotionEvent.patch} |  0
 ...205-ItemStack-getMaxItemUseDuration.patch} |  0
 ...ement-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  0
 ...ch => 0208-Fix-CraftEntity-hashCode.patch} |  0
 ...e-Alternative-LootPool-Luck-Formula.patch} |  0
 ...ls-when-failing-to-save-player-data.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  2 +-
 ...=> 0212-Improve-EntityShootBowEvent.patch} |  0
 ...patch => 0213-PlayerReadyArrowEvent.patch} |  2 +-
 ...lement-EntityKnockbackByEntityEvent.patch} |  6 +--
 ...patch => 0215-Expand-Explosions-API.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0217-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  0
 ...-Implement-World.getEntity-UUID-API.patch} |  0
 ...0220-InventoryCloseEvent-Reason-API.patch} |  6 +--
 ...tch => 0221-Vex-get-setSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  2 +-
 ...-if-stack-size-above-max-stack-size.patch} |  0
 ...24-Use-asynchronous-Log4j-2-loggers.patch} |  2 +-
 ...more-information-to-Entity.toString.patch} |  2 +-
 ...tMagicNumbers.isSupportedApiVersion.patch} |  0
 ...ts.patch => 0227-EnderDragon-Events.patch} |  0
 ...atch => 0228-PlayerElytraBoostEvent.patch} |  0
 ...=> 0229-PlayerLaunchProjectileEvent.patch} |  0
 ...0230-Improve-BlockPosition-inlining.patch} |  2 +-
 ...timize-IntIdentityHashBiMiap-nextId.patch} |  0
 ...-armor-stands-from-doing-entity-loo.patch} |  6 +--
 ...-Vanished-players-don-t-have-rights.patch} |  4 +-
 ...llow-disabling-armour-stand-ticking.patch} |  2 +-
 ...tch => 0235-SkeletonHorse-Additions.patch} |  0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...7-Implement-Expanded-ArmorStand-API.patch} |  0
 ...vent.patch => 0238-AnvilDamageEvent.patch} |  0
 ...h => 0239-Add-hand-to-bucket-events.patch} |  8 ++--
 ...ent.patch => 0240-Add-TNTPrimeEvent.patch} |  2 +-
 ...d-make-tab-spam-limits-configurable.patch} |  2 +-
 ...-Experience-should-save-as-Integers.patch} |  0
 ...ent-rendering-skulls-from-same-user.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  8 ++--
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  0
 ...0246-Make-EnderDragon-implement-Mob.patch} |  0
 ...7-Use-ConcurrentHashMap-in-JsonList.patch} |  0
 ...8-Use-a-Queue-for-Queueing-Commands.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...timize-BlockPosition-helper-methods.patch} |  2 +-
 ...fault-mob-spawn-range-and-water-ani.patch} |  2 +-
 ...tch => 0252-Slime-Pathfinder-Events.patch} |  2 +-
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ...54-Optimize-CraftBlockData-Creation.patch} |  0
 ...tch => 0255-Optimize-MappedRegistry.patch} |  0
 ...ch => 0256-Add-PhantomPreSpawnEvent.patch} |  2 +-
 ....patch => 0257-Add-More-Creeper-API.patch} |  0
 ...=> 0258-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  0
 ...0-Asynchronous-chunk-IO-and-loading.patch} |  0
 ...ray-tracing-methods-to-LivingEntity.patch} |  4 +-
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0263-Improve-death-events.patch} |  0
 ...w-chests-to-be-placed-with-NBT-data.patch} |  2 +-
 ...I.patch => 0265-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
 ...=> 0272-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  0
 ...> 0274-Hook-into-CB-plugin-rewrites.patch} |  0
 ...I.patch => 0275-Add-sun-related-API.patch} |  0
 ...76-Add-LivingEntity-getTargetEntity.patch} |  2 +-
 ...Turtle-API.patch => 0277-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} |  4 +-
 ...PI.patch => 0281-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...-Johnny.patch => 0283-Here-s-Johnny.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  2 +-
 ...5-Reset-players-airTicks-on-respawn.patch} |  4 +-
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  2 +-
 ...=> 0288-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0290-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0291-Fix-SpongeAbsortEvent-handling.patch} |  0
 ....patch => 0292-PreSpawnerSpawnEvent.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  2 +-
 ...ult-permission-message-configurable.patch} |  0
 ...revent-rayTrace-from-loading-chunks.patch} |  0
 ...-Large-Packets-disconnecting-client.patch} |  0
 ...ntity-dismount-during-teleportation.patch} |  2 +-
 ...I.patch => 0298-Add-more-Zombie-API.patch} |  0
 ...mits.patch => 0299-Book-Size-Limits.patch} |  2 +-
 ...0300-Add-PlayerConnectionCloseEvent.patch} |  0
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  2 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |  2 +-
 ...nRetractEvent-for-all-empty-pistons.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  0
 ...ent.patch => 0306-BlockDestroyEvent.patch} |  2 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ... 0308-Limit-Client-Sign-length-more.patch} |  2 +-
 ...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} |  2 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |  0
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0316-Entity-getEntitySpawnReason.patch} |  4 +-
 ...ty-Metadata-for-all-tracked-players.patch} |  2 +-
 ...tch => 0318-Fire-event-on-GS4-query.patch} |  0
 ...19-Implement-PlayerPostRespawnEvent.patch} |  0
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...ts.patch => 0321-Server-Tick-Events.patch} |  0
 ...322-PlayerDeathEvent-getItemsToKeep.patch} |  2 +-
 ...Optimize-Captured-TileEntity-Lookup.patch} |  4 +-
 ...API.patch => 0324-Add-Heightmap-API.patch} |  0
 ...> 0325-Mob-Spawner-API-Enhancements.patch} |  0
 ...-to-changed-postToMainThread-method.patch} |  2 +-
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...29-improve-CraftWorld-isChunkLoaded.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  2 +-
 ....patch => 0331-ChunkMapDistance-CME.patch} |  2 +-
 ...0332-Implement-CraftBlockSoundGroup.patch} |  0
 ...d.patch => 0333-Chunk-debug-command.patch} |  0
 ...34-Fix-World-isChunkGenerated-calls.patch} |  0
 ...te-location-if-we-failed-to-read-it.patch} |  2 +-
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  0
 ...urable-projectile-relative-velocity.patch} |  0
 ...h => 0338-offset-item-frame-ticking.patch} |  0
 ...f-we-have-a-custom-Bukkit-generator.patch} |  0
 ...-158900.patch => 0340-Fix-MC-158900.patch} |  0
 ...event-consuming-the-wrong-itemstack.patch} |  2 +-
 ...gs.patch => 0342-Generator-Settings.patch} |  2 +-
 ...-161754.patch => 0343-Fix-MC-161754.patch} |  0
 ...anging-entities-that-are-not-ItemFr.patch} |  0
 ...45-Expose-the-internal-current-tick.patch} |  0
 ...sneak-when-changing-worlds-MC-10657.patch} |  2 +-
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...r-when-player-hand-set-to-empty-typ.patch} |  2 +-
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ...pers.patch => 0351-Optimize-Hoppers.patch} |  2 +-
 ...ayerDeathEvent-shouldDropExperience.patch} |  2 +-
 ...ading-chunks-checking-hive-position.patch} |  2 +-
 ...hunks-from-Hoppers-and-other-things.patch} |  0
 ...ializing-mismatching-chunk-coordina.patch} |  0
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  2 +-
 ...357-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0358-Lag-compensate-eating.patch} |  2 +-
 ...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
 ...=> 0362-Entity-Activation-Range-2.0.patch} |  2 +-
 ...h => 0363-Increase-Light-Queue-Size.patch} |  0
 ...and.patch => 0364-Fix-Light-Command.patch} |  0
 ...4-Anti-Xray.patch => 0365-Anti-Xray.patch} |  2 +-
 ...o-Tick-view-distance-implementation.patch} |  2 +-
 ...ement-alternative-item-despawn-rate.patch} |  2 +-
 ...=> 0368-Tracking-Range-Improvements.patch} |  2 +-
 ...-items-vanishing-through-end-portal.patch} |  2 +-
 ...ment-optional-per-player-mob-spawns.patch} |  6 +--
 ...pper-searches-if-there-are-no-items.patch} |  4 +-
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  2 +-
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  2 +-
 ...0374-Add-debug-for-sync-chunk-loads.patch} |  0
 ...w-overriding-the-java-version-check.patch} |  0
 ...tch => 0376-Add-ThrownEggHatchEvent.patch} |  0
 ... 0377-Optimise-random-block-ticking.patch} |  4 +-
 ...p-API.patch => 0378-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0380-Make-the-GUI-graph-fancier.patch} |  0
 ...81-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...2-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 => 0386-Optimise-Chunk-getFluid.patch} |  0
 ...mise-TickListServer-by-rewriting-it.patch} |  0
 ...pawn-settings-and-per-player-option.patch} |  0
 ...nections-shouldn-t-hold-up-shutdown.patch} |  0
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} |  0
 ...timize-Collision-to-not-load-chunks.patch} |  0
 ...tch => 0393-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} |  0
 ...ove-existing-players-to-world-spawn.patch} |  0
 ...Add-tick-times-API-and-mspt-command.patch} |  0
 ...99-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...1-Remove-streams-from-Mob-AI-System.patch} |  0
 ... => 0402-Async-command-map-building.patch} |  0
 ...h => 0403-Improved-Watchdog-Support.patch} |  4 +-
 ....patch => 0404-Optimize-Pathfinding.patch} |  0
 ...5-Reduce-Either-Optional-allocation.patch} |  0
 ...406-Remove-streams-from-PairedQueue.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...09-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
 ...5-Broadcast-join-message-to-console.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  0
 ...oad-Chunks-for-Login-Asynchronously.patch} |  0
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...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} |  0
 ...0424-Implement-Brigadier-Mojang-API.patch} |  0
 ...patch => 0425-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  0
 ...n.patch => 0427-Expose-game-version.patch} |  0
 ...> 0428-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ...atch => 0430-Implement-Mob-Goal-API.patch} |  0
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...isOutsideRange-to-use-distance-maps.patch} |  0
 ...=> 0433-Add-villager-reputation-API.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ...tch => 0435-ExperienceOrbMergeEvent.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...API.patch => 0438-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} |  2 +-
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  0
 ...> 0444-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
 ... => 0449-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...ch => 0453-incremental-chunk-saving.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  0
 ...uping.patch => 0458-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0461-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...4-Add-permission-for-command-blocks.patch} |  0
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...orldBorder-collision-checks-and-air.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  0
 ...atch => 0468-Paper-dumpitem-command.patch} |  0
 ...69-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...e-operations-for-updating-light-dat.patch} |  0
 ...472-Support-old-UUID-format-for-NBT.patch} |  0
 ...p-duplicated-GameProfile-Properties.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} |  0
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...0478-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0480-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  0
 ...atch => 0483-Add-PrepareResultEvent.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-5989.patch => 0491-Fix-SPIGOT-5989.patch} |  0
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...h => 0497-Incremental-player-saving.patch} |  0
 ...Fix-MC-187716-Use-configured-height.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0501-Brand-support.patch} |  0
 ...patch => 0502-Add-setMaxPlayers-API.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0504-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0506-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0508-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0510-Buffer-joins-to-world.patch} |  0
 ...=> 0511-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0514-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0515-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0518-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0526-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...g-a-passenger-in-CreatureSpawnEvent.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0532-Optimise-getType-calls.patch} |  0
 ....patch => 0533-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  2 +-
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0538-Player-elytra-boost-API.patch} |  0
 ...39-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0542-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  0
 ...> 0545-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...547-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0548-Add-API-for-quit-reason.patch} |  0
 ...h => 0549-Seed-based-feature-search.patch} |  0
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...ch => 0552-Expose-world-spawn-angle.patch} |  0
 ...patch => 0553-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...55-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0556-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0557-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  0
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0560-Add-PlayerShearBlockEvent.patch} |  0
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  0
 ....patch => 0563-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0565-MC-4-Fix-item-position-desync.patch} |  0
 ...566-Player-Chunk-Load-Unload-Events.patch} |  0
 ...7-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...-invalid-ingredient-lists-in-Villag.patch} |  0
 ...atch => 0571-added-PlayerTradeEvent.patch} |  0
 ...ch => 0572-Implement-TargetHitEvent.patch} |  0
 ...573-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0574-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0576-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  0
 ...h => 0581-Zombie-API-breaking-doors.patch} |  0
 ...582-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0583-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0584-Guardian-beam-workaround.patch} |  0
 ...0585-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...mplemented-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  0
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...I-to-expose-exact-interaction-point.patch} |  0
 ...OIs.patch => 0594-Remove-stale-POIs.patch} |  0
 ...h => 0595-Fix-villager-boat-exploit.patch} |  0
 ...I.patch => 0596-Add-sendOpLevel-API.patch} |  0
 ...ch => 0597-Add-StructureLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  0
 ...leHitEvent-call-when-fireballs-dead.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...601-Make-schedule-command-per-world.patch} |  0
 ...602-Configurable-max-leash-distance.patch} |  0
 ...603-Implement-BlockPreDispenseEvent.patch} |  0
 ...h => 0604-Added-Vanilla-Entity-Tags.patch} |  0
 ...-API.patch => 0605-added-Wither-API.patch} |  0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...-spam-when-removing-chests-in-water.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  0
 ...e-map-update-when-spawning-disabled.patch} |  0
 ...shield-blocking-on-dimension-change.patch} |  0
 ...atch => 0613-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0614-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0616-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...ix-dead-slime-setSize-invincibility.patch} |  0
 ...pes-should-return-an-immutable-list.patch} |  0
 ....patch => 0622-misc-debugging-dumps.patch} |  0
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...atch => 0624-Expose-Tracked-Players.patch} |  0
 ...5-Remove-streams-from-SensorNearest.patch} |  0
 ...ix-Wither-hostility-towards-players.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  0
 ...GUI.patch => 0628-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...630-fix-converting-txt-to-json-file.patch} |  0
 ...atch => 0631-Add-worldborder-events.patch} |  0
 ...=> 0632-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0634-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0635-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ...ch => 0637-Implement-Keyed-on-World.patch} |  0
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0639-Item-Rarity-API.patch} |  0
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...py-TESign-isEditable-from-snapshots.patch} |  0
 ...d-item-when-player-has-disconnected.patch} |  0
 ...elist-use-configurable-kick-message.patch} |  0
 ...gnore-result-of-PlayerEditBookEvent.patch} |  0
 ...block-falling-causing-client-desync.patch} |  0
 ...tch => 0646-Expose-protocol-version.patch} |  0
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |  0
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  0
 ...patch => 0650-Add-bypass-host-check.patch} |  0
 ...0651-Set-area-affect-cloud-rotation.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...ting-give-items-on-item-drop-cancel.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ...ix-PigZombieAngerEvent-cancellation.patch} |  0
 ...-checkReach-check-for-Shulker-boxes.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ... => 0659-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0660-More-World-API.patch} |  0
 ... 0661-Added-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |  0
 ...acon-activation-deactivation-events.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  0
 ...dd-Channel-initialization-listeners.patch} |  0
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0668-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0672-Inventory-close.patch} |  0
 ...reateEvent-players-and-end-platform.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0675-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0676-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  0
 ...fo.patch => 0679-Clear-SyncLoadInfo.patch} |  0
 ... => 0680-ItemStack-repair-check-API.patch} |  0
 ....patch => 0681-More-Enchantment-API.patch} |  0
 ...option-to-load-extra-plugin-jars-no.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  2 +-
 ...PI.patch => 0684-Add-Mob-lookAt-API.patch} |  0
 ...0685-Add-Unix-domain-socket-support.patch} |  0
 ... => 0686-Add-EntityInsideBlockEvent.patch} |  0
 ...87-Attributes-API-for-item-defaults.patch} |  0
 ...hantCustom-emit-PlayerPurchaseEvent.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...patch => 0690-More-Lidded-Block-API.patch} |  0
 ...91-Limit-item-frame-cursors-on-maps.patch} |  0
 ...0692-Add-PufferFishStateChangeEvent.patch} |  0
 ... => 0693-Add-PlayerKickEvent-causes.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ReentrantLo.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0697-Add-BellRevealRaiderEvent.patch} |  0
 ... 0698-Fix-invulnerable-end-crystals.patch} |  0
 ...99-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...inventory-on-cancelled-pickup-event.patch} |  0
 ...0701-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...0704-Add-more-line-of-sight-methods.patch} |  0
 ... => 0705-add-per-world-spawn-limits.patch} |  0
 ...plashEvent-for-water-splash-potions.patch} |  0
 ...tus-dataconverter-for-pre-1.13-chun.patch} |  0
 544 files changed, 148 insertions(+), 126 deletions(-)
 delete mode 100644 patches/removed/1.17/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
 create mode 100644 patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
 rename patches/server/{0166-use-CB-BlockState-implementations-for-captured-block.patch => 0167-use-CB-BlockState-implementations-for-captured-block.patch} (97%)
 rename patches/server/{0167-API-to-get-a-BlockState-without-a-snapshot.patch => 0168-API-to-get-a-BlockState-without-a-snapshot.patch} (98%)
 rename patches/server/{0168-AsyncTabCompleteEvent.patch => 0169-AsyncTabCompleteEvent.patch} (100%)
 rename patches/server/{0169-PlayerPickupExperienceEvent.patch => 0170-PlayerPickupExperienceEvent.patch} (100%)
 rename patches/server/{0170-Ability-to-apply-mending-to-XP-API.patch => 0171-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename patches/server/{0171-Make-max-squid-spawn-height-configurable.patch => 0172-Make-max-squid-spawn-height-configurable.patch} (95%)
 rename patches/server/{0172-PlayerNaturallySpawnCreaturesEvent.patch => 0173-PlayerNaturallySpawnCreaturesEvent.patch} (94%)
 rename patches/server/{0173-PreCreatureSpawnEvent.patch => 0174-PreCreatureSpawnEvent.patch} (99%)
 rename patches/server/{0174-Add-setPlayerProfile-API-for-Skulls.patch => 0175-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/server/{0175-Fill-Profile-Property-Events.patch => 0176-Fill-Profile-Property-Events.patch} (100%)
 rename patches/server/{0176-PlayerAdvancementCriterionGrantEvent.patch => 0177-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename patches/server/{0177-Add-ArmorStand-Item-Meta.patch => 0178-Add-ArmorStand-Item-Meta.patch} (100%)
 rename patches/server/{0178-Extend-Player-Interact-cancellation.patch => 0179-Extend-Player-Interact-cancellation.patch} (100%)
 rename patches/server/{0179-Tameable-getOwnerUniqueId-API.patch => 0180-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename patches/server/{0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (95%)
 rename patches/server/{0181-Disable-Explicit-Network-Manager-Flushing.patch => 0182-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename patches/server/{0182-Implement-extended-PaperServerListPingEvent.patch => 0183-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename patches/server/{0183-Improved-Async-Task-Scheduler.patch => 0184-Improved-Async-Task-Scheduler.patch} (100%)
 rename patches/server/{0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (96%)
 rename patches/server/{0185-Player.setPlayerProfile-API.patch => 0186-Player.setPlayerProfile-API.patch} (97%)
 rename patches/server/{0186-getPlayerUniqueId-API.patch => 0187-getPlayerUniqueId-API.patch} (100%)
 rename patches/server/{0187-Make-player-data-saving-configurable.patch => 0188-Make-player-data-saving-configurable.patch} (100%)
 rename patches/server/{0188-Make-legacy-ping-handler-more-reliable.patch => 0189-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename patches/server/{0189-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0190-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename patches/server/{0190-Flag-to-disable-the-channel-limit.patch => 0191-Flag-to-disable-the-channel-limit.patch} (100%)
 rename patches/server/{0191-Add-method-to-open-already-placed-sign.patch => 0192-Add-method-to-open-already-placed-sign.patch} (100%)
 rename patches/server/{0192-Configurable-sprint-interruption-on-attack.patch => 0193-Configurable-sprint-interruption-on-attack.patch} (95%)
 rename patches/server/{0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (93%)
 rename patches/server/{0194-EndermanEscapeEvent.patch => 0195-EndermanEscapeEvent.patch} (100%)
 rename patches/server/{0195-Enderman.teleportRandomly.patch => 0196-Enderman.teleportRandomly.patch} (100%)
 rename patches/server/{0196-Block-Enderpearl-Travel-Exploit.patch => 0197-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename patches/server/{0197-Expand-World.spawnParticle-API-and-add-Builder.patch => 0198-Expand-World.spawnParticle-API-and-add-Builder.patch} (97%)
 rename patches/server/{0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename patches/server/{0199-EndermanAttackPlayerEvent.patch => 0200-EndermanAttackPlayerEvent.patch} (100%)
 rename patches/server/{0200-WitchConsumePotionEvent.patch => 0201-WitchConsumePotionEvent.patch} (100%)
 rename patches/server/{0201-WitchThrowPotionEvent.patch => 0202-WitchThrowPotionEvent.patch} (100%)
 rename patches/server/{0202-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename patches/server/{0203-WitchReadyPotionEvent.patch => 0204-WitchReadyPotionEvent.patch} (100%)
 rename patches/server/{0204-ItemStack-getMaxItemUseDuration.patch => 0205-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/server/{0205-Implement-EntityTeleportEndGatewayEvent.patch => 0206-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename patches/server/{0207-Fix-CraftEntity-hashCode.patch => 0208-Fix-CraftEntity-hashCode.patch} (100%)
 rename patches/server/{0208-Configurable-Alternative-LootPool-Luck-Formula.patch => 0209-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename patches/server/{0209-Print-Error-details-when-failing-to-save-player-data.patch => 0210-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename patches/server/{0210-Make-shield-blocking-delay-configurable.patch => 0211-Make-shield-blocking-delay-configurable.patch} (97%)
 rename patches/server/{0211-Improve-EntityShootBowEvent.patch => 0212-Improve-EntityShootBowEvent.patch} (100%)
 rename patches/server/{0212-PlayerReadyArrowEvent.patch => 0213-PlayerReadyArrowEvent.patch} (95%)
 rename patches/server/{0213-Implement-EntityKnockbackByEntityEvent.patch => 0214-Implement-EntityKnockbackByEntityEvent.patch} (95%)
 rename patches/server/{0214-Expand-Explosions-API.patch => 0215-Expand-Explosions-API.patch} (100%)
 rename patches/server/{0215-LivingEntity-Hand-Raised-Item-Use-API.patch => 0216-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/server/{0216-RangedEntity-API.patch => 0217-RangedEntity-API.patch} (100%)
 rename patches/server/{0217-Add-config-to-disable-ender-dragon-legacy-check.patch => 0218-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename patches/server/{0218-Implement-World.getEntity-UUID-API.patch => 0219-Implement-World.getEntity-UUID-API.patch} (100%)
 rename patches/server/{0219-InventoryCloseEvent-Reason-API.patch => 0220-InventoryCloseEvent-Reason-API.patch} (97%)
 rename patches/server/{0220-Vex-get-setSummoner-API.patch => 0221-Vex-get-setSummoner-API.patch} (100%)
 rename patches/server/{0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (94%)
 rename patches/server/{0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (100%)
 rename patches/server/{0223-Use-asynchronous-Log4j-2-loggers.patch => 0224-Use-asynchronous-Log4j-2-loggers.patch} (96%)
 rename patches/server/{0224-add-more-information-to-Entity.toString.patch => 0225-add-more-information-to-Entity.toString.patch} (93%)
 rename patches/server/{0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename patches/server/{0226-EnderDragon-Events.patch => 0227-EnderDragon-Events.patch} (100%)
 rename patches/server/{0227-PlayerElytraBoostEvent.patch => 0228-PlayerElytraBoostEvent.patch} (100%)
 rename patches/server/{0228-PlayerLaunchProjectileEvent.patch => 0229-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/server/{0229-Improve-BlockPosition-inlining.patch => 0230-Improve-BlockPosition-inlining.patch} (96%)
 rename patches/server/{0230-Optimize-IntIdentityHashBiMiap-nextId.patch => 0231-Optimize-IntIdentityHashBiMiap-nextId.patch} (100%)
 rename patches/server/{0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (91%)
 rename patches/server/{0232-Vanished-players-don-t-have-rights.patch => 0233-Vanished-players-don-t-have-rights.patch} (97%)
 rename patches/server/{0233-Allow-disabling-armour-stand-ticking.patch => 0234-Allow-disabling-armour-stand-ticking.patch} (98%)
 rename patches/server/{0234-SkeletonHorse-Additions.patch => 0235-SkeletonHorse-Additions.patch} (100%)
 rename patches/server/{0235-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0236-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename patches/server/{0236-Implement-Expanded-ArmorStand-API.patch => 0237-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename patches/server/{0237-AnvilDamageEvent.patch => 0238-AnvilDamageEvent.patch} (100%)
 rename patches/server/{0238-Add-hand-to-bucket-events.patch => 0239-Add-hand-to-bucket-events.patch} (97%)
 rename patches/server/{0239-Add-TNTPrimeEvent.patch => 0240-Add-TNTPrimeEvent.patch} (98%)
 rename patches/server/{0240-Break-up-and-make-tab-spam-limits-configurable.patch => 0241-Break-up-and-make-tab-spam-limits-configurable.patch} (98%)
 rename patches/server/{0241-MC-135506-Experience-should-save-as-Integers.patch => 0242-MC-135506-Experience-should-save-as-Integers.patch} (100%)
 rename patches/server/{0242-Fix-client-rendering-skulls-from-same-user.patch => 0243-Fix-client-rendering-skulls-from-same-user.patch} (100%)
 rename patches/server/{0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (95%)
 rename patches/server/{0244-Add-Early-Warning-Feature-to-WatchDog.patch => 0245-Add-Early-Warning-Feature-to-WatchDog.patch} (100%)
 rename patches/server/{0245-Make-EnderDragon-implement-Mob.patch => 0246-Make-EnderDragon-implement-Mob.patch} (100%)
 rename patches/server/{0246-Use-ConcurrentHashMap-in-JsonList.patch => 0247-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename patches/server/{0247-Use-a-Queue-for-Queueing-Commands.patch => 0248-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename patches/server/{0248-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename patches/server/{0249-Optimize-BlockPosition-helper-methods.patch => 0250-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename patches/server/{0250-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch => 0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch} (93%)
 rename patches/server/{0251-Slime-Pathfinder-Events.patch => 0252-Slime-Pathfinder-Events.patch} (98%)
 rename patches/server/{0252-Configurable-speed-for-water-flowing-over-lava.patch => 0253-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0253-Optimize-CraftBlockData-Creation.patch => 0254-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0254-Optimize-MappedRegistry.patch => 0255-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0255-Add-PhantomPreSpawnEvent.patch => 0256-Add-PhantomPreSpawnEvent.patch} (98%)
 rename patches/server/{0256-Add-More-Creeper-API.patch => 0257-Add-More-Creeper-API.patch} (100%)
 rename patches/server/{0257-Inventory-removeItemAnySlot.patch => 0258-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0258-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename patches/server/{0259-Asynchronous-chunk-IO-and-loading.patch => 0260-Asynchronous-chunk-IO-and-loading.patch} (100%)
 rename patches/server/{0260-Add-ray-tracing-methods-to-LivingEntity.patch => 0261-Add-ray-tracing-methods-to-LivingEntity.patch} (96%)
 rename patches/server/{0261-Expose-attack-cooldown-methods-for-Player.patch => 0262-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/server/{0262-Improve-death-events.patch => 0263-Improve-death-events.patch} (100%)
 rename patches/server/{0263-Allow-chests-to-be-placed-with-NBT-data.patch => 0264-Allow-chests-to-be-placed-with-NBT-data.patch} (94%)
 rename patches/server/{0264-Mob-Pathfinding-API.patch => 0265-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0265-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0266-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0266-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename patches/server/{0267-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0268-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0269-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename patches/server/{0269-Implement-furnace-cook-speed-multiplier-API.patch => 0270-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0270-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0271-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename patches/server/{0271-Honor-EntityAgeable.ageLock.patch => 0272-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0272-Configurable-connection-throttle-kick-message.patch => 0273-Configurable-connection-throttle-kick-message.patch} (100%)
 rename patches/server/{0273-Hook-into-CB-plugin-rewrites.patch => 0274-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0274-Add-sun-related-API.patch => 0275-Add-sun-related-API.patch} (100%)
 rename patches/server/{0275-Add-LivingEntity-getTargetEntity.patch => 0276-Add-LivingEntity-getTargetEntity.patch} (98%)
 rename patches/server/{0276-Turtle-API.patch => 0277-Turtle-API.patch} (100%)
 rename patches/server/{0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0278-Call-player-spectator-target-events-and-improve-impl.patch => 0279-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename patches/server/{0279-Add-Velocity-IP-Forwarding-Support.patch => 0280-Add-Velocity-IP-Forwarding-Support.patch} (98%)
 rename patches/server/{0280-Add-more-Witch-API.patch => 0281-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0281-Check-Drowned-for-Villager-Aggression-Config.patch => 0282-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0282-Here-s-Johnny.patch => 0283-Here-s-Johnny.patch} (100%)
 rename patches/server/{0283-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0284-Add-option-to-prevent-players-from-moving-into-unloa.patch} (97%)
 rename patches/server/{0284-Reset-players-airTicks-on-respawn.patch => 0285-Reset-players-airTicks-on-respawn.patch} (86%)
 rename patches/server/{0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (98%)
 rename patches/server/{0287-Optimize-World-Time-Updates.patch => 0288-Optimize-World-Time-Updates.patch} (100%)
 rename patches/server/{0288-Restore-custom-InventoryHolder-support.patch => 0289-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0289-Use-Vanilla-Minecart-Speeds.patch => 0290-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0290-Fix-SpongeAbsortEvent-handling.patch => 0291-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0291-PreSpawnerSpawnEvent.patch => 0292-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/server/{0292-Don-t-allow-digging-into-unloaded-chunks.patch => 0293-Don-t-allow-digging-into-unloaded-chunks.patch} (97%)
 rename patches/server/{0293-Make-the-default-permission-message-configurable.patch => 0294-Make-the-default-permission-message-configurable.patch} (100%)
 rename patches/server/{0294-Prevent-rayTrace-from-loading-chunks.patch => 0295-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0295-Handle-Large-Packets-disconnecting-client.patch => 0296-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0296-force-entity-dismount-during-teleportation.patch => 0297-force-entity-dismount-during-teleportation.patch} (98%)
 rename patches/server/{0297-Add-more-Zombie-API.patch => 0298-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0298-Book-Size-Limits.patch => 0299-Book-Size-Limits.patch} (97%)
 rename patches/server/{0299-Add-PlayerConnectionCloseEvent.patch => 0300-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/server/{0300-Prevent-Enderman-from-loading-chunks.patch => 0301-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0301-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (98%)
 rename patches/server/{0302-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (91%)
 rename patches/server/{0303-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename patches/server/{0304-Block-Entity-remove-from-being-called-on-Players.patch => 0305-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename patches/server/{0305-BlockDestroyEvent.patch => 0306-BlockDestroyEvent.patch} (96%)
 rename patches/server/{0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename patches/server/{0307-Limit-Client-Sign-length-more.patch => 0308-Limit-Client-Sign-length-more.patch} (97%)
 rename patches/server/{0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename patches/server/{0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0310-Handle-Oversized-Tile-Entities-in-chunks.patch => 0311-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0311-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (100%)
 rename patches/server/{0312-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (90%)
 rename patches/server/{0313-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename patches/server/{0314-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename patches/server/{0315-Entity-getEntitySpawnReason.patch => 0316-Entity-getEntitySpawnReason.patch} (97%)
 rename patches/server/{0316-Update-entity-Metadata-for-all-tracked-players.patch => 0317-Update-entity-Metadata-for-all-tracked-players.patch} (96%)
 rename patches/server/{0317-Fire-event-on-GS4-query.patch => 0318-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0318-Implement-PlayerPostRespawnEvent.patch => 0319-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename patches/server/{0319-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0320-Server-Tick-Events.patch => 0321-Server-Tick-Events.patch} (100%)
 rename patches/server/{0321-PlayerDeathEvent-getItemsToKeep.patch => 0322-PlayerDeathEvent-getItemsToKeep.patch} (96%)
 rename patches/server/{0322-Optimize-Captured-TileEntity-Lookup.patch => 0323-Optimize-Captured-TileEntity-Lookup.patch} (90%)
 rename patches/server/{0323-Add-Heightmap-API.patch => 0324-Add-Heightmap-API.patch} (100%)
 rename patches/server/{0324-Mob-Spawner-API-Enhancements.patch => 0325-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/server/{0325-Fix-CB-call-to-changed-postToMainThread-method.patch => 0326-Fix-CB-call-to-changed-postToMainThread-method.patch} (91%)
 rename patches/server/{0326-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0327-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename patches/server/{0328-improve-CraftWorld-isChunkLoaded.patch => 0329-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename patches/server/{0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (99%)
 rename patches/server/{0330-ChunkMapDistance-CME.patch => 0331-ChunkMapDistance-CME.patch} (97%)
 rename patches/server/{0331-Implement-CraftBlockSoundGroup.patch => 0332-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0332-Chunk-debug-command.patch => 0333-Chunk-debug-command.patch} (100%)
 rename patches/server/{0333-Fix-World-isChunkGenerated-calls.patch => 0334-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename patches/server/{0334-Show-blockstate-location-if-we-failed-to-read-it.patch => 0335-Show-blockstate-location-if-we-failed-to-read-it.patch} (94%)
 rename patches/server/{0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename patches/server/{0336-Configurable-projectile-relative-velocity.patch => 0337-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0337-offset-item-frame-ticking.patch => 0338-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0338-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0339-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (100%)
 rename patches/server/{0339-Fix-MC-158900.patch => 0340-Fix-MC-158900.patch} (100%)
 rename patches/server/{0340-Prevent-consuming-the-wrong-itemstack.patch => 0341-Prevent-consuming-the-wrong-itemstack.patch} (96%)
 rename patches/server/{0341-Generator-Settings.patch => 0342-Generator-Settings.patch} (99%)
 rename patches/server/{0342-Fix-MC-161754.patch => 0343-Fix-MC-161754.patch} (100%)
 rename patches/server/{0343-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0344-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename patches/server/{0344-Expose-the-internal-current-tick.patch => 0345-Expose-the-internal-current-tick.patch} (100%)
 rename patches/server/{0345-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0346-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (94%)
 rename patches/server/{0346-Add-option-to-disable-pillager-patrols.patch => 0347-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0347-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0348-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (92%)
 rename patches/server/{0348-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0349-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0349-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0350-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0350-Optimize-Hoppers.patch => 0351-Optimize-Hoppers.patch} (99%)
 rename patches/server/{0351-PlayerDeathEvent-shouldDropExperience.patch => 0352-PlayerDeathEvent-shouldDropExperience.patch} (91%)
 rename patches/server/{0352-Prevent-bees-loading-chunks-checking-hive-position.patch => 0353-Prevent-bees-loading-chunks-checking-hive-position.patch} (91%)
 rename patches/server/{0353-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0354-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0354-Guard-against-serializing-mismatching-chunk-coordina.patch => 0355-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0355-Optimise-IEntityAccess-getPlayerByUUID.patch => 0356-Optimise-IEntityAccess-getPlayerByUUID.patch} (94%)
 rename patches/server/{0356-Fix-items-not-falling-correctly.patch => 0357-Fix-items-not-falling-correctly.patch} (100%)
 rename patches/server/{0357-Lag-compensate-eating.patch => 0358-Lag-compensate-eating.patch} (97%)
 rename patches/server/{0358-Optimize-call-to-getFluid-for-explosions.patch => 0359-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0359-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0360-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0360-Add-effect-to-block-break-naturally.patch => 0361-Add-effect-to-block-break-naturally.patch} (100%)
 rename patches/server/{0361-Entity-Activation-Range-2.0.patch => 0362-Entity-Activation-Range-2.0.patch} (99%)
 rename patches/server/{0362-Increase-Light-Queue-Size.patch => 0363-Increase-Light-Queue-Size.patch} (100%)
 rename patches/server/{0363-Fix-Light-Command.patch => 0364-Fix-Light-Command.patch} (100%)
 rename patches/server/{0364-Anti-Xray.patch => 0365-Anti-Xray.patch} (99%)
 rename patches/server/{0365-No-Tick-view-distance-implementation.patch => 0366-No-Tick-view-distance-implementation.patch} (99%)
 rename patches/server/{0366-Implement-alternative-item-despawn-rate.patch => 0367-Implement-alternative-item-despawn-rate.patch} (98%)
 rename patches/server/{0367-Tracking-Range-Improvements.patch => 0368-Tracking-Range-Improvements.patch} (97%)
 rename patches/server/{0368-Fix-items-vanishing-through-end-portal.patch => 0369-Fix-items-vanishing-through-end-portal.patch} (93%)
 rename patches/server/{0369-implement-optional-per-player-mob-spawns.patch => 0370-implement-optional-per-player-mob-spawns.patch} (99%)
 rename patches/server/{0370-Avoid-hopper-searches-if-there-are-no-items.patch => 0371-Avoid-hopper-searches-if-there-are-no-items.patch} (97%)
 rename patches/server/{0371-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0372-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (94%)
 rename patches/server/{0372-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0373-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (96%)
 rename patches/server/{0373-Add-debug-for-sync-chunk-loads.patch => 0374-Add-debug-for-sync-chunk-loads.patch} (100%)
 rename patches/server/{0374-Allow-overriding-the-java-version-check.patch => 0375-Allow-overriding-the-java-version-check.patch} (100%)
 rename patches/server/{0375-Add-ThrownEggHatchEvent.patch => 0376-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0376-Optimise-random-block-ticking.patch => 0377-Optimise-random-block-ticking.patch} (99%)
 rename patches/server/{0377-Entity-Jump-API.patch => 0378-Entity-Jump-API.patch} (100%)
 rename patches/server/{0378-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0379-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename patches/server/{0379-Make-the-GUI-graph-fancier.patch => 0380-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0380-add-hand-to-BlockMultiPlaceEvent.patch => 0381-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0381-Prevent-teleporting-dead-entities.patch => 0382-Prevent-teleporting-dead-entities.patch} (100%)
 rename patches/server/{0382-Validate-tripwire-hook-placement-before-update.patch => 0383-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0383-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0384-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0384-Configurable-chance-of-villager-zombie-infection.patch => 0385-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0385-Optimise-Chunk-getFluid.patch => 0386-Optimise-Chunk-getFluid.patch} (100%)
 rename patches/server/{0386-Optimise-TickListServer-by-rewriting-it.patch => 0387-Optimise-TickListServer-by-rewriting-it.patch} (100%)
 rename patches/server/{0387-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0388-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename patches/server/{0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0389-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0390-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0391-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename patches/server/{0391-Optimize-Collision-to-not-load-chunks.patch => 0392-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename patches/server/{0392-Don-t-tick-dead-players.patch => 0393-Don-t-tick-dead-players.patch} (100%)
 rename patches/server/{0393-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0394-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0394-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0395-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (100%)
 rename patches/server/{0395-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0396-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (100%)
 rename patches/server/{0396-Don-t-move-existing-players-to-world-spawn.patch => 0397-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename patches/server/{0397-Add-tick-times-API-and-mspt-command.patch => 0398-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename patches/server/{0398-Expose-MinecraftServer-isRunning.patch => 0399-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/server/{0399-Add-Raw-Byte-ItemStack-Serialization.patch => 0400-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0400-Remove-streams-from-Mob-AI-System.patch => 0401-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename patches/server/{0401-Async-command-map-building.patch => 0402-Async-command-map-building.patch} (100%)
 rename patches/server/{0402-Improved-Watchdog-Support.patch => 0403-Improved-Watchdog-Support.patch} (99%)
 rename patches/server/{0403-Optimize-Pathfinding.patch => 0404-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0404-Reduce-Either-Optional-allocation.patch => 0405-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0405-Remove-streams-from-PairedQueue.patch => 0406-Remove-streams-from-PairedQueue.patch} (100%)
 rename patches/server/{0406-Reduce-memory-footprint-of-NBTTagCompound.patch => 0407-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0407-Prevent-opening-inventories-when-frozen.patch => 0408-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename patches/server/{0408-Optimise-ArraySetSorted-removeIf.patch => 0409-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename patches/server/{0409-Don-t-run-entity-collision-code-if-not-needed.patch => 0410-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0410-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0411-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename patches/server/{0411-Implement-Player-Client-Options-API.patch => 0412-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0412-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0413-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename patches/server/{0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0414-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0414-Broadcast-join-message-to-console.patch => 0415-Broadcast-join-message-to-console.patch} (100%)
 rename patches/server/{0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0416-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename patches/server/{0416-Load-Chunks-for-Login-Asynchronously.patch => 0417-Load-Chunks-for-Login-Asynchronously.patch} (100%)
 rename patches/server/{0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0418-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename patches/server/{0418-Add-PlayerAttackEntityCooldownResetEvent.patch => 0419-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0419-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0420-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (100%)
 rename patches/server/{0420-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0421-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0421-Add-phantom-creative-and-insomniac-controls.patch => 0422-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0423-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename patches/server/{0423-Implement-Brigadier-Mojang-API.patch => 0424-Implement-Brigadier-Mojang-API.patch} (100%)
 rename patches/server/{0424-Villager-Restocks-API.patch => 0425-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0425-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0426-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename patches/server/{0426-Expose-game-version.patch => 0427-Expose-game-version.patch} (100%)
 rename patches/server/{0427-Optimize-Voxel-Shape-Merging.patch => 0428-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0428-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0429-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0429-Implement-Mob-Goal-API.patch => 0430-Implement-Mob-Goal-API.patch} (100%)
 rename patches/server/{0430-Use-distance-map-to-optimise-entity-tracker.patch => 0431-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename patches/server/{0431-Optimize-isOutsideRange-to-use-distance-maps.patch => 0432-Optimize-isOutsideRange-to-use-distance-maps.patch} (100%)
 rename patches/server/{0432-Add-villager-reputation-API.patch => 0433-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0433-Option-for-maximum-exp-value-when-merging-orbs.patch => 0434-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0434-ExperienceOrbMergeEvent.patch => 0435-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0435-Fix-PotionEffect-ignores-icon-flag.patch => 0436-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0436-Optimize-brigadier-child-sorting-performance.patch => 0437-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0437-Potential-bed-API.patch => 0438-Potential-bed-API.patch} (100%)
 rename patches/server/{0438-Wait-for-Async-Tasks-during-shutdown.patch => 0439-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0439-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (99%)
 rename patches/server/{0441-Reduce-MutableInt-allocations-from-light-engine.patch => 0442-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename patches/server/{0443-Ensure-safe-gateway-teleport.patch => 0444-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0444-Add-option-for-console-having-all-permissions.patch => 0445-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0446-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename patches/server/{0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0447-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (100%)
 rename patches/server/{0447-Fix-villager-trading-demand-MC-163962.patch => 0448-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0448-Maps-shouldn-t-load-chunks.patch => 0449-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0450-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0451-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename patches/server/{0451-Optimize-Bit-Operations-by-inlining.patch => 0452-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0452-incremental-chunk-saving.patch => 0453-incremental-chunk-saving.patch} (100%)
 rename patches/server/{0453-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0454-Fix-missing-chunks-due-to-integer-overflow.patch => 0455-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0456-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0456-Fix-piston-physics-inconsistency-MC-188840.patch => 0457-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0457-Fix-sand-duping.patch => 0458-Fix-sand-duping.patch} (100%)
 rename patches/server/{0458-Prevent-position-desync-in-playerconnection-causing-.patch => 0459-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename patches/server/{0459-Inventory-getHolder-method-without-block-snapshot.patch => 0460-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0460-Expose-Arrow-getItemStack.patch => 0461-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/server/{0461-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0462-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0462-Hide-sync-chunk-writes-behind-flag.patch => 0463-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0463-Add-permission-for-command-blocks.patch => 0464-Add-permission-for-command-blocks.patch} (100%)
 rename patches/server/{0464-Ensure-Entity-AABB-s-are-never-invalid.patch => 0465-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0465-Optimize-WorldBorder-collision-checks-and-air.patch => 0466-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename patches/server/{0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0467-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)
 rename patches/server/{0467-Paper-dumpitem-command.patch => 0468-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0468-Don-t-allow-null-UUID-s-for-chat.patch => 0469-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0469-Improve-Legacy-Component-serialization-size.patch => 0470-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0470-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0471-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0471-Support-old-UUID-format-for-NBT.patch => 0472-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0472-Clean-up-duplicated-GameProfile-Properties.patch => 0473-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0473-Convert-legacy-attributes-in-Item-Meta.patch => 0474-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0474-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0475-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (100%)
 rename patches/server/{0475-Remove-some-streams-from-structures.patch => 0476-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0476-Remove-streams-from-classes-related-villager-gossip.patch => 0477-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0477-Support-components-in-ItemMeta.patch => 0478-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0479-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0479-Add-entity-liquid-API.patch => 0480-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0480-Update-itemstack-legacy-name-and-lore.patch => 0481-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0481-Spawn-player-in-correct-world-on-login.patch => 0482-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename patches/server/{0482-Add-PrepareResultEvent.patch => 0483-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0483-Allow-delegation-to-vanilla-chunk-gen.patch => 0484-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0485-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0485-Optimize-NetworkManager-Exception-Handling.patch => 0486-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0486-Optimize-the-advancement-data-player-iteration-to-be.patch => 0487-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0487-Fix-arrows-never-despawning-MC-125757.patch => 0488-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0488-Thread-Safe-Vanilla-Command-permission-checking.patch => 0489-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0489-Move-range-check-for-block-placing-up.patch => 0490-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0490-Fix-SPIGOT-5989.patch => 0491-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0491-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0492-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0492-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0493-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0493-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0494-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0494-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0495-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0495-Fix-some-rails-connecting-improperly.patch => 0496-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0496-Incremental-player-saving.patch => 0497-Incremental-player-saving.patch} (100%)
 rename patches/server/{0497-Fix-MC-187716-Use-configured-height.patch => 0498-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename patches/server/{0498-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0499-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0499-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0500-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0500-Brand-support.patch => 0501-Brand-support.patch} (100%)
 rename patches/server/{0501-Add-setMaxPlayers-API.patch => 0502-Add-setMaxPlayers-API.patch} (100%)
 rename patches/server/{0502-Add-playPickupItemAnimation-to-LivingEntity.patch => 0503-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0503-Don-t-require-FACING-data.patch => 0504-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0504-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0505-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0505-Add-moon-phase-API.patch => 0506-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0506-Prevent-headless-pistons-from-being-created.patch => 0507-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0507-Add-BellRingEvent.patch => 0508-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0508-Add-zombie-targets-turtle-egg-config.patch => 0509-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0509-Buffer-joins-to-world.patch => 0510-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0510-Optimize-redstone-algorithm.patch => 0511-Optimize-redstone-algorithm.patch} (100%)
 rename patches/server/{0511-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0512-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0512-PortalCreateEvent-needs-to-know-its-entity.patch => 0513-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0513-Fix-CraftTeam-null-check.patch => 0514-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0514-Add-more-Evoker-API.patch => 0515-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0515-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0516-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename patches/server/{0516-Create-HoverEvent-from-ItemStack-Entity.patch => 0517-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0517-Cache-block-data-strings.patch => 0518-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0518-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0519-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename patches/server/{0519-Add-additional-open-container-api-to-HumanEntity.patch => 0520-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0520-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0521-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0521-Extend-block-drop-capture-to-capture-all-items-added.patch => 0522-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0522-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0523-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename patches/server/{0523-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0524-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0524-Lazily-track-plugin-scoreboards-by-default.patch => 0525-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0525-Entity-isTicking.patch => 0526-Entity-isTicking.patch} (100%)
 rename patches/server/{0526-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0527-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0527-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0528-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (100%)
 rename patches/server/{0528-Fix-Concurrency-issue-in-WeightedList.patch => 0529-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename patches/server/{0529-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0530-Fix-for-large-move-vectors-crashing-server.patch => 0531-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0531-Optimise-getType-calls.patch => 0532-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0532-Villager-resetOffers.patch => 0533-Villager-resetOffers.patch} (100%)
 rename patches/server/{0533-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0534-Retain-block-place-order-when-capturing-blockstates.patch => 0535-Retain-block-place-order-when-capturing-blockstates.patch} (93%)
 rename patches/server/{0535-Reduce-blockpos-allocation-from-pathfinding.patch => 0536-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0536-Fix-item-locations-dropped-from-campfires.patch => 0537-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0537-Player-elytra-boost-API.patch => 0538-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0538-Fixed-TileEntityBell-memory-leak.patch => 0539-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0539-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0540-Add-getOfflinePlayerIfCached-String.patch => 0541-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0541-Add-ignore-discounts-API.patch => 0542-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0542-Toggle-for-removing-existing-dragon.patch => 0543-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0543-Fix-client-lag-on-advancement-loading.patch => 0544-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0544-Item-no-age-no-player-pickup.patch => 0545-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0545-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0546-Beacon-API-custom-effect-ranges.patch => 0547-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0547-Add-API-for-quit-reason.patch => 0548-Add-API-for-quit-reason.patch} (100%)
 rename patches/server/{0548-Seed-based-feature-search.patch => 0549-Seed-based-feature-search.patch} (100%)
 rename patches/server/{0549-Add-Wandering-Trader-spawn-rate-config-options.patch => 0550-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0550-Significantly-improve-performance-of-the-end-generat.patch => 0551-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0551-Expose-world-spawn-angle.patch => 0552-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0552-Add-Destroy-Speed-API.patch => 0553-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0553-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0554-Add-LivingEntity-clearActiveItem.patch => 0555-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0555-Add-PlayerItemCooldownEvent.patch => 0556-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0556-More-lightning-API.patch => 0557-More-lightning-API.patch} (100%)
 rename patches/server/{0557-Climbing-should-not-bypass-cramming-gamerule.patch => 0558-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename patches/server/{0558-Added-missing-default-perms-for-commands.patch => 0559-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0559-Add-PlayerShearBlockEvent.patch => 0560-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0560-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0561-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0561-Fix-curing-zombie-villager-discount-exploit.patch => 0562-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0562-Limit-recipe-packets.patch => 0563-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0563-Fix-CraftSound-backwards-compatibility.patch => 0564-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0564-MC-4-Fix-item-position-desync.patch => 0565-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0565-Player-Chunk-Load-Unload-Events.patch => 0566-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0566-Optimize-Dynamic-get-Missing-Keys.patch => 0567-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0567-Expose-LivingEntity-hurt-direction.patch => 0568-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0568-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0569-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0570-added-PlayerTradeEvent.patch => 0571-added-PlayerTradeEvent.patch} (100%)
 rename patches/server/{0571-Implement-TargetHitEvent.patch => 0572-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0572-Additional-Block-Material-API-s.patch => 0573-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0573-Fix-harming-potion-dupe.patch => 0574-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0574-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0575-Cache-burn-durations.patch => 0576-Cache-burn-durations.patch} (100%)
 rename patches/server/{0576-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0577-Fix-Not-a-string-Map-Conversion-spam.patch => 0578-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0578-Implement-PlayerFlowerPotManipulateEvent.patch => 0579-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0579-Fix-interact-event-not-being-called-in-adventure.patch => 0580-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0580-Zombie-API-breaking-doors.patch => 0581-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0581-Fix-nerfed-slime-when-splitting.patch => 0582-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0582-Add-EntityLoadCrossbowEvent.patch => 0583-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0583-Guardian-beam-workaround.patch => 0584-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0584-Added-WorldGameRuleChangeEvent.patch => 0585-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0585-Added-ServerResourcesReloadedEvent.patch => 0586-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0586-Added-world-settings-for-mobs-picking-up-loot.patch => 0587-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0587-Implemented-BlockFailedDispenseEvent.patch => 0588-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0588-Added-PlayerLecternPageChangeEvent.patch => 0589-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0589-Added-PlayerLoomPatternSelectEvent.patch => 0590-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0590-Configurable-door-breaking-difficulty.patch => 0591-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0591-Empty-commands-shall-not-be-dispatched.patch => 0592-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0592-Implement-API-to-expose-exact-interaction-point.patch => 0593-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0593-Remove-stale-POIs.patch => 0594-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0594-Fix-villager-boat-exploit.patch => 0595-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0595-Add-sendOpLevel-API.patch => 0596-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0596-Add-StructureLocateEvent.patch => 0597-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0597-Collision-option-for-requiring-a-player-participant.patch => 0598-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0598-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0599-Return-chat-component-with-empty-text-instead-of-thr.patch => 0600-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0600-Make-schedule-command-per-world.patch => 0601-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0601-Configurable-max-leash-distance.patch => 0602-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0602-Implement-BlockPreDispenseEvent.patch => 0603-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0603-Added-Vanilla-Entity-Tags.patch => 0604-Added-Vanilla-Entity-Tags.patch} (100%)
 rename patches/server/{0604-added-Wither-API.patch => 0605-added-Wither-API.patch} (100%)
 rename patches/server/{0605-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0606-Fix-console-spam-when-removing-chests-in-water.patch => 0607-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename patches/server/{0607-Add-toggle-for-always-placing-the-dragon-egg.patch => 0608-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0608-Added-PlayerStonecutterRecipeSelectEvent.patch => 0609-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0609-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0610-Skip-distance-map-update-when-spawning-disabled.patch => 0611-Skip-distance-map-update-when-spawning-disabled.patch} (100%)
 rename patches/server/{0611-Reset-shield-blocking-on-dimension-change.patch => 0612-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0612-add-DragonEggFormEvent.patch => 0613-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0613-EntityMoveEvent.patch => 0614-EntityMoveEvent.patch} (100%)
 rename patches/server/{0614-added-option-to-disable-pathfinding-updates-on-block.patch => 0615-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0615-Inline-shift-direction-fields.patch => 0616-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0616-Allow-adding-items-to-BlockDropItemEvent.patch => 0617-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0617-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0618-living-entity-allow-attribute-registration.patch => 0619-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0619-fix-dead-slime-setSize-invincibility.patch => 0620-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0620-Merchant-getRecipes-should-return-an-immutable-list.patch => 0621-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0621-misc-debugging-dumps.patch => 0622-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0622-Add-support-for-hex-color-codes-in-console.patch => 0623-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0623-Expose-Tracked-Players.patch => 0624-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0624-Remove-streams-from-SensorNearest.patch => 0625-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0625-MC-29274-Fix-Wither-hostility-towards-players.patch => 0626-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename patches/server/{0626-Throw-proper-exception-on-empty-JsonList-file.patch => 0627-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0627-Improve-ServerGUI.patch => 0628-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0628-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0629-fix-converting-txt-to-json-file.patch => 0630-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0630-Add-worldborder-events.patch => 0631-Add-worldborder-events.patch} (100%)
 rename patches/server/{0631-added-PlayerNameEntityEvent.patch => 0632-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0632-Prevent-grindstones-from-overstacking-items.patch => 0633-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0633-Add-recipe-to-cook-events.patch => 0634-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0634-Add-Block-isValidTool.patch => 0635-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0635-Allow-using-signs-inside-spawn-protection.patch => 0636-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0636-Implement-Keyed-on-World.patch => 0637-Implement-Keyed-on-World.patch} (100%)
 rename patches/server/{0637-Add-fast-alternative-constructor-for-Rotations.patch => 0638-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0638-Item-Rarity-API.patch => 0639-Item-Rarity-API.patch} (100%)
 rename patches/server/{0639-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0640-copy-TESign-isEditable-from-snapshots.patch => 0641-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0641-Drop-carried-item-when-player-has-disconnected.patch => 0642-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0642-forced-whitelist-use-configurable-kick-message.patch => 0643-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0643-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0644-fix-cancelling-block-falling-causing-client-desync.patch => 0645-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0645-Expose-protocol-version.patch => 0646-Expose-protocol-version.patch} (100%)
 rename patches/server/{0646-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (100%)
 rename patches/server/{0647-Enhance-console-tab-completions-for-brigadier-comman.patch => 0648-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0648-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0649-Add-bypass-host-check.patch => 0650-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0650-Set-area-affect-cloud-rotation.patch => 0651-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0651-add-isDeeplySleeping-to-HumanEntity.patch => 0652-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0652-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0653-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename patches/server/{0653-add-consumeFuel-to-FurnaceBurnEvent.patch => 0654-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0654-add-get-set-drop-chance-to-EntityEquipment.patch => 0655-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0655-fix-PigZombieAngerEvent-cancellation.patch => 0656-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0656-Fix-checkReach-check-for-Shulker-boxes.patch => 0657-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0657-fix-PlayerItemHeldEvent-firing-twice.patch => 0658-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0658-Added-PlayerDeepSleepEvent.patch => 0659-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0659-More-World-API.patch => 0660-More-World-API.patch} (100%)
 rename patches/server/{0660-Added-PlayerBedFailEnterEvent.patch => 0661-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0661-Implement-methods-to-convert-between-Component-and-B.patch => 0662-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0662-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0663-Introduce-beacon-activation-deactivation-events.patch => 0664-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0664-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0665-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0665-Add-Channel-initialization-listeners.patch => 0666-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0666-Send-empty-commands-if-tab-completion-is-disabled.patch => 0667-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0667-Add-more-WanderingTrader-API.patch => 0668-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0668-Add-EntityBlockStorage-clearEntities.patch => 0669-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0669-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0670-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0671-Inventory-close.patch => 0672-Inventory-close.patch} (100%)
 rename patches/server/{0672-call-PortalCreateEvent-players-and-end-platform.patch => 0673-call-PortalCreateEvent-players-and-end-platform.patch} (100%)
 rename patches/server/{0673-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0674-Fix-CraftPotionBrewer-cache.patch => 0675-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0675-Add-basic-Datapack-API.patch => 0676-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0676-Add-environment-variable-to-disable-server-gui.patch => 0677-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0677-additions-to-PlayerGameModeChangeEvent.patch => 0678-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0678-Clear-SyncLoadInfo.patch => 0679-Clear-SyncLoadInfo.patch} (100%)
 rename patches/server/{0679-ItemStack-repair-check-API.patch => 0680-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0680-More-Enchantment-API.patch => 0681-More-Enchantment-API.patch} (100%)
 rename patches/server/{0681-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%)
 rename patches/server/{0682-Fix-and-optimise-world-force-upgrading.patch => 0683-Fix-and-optimise-world-force-upgrading.patch} (99%)
 rename patches/server/{0683-Add-Mob-lookAt-API.patch => 0684-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0684-Add-Unix-domain-socket-support.patch => 0685-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0685-Add-EntityInsideBlockEvent.patch => 0686-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0686-Attributes-API-for-item-defaults.patch => 0687-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0687-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch => 0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0688-Add-cause-to-Weather-ThunderChangeEvents.patch => 0689-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0689-More-Lidded-Block-API.patch => 0690-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0690-Limit-item-frame-cursors-on-maps.patch => 0691-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0691-Add-PufferFishStateChangeEvent.patch => 0692-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0692-Add-PlayerKickEvent-causes.patch => 0693-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%)
 rename patches/server/{0695-Add-option-to-fix-items-merging-through-walls.patch => 0696-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0696-Add-BellRevealRaiderEvent.patch => 0697-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0697-Fix-invulnerable-end-crystals.patch => 0698-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0698-Add-ElderGuardianAppearanceEvent.patch => 0699-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0699-Reset-villager-inventory-on-cancelled-pickup-event.patch => 0700-Reset-villager-inventory-on-cancelled-pickup-event.patch} (100%)
 rename patches/server/{0700-Fix-dangerous-end-portal-logic.patch => 0701-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0702-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0702-Make-item-validations-configurable.patch => 0703-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0703-Add-more-line-of-sight-methods.patch => 0704-Add-more-line-of-sight-methods.patch} (100%)
 rename patches/server/{0704-add-per-world-spawn-limits.patch => 0705-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0705-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0706-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch => 0707-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch} (100%)

diff --git a/build-data/paper.at b/build-data/paper.at
index 76c0fda45..850c04ac8 100644
--- a/build-data/paper.at
+++ b/build-data/paper.at
@@ -177,3 +177,6 @@ public net.minecraft.util.thread.BlockableEventLoop runAllTasks()V
 # Chunk debug command
 public net.minecraft.server.level.ChunkMap entitiesInLevel
 public net.minecraft.server.level.ServerLevel players
+
+# Improve block entity unload performance
+public net.minecraft.Util$IdentityStrategy
diff --git a/patches/removed/1.17/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/removed/1.17/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
deleted file mode 100644
index 01e55f74f..000000000
--- a/patches/removed/1.17/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: mezz <tehgeek@gmail.com>
-Date: Wed, 9 Aug 2017 17:51:22 -0500
-Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
-
-
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ecb6378a285dff4b34170410387ebb7a8510a6dc..81713c97f35263f4ab8d14f8b707aac3d6afea11 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -726,7 +726,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         gameprofilerfiller.push("blockEntities");
-         timings.tileEntityTick.startTiming(); // Spigot
-         if (!this.tileEntityListUnload.isEmpty()) {
--            this.tickableBlockEntities.removeAll(this.tileEntityListUnload);
-+            // Paper start - Use alternate implementation with faster contains
-+            java.util.Set<BlockEntity> toRemove = java.util.Collections.newSetFromMap(new java.util.IdentityHashMap<>());
-+            toRemove.addAll(tileEntityListUnload);
-+            this.tickableBlockEntities.removeAll(toRemove);
-+            // Paper end
-             //this.tileEntityList.removeAll(this.tileEntityListUnload); // Paper - remove unused list
-             this.tileEntityListUnload.clear();
-         }
diff --git a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
new file mode 100644
index 000000000..34e6cd2ee
--- /dev/null
+++ b/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: mezz <tehgeek@gmail.com>
+Date: Wed, 9 Aug 2017 17:51:22 -0500
+Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
+
+
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index a86b5272c0ac4dd64f796f7fd025c7a34a5d2f8d..e8ec98aa4598af6733b94a58a196190c9e0839d2 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -724,6 +724,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         // Spigot start
+         // Iterator iterator = this.blockEntityTickers.iterator();
+         int tilesThisCycle = 0;
++        it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet<TickingBlockEntity> toRemove = new it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet(net.minecraft.Util.IdentityStrategy.INSTANCE); // Paper - use removeAll
++        toRemove.add(null);
+         for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
+             this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
+             TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
+@@ -731,7 +733,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+             if (tickingblockentity == null) {
+                 this.getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
+                 tilesThisCycle--;
+-                this.blockEntityTickers.remove(this.tileTickPosition--);
+                 continue;
+             }
+             // Spigot end
+@@ -739,12 +740,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+             if (tickingblockentity.isRemoved()) {
+                 // Spigot start
+                 tilesThisCycle--;
+-                this.blockEntityTickers.remove(this.tileTickPosition--);
++                toRemove.add(tickingblockentity); // Paper - use removeAll
+                 // Spigot end
+             } else {
+                 tickingblockentity.tick();
+             }
+         }
++        this.blockEntityTickers.removeAll(toRemove);
+ 
+         timings.tileEntityTick.stopTiming(); // Spigot
+         this.tickingBlockEntities = false;
diff --git a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 97%
rename from patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
index 8cc215d1a..c55c099b4 100644
--- a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a86b5272c0ac4dd64f796f7fd025c7a34a5d2f8d..8859b0483ca71e1a36c164f7d386684540f0bf18 100644
+index e8ec98aa4598af6733b94a58a196190c9e0839d2..e9e694286bce719b825a37939fe8ab90a5010819 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -140,7 +140,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 98%
rename from patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
index 0ad07b41d..0bfe23eb0 100644
--- a/patches/server/0167-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -85,7 +85,7 @@ index 923948e7fc63a778ca126c99e1189357bb490dee..bf12cb6a1f991372206e462e46f2686d
          switch (material) {
              case ACACIA_SIGN:
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index d57b32090cebfc952ac0a71b8aada85f49275241..9a30770a2f68e1253afe3ca8ecdae19c988248f9 100644
+index fd5b5287d67af364f149d4e284001fd319986bd5..972d4aa11a0a119e8e6703af99d93bcd3cddc6d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -26,20 +26,40 @@ public class CraftBlockEntityState<T extends BlockEntity> extends CraftBlockStat
diff --git a/patches/server/0168-AsyncTabCompleteEvent.patch b/patches/server/0169-AsyncTabCompleteEvent.patch
similarity index 100%
rename from patches/server/0168-AsyncTabCompleteEvent.patch
rename to patches/server/0169-AsyncTabCompleteEvent.patch
diff --git a/patches/server/0169-PlayerPickupExperienceEvent.patch b/patches/server/0170-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0169-PlayerPickupExperienceEvent.patch
rename to patches/server/0170-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0171-Make-max-squid-spawn-height-configurable.patch b/patches/server/0172-Make-max-squid-spawn-height-configurable.patch
similarity index 95%
rename from patches/server/0171-Make-max-squid-spawn-height-configurable.patch
rename to patches/server/0172-Make-max-squid-spawn-height-configurable.patch
index c6e51b97e..fba0056ff 100644
--- a/patches/server/0171-Make-max-squid-spawn-height-configurable.patch
+++ b/patches/server/0172-Make-max-squid-spawn-height-configurable.patch
@@ -21,7 +21,7 @@ index 90ca51dfdbb3045dd528450225cba96f5834166e..3577100f850975020b74f077d688f59d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 5faa9e05e041a8bdcac88f3c3af7620353c10c3a..714e521ee96612bbc479e497f0520097b548472b 100644
+index 3093fc37c47bec1a6e884553809277fff1053d8e..56838c9f214c0f75041e75c45ad1a0c72fcacc66 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -211,7 +211,8 @@ public class Squid extends WaterAnimal {
diff --git a/patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 94%
rename from patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
index 491546761..14d1eb009 100644
--- a/patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch
+++ b/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 5a80ea6bee72921454fbbd6ee202dc114c481ea1..4b349960daaacd87c042b055adf36c0a66748f7f 100644
+index b489307e64cab8c990cba775c299297ed8ccf05c..47167bbd2f167e9e266b0962a2034379ab8b7e77 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -974,11 +974,21 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -36,7 +36,7 @@ index 5a80ea6bee72921454fbbd6ee202dc114c481ea1..4b349960daaacd87c042b055adf36c0a
          });
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 2cea8b1e8c414c8715ce61d61168dfb9d5c2200c..4a343fa19566f468aca17228379f4d75f3f56f28 100644
+index 8746654a1c1b3b6cb1cabb468c0498aada17d517..bd937505244cc9305611815a9274f91395d3a8f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -632,6 +632,15 @@ public class ServerChunkCache extends ChunkSource {
@@ -56,7 +56,7 @@ index 2cea8b1e8c414c8715ce61d61168dfb9d5c2200c..4a343fa19566f468aca17228379f4d75
              this.chunkMap.getChunks().forEach((playerchunk) -> { // Paper - no... just no...
                  Optional<LevelChunk> optional = ((Either) playerchunk.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1c4f3a1cfe808d59333e45c170caf0d760a709c9..7159a433e9a264d2151dddc84a74689d0bc7635b 100644
+index a580ac8a39612f7b2cc9aad2815e987d4ba77b42..83a2c8e00d8445ad66bb8360f4e0e4b7cba44bb3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/server/0174-PreCreatureSpawnEvent.patch
similarity index 99%
rename from patches/server/0173-PreCreatureSpawnEvent.patch
rename to patches/server/0174-PreCreatureSpawnEvent.patch
index d68ee45bd..a715d952d 100644
--- a/patches/server/0173-PreCreatureSpawnEvent.patch
+++ b/patches/server/0174-PreCreatureSpawnEvent.patch
@@ -40,7 +40,7 @@ index 9f5f2bd9bdfce14da030b09f56c821ec1989e12f..872f92ac1a6bc86ce54700dbf555ceea
  
          if (t0 != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 6a9e2105b2d9a4ee83c0a2516d5ef26dc3b99053..aec77679584a2acab5818e26e2586b5316118e84 100644
+index 98085ea2b5baf99697f2992354918e15691c888f..555cf6d39108d40998adbbaf6b09dd9973f5f2e3 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -987,6 +987,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0174-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0174-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0175-Fill-Profile-Property-Events.patch b/patches/server/0176-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0175-Fill-Profile-Property-Events.patch
rename to patches/server/0176-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0177-Add-ArmorStand-Item-Meta.patch b/patches/server/0178-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0177-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0178-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0178-Extend-Player-Interact-cancellation.patch b/patches/server/0179-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0178-Extend-Player-Interact-cancellation.patch
rename to patches/server/0179-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0179-Tameable-getOwnerUniqueId-API.patch b/patches/server/0180-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0179-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0180-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 95%
rename from patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
index 92ccad378..2f1b17bf1 100644
--- a/patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch
+++ b/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
@@ -21,7 +21,7 @@ index 3577100f850975020b74f077d688f59dbca78962..da4a110809eee691c1d5b072de335d75
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d3fe3eabf4465101760951113b23edf2ce03e57d..4e8d38a6379d3dc1b7167b27479e6a27ea19ea19 100644
+index eb71f050fcd673ee4d9d1da62e098e2e37d4dd9a..278416af649425890ad00ca6f47d459ebab08e0b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1191,6 +1191,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0182-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/0182-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0183-Improved-Async-Task-Scheduler.patch b/patches/server/0184-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0183-Improved-Async-Task-Scheduler.patch
rename to patches/server/0184-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 96%
rename from patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 6cbe99f5a..5535fbd28 100644
--- a/patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/patches/server/0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 7923078a4235a6169eb94b7c0ce85e4cd51eb593..f39ccd15c037138a933eb529bec17d49349c0264 100644
+index 7224aa974a3936a68d1c1210c671192812af93c9..94b1ec73f2039c83203045db42bf0270c985d995 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -1,5 +1,7 @@
diff --git a/patches/server/0185-Player.setPlayerProfile-API.patch b/patches/server/0186-Player.setPlayerProfile-API.patch
similarity index 97%
rename from patches/server/0185-Player.setPlayerProfile-API.patch
rename to patches/server/0186-Player.setPlayerProfile-API.patch
index 8f5c34452..94781084f 100644
--- a/patches/server/0185-Player.setPlayerProfile-API.patch
+++ b/patches/server/0186-Player.setPlayerProfile-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index f39ccd15c037138a933eb529bec17d49349c0264..1d05725374bdffad6a8ab1502ee732775345024d 100644
+index 94b1ec73f2039c83203045db42bf0270c985d995..dbdd320eca27e82d5b058a7e6596b0a5fbc2631f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -340,12 +340,12 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
@@ -26,7 +26,7 @@ index f39ccd15c037138a933eb529bec17d49349c0264..1d05725374bdffad6a8ab1502ee73277
                              uniqueId = gameProfile.getId();
                              // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4e8d38a6379d3dc1b7167b27479e6a27ea19ea19..3c0aca2b90521da83cf494d9fff953a17a57701d 100644
+index 278416af649425890ad00ca6f47d459ebab08e0b..91f96f5718f7a7f2e0ce56f4dbf894d8a052630c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -173,7 +173,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0186-getPlayerUniqueId-API.patch b/patches/server/0187-getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/server/0186-getPlayerUniqueId-API.patch
rename to patches/server/0187-getPlayerUniqueId-API.patch
diff --git a/patches/server/0187-Make-player-data-saving-configurable.patch b/patches/server/0188-Make-player-data-saving-configurable.patch
similarity index 100%
rename from patches/server/0187-Make-player-data-saving-configurable.patch
rename to patches/server/0188-Make-player-data-saving-configurable.patch
diff --git a/patches/server/0188-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0188-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0189-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0189-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0190-Flag-to-disable-the-channel-limit.patch b/patches/server/0191-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from patches/server/0190-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0191-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0191-Add-method-to-open-already-placed-sign.patch b/patches/server/0192-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from patches/server/0191-Add-method-to-open-already-placed-sign.patch
rename to patches/server/0192-Add-method-to-open-already-placed-sign.patch
diff --git a/patches/server/0192-Configurable-sprint-interruption-on-attack.patch b/patches/server/0193-Configurable-sprint-interruption-on-attack.patch
similarity index 95%
rename from patches/server/0192-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0193-Configurable-sprint-interruption-on-attack.patch
index 70eed8773..41a662d21 100644
--- a/patches/server/0192-Configurable-sprint-interruption-on-attack.patch
+++ b/patches/server/0193-Configurable-sprint-interruption-on-attack.patch
@@ -20,7 +20,7 @@ index da4a110809eee691c1d5b072de335d75e1516eae..9225372cb9ef51a8cfbd4cee543c250a
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 3c0aca2b90521da83cf494d9fff953a17a57701d..a3f719d9dc63af9decc54a789f04595bb2d55710 100644
+index 91f96f5718f7a7f2e0ce56f4dbf894d8a052630c..8932cb934d77c0c120cad8392acbbc1c049dcfa7 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1240,7 +1240,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 93%
rename from patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index b08e17190..28a322773 100644
--- a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5b426265d62063544f0104c8c9f8061d002bc56c..d5c3c97e5205ef94578bc2d9d39f1a4c2600db94 100644
+index 413bf8504821d4605e940f865332e8dd77acb436..3bc5749f0e93b0298fa9a170e53f11dd05730eb1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2787,9 +2787,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0194-EndermanEscapeEvent.patch b/patches/server/0195-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0194-EndermanEscapeEvent.patch
rename to patches/server/0195-EndermanEscapeEvent.patch
diff --git a/patches/server/0195-Enderman.teleportRandomly.patch b/patches/server/0196-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0195-Enderman.teleportRandomly.patch
rename to patches/server/0196-Enderman.teleportRandomly.patch
diff --git a/patches/server/0196-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from patches/server/0196-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
diff --git a/patches/server/0197-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 97%
rename from patches/server/0197-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
index c403b862a..fda64d910 100644
--- a/patches/server/0197-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 18ab943ea2a959f012c3f75957fcb05dbe4ee6ff..c7ac5b323c731e5a7929f87d59e62796e8d4a107 100644
+index 097406c4c2ba72060efb4efd06fb1cbbb6bc4ad5..3634a9d2f76bc7cd4479026f7507fc6658a41a84 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1287,12 +1287,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0199-EndermanAttackPlayerEvent.patch b/patches/server/0200-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0199-EndermanAttackPlayerEvent.patch
rename to patches/server/0200-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0200-WitchConsumePotionEvent.patch b/patches/server/0201-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0200-WitchConsumePotionEvent.patch
rename to patches/server/0201-WitchConsumePotionEvent.patch
diff --git a/patches/server/0201-WitchThrowPotionEvent.patch b/patches/server/0202-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0201-WitchThrowPotionEvent.patch
rename to patches/server/0202-WitchThrowPotionEvent.patch
diff --git a/patches/server/0202-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/0202-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0203-WitchReadyPotionEvent.patch b/patches/server/0204-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0203-WitchReadyPotionEvent.patch
rename to patches/server/0204-WitchReadyPotionEvent.patch
diff --git a/patches/server/0204-ItemStack-getMaxItemUseDuration.patch b/patches/server/0205-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0204-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0205-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0205-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0205-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0207-Fix-CraftEntity-hashCode.patch b/patches/server/0208-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0207-Fix-CraftEntity-hashCode.patch
rename to patches/server/0208-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0208-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/0208-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0209-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0209-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0210-Make-shield-blocking-delay-configurable.patch b/patches/server/0211-Make-shield-blocking-delay-configurable.patch
similarity index 97%
rename from patches/server/0210-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0211-Make-shield-blocking-delay-configurable.patch
index 4762d6fb7..062134ef5 100644
--- a/patches/server/0210-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0211-Make-shield-blocking-delay-configurable.patch
@@ -19,7 +19,7 @@ index a0a846a2e60bdc17537bd697137f65321c1a61d8..e1110274a9f6b8f7007537732ec8eff7
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 28de49c8b5771491b168bba26e6033669c48e3c9..a3af689df12852ac47bd658f28c9f5b9991d3301 100644
+index 0dc03f53c80aac91a914bea91958a6c11c4f2061..08c29388621bf460e1704f6edba59d08a12e75d0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3665,12 +3665,24 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0211-Improve-EntityShootBowEvent.patch b/patches/server/0212-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0211-Improve-EntityShootBowEvent.patch
rename to patches/server/0212-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0212-PlayerReadyArrowEvent.patch b/patches/server/0213-PlayerReadyArrowEvent.patch
similarity index 95%
rename from patches/server/0212-PlayerReadyArrowEvent.patch
rename to patches/server/0213-PlayerReadyArrowEvent.patch
index 12d94370e..eb576cec0 100644
--- a/patches/server/0212-PlayerReadyArrowEvent.patch
+++ b/patches/server/0213-PlayerReadyArrowEvent.patch
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a3f719d9dc63af9decc54a789f04595bb2d55710..a4bb172ed720869578575562738521e99a53acca 100644
+index 8932cb934d77c0c120cad8392acbbc1c049dcfa7..543a1c9bc5aa97262424758c69cb28127fa0ee75 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2186,6 +2186,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
similarity index 95%
rename from patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch
rename to patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
index e2301e4e1..fde58e368 100644
--- a/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a3af689df12852ac47bd658f28c9f5b9991d3301..acf6f04fa229fb0850217ff3d50bf3b8c16cafdf 100644
+index 08c29388621bf460e1704f6edba59d08a12e75d0..7bb2ce6b378547d593f8487626b5a4d4b3361397 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1437,7 +1437,7 @@ public abstract class LivingEntity extends Entity {
@@ -56,7 +56,7 @@ index a3af689df12852ac47bd658f28c9f5b9991d3301..acf6f04fa229fb0850217ff3d50bf3b8
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2ed756c73b0cfddb559126d85316f37c3f958c0c..8451baff82cb7ec7615ab50a409724897ccf4d95 100644
+index 61c9b89b6ef41cde465d84f75f2dc6ef07048cc4..9c208d24d6f84e8818c0a7b88cdcb7c2fd703f91 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1532,7 +1532,7 @@ public abstract class Mob extends LivingEntity {
@@ -69,7 +69,7 @@ index 2ed756c73b0cfddb559126d85316f37c3f958c0c..8451baff82cb7ec7615ab50a40972489
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a4bb172ed720869578575562738521e99a53acca..0d6e024208182d5779be3d84cff193ce904ad541 100644
+index 543a1c9bc5aa97262424758c69cb28127fa0ee75..022bff6ac8ed5f2da438929c5ac455505bb16da7 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1234,7 +1234,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0214-Expand-Explosions-API.patch b/patches/server/0215-Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/0214-Expand-Explosions-API.patch
rename to patches/server/0215-Expand-Explosions-API.patch
diff --git a/patches/server/0215-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0215-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0216-RangedEntity-API.patch b/patches/server/0217-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0216-RangedEntity-API.patch
rename to patches/server/0217-RangedEntity-API.patch
diff --git a/patches/server/0217-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0217-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0218-Implement-World.getEntity-UUID-API.patch b/patches/server/0219-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/0218-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0219-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0219-InventoryCloseEvent-Reason-API.patch b/patches/server/0220-InventoryCloseEvent-Reason-API.patch
similarity index 97%
rename from patches/server/0219-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0220-InventoryCloseEvent-Reason-API.patch
index 05b1177c1..c11b93b67 100644
--- a/patches/server/0219-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0220-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c7ac5b323c731e5a7929f87d59e62796e8d4a107..5a5733124bd8395bb996e9d5426c4a260fbeb1d3 100644
+index 3634a9d2f76bc7cd4479026f7507fc6658a41a84..fdf64581f26112bb9f5135485a745e50dc4a8248 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1055,7 +1055,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -29,7 +29,7 @@ index c7ac5b323c731e5a7929f87d59e62796e8d4a107..5a5733124bd8395bb996e9d5426c4a26
              }
              // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6f9a28a505f387387a42d607bd14cda75b5611eb..b3286a015f89068719381411f92ecc407e2dd796 100644
+index 83a2c8e00d8445ad66bb8360f4e0e4b7cba44bb3..b9fdccfc9815b0aec7bb5f5ad633c69b8eba6af2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -602,7 +602,7 @@ public class ServerPlayer extends Player {
@@ -127,7 +127,7 @@ index 429e6c7f9a5e5355e26deeae1e89ffea7439cd96..7c5a75fb34640bb4e7ef839412dbb30b
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(this.cserver.getPlayer(entityplayer), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, com.destroystokyo.paper.PaperConfig.useDisplayNameInQuit ? entityplayer.getBukkitEntity().displayName() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName())));
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0d6e024208182d5779be3d84cff193ce904ad541..e0e33dd92b686939f622f0a7da0d5a971f43d0d6 100644
+index 022bff6ac8ed5f2da438929c5ac455505bb16da7..1a7bd2462bab95fa6986cef705e5e5b82da30063 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -264,7 +264,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0220-Vex-get-setSummoner-API.patch b/patches/server/0221-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0220-Vex-get-setSummoner-API.patch
rename to patches/server/0221-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 94%
rename from patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index c4c078ca9..ab138c34e 100644
--- a/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ec473952e9f35db15cbb743a3c77c45c26d40ac5..28f4c456936c378628336d4a36f1975476f7913f 100644
+index f9f1eb0d7e85278186f42a4975d113bf07f367e9..4526bf94a9fd39c2f139666557f389a8684595a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2218,6 +2218,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 100%
rename from patches/server/0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/patches/server/0223-Use-asynchronous-Log4j-2-loggers.patch b/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch
similarity index 96%
rename from patches/server/0223-Use-asynchronous-Log4j-2-loggers.patch
rename to patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch
index 15fd44e4b..f70348c33 100644
--- a/patches/server/0223-Use-asynchronous-Log4j-2-loggers.patch
+++ b/patches/server/0224-Use-asynchronous-Log4j-2-loggers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index daf0455eeb2ef3d2bf88b1177315133b571569bb..f0256fe4aea16c9e0d6f5eee360eeec36cfdeebd 100644
+index 755d0472684579272a63a481d7504ff2dae69c2d..39ae4cc76438c40e007bfe5e8ace7cbaee66d3b8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -42,6 +42,7 @@ dependencies {
diff --git a/patches/server/0224-add-more-information-to-Entity.toString.patch b/patches/server/0225-add-more-information-to-Entity.toString.patch
similarity index 93%
rename from patches/server/0224-add-more-information-to-Entity.toString.patch
rename to patches/server/0225-add-more-information-to-Entity.toString.patch
index bfc1e3764..65c46002a 100644
--- a/patches/server/0224-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0225-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1603a0ff6a0c82e18ef5446c129a1c05488abf86..960c3e75a60ef33141e615bd8b256528eeaf399c 100644
+index 75aae3301ea1cef6fdeb1155e880a7451e76fb02..2ec198a29b85bf118f05a639d6290334ab3810d6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2784,7 +2784,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0226-EnderDragon-Events.patch b/patches/server/0227-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0226-EnderDragon-Events.patch
rename to patches/server/0227-EnderDragon-Events.patch
diff --git a/patches/server/0227-PlayerElytraBoostEvent.patch b/patches/server/0228-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0227-PlayerElytraBoostEvent.patch
rename to patches/server/0228-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0228-PlayerLaunchProjectileEvent.patch b/patches/server/0229-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0228-PlayerLaunchProjectileEvent.patch
rename to patches/server/0229-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0229-Improve-BlockPosition-inlining.patch b/patches/server/0230-Improve-BlockPosition-inlining.patch
similarity index 96%
rename from patches/server/0229-Improve-BlockPosition-inlining.patch
rename to patches/server/0230-Improve-BlockPosition-inlining.patch
index b667b7f9b..0ba1d63f0 100644
--- a/patches/server/0229-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0230-Improve-BlockPosition-inlining.patch
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index c66ae4d9eea993f3b7fcc6e253259db3346229d1..ea496a990e7e49bc83f7a8b98f71f2b11d9fc56c 100644
+index e188f130e47ef319477050981de53a7410452592..5e09890ba2fe326503a49b2dbec09845f5c8c5eb 100644
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
 @@ -41,7 +41,7 @@ public class Vec3i implements Comparable<Vec3i> {
diff --git a/patches/server/0230-Optimize-IntIdentityHashBiMiap-nextId.patch b/patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch
similarity index 100%
rename from patches/server/0230-Optimize-IntIdentityHashBiMiap-nextId.patch
rename to patches/server/0231-Optimize-IntIdentityHashBiMiap-nextId.patch
diff --git a/patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 91%
rename from patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 7e1ddc658..b1bacc83c 100644
--- a/patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0232-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -19,7 +19,7 @@ index 8f8a3ea51823a9cfba985efeb7e320ae42e0da8a..1f6b37bd3cbc825abab5ad2f673200ef
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index cda073a8ab9daed75f284cbbe4459991fba348f0..449f9b87ea6ff313f7e0e9104a641f1bf7729f24 100644
+index 6d717d3852afb3a3a4bef30c68980c402bdfefff..b47b1215e685c453c3496439bb350a917d8bde3c 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -339,6 +339,7 @@ public class ArmorStand extends LivingEntity {
@@ -31,10 +31,10 @@ index cda073a8ab9daed75f284cbbe4459991fba348f0..449f9b87ea6ff313f7e0e9104a641f1b
  
          for (int i = 0; i < list.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8859b0483ca71e1a36c164f7d386684540f0bf18..2c86a5ae8bbf7d80e7ce8cd08319ed6a17b86dbb 100644
+index e9e694286bce719b825a37939fe8ab90a5010819..ed7b9b350558df96f91b64ceccb137968c05a0f6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -767,6 +767,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -769,6 +769,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper end
          }
      }
diff --git a/patches/server/0232-Vanished-players-don-t-have-rights.patch b/patches/server/0233-Vanished-players-don-t-have-rights.patch
similarity index 97%
rename from patches/server/0232-Vanished-players-don-t-have-rights.patch
rename to patches/server/0233-Vanished-players-don-t-have-rights.patch
index 4ccf5980c..9ab65f793 100644
--- a/patches/server/0232-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0233-Vanished-players-don-t-have-rights.patch
@@ -38,7 +38,7 @@ index 86d245c9a817be5fd2be7f331d3a3a5f3169e8c2..44b28773fe8e79931e738d493bd9405e
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2c86a5ae8bbf7d80e7ce8cd08319ed6a17b86dbb..c1cf7f5bff2878281d4a9787ea7160e984268352 100644
+index ed7b9b350558df96f91b64ceccb137968c05a0f6..4635400065ef169d7c95e083c2b57eb0dd7f29ce 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -71,6 +71,10 @@ import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
@@ -99,7 +99,7 @@ index 2c86a5ae8bbf7d80e7ce8cd08319ed6a17b86dbb..c1cf7f5bff2878281d4a9787ea7160e9
      public boolean isClientSide() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5d0bbdd342eda5660b461b99fed7e80afaefbff9..c09c2c8ec2a4dd2e1eec5ecf97cbd8456b5ec3c9 100644
+index 378e09eca16738bce048837752149f212a6e2cc3..4e5128629ccbb884d88b369be5010e6b20763707 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1206,6 +1206,14 @@ public class CraftEventFactory {
diff --git a/patches/server/0233-Allow-disabling-armour-stand-ticking.patch b/patches/server/0234-Allow-disabling-armour-stand-ticking.patch
similarity index 98%
rename from patches/server/0233-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0234-Allow-disabling-armour-stand-ticking.patch
index 2075008fe..483cc64d5 100644
--- a/patches/server/0233-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/server/0234-Allow-disabling-armour-stand-ticking.patch
@@ -20,7 +20,7 @@ index 1f6b37bd3cbc825abab5ad2f673200ef5061746a..8bb33e1b631c3aa99cef2a63c140f0b0
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 449f9b87ea6ff313f7e0e9104a641f1bf7729f24..33f1e486f3732c156289b16d973297e771da82b9 100644
+index b47b1215e685c453c3496439bb350a917d8bde3c..d545349f659b2a164a28d06e9ff0f9fff8fa8ecf 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -93,9 +93,16 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0234-SkeletonHorse-Additions.patch b/patches/server/0235-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0234-SkeletonHorse-Additions.patch
rename to patches/server/0235-SkeletonHorse-Additions.patch
diff --git a/patches/server/0235-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0235-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0236-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0236-Implement-Expanded-ArmorStand-API.patch b/patches/server/0237-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0236-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0237-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0237-AnvilDamageEvent.patch b/patches/server/0238-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0237-AnvilDamageEvent.patch
rename to patches/server/0238-AnvilDamageEvent.patch
diff --git a/patches/server/0238-Add-hand-to-bucket-events.patch b/patches/server/0239-Add-hand-to-bucket-events.patch
similarity index 97%
rename from patches/server/0238-Add-hand-to-bucket-events.patch
rename to patches/server/0239-Add-hand-to-bucket-events.patch
index b18f26656..4120af0c2 100644
--- a/patches/server/0238-Add-hand-to-bucket-events.patch
+++ b/patches/server/0239-Add-hand-to-bucket-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5a5733124bd8395bb996e9d5426c4a260fbeb1d3..8989b3153b0c849e189a8ff4ac4de6085e3a3db2 100644
+index fdf64581f26112bb9f5135485a745e50dc4a8248..bf06d2c5209f72eda22f1de351059eb7f1173ae0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1419,15 +1419,17 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -36,7 +36,7 @@ index 5a5733124bd8395bb996e9d5426c4a260fbeb1d3..8989b3153b0c849e189a8ff4ac4de608
      public float getSharedSpawnAngle() {
          return this.levelData.getSpawnAngle();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 4656c2a524bc5d397715c55799362c4b97f96009..41d5f4bf470bccbc0967df64e1630a01a5c6f27a 100644
+index fe90b59a71b85afd3f4b5f7c4d4ba66ed74a05df..c9dcbc2dcb2736d0f448496c67121db29b7d4deb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -87,7 +87,7 @@ public class Cow extends Animal {
@@ -117,7 +117,7 @@ index 24272b384b96bb98a8231fe8583f404ad0c96de5..7c3e94c6bf8337ef660473d8ed451606
                  int i = blockposition.getX();
                  int j = blockposition.getY();
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c1cf7f5bff2878281d4a9787ea7160e984268352..8d4f8719b30a66fbb68c9407ee8484312f05b3fb 100644
+index 4635400065ef169d7c95e083c2b57eb0dd7f29ce..53ea0231737e162a8914d916bfd3ab8fe244208f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -291,6 +291,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -148,7 +148,7 @@ index be667bb12e1ee186b8d9ad1d7ac4534454d0e787..cf6bcbe7d75a52fe509e3b6c6c24b64b
  }
 +
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c09c2c8ec2a4dd2e1eec5ecf97cbd8456b5ec3c9..bb006e6c703e5c4cfa16ca4ee4cf8463215c38b0 100644
+index 4e5128629ccbb884d88b369be5010e6b20763707..8f44cabc1a92dc3e9afe988b23ac982e85d49fc8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -222,7 +222,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0239-Add-TNTPrimeEvent.patch b/patches/server/0240-Add-TNTPrimeEvent.patch
similarity index 98%
rename from patches/server/0239-Add-TNTPrimeEvent.patch
rename to patches/server/0240-Add-TNTPrimeEvent.patch
index 995e6db56..ce6d03399 100644
--- a/patches/server/0239-Add-TNTPrimeEvent.patch
+++ b/patches/server/0240-Add-TNTPrimeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add TNTPrimeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index e286d4ed03eba05b862741cb98db8a031224cd98..bd61f2b3940bfba7948dbb0a52173144c9ef08bd 100644
+index 401a105a161c23a8d3fe45d0a7c845072afb8bd9..c98202092752a9015aaf95bd1471135b88e84425 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -536,6 +536,11 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 98%
rename from patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
index eb1d793af..aa9667bc2 100644
--- a/patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0241-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -45,7 +45,7 @@ index 77a03abd59db4a43f6f2d59d4c7ef176e782f205..bd508025b771424c942fd856c31d520b
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 28f4c456936c378628336d4a36f1975476f7913f..b65fcc7519589c3bc5c5f5b5ec1db53a520ec39f 100644
+index 4526bf94a9fd39c2f139666557f389a8684595a2..1c76d6a616d6967402fb55feffafffa0aa2fd468 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -228,6 +228,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0241-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from patches/server/0241-MC-135506-Experience-should-save-as-Integers.patch
rename to patches/server/0242-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0242-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0243-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from patches/server/0242-Fix-client-rendering-skulls-from-same-user.patch
rename to patches/server/0243-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 95%
rename from patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index f59488bae..f3da28c74 100644
--- a/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -8,7 +8,7 @@ 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
+index 47167bbd2f167e9e266b0962a2034379ab8b7e77..a8c172c3742b8eb52c9cdd5adb65224f2e7bc736 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
@@ -29,7 +29,7 @@ index 4b349960daaacd87c042b055adf36c0a66748f7f..a0f8f341e0cd6a2ac28e12d0824b694a
  
      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
+index bf06d2c5209f72eda22f1de351059eb7f1173ae0..a86757a96fea11de150fb48ac123c3493e5420b7 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
@@ -72,7 +72,7 @@ index 8989b3153b0c849e189a8ff4ac4de6085e3a3db2..73da340ab8782efc7d97c3a3e29ea9cd
              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
+index 2ec198a29b85bf118f05a639d6290334ab3810d6..0be7bd3c5deef99f9ffe6d3d6390c9297d5b5815 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
@@ -85,7 +85,7 @@ index 960c3e75a60ef33141e615bd8b256528eeaf399c..0d4ab7a469b2ce643b80e7912e20d126
          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
+index 53ea0231737e162a8914d916bfd3ab8fe244208f..d550ed7358aa8561bf307972d411f170bd96d515 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 {
diff --git a/patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0245-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0245-Make-EnderDragon-implement-Mob.patch b/patches/server/0246-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from patches/server/0245-Make-EnderDragon-implement-Mob.patch
rename to patches/server/0246-Make-EnderDragon-implement-Mob.patch
diff --git a/patches/server/0246-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0247-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0246-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0247-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0247-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0247-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0248-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0248-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0248-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0249-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0249-Optimize-BlockPosition-helper-methods.patch b/patches/server/0250-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from patches/server/0249-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0250-Optimize-BlockPosition-helper-methods.patch
index b31d553b3..2c59eaa8a 100644
--- a/patches/server/0249-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0250-Optimize-BlockPosition-helper-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index c2309751e3798874eee6b469129121c2e317fbc3..dd1d76867ac3832ad515f304925c595c9a021c8f 100644
+index 022cccbc52a7dda2f6bf0999905db82dd650b5ef..86618513e8f777d1d738b230c97eb527ddce7c26 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -131,67 +131,84 @@ public class BlockPos extends Vec3i {
diff --git a/patches/server/0250-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
similarity index 93%
rename from patches/server/0250-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
rename to patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
index 84ff27f26..077591e0e 100644
--- a/patches/server/0250-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
+++ b/patches/server/0251-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Restore vanlla default mob-spawn-range and water animals
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 9a31d8b709b28bba658603106c623560c5362947..8e6eae7cc27f66faede9a3dc74571e1814df3652 100644
+index c45332fa7b374e7775ca24a7065af3cb5c85d7cf..45be7d1821497f13ab0da3c4bbff7585238e902e 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -165,7 +165,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0251-Slime-Pathfinder-Events.patch b/patches/server/0252-Slime-Pathfinder-Events.patch
similarity index 98%
rename from patches/server/0251-Slime-Pathfinder-Events.patch
rename to patches/server/0252-Slime-Pathfinder-Events.patch
index 4cb18162e..abe08003e 100644
--- a/patches/server/0251-Slime-Pathfinder-Events.patch
+++ b/patches/server/0252-Slime-Pathfinder-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Slime Pathfinder Events
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index 53130b34e5964acec191e1d8de6bde996f498699..6a199e148929d8df9b1f39733dd821c503380973 100644
+index 95fadcb0b90f4824b5c06673266ae04e73c8a219..e9d3e5eddaee0c8ae98755119b3c0734166cafa9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -44,6 +44,12 @@ import net.minecraft.world.level.biome.Biomes;
diff --git a/patches/server/0252-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0253-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0252-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0253-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0253-Optimize-CraftBlockData-Creation.patch b/patches/server/0254-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0253-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0254-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0254-Optimize-MappedRegistry.patch b/patches/server/0255-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0254-Optimize-MappedRegistry.patch
rename to patches/server/0255-Optimize-MappedRegistry.patch
diff --git a/patches/server/0255-Add-PhantomPreSpawnEvent.patch b/patches/server/0256-Add-PhantomPreSpawnEvent.patch
similarity index 98%
rename from patches/server/0255-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0256-Add-PhantomPreSpawnEvent.patch
index e68cfb61b..a5b7fa201 100644
--- a/patches/server/0255-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0256-Add-PhantomPreSpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index dcfd0b107ac7bd1633f3b681cd5f5e26ce87bd63..2ddb7b4c0a75c6f41910c84c8b9341f56fcb1116 100644
+index d60d3dd3e001afa3d1103f78512389a4bdc85a63..f69ad3b2f19a71f1e4a1a8fb37ac63df78548871 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -172,6 +172,11 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/server/0256-Add-More-Creeper-API.patch b/patches/server/0257-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0256-Add-More-Creeper-API.patch
rename to patches/server/0257-Add-More-Creeper-API.patch
diff --git a/patches/server/0257-Inventory-removeItemAnySlot.patch b/patches/server/0258-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0257-Inventory-removeItemAnySlot.patch
rename to patches/server/0258-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0258-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0258-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0259-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0259-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
similarity index 100%
rename from patches/server/0259-Asynchronous-chunk-IO-and-loading.patch
rename to patches/server/0260-Asynchronous-chunk-IO-and-loading.patch
diff --git a/patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 96%
rename from patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
index bdc08913c..403365fbb 100644
--- a/patches/server/0260-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0261-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -28,7 +28,7 @@ index 49fd3486a6c595749f33bbe1c1bec0454e4725c5..5c290f263fc2b643987c96ea75729bf1
          switch (enumDirection) {
              case DOWN:
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index acf6f04fa229fb0850217ff3d50bf3b8c16cafdf..773c1e0ed3e10157c968d84b19947d99bb01371a 100644
+index 7bb2ce6b378547d593f8487626b5a4d4b3361397..dd61eacfa417ed77bf09f482249bdd3a5a566ace 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3686,6 +3686,23 @@ public abstract class LivingEntity extends Entity {
@@ -56,7 +56,7 @@ index acf6f04fa229fb0850217ff3d50bf3b8c16cafdf..773c1e0ed3e10157c968d84b19947d99
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 5194da5a141718390a317d75b31205f951cec7a2..cb4c15d17ea3f22e6baa73ba6ce2a18e34ac4b00 100644
+index 0aec2e79d053b6cb845ffea393ad431b3d254b83..05e962ed9269db4cfa170960507b10d7b7d13741 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -190,6 +190,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0261-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0262-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0261-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0262-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0262-Improve-death-events.patch b/patches/server/0263-Improve-death-events.patch
similarity index 100%
rename from patches/server/0262-Improve-death-events.patch
rename to patches/server/0263-Improve-death-events.patch
diff --git a/patches/server/0263-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 94%
rename from patches/server/0263-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch
index 83f45fc47..dc5723cf6 100644
--- a/patches/server/0263-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0264-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 8b3cf3b882ea6c0d48df8b551f4b85b87b889c58..dd4deb08eb3ed15a156269a11d3d43abfd61fe5b 100644
+index 55e2ac3fc3d6e1da40f766ac42c9ca24b8b6e872..1b1786934cdbc0e701d7f3f12883adffcd12e0b3 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -339,6 +339,7 @@ public final class ItemStack {
diff --git a/patches/server/0264-Mob-Pathfinding-API.patch b/patches/server/0265-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0264-Mob-Pathfinding-API.patch
rename to patches/server/0265-Mob-Pathfinding-API.patch
diff --git a/patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0266-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0266-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0266-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0267-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0267-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0267-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0268-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0268-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0268-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0269-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0269-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0270-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0269-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0270-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0270-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0270-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0271-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0271-Honor-EntityAgeable.ageLock.patch b/patches/server/0272-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0271-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0272-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0272-Configurable-connection-throttle-kick-message.patch b/patches/server/0273-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0272-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0273-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0273-Hook-into-CB-plugin-rewrites.patch b/patches/server/0274-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0273-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0274-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0274-Add-sun-related-API.patch b/patches/server/0275-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0274-Add-sun-related-API.patch
rename to patches/server/0275-Add-sun-related-API.patch
diff --git a/patches/server/0275-Add-LivingEntity-getTargetEntity.patch b/patches/server/0276-Add-LivingEntity-getTargetEntity.patch
similarity index 98%
rename from patches/server/0275-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0276-Add-LivingEntity-getTargetEntity.patch
index 4395e3cbf..39c6d92dd 100644
--- a/patches/server/0275-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0276-Add-LivingEntity-getTargetEntity.patch
@@ -17,7 +17,7 @@ index 0be7bd3c5deef99f9ffe6d3d6390c9297d5b5815..0680ed44a47cfafdff400dd3033c9600
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a629b6e3cd085f79ad231747cce996bb1fbdc3b2..f795e7e689e205e9ba5ef57482850679ad7b19f9 100644
+index 252a935db848a1001c6109b582886a98d21941cb..8d11a803516ae711a10e9b3af7f6704f59d40874 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
diff --git a/patches/server/0276-Turtle-API.patch b/patches/server/0277-Turtle-API.patch
similarity index 100%
rename from patches/server/0276-Turtle-API.patch
rename to patches/server/0277-Turtle-API.patch
diff --git a/patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0278-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0278-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0279-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
index 1fa12ab51..76d4e1de8 100644
--- a/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
@@ -128,7 +128,7 @@ index 0000000000000000000000000000000000000000..41d73aa91fb401612e087aa1b7278ba6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 1d05725374bdffad6a8ab1502ee732775345024d..a196ab2510a1c302ef1c946400c1a7c07619994a 100644
+index dbdd320eca27e82d5b058a7e6596b0a5fbc2631f..3d97f76f14b8c22c78c46a34c2da2e6406ba28b6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -18,6 +18,7 @@ import javax.crypto.Cipher;
@@ -225,7 +225,7 @@ index 1d05725374bdffad6a8ab1502ee732775345024d..a196ab2510a1c302ef1c946400c1a7c0
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 16645b4c096936c4d5c00f335e5cdb7dd4a4e2bd..717ad1c24bbc882db8f76cfef7bf847c58914e5a 100644
+index e22b073a7a5f35a8edf58946144d1f1e9d94b6e3..7f1d5725e156b9cf3273aa0f66c1e0d486df6a51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -683,7 +683,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0280-Add-more-Witch-API.patch b/patches/server/0281-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0280-Add-more-Witch-API.patch
rename to patches/server/0281-Add-more-Witch-API.patch
diff --git a/patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0282-Here-s-Johnny.patch b/patches/server/0283-Here-s-Johnny.patch
similarity index 100%
rename from patches/server/0282-Here-s-Johnny.patch
rename to patches/server/0283-Here-s-Johnny.patch
diff --git a/patches/server/0283-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 97%
rename from patches/server/0283-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 08f65404d..a6d185a07 100644
--- a/patches/server/0283-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0284-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -20,7 +20,7 @@ index c17c504acdc12b6ef37d6643eb98a57fa5ca40c9..13e730b18c346934c061fb570048623a
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 06922b26ca1f2e31f7c8a527f1a8fdda4a8554c0..5f4718fa42be0ade1a40c0472efbbd0c65f061a7 100644
+index 4f263837f4111f77e14e4663afeff4e170b2b3da..17e2219bf69e8282aedf476fea5ee00137a95057 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -532,6 +532,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0284-Reset-players-airTicks-on-respawn.patch b/patches/server/0285-Reset-players-airTicks-on-respawn.patch
similarity index 86%
rename from patches/server/0284-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0285-Reset-players-airTicks-on-respawn.patch
index 5ce220ca2..3b6f8e33d 100644
--- a/patches/server/0284-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0285-Reset-players-airTicks-on-respawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b2324b53b3cec3e577a8ec8c45b113c232d220a6..5eb37fb1ae861940839fe6815b57111812d6b3ec 100644
+index 3ca3a1c16ea0900bfb868a6e2fc88e3522bf7752..8beca0412c65ad03376fb76e2d993bc841bf9e0b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2210,6 +2210,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ 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 b75a7f702ca6166c1f869a138ac4b93ba3870c62..f9f51b84036f522cdfc4ca6d47c074d51c14bf08 100644
+index 0680ed44a47cfafdff400dd3033c9600afd3514b..62bb61b6f8e099eddf3ad12b7ff47f62cab2eaa9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2587,6 +2587,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0286-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 98%
rename from patches/server/0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 088dd9b37..cc8c9e950 100644
--- a/patches/server/0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0287-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -12,7 +12,7 @@ server threads
 Allow usage of a single thread executor by not using ForkJoin so single core CPU's.
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 65e0ca442980f273d2fe5f131e174cd92f80da20..81f4f26a6b83079d36acd1fd86dede0eb1116c01 100644
+index a44709de54fc57eec337e560dc4a699a8012c58f..a6b9299d8e221da55765524e7bf6214aba880298 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -56,7 +56,7 @@ import java.util.stream.Stream;
diff --git a/patches/server/0287-Optimize-World-Time-Updates.patch b/patches/server/0288-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0287-Optimize-World-Time-Updates.patch
rename to patches/server/0288-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0288-Restore-custom-InventoryHolder-support.patch b/patches/server/0289-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0288-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0289-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0289-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0290-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0289-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0290-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0290-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0291-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0290-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0291-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0291-PreSpawnerSpawnEvent.patch b/patches/server/0292-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0291-PreSpawnerSpawnEvent.patch
rename to patches/server/0292-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0292-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 97%
rename from patches/server/0292-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch
index 6a1a7e75b..4e5b9a9d3 100644
--- a/patches/server/0292-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0293-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -51,7 +51,7 @@ index 315dad4789f5f2582ee9b4fc176affd1f57537ef..f4a056185990181e486f452960159a52
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cdcfc4390eca3dbb3395c29f300acce661a5e494..674d83f05246f7c6c9c9e1674c9428cfe0322cda 100644
+index 17e2219bf69e8282aedf476fea5ee00137a95057..cd95e232e174de5aad462bc968fed5dda16b140d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1558,6 +1558,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0293-Make-the-default-permission-message-configurable.patch b/patches/server/0294-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/0293-Make-the-default-permission-message-configurable.patch
rename to patches/server/0294-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0294-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0295-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0294-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0295-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0295-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0296-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0295-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0296-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0296-force-entity-dismount-during-teleportation.patch b/patches/server/0297-force-entity-dismount-during-teleportation.patch
similarity index 98%
rename from patches/server/0296-force-entity-dismount-during-teleportation.patch
rename to patches/server/0297-force-entity-dismount-during-teleportation.patch
index 4d12d3502..b78d517c2 100644
--- a/patches/server/0296-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0297-force-entity-dismount-during-teleportation.patch
@@ -93,7 +93,7 @@ index 62bb61b6f8e099eddf3ad12b7ff47f62cab2eaa9..f95b6e77318f18c62b7c7dda2be23161
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f795e7e689e205e9ba5ef57482850679ad7b19f9..1460a3185d557acfe695d46b4254a2a573cb7323 100644
+index 8d11a803516ae711a10e9b3af7f6704f59d40874..ddb0a2f4d2894bd416d4b4b8d9cf1538705d104c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3328,11 +3328,13 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0297-Add-more-Zombie-API.patch b/patches/server/0298-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0297-Add-more-Zombie-API.patch
rename to patches/server/0298-Add-more-Zombie-API.patch
diff --git a/patches/server/0298-Book-Size-Limits.patch b/patches/server/0299-Book-Size-Limits.patch
similarity index 97%
rename from patches/server/0298-Book-Size-Limits.patch
rename to patches/server/0299-Book-Size-Limits.patch
index 56321d1d6..3921fba54 100644
--- a/patches/server/0298-Book-Size-Limits.patch
+++ b/patches/server/0299-Book-Size-Limits.patch
@@ -24,7 +24,7 @@ index 11d628869a9a6eda8bf21a4f213ff23ad753b18e..8bf4d2b8c38c02d6a5b2fea37113689a
      private static void asyncChunks() {
          ConfigurationSection section;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 674d83f05246f7c6c9c9e1674c9428cfe0322cda..6f657c8b3a147fbd4cf625e89cb6023ee2967c07 100644
+index cd95e232e174de5aad462bc968fed5dda16b140d..6af9fbf46cb5fcf419fdf8800b5f6b08ef09cc81 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1002,6 +1002,52 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0299-Add-PlayerConnectionCloseEvent.patch b/patches/server/0300-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0299-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0300-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0300-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0301-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0300-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0301-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0301-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 98%
rename from patches/server/0301-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index acd1612f4..942b67215 100644
--- a/patches/server/0301-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0302-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8e86ca5221236ab3ab61d7a6859b64be9e5d8f97..091d4fa14d286ad4777750fff2b315335e46e379 100644
+index 77d9a4ce7be345b6a999a0269b26c0e60acab864..273f493436918a72f0474fe7d77011d9de40119b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -218,6 +218,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0302-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 91%
rename from patches/server/0302-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 45a56c914..8f1d1c363 100644
--- a/patches/server/0302-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0303-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 091d4fa14d286ad4777750fff2b315335e46e379..8f558fac783783c27c89b3b64a8d1feaa1c82d46 100644
+index 273f493436918a72f0474fe7d77011d9de40119b..a55bc1878e7bd24225b52fee7f10e59ef4e66934 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1538,6 +1538,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0303-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/patches/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from patches/server/0303-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to patches/server/0304-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/patches/server/0304-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0305-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0304-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0305-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0305-BlockDestroyEvent.patch b/patches/server/0306-BlockDestroyEvent.patch
similarity index 96%
rename from patches/server/0305-BlockDestroyEvent.patch
rename to patches/server/0306-BlockDestroyEvent.patch
index ba8f2e39c..488b64544 100644
--- a/patches/server/0305-BlockDestroyEvent.patch
+++ b/patches/server/0306-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 b978a6d44416ce89addaafb54a71fcb06e635b30..834bbd63b4e45e8c89b4ece4eaf357f3cbe8e8ca 100644
+index d550ed7358aa8561bf307972d411f170bd96d515..6882649609356b28a0b73949200f5111459e282e 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;
diff --git a/patches/server/0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0307-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0307-Limit-Client-Sign-length-more.patch b/patches/server/0308-Limit-Client-Sign-length-more.patch
similarity index 97%
rename from patches/server/0307-Limit-Client-Sign-length-more.patch
rename to patches/server/0308-Limit-Client-Sign-length-more.patch
index eb442a11d..a959b56ca 100644
--- a/patches/server/0307-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0308-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f657c8b3a147fbd4cf625e89cb6023ee2967c07..d8312d29103dd10f2b0634de5a056774d06d3263 100644
+index 6af9fbf46cb5fcf419fdf8800b5f6b08ef09cc81..c184417a71467abd420c99ba5feb3a1844e92c1d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -255,6 +255,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0309-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0310-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0310-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0310-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0311-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0311-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/patches/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from patches/server/0311-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to patches/server/0312-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/patches/server/0312-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 90%
rename from patches/server/0312-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 2a8b7a4ce..0ead48d33 100644
--- a/patches/server/0312-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/server/0313-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index c60d9775230b2ff554eeb38136f8e7c32c47d8cf..ee17cba501e0cc4822bd1278d18b561c77fe9674 100644
+index 0878e69aa5805f635971b5ce46783ce043c19bbe..4c5213fe89ec131addcc3d705f2e3268f51f1868 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -225,6 +225,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0313-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0313-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0314-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0314-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from patches/server/0314-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to patches/server/0315-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0315-Entity-getEntitySpawnReason.patch b/patches/server/0316-Entity-getEntitySpawnReason.patch
similarity index 97%
rename from patches/server/0315-Entity-getEntitySpawnReason.patch
rename to patches/server/0316-Entity-getEntitySpawnReason.patch
index a034031ad..005cee76d 100644
--- a/patches/server/0315-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0316-Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ 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 043869948201c728bf168855d260b0dca42a0b3a..c64557c70122bff6ea0c8d0b34f62daf680e4334 100644
+index f1d08ad4f29eb2b94dc24962bac177397df1110c..efc4d75baca19bb2c89be26e6880116dd9774b1b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1111,6 +1111,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -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 7b7c554ab22cee655d19eed793f45706f0311234..434618dcb3d4261eb1db20b8f0807c9aba6b8332 100644
+index f95b6e77318f18c62b7c7dda2be23161ddd914d7..b2275c1171f52cbdf283d210c6488e974fa07d98 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;
diff --git a/patches/server/0316-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 96%
rename from patches/server/0316-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch
index 4b63ab166..9dc0d1da1 100644
--- a/patches/server/0316-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0317-Update-entity-Metadata-for-all-tracked-players.patch
@@ -22,7 +22,7 @@ index ad9bbda31a4cdb306ca40f2b99e4b815c4f136bd..28afe2f238ded241acf77c3272a44068
          this.broadcast.accept(packet);
          if (this.entity instanceof ServerPlayer) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d8312d29103dd10f2b0634de5a056774d06d3263..8b76ac2e7462cf56c2d5019d12f7e839bfbc8b1e 100644
+index c184417a71467abd420c99ba5feb3a1844e92c1d..61cfe722c01ac8fa89e8ade3e798bc50bed5e186 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2289,7 +2289,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0317-Fire-event-on-GS4-query.patch b/patches/server/0318-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0317-Fire-event-on-GS4-query.patch
rename to patches/server/0318-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0318-Implement-PlayerPostRespawnEvent.patch b/patches/server/0319-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0318-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0319-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0319-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0319-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0320-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0320-Server-Tick-Events.patch b/patches/server/0321-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0320-Server-Tick-Events.patch
rename to patches/server/0321-Server-Tick-Events.patch
diff --git a/patches/server/0321-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from patches/server/0321-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch
index 6c015bede..26a59a20f 100644
--- a/patches/server/0321-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0322-PlayerDeathEvent-getItemsToKeep.patch
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8f558fac783783c27c89b3b64a8d1feaa1c82d46..62a43f3e6f27245a0baec7ff703ec023dd4e5e05 100644
+index a55bc1878e7bd24225b52fee7f10e59ef4e66934..4f53c802c4a5de9b6cd059dfd6e5604a5d6d7c2b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -729,6 +729,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0322-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0323-Optimize-Captured-TileEntity-Lookup.patch
similarity index 90%
rename from patches/server/0322-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0323-Optimize-Captured-TileEntity-Lookup.patch
index 222154acf..0f1434ac2 100644
--- a/patches/server/0322-Optimize-Captured-TileEntity-Lookup.patch
+++ b/patches/server/0323-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 834bbd63b4e45e8c89b4ece4eaf357f3cbe8e8ca..982029f2927b034835e95f45bb2937fff28f1cdf 100644
+index 6882649609356b28a0b73949200f5111459e282e..e8b935aa953d19f5617440dbdb8a763a440a0c82 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -870,9 +870,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -872,9 +872,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getTileEntity(BlockPos blockposition, boolean validate) {
diff --git a/patches/server/0323-Add-Heightmap-API.patch b/patches/server/0324-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0323-Add-Heightmap-API.patch
rename to patches/server/0324-Add-Heightmap-API.patch
diff --git a/patches/server/0324-Mob-Spawner-API-Enhancements.patch b/patches/server/0325-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0324-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0325-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0325-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0325-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch
index 260247a1e..1b700e5af 100644
--- a/patches/server/0325-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0326-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8b76ac2e7462cf56c2d5019d12f7e839bfbc8b1e..fc7776e081a76d52e5890ba05f750944e5a1d402 100644
+index 61cfe722c01ac8fa89e8ade3e798bc50bed5e186..e75e29919c6703f720658bc1c6f6f347ef066a82 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -440,7 +440,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0326-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0326-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0327-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0327-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from patches/server/0327-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/server/0328-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/0328-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0329-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from patches/server/0328-improve-CraftWorld-isChunkLoaded.patch
rename to patches/server/0329-improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0330-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index ce2f3b24c..792ca2c76 100644
--- a/patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0330-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 c64557c70122bff6ea0c8d0b34f62daf680e4334..6631a2b8cf99993d727d65a67af2bc7febb685b4 100644
+index efc4d75baca19bb2c89be26e6880116dd9774b1b..70c583827f6b947d57b477f6fc416857c70336c1 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;
diff --git a/patches/server/0330-ChunkMapDistance-CME.patch b/patches/server/0331-ChunkMapDistance-CME.patch
similarity index 97%
rename from patches/server/0330-ChunkMapDistance-CME.patch
rename to patches/server/0331-ChunkMapDistance-CME.patch
index a124ceb87..809d0e30f 100644
--- a/patches/server/0330-ChunkMapDistance-CME.patch
+++ b/patches/server/0331-ChunkMapDistance-CME.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ChunkMapDistance CME
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 00f5cd29170e3594fe2ac194e04e403cef685912..84831fc611589c19320b5e3af107080596b1fbdc 100644
+index 92faf96e12b443351ea146d4d1deccb0f7e020e5..1ff399ae84eb5281cd058556f67374688ab59e54 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
 @@ -73,6 +73,7 @@ public class ChunkHolder {
diff --git a/patches/server/0331-Implement-CraftBlockSoundGroup.patch b/patches/server/0332-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0331-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0332-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0332-Chunk-debug-command.patch b/patches/server/0333-Chunk-debug-command.patch
similarity index 100%
rename from patches/server/0332-Chunk-debug-command.patch
rename to patches/server/0333-Chunk-debug-command.patch
diff --git a/patches/server/0333-Fix-World-isChunkGenerated-calls.patch b/patches/server/0334-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0333-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0334-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0335-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 94%
rename from patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0335-Show-blockstate-location-if-we-failed-to-read-it.patch
index f19e04233..770d6fb7e 100644
--- a/patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0335-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Show blockstate location if we failed to read it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 9a30770a2f68e1253afe3ca8ecdae19c988248f9..2b2c9e58eabe148c994152d2596e29a313be921b 100644
+index 972d4aa11a0a119e8e6703af99d93bcd3cddc6d8..315690d72c5ba07b9bb6e7dd997b8f5afdf627f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -19,6 +19,8 @@ public class CraftBlockEntityState<T extends BlockEntity> extends CraftBlockStat
diff --git a/patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0336-Configurable-projectile-relative-velocity.patch b/patches/server/0337-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0336-Configurable-projectile-relative-velocity.patch
rename to patches/server/0337-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0337-offset-item-frame-ticking.patch b/patches/server/0338-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0337-offset-item-frame-ticking.patch
rename to patches/server/0338-offset-item-frame-ticking.patch
diff --git a/patches/server/0338-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/server/0339-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from patches/server/0338-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to patches/server/0339-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/patches/server/0339-Fix-MC-158900.patch b/patches/server/0340-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0339-Fix-MC-158900.patch
rename to patches/server/0340-Fix-MC-158900.patch
diff --git a/patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0341-Prevent-consuming-the-wrong-itemstack.patch
similarity index 96%
rename from patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0341-Prevent-consuming-the-wrong-itemstack.patch
index d9f9c995d..328cfeb1b 100644
--- a/patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0341-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1460a3185d557acfe695d46b4254a2a573cb7323..084156e1014647d8f4bfce271e114c47b1a09a81 100644
+index ddb0a2f4d2894bd416d4b4b8d9cf1538705d104c..01546bc3e79e1f69385d070ce97f047c670ab926 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3547,15 +3547,18 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0341-Generator-Settings.patch b/patches/server/0342-Generator-Settings.patch
similarity index 99%
rename from patches/server/0341-Generator-Settings.patch
rename to patches/server/0342-Generator-Settings.patch
index 590c2cd9f..f8115a02c 100644
--- a/patches/server/0341-Generator-Settings.patch
+++ b/patches/server/0342-Generator-Settings.patch
@@ -20,7 +20,7 @@ index 4c177a383b277debe8a7c02a70d029d862e6b048..0c336a794d21d5084b9ea39308379b2f
  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index dd7de2c3db10d9d606d47c52eba40e71034fc11a..5473b22d21ea981f245f4826c4d47295890f88ef 100644
+index da58b2ee334a347eea375dafd37347635a4ab62f..6d69f15d90e9096f0ee6cb7259effa87622c787b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -678,7 +678,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0342-Fix-MC-161754.patch b/patches/server/0343-Fix-MC-161754.patch
similarity index 100%
rename from patches/server/0342-Fix-MC-161754.patch
rename to patches/server/0343-Fix-MC-161754.patch
diff --git a/patches/server/0343-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/patches/server/0344-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from patches/server/0343-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to patches/server/0344-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/patches/server/0344-Expose-the-internal-current-tick.patch b/patches/server/0345-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0344-Expose-the-internal-current-tick.patch
rename to patches/server/0345-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0345-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/patches/server/0346-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 94%
rename from patches/server/0345-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to patches/server/0346-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index a87c2ad2b..6e3dab38b 100644
--- a/patches/server/0345-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/patches/server/0346-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 62a43f3e6f27245a0baec7ff703ec023dd4e5e05..6086f86e6fd0395553aef42df4aef6a117231896 100644
+index 4f53c802c4a5de9b6cd059dfd6e5604a5d6d7c2b..c0ef21b773101abaf86f50b1bf7cde1b1336a5ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1101,6 +1101,8 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0346-Add-option-to-disable-pillager-patrols.patch b/patches/server/0347-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0346-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0347-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0347-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0348-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 92%
rename from patches/server/0347-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/server/0348-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 55d9df04d..2d6115905 100644
--- a/patches/server/0347-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0348-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fc7776e081a76d52e5890ba05f750944e5a1d402..9c5eba2cbd7399c8e3f8c5c3dad228ded6d57832 100644
+index e75e29919c6703f720658bc1c6f6f347ef066a82..58c5fd6518cf7a05725a840f6051ed0548eb1cd6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1741,6 +1741,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0348-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0349-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0348-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0349-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0349-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0350-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0349-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0350-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0350-Optimize-Hoppers.patch b/patches/server/0351-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0350-Optimize-Hoppers.patch
rename to patches/server/0351-Optimize-Hoppers.patch
index e8c6dade1..b4d794752 100644
--- a/patches/server/0350-Optimize-Hoppers.patch
+++ b/patches/server/0351-Optimize-Hoppers.patch
@@ -62,7 +62,7 @@ index 449d2e7b18608ca36282f1a29e69457fc525307e..c738cb0433ea4a86d82372bf66e29c01
      public double getLevelX() {
          return this.getX();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index dd4deb08eb3ed15a156269a11d3d43abfd61fe5b..10f55ba189d12c46e0ef38b0b96a29894b4fba93 100644
+index 1b1786934cdbc0e701d7f3f12883adffcd12e0b3..d0cf2ab939392b8bf6558a69d5110a8c18c092b8 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -601,11 +601,12 @@ public final class ItemStack {
diff --git a/patches/server/0351-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0352-PlayerDeathEvent-shouldDropExperience.patch
similarity index 91%
rename from patches/server/0351-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0352-PlayerDeathEvent-shouldDropExperience.patch
index bf75aa191..a88bb99d6 100644
--- a/patches/server/0351-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0352-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6086f86e6fd0395553aef42df4aef6a117231896..018632aa8b122f8c013579075615d88d712f4250 100644
+index c0ef21b773101abaf86f50b1bf7cde1b1336a5ee..54cc0391f77d90a206e9fb2422ea31d5b9ee22af 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -849,7 +849,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0352-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0353-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 91%
rename from patches/server/0352-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0353-Prevent-bees-loading-chunks-checking-hive-position.patch
index 6c74d7945..19bb2a3a5 100644
--- a/patches/server/0352-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0353-Prevent-bees-loading-chunks-checking-hive-position.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent bees loading chunks checking hive position
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 488dd4693dbbc303f0fc6d98667b822304b06c9f..f3ba4b26553915917c79f013ed9dd7c87d9f65a4 100644
+index 7ada55085ded1c72c490eeca3d80c518aebbca8e..51a1d061e539418cfd169e806ee0b51adccaf21a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -495,6 +495,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0353-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0354-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0353-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0354-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0354-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0355-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0354-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0355-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0355-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0356-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0355-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0356-Optimise-IEntityAccess-getPlayerByUUID.patch
index 9b8cfb93e..9757f2d9c 100644
--- a/patches/server/0355-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0356-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ 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 1e09fdfbc1a8f1014ad0f7c5db7c709fc454270e..fe98fa03548922903e4fb352fbdfeeaac87450df 100644
+index 70c583827f6b947d57b477f6fc416857c70336c1..30ccb9c0ffabfe5536c89d1dafb97afb467371a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -284,6 +284,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0356-Fix-items-not-falling-correctly.patch b/patches/server/0357-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0356-Fix-items-not-falling-correctly.patch
rename to patches/server/0357-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0357-Lag-compensate-eating.patch b/patches/server/0358-Lag-compensate-eating.patch
similarity index 97%
rename from patches/server/0357-Lag-compensate-eating.patch
rename to patches/server/0358-Lag-compensate-eating.patch
index c6b1004b9..d8b9349b0 100644
--- a/patches/server/0357-Lag-compensate-eating.patch
+++ b/patches/server/0358-Lag-compensate-eating.patch
@@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 084156e1014647d8f4bfce271e114c47b1a09a81..5f73418035ac1226c6b655b654367ff9cf9f0841 100644
+index 01546bc3e79e1f69385d070ce97f047c670ab926..13bb9c49847df699263977864dec52752ee4cf28 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3491,6 +3491,11 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0358-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0359-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0358-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0359-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0359-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0360-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0359-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0360-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0360-Add-effect-to-block-break-naturally.patch b/patches/server/0361-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0360-Add-effect-to-block-break-naturally.patch
rename to patches/server/0361-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0361-Entity-Activation-Range-2.0.patch b/patches/server/0362-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0361-Entity-Activation-Range-2.0.patch
rename to patches/server/0362-Entity-Activation-Range-2.0.patch
index 8b80bb91a..1ffafe3ec 100644
--- a/patches/server/0361-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0362-Entity-Activation-Range-2.0.patch
@@ -317,7 +317,7 @@ index 555cf6d39108d40998adbbaf6b09dd9973f5f2e3..426fa33c9e5ddf2de5435859ee4a5f35
          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 982029f2927b034835e95f45bb2937fff28f1cdf..aa198e9f2755734eac591bd3f94679518e9d7270 100644
+index e8b935aa953d19f5617440dbdb8a763a440a0c82..a689ae14c01206940d1fc4ce8cea3410b601d71d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -154,6 +154,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0362-Increase-Light-Queue-Size.patch b/patches/server/0363-Increase-Light-Queue-Size.patch
similarity index 100%
rename from patches/server/0362-Increase-Light-Queue-Size.patch
rename to patches/server/0363-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0363-Fix-Light-Command.patch b/patches/server/0364-Fix-Light-Command.patch
similarity index 100%
rename from patches/server/0363-Fix-Light-Command.patch
rename to patches/server/0364-Fix-Light-Command.patch
diff --git a/patches/server/0364-Anti-Xray.patch b/patches/server/0365-Anti-Xray.patch
similarity index 99%
rename from patches/server/0364-Anti-Xray.patch
rename to patches/server/0365-Anti-Xray.patch
index 6a0252671..ebe19a754 100644
--- a/patches/server/0364-Anti-Xray.patch
+++ b/patches/server/0365-Anti-Xray.patch
@@ -1153,7 +1153,7 @@ index f4a056185990181e486f452960159a5287947382..a695e5a0c2e8846333ccb9aea499b565
  
      public void destroyAndAck(BlockPos pos, ServerboundPlayerActionPacket.Action action, String reason) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index aa198e9f2755734eac591bd3f94679518e9d7270..5c30d06ac80bb9e82d5eecf58b692040c3a55a99 100644
+index a689ae14c01206940d1fc4ce8cea3410b601d71d..603db501fe8491539edb2564a312fe69f9e07a63 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -164,6 +164,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0365-No-Tick-view-distance-implementation.patch b/patches/server/0366-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from patches/server/0365-No-Tick-view-distance-implementation.patch
rename to patches/server/0366-No-Tick-view-distance-implementation.patch
index 3c459b373..b4c7643d1 100644
--- a/patches/server/0365-No-Tick-view-distance-implementation.patch
+++ b/patches/server/0366-No-Tick-view-distance-implementation.patch
@@ -562,7 +562,7 @@ 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 5c30d06ac80bb9e82d5eecf58b692040c3a55a99..c71ca549c15d4f88053b8046feecab4ea6a724a4 100644
+index 603db501fe8491539edb2564a312fe69f9e07a63..4569aa6df0ef596f185235bfedb1ce058d1da62b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -527,8 +527,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0366-Implement-alternative-item-despawn-rate.patch b/patches/server/0367-Implement-alternative-item-despawn-rate.patch
similarity index 98%
rename from patches/server/0366-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0367-Implement-alternative-item-despawn-rate.patch
index 889c22011..71362a496 100644
--- a/patches/server/0366-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0367-Implement-alternative-item-despawn-rate.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement alternative item-despawn-rate
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b2f0102c2a15eb4324367f52e03e534bff883f9b..3f4a9ce31981f77b1c451a5d9ba91d6c9ab67587 100644
+index 3e3097f23f775eec4107f5c2f3f2266f4250ba15..1a21a177e3062130d7bbcde53e49732c634db73d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -453,6 +453,54 @@ public class PaperWorldConfig {
diff --git a/patches/server/0367-Tracking-Range-Improvements.patch b/patches/server/0368-Tracking-Range-Improvements.patch
similarity index 97%
rename from patches/server/0367-Tracking-Range-Improvements.patch
rename to patches/server/0368-Tracking-Range-Improvements.patch
index a8cc0ab06..8879bf835 100644
--- a/patches/server/0367-Tracking-Range-Improvements.patch
+++ b/patches/server/0368-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b0cf6e186d7030b1aa9296671683bd33e2d15579..280bd301b7005d16fec293311f11485b94ded550 100644
+index 91930daa3c965dcc1cb50ae260c159be55f351ed..38c0437b0676e3f5f4bbc96c1f3a42712794ba5f 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1791,6 +1791,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
diff --git a/patches/server/0368-Fix-items-vanishing-through-end-portal.patch b/patches/server/0369-Fix-items-vanishing-through-end-portal.patch
similarity index 93%
rename from patches/server/0368-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0369-Fix-items-vanishing-through-end-portal.patch
index 7ba3ecfef..988d385a3 100644
--- a/patches/server/0368-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0369-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ 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 9ebbcd15dee0141eca83187a85e0d9b0b5a0fa86..b4694693814ca37ca33fef10bd87e05c228c9fa1 100644
+index 4ea2bea8641e08bb0350582efc8b43293703c453..1569ef6efd811c173dc421761f433152cca9f9ea 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2984,6 +2984,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
diff --git a/patches/server/0369-implement-optional-per-player-mob-spawns.patch b/patches/server/0370-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from patches/server/0369-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0370-implement-optional-per-player-mob-spawns.patch
index 08d0b300e..ad605ed13 100644
--- a/patches/server/0369-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0370-implement-optional-per-player-mob-spawns.patch
@@ -545,7 +545,7 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc
 +    }
 +} 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 280bd301b7005d16fec293311f11485b94ded550..d3f835a0c76ce559fb5f3c39714a3312c7e865d1 100644
+index 38c0437b0676e3f5f4bbc96c1f3a42712794ba5f..ebcfe31c8395aa2bbcc9a9ac74d4c6e1f2e5d0f7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -140,6 +140,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -591,7 +591,7 @@ index 280bd301b7005d16fec293311f11485b94ded550..d3f835a0c76ce559fb5f3c39714a3312
          double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8);
          double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8);
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index c47d1772044913475a60292162ef4be594bed4c6..78143fe566fef13604c46029d4184ba39ed4aefc 100644
+index 6f8b4d9974c8fb549d69e9b46ab05958c9ce0ba7..666626752b9f05c6c33fee709865526b738acaf6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -754,7 +754,22 @@ public class ServerChunkCache extends ChunkSource {
@@ -619,7 +619,7 @@ index c47d1772044913475a60292162ef4be594bed4c6..78143fe566fef13604c46029d4184ba3
  
              this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 92a77fa90828cc4bc3d9217d2df37ffeec6ee58e..ec7804e80f9c6b0fc53eb67823c6325a685c850b 100644
+index 648e7b258eef32213c512781faffa840eedebec6..e896224cec9eede23a890975888076bfe94f8a0a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -90,12 +90,7 @@ import net.minecraft.world.damagesource.DamageSource;
diff --git a/patches/server/0370-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0371-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 97%
rename from patches/server/0370-Avoid-hopper-searches-if-there-are-no-items.patch
rename to patches/server/0371-Avoid-hopper-searches-if-there-are-no-items.patch
index d0bab4c13..4b30221d3 100644
--- a/patches/server/0370-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0371-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -14,10 +14,10 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 4eee8156d193f59b7e28499f492f81247c4b1591..641f022c4c716e0441a098f4540fd008059a4b51 100644
+index 4569aa6df0ef596f185235bfedb1ce058d1da62b..02c4396f3f42c1ec387eae9b2f7815f6e9f9e1c4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -989,7 +989,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -991,7 +991,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  }
              }
  
diff --git a/patches/server/0371-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0372-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 94%
rename from patches/server/0371-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0372-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index aa3265d3a..54eaba16b 100644
--- a/patches/server/0371-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0372-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index f3ba4b26553915917c79f013ed9dd7c87d9f65a4..50724baf5eb207ce44be62509f9a024d9a0e10f3 100644
+index 51a1d061e539418cfd169e806ee0b51adccaf21a..8e2ebb2ba724d94c5723d82affc01ccb264c95c5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -143,7 +143,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0372-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0373-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 96%
rename from patches/server/0372-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0373-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 8a08a8419..96c9a596f 100644
--- a/patches/server/0372-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0373-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 78143fe566fef13604c46029d4184ba39ed4aefc..56aa640eb0096e5c5f1a34d6f11a4dd9ac8770df 100644
+index 666626752b9f05c6c33fee709865526b738acaf6..c22b7cfdcff46161444cd145a50678e982f2f645 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -451,6 +451,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0373-Add-debug-for-sync-chunk-loads.patch b/patches/server/0374-Add-debug-for-sync-chunk-loads.patch
similarity index 100%
rename from patches/server/0373-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0374-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0374-Allow-overriding-the-java-version-check.patch b/patches/server/0375-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from patches/server/0374-Allow-overriding-the-java-version-check.patch
rename to patches/server/0375-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0375-Add-ThrownEggHatchEvent.patch b/patches/server/0376-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0375-Add-ThrownEggHatchEvent.patch
rename to patches/server/0376-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0376-Optimise-random-block-ticking.patch b/patches/server/0377-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0376-Optimise-random-block-ticking.patch
rename to patches/server/0377-Optimise-random-block-ticking.patch
index dce97879c..65d4abd3e 100644
--- a/patches/server/0376-Optimise-random-block-ticking.patch
+++ b/patches/server/0377-Optimise-random-block-ticking.patch
@@ -266,10 +266,10 @@ index 925f16d5eb092518ef774f69a8d99689feb0f5d7..01d8af06f19427354cac95d691e65d31
  
      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 f3b100976a374cf9f1c3473788e9ff5b55f00ff5..3468c331208978f37dfed96b02be950e019f8a40 100644
+index 02c4396f3f42c1ec387eae9b2f7815f6e9f9e1c4..1e373db7080bd4fa5c62188e3ddb3e5206e9b5b1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1305,10 +1305,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1307,10 +1307,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/0377-Entity-Jump-API.patch b/patches/server/0378-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0377-Entity-Jump-API.patch
rename to patches/server/0378-Entity-Jump-API.patch
diff --git a/patches/server/0378-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0379-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0378-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0379-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0379-Make-the-GUI-graph-fancier.patch b/patches/server/0380-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0379-Make-the-GUI-graph-fancier.patch
rename to patches/server/0380-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0380-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0381-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0380-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0381-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0381-Prevent-teleporting-dead-entities.patch b/patches/server/0382-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0381-Prevent-teleporting-dead-entities.patch
rename to patches/server/0382-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0382-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0383-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0382-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0383-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0383-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0384-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0383-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0384-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0384-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0385-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0384-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0385-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0385-Optimise-Chunk-getFluid.patch b/patches/server/0386-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0385-Optimise-Chunk-getFluid.patch
rename to patches/server/0386-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0386-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0387-Optimise-TickListServer-by-rewriting-it.patch
similarity index 100%
rename from patches/server/0386-Optimise-TickListServer-by-rewriting-it.patch
rename to patches/server/0387-Optimise-TickListServer-by-rewriting-it.patch
diff --git a/patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0388-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0387-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0388-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0389-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0388-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0389-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0390-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0389-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0390-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0391-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0390-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0391-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0391-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0392-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0391-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0392-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0392-Don-t-tick-dead-players.patch b/patches/server/0393-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0392-Don-t-tick-dead-players.patch
rename to patches/server/0393-Don-t-tick-dead-players.patch
diff --git a/patches/server/0393-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0394-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0393-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0394-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0394-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0395-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from patches/server/0394-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to patches/server/0395-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/patches/server/0395-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0396-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 100%
rename from patches/server/0395-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to patches/server/0396-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
diff --git a/patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0397-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0396-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0397-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0397-Add-tick-times-API-and-mspt-command.patch b/patches/server/0398-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0397-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0398-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0398-Expose-MinecraftServer-isRunning.patch b/patches/server/0399-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0398-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0399-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0400-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0399-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0400-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0400-Remove-streams-from-Mob-AI-System.patch b/patches/server/0401-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from patches/server/0400-Remove-streams-from-Mob-AI-System.patch
rename to patches/server/0401-Remove-streams-from-Mob-AI-System.patch
diff --git a/patches/server/0401-Async-command-map-building.patch b/patches/server/0402-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0401-Async-command-map-building.patch
rename to patches/server/0402-Async-command-map-building.patch
diff --git a/patches/server/0402-Improved-Watchdog-Support.patch b/patches/server/0403-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0402-Improved-Watchdog-Support.patch
rename to patches/server/0403-Improved-Watchdog-Support.patch
index de067e6a2..5a5afd404 100644
--- a/patches/server/0402-Improved-Watchdog-Support.patch
+++ b/patches/server/0403-Improved-Watchdog-Support.patch
@@ -299,10 +299,10 @@ index 7bf4bf5cb2c1b54a7e2733091f48f3a824336d36..dcce05d2f4ab16424db4ab103a12188e
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 3468c331208978f37dfed96b02be950e019f8a40..668d6256df12888a5a15109365d9a4f1d004d9d6 100644
+index 1e373db7080bd4fa5c62188e3ddb3e5206e9b5b1..df28b1d2a67b327f6375290126943ae0292d5595 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -842,6 +842,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -844,6 +844,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
diff --git a/patches/server/0403-Optimize-Pathfinding.patch b/patches/server/0404-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0403-Optimize-Pathfinding.patch
rename to patches/server/0404-Optimize-Pathfinding.patch
diff --git a/patches/server/0404-Reduce-Either-Optional-allocation.patch b/patches/server/0405-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0404-Reduce-Either-Optional-allocation.patch
rename to patches/server/0405-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0405-Remove-streams-from-PairedQueue.patch b/patches/server/0406-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from patches/server/0405-Remove-streams-from-PairedQueue.patch
rename to patches/server/0406-Remove-streams-from-PairedQueue.patch
diff --git a/patches/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0407-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0406-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0407-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0407-Prevent-opening-inventories-when-frozen.patch b/patches/server/0408-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0407-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0408-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0408-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0409-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0408-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0409-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0410-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0409-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0410-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0411-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from patches/server/0410-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to patches/server/0411-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/patches/server/0411-Implement-Player-Client-Options-API.patch b/patches/server/0412-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0411-Implement-Player-Client-Options-API.patch
rename to patches/server/0412-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0413-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/0412-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0413-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0414-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0413-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0414-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0414-Broadcast-join-message-to-console.patch b/patches/server/0415-Broadcast-join-message-to-console.patch
similarity index 100%
rename from patches/server/0414-Broadcast-join-message-to-console.patch
rename to patches/server/0415-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0416-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0415-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0416-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0417-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from patches/server/0416-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0417-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0418-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0417-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0418-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0419-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0418-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0419-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0419-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0420-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from patches/server/0419-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to patches/server/0420-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/patches/server/0420-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0421-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0420-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0421-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0421-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0422-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0421-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0422-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0423-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0422-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0423-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0423-Implement-Brigadier-Mojang-API.patch b/patches/server/0424-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0423-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0424-Implement-Brigadier-Mojang-API.patch
diff --git a/patches/server/0424-Villager-Restocks-API.patch b/patches/server/0425-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0424-Villager-Restocks-API.patch
rename to patches/server/0425-Villager-Restocks-API.patch
diff --git a/patches/server/0425-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0426-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0425-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0426-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0426-Expose-game-version.patch b/patches/server/0427-Expose-game-version.patch
similarity index 100%
rename from patches/server/0426-Expose-game-version.patch
rename to patches/server/0427-Expose-game-version.patch
diff --git a/patches/server/0427-Optimize-Voxel-Shape-Merging.patch b/patches/server/0428-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0427-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0428-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0428-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0429-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0428-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0429-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0429-Implement-Mob-Goal-API.patch b/patches/server/0430-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0429-Implement-Mob-Goal-API.patch
rename to patches/server/0430-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0430-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0431-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0430-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0431-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0431-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0432-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from patches/server/0431-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to patches/server/0432-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/patches/server/0432-Add-villager-reputation-API.patch b/patches/server/0433-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0432-Add-villager-reputation-API.patch
rename to patches/server/0433-Add-villager-reputation-API.patch
diff --git a/patches/server/0433-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0434-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0433-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0434-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0434-ExperienceOrbMergeEvent.patch b/patches/server/0435-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0434-ExperienceOrbMergeEvent.patch
rename to patches/server/0435-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0435-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0436-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0435-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0436-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0436-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0437-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0436-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0437-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0437-Potential-bed-API.patch b/patches/server/0438-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0437-Potential-bed-API.patch
rename to patches/server/0438-Potential-bed-API.patch
diff --git a/patches/server/0438-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0439-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0438-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0439-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0439-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0439-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0440-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from patches/server/0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 557036844..96a35d0f6 100644
--- a/patches/server/0440-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0441-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -56,7 +56,7 @@ 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 668d6256df12888a5a15109365d9a4f1d004d9d6..d9697003d05ddc344207793b4f266743fcaef16c 100644
+index df28b1d2a67b327f6375290126943ae0292d5595..5e18a44af40c5c3d5276608b4ab9e83988027c32 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -424,6 +424,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0441-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0442-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0441-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0442-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0442-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0443-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0443-Ensure-safe-gateway-teleport.patch b/patches/server/0444-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0443-Ensure-safe-gateway-teleport.patch
rename to patches/server/0444-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0444-Add-option-for-console-having-all-permissions.patch b/patches/server/0445-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0444-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0445-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0446-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from patches/server/0445-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to patches/server/0446-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/patches/server/0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0447-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from patches/server/0446-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to patches/server/0447-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/patches/server/0447-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0448-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0447-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0448-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0448-Maps-shouldn-t-load-chunks.patch b/patches/server/0449-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0448-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0449-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0450-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0449-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0450-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0451-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0450-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0451-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0451-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0452-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0451-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0452-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0452-incremental-chunk-saving.patch b/patches/server/0453-incremental-chunk-saving.patch
similarity index 100%
rename from patches/server/0452-incremental-chunk-saving.patch
rename to patches/server/0453-incremental-chunk-saving.patch
diff --git a/patches/server/0453-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0453-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0454-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0455-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0454-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0455-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0456-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0455-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0456-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0457-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0456-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0457-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0457-Fix-sand-duping.patch b/patches/server/0458-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0457-Fix-sand-duping.patch
rename to patches/server/0458-Fix-sand-duping.patch
diff --git a/patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0459-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0458-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0459-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0459-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0460-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0459-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0460-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0460-Expose-Arrow-getItemStack.patch b/patches/server/0461-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0460-Expose-Arrow-getItemStack.patch
rename to patches/server/0461-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0462-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0461-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0462-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0462-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0463-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0462-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0463-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0463-Add-permission-for-command-blocks.patch b/patches/server/0464-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0463-Add-permission-for-command-blocks.patch
rename to patches/server/0464-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0465-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0464-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0465-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0466-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from patches/server/0465-Optimize-WorldBorder-collision-checks-and-air.patch
rename to patches/server/0466-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0467-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0466-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0467-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0467-Paper-dumpitem-command.patch b/patches/server/0468-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0467-Paper-dumpitem-command.patch
rename to patches/server/0468-Paper-dumpitem-command.patch
diff --git a/patches/server/0468-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0469-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0468-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0469-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0469-Improve-Legacy-Component-serialization-size.patch b/patches/server/0470-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0469-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0470-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0471-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0470-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0471-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0471-Support-old-UUID-format-for-NBT.patch b/patches/server/0472-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0471-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0472-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0472-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0473-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0472-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0473-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0473-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0474-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0473-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0474-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0474-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0475-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/0474-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0475-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0475-Remove-some-streams-from-structures.patch b/patches/server/0476-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0475-Remove-some-streams-from-structures.patch
rename to patches/server/0476-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0476-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0476-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0477-Support-components-in-ItemMeta.patch b/patches/server/0478-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0477-Support-components-in-ItemMeta.patch
rename to patches/server/0478-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0479-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0478-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0479-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0479-Add-entity-liquid-API.patch b/patches/server/0480-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0479-Add-entity-liquid-API.patch
rename to patches/server/0480-Add-entity-liquid-API.patch
diff --git a/patches/server/0480-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0481-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0480-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0481-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0481-Spawn-player-in-correct-world-on-login.patch b/patches/server/0482-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0481-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0482-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0482-Add-PrepareResultEvent.patch b/patches/server/0483-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0482-Add-PrepareResultEvent.patch
rename to patches/server/0483-Add-PrepareResultEvent.patch
diff --git a/patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0484-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0483-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0484-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0485-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0484-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0485-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0485-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0486-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0485-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0486-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0486-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0487-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0486-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0487-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0487-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0488-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0487-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0488-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0488-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0489-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0488-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0489-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0489-Move-range-check-for-block-placing-up.patch b/patches/server/0490-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0489-Move-range-check-for-block-placing-up.patch
rename to patches/server/0490-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0490-Fix-SPIGOT-5989.patch b/patches/server/0491-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0490-Fix-SPIGOT-5989.patch
rename to patches/server/0491-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0491-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0492-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0491-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0492-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0492-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0493-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0492-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0493-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0493-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0494-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0493-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0494-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0494-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0495-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0494-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0495-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0495-Fix-some-rails-connecting-improperly.patch b/patches/server/0496-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0495-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0496-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0496-Incremental-player-saving.patch b/patches/server/0497-Incremental-player-saving.patch
similarity index 100%
rename from patches/server/0496-Incremental-player-saving.patch
rename to patches/server/0497-Incremental-player-saving.patch
diff --git a/patches/server/0497-Fix-MC-187716-Use-configured-height.patch b/patches/server/0498-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0497-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0498-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0498-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0499-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0498-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0499-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0499-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0500-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0499-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0500-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0500-Brand-support.patch b/patches/server/0501-Brand-support.patch
similarity index 100%
rename from patches/server/0500-Brand-support.patch
rename to patches/server/0501-Brand-support.patch
diff --git a/patches/server/0501-Add-setMaxPlayers-API.patch b/patches/server/0502-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0501-Add-setMaxPlayers-API.patch
rename to patches/server/0502-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0502-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0503-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0502-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0503-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0503-Don-t-require-FACING-data.patch b/patches/server/0504-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0503-Don-t-require-FACING-data.patch
rename to patches/server/0504-Don-t-require-FACING-data.patch
diff --git a/patches/server/0504-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0505-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0504-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0505-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0505-Add-moon-phase-API.patch b/patches/server/0506-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0505-Add-moon-phase-API.patch
rename to patches/server/0506-Add-moon-phase-API.patch
diff --git a/patches/server/0506-Prevent-headless-pistons-from-being-created.patch b/patches/server/0507-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0506-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0507-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0507-Add-BellRingEvent.patch b/patches/server/0508-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0507-Add-BellRingEvent.patch
rename to patches/server/0508-Add-BellRingEvent.patch
diff --git a/patches/server/0508-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0509-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0508-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0509-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0509-Buffer-joins-to-world.patch b/patches/server/0510-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0509-Buffer-joins-to-world.patch
rename to patches/server/0510-Buffer-joins-to-world.patch
diff --git a/patches/server/0510-Optimize-redstone-algorithm.patch b/patches/server/0511-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0510-Optimize-redstone-algorithm.patch
rename to patches/server/0511-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0511-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0512-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0511-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0512-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0512-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0513-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0512-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0513-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0513-Fix-CraftTeam-null-check.patch b/patches/server/0514-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0513-Fix-CraftTeam-null-check.patch
rename to patches/server/0514-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0514-Add-more-Evoker-API.patch b/patches/server/0515-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0514-Add-more-Evoker-API.patch
rename to patches/server/0515-Add-more-Evoker-API.patch
diff --git a/patches/server/0515-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0516-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from patches/server/0515-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to patches/server/0516-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/patches/server/0516-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0517-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0516-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0517-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0517-Cache-block-data-strings.patch b/patches/server/0518-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0517-Cache-block-data-strings.patch
rename to patches/server/0518-Cache-block-data-strings.patch
diff --git a/patches/server/0518-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0519-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0518-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0519-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0519-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0520-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0519-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0520-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0520-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0521-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0520-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0521-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0521-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0522-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0521-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0522-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0522-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0523-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0522-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0523-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0523-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0524-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0523-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0524-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0524-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0525-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0524-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0525-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0525-Entity-isTicking.patch b/patches/server/0526-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0525-Entity-isTicking.patch
rename to patches/server/0526-Entity-isTicking.patch
diff --git a/patches/server/0526-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0527-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0526-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0527-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0527-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0528-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0527-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to patches/server/0528-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/patches/server/0528-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0529-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0528-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0529-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0529-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0529-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0530-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0531-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0530-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0531-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0531-Optimise-getType-calls.patch b/patches/server/0532-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0531-Optimise-getType-calls.patch
rename to patches/server/0532-Optimise-getType-calls.patch
diff --git a/patches/server/0532-Villager-resetOffers.patch b/patches/server/0533-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0532-Villager-resetOffers.patch
rename to patches/server/0533-Villager-resetOffers.patch
diff --git a/patches/server/0533-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0533-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0534-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0534-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch
index 9825acb71..a795154ad 100644
--- a/patches/server/0534-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d9697003d05ddc344207793b4f266743fcaef16c..c820cc7f3be693f445937a157ac2477e36f906b4 100644
+index 5e18a44af40c5c3d5276608b4ab9e83988027c32..bade87f842bf36b948bdeacf6d22715a5b075f3e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -147,7 +147,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0535-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0536-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0535-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0536-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0536-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0537-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0536-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0537-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0537-Player-elytra-boost-API.patch b/patches/server/0538-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0537-Player-elytra-boost-API.patch
rename to patches/server/0538-Player-elytra-boost-API.patch
diff --git a/patches/server/0538-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0539-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0538-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0539-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0539-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0539-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0540-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0541-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0540-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0541-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0541-Add-ignore-discounts-API.patch b/patches/server/0542-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0541-Add-ignore-discounts-API.patch
rename to patches/server/0542-Add-ignore-discounts-API.patch
diff --git a/patches/server/0542-Toggle-for-removing-existing-dragon.patch b/patches/server/0543-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0542-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0543-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0543-Fix-client-lag-on-advancement-loading.patch b/patches/server/0544-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0543-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0544-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0544-Item-no-age-no-player-pickup.patch b/patches/server/0545-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0544-Item-no-age-no-player-pickup.patch
rename to patches/server/0545-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0545-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0545-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0546-Beacon-API-custom-effect-ranges.patch b/patches/server/0547-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0546-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0547-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0547-Add-API-for-quit-reason.patch b/patches/server/0548-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0547-Add-API-for-quit-reason.patch
rename to patches/server/0548-Add-API-for-quit-reason.patch
diff --git a/patches/server/0548-Seed-based-feature-search.patch b/patches/server/0549-Seed-based-feature-search.patch
similarity index 100%
rename from patches/server/0548-Seed-based-feature-search.patch
rename to patches/server/0549-Seed-based-feature-search.patch
diff --git a/patches/server/0549-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0549-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0550-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0550-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0551-Expose-world-spawn-angle.patch b/patches/server/0552-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0551-Expose-world-spawn-angle.patch
rename to patches/server/0552-Expose-world-spawn-angle.patch
diff --git a/patches/server/0552-Add-Destroy-Speed-API.patch b/patches/server/0553-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0552-Add-Destroy-Speed-API.patch
rename to patches/server/0553-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0553-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0553-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0554-Add-LivingEntity-clearActiveItem.patch b/patches/server/0555-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0554-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0555-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0555-Add-PlayerItemCooldownEvent.patch b/patches/server/0556-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0555-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0556-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0556-More-lightning-API.patch b/patches/server/0557-More-lightning-API.patch
similarity index 100%
rename from patches/server/0556-More-lightning-API.patch
rename to patches/server/0557-More-lightning-API.patch
diff --git a/patches/server/0557-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0557-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0558-Added-missing-default-perms-for-commands.patch b/patches/server/0559-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0558-Added-missing-default-perms-for-commands.patch
rename to patches/server/0559-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0559-Add-PlayerShearBlockEvent.patch b/patches/server/0560-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0559-Add-PlayerShearBlockEvent.patch
rename to patches/server/0560-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0560-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0560-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0561-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0561-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0562-Limit-recipe-packets.patch b/patches/server/0563-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0562-Limit-recipe-packets.patch
rename to patches/server/0563-Limit-recipe-packets.patch
diff --git a/patches/server/0563-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0564-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0563-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0564-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0564-MC-4-Fix-item-position-desync.patch b/patches/server/0565-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0564-MC-4-Fix-item-position-desync.patch
rename to patches/server/0565-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0565-Player-Chunk-Load-Unload-Events.patch b/patches/server/0566-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0565-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0566-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0566-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0566-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0567-Expose-LivingEntity-hurt-direction.patch b/patches/server/0568-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0567-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0568-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0568-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0568-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0569-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0569-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0570-added-PlayerTradeEvent.patch b/patches/server/0571-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0570-added-PlayerTradeEvent.patch
rename to patches/server/0571-added-PlayerTradeEvent.patch
diff --git a/patches/server/0571-Implement-TargetHitEvent.patch b/patches/server/0572-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0571-Implement-TargetHitEvent.patch
rename to patches/server/0572-Implement-TargetHitEvent.patch
diff --git a/patches/server/0572-Additional-Block-Material-API-s.patch b/patches/server/0573-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0572-Additional-Block-Material-API-s.patch
rename to patches/server/0573-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0573-Fix-harming-potion-dupe.patch b/patches/server/0574-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0573-Fix-harming-potion-dupe.patch
rename to patches/server/0574-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0574-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0574-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0575-Cache-burn-durations.patch b/patches/server/0576-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0575-Cache-burn-durations.patch
rename to patches/server/0576-Cache-burn-durations.patch
diff --git a/patches/server/0576-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0576-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0577-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0577-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0578-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0578-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0579-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0579-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0580-Zombie-API-breaking-doors.patch b/patches/server/0581-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0580-Zombie-API-breaking-doors.patch
rename to patches/server/0581-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0581-Fix-nerfed-slime-when-splitting.patch b/patches/server/0582-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0581-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0582-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0582-Add-EntityLoadCrossbowEvent.patch b/patches/server/0583-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0582-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0583-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0583-Guardian-beam-workaround.patch b/patches/server/0584-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0583-Guardian-beam-workaround.patch
rename to patches/server/0584-Guardian-beam-workaround.patch
diff --git a/patches/server/0584-Added-WorldGameRuleChangeEvent.patch b/patches/server/0585-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0584-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0585-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0585-Added-ServerResourcesReloadedEvent.patch b/patches/server/0586-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0585-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0586-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0586-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0586-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0587-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0588-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0587-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0588-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0588-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0589-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0588-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0589-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0589-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0590-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0589-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0590-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0590-Configurable-door-breaking-difficulty.patch b/patches/server/0591-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0590-Configurable-door-breaking-difficulty.patch
rename to patches/server/0591-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0591-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0592-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0591-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0592-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0592-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0592-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0593-Remove-stale-POIs.patch b/patches/server/0594-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0593-Remove-stale-POIs.patch
rename to patches/server/0594-Remove-stale-POIs.patch
diff --git a/patches/server/0594-Fix-villager-boat-exploit.patch b/patches/server/0595-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0594-Fix-villager-boat-exploit.patch
rename to patches/server/0595-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0595-Add-sendOpLevel-API.patch b/patches/server/0596-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0595-Add-sendOpLevel-API.patch
rename to patches/server/0596-Add-sendOpLevel-API.patch
diff --git a/patches/server/0596-Add-StructureLocateEvent.patch b/patches/server/0597-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0596-Add-StructureLocateEvent.patch
rename to patches/server/0597-Add-StructureLocateEvent.patch
diff --git a/patches/server/0597-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0598-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0597-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0598-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0598-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0598-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0599-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0599-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0600-Make-schedule-command-per-world.patch b/patches/server/0601-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0600-Make-schedule-command-per-world.patch
rename to patches/server/0601-Make-schedule-command-per-world.patch
diff --git a/patches/server/0601-Configurable-max-leash-distance.patch b/patches/server/0602-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0601-Configurable-max-leash-distance.patch
rename to patches/server/0602-Configurable-max-leash-distance.patch
diff --git a/patches/server/0602-Implement-BlockPreDispenseEvent.patch b/patches/server/0603-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0602-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0603-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0603-Added-Vanilla-Entity-Tags.patch b/patches/server/0604-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/0603-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0604-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0604-added-Wither-API.patch b/patches/server/0605-added-Wither-API.patch
similarity index 100%
rename from patches/server/0604-added-Wither-API.patch
rename to patches/server/0605-added-Wither-API.patch
diff --git a/patches/server/0605-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0605-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0606-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0607-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0606-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0607-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0607-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0607-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0608-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0609-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0608-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0609-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0609-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0609-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0610-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from patches/server/0610-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/patches/server/0611-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0612-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0611-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0612-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0612-add-DragonEggFormEvent.patch b/patches/server/0613-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0612-add-DragonEggFormEvent.patch
rename to patches/server/0613-add-DragonEggFormEvent.patch
diff --git a/patches/server/0613-EntityMoveEvent.patch b/patches/server/0614-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0613-EntityMoveEvent.patch
rename to patches/server/0614-EntityMoveEvent.patch
diff --git a/patches/server/0614-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0614-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0615-Inline-shift-direction-fields.patch b/patches/server/0616-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0615-Inline-shift-direction-fields.patch
rename to patches/server/0616-Inline-shift-direction-fields.patch
diff --git a/patches/server/0616-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0617-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0616-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0617-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0617-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0617-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0618-living-entity-allow-attribute-registration.patch b/patches/server/0619-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0618-living-entity-allow-attribute-registration.patch
rename to patches/server/0619-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0619-fix-dead-slime-setSize-invincibility.patch b/patches/server/0620-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0619-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0620-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0620-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0621-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0620-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0621-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0621-misc-debugging-dumps.patch b/patches/server/0622-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0621-misc-debugging-dumps.patch
rename to patches/server/0622-misc-debugging-dumps.patch
diff --git a/patches/server/0622-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0622-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0623-Expose-Tracked-Players.patch b/patches/server/0624-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0623-Expose-Tracked-Players.patch
rename to patches/server/0624-Expose-Tracked-Players.patch
diff --git a/patches/server/0624-Remove-streams-from-SensorNearest.patch b/patches/server/0625-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0624-Remove-streams-from-SensorNearest.patch
rename to patches/server/0625-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0625-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from patches/server/0625-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/patches/server/0626-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0626-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0627-Improve-ServerGUI.patch b/patches/server/0628-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0627-Improve-ServerGUI.patch
rename to patches/server/0628-Improve-ServerGUI.patch
diff --git a/patches/server/0628-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0628-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0629-fix-converting-txt-to-json-file.patch b/patches/server/0630-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0629-fix-converting-txt-to-json-file.patch
rename to patches/server/0630-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0630-Add-worldborder-events.patch b/patches/server/0631-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0630-Add-worldborder-events.patch
rename to patches/server/0631-Add-worldborder-events.patch
diff --git a/patches/server/0631-added-PlayerNameEntityEvent.patch b/patches/server/0632-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0631-added-PlayerNameEntityEvent.patch
rename to patches/server/0632-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0632-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0633-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0632-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0633-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0633-Add-recipe-to-cook-events.patch b/patches/server/0634-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0633-Add-recipe-to-cook-events.patch
rename to patches/server/0634-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0634-Add-Block-isValidTool.patch b/patches/server/0635-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0634-Add-Block-isValidTool.patch
rename to patches/server/0635-Add-Block-isValidTool.patch
diff --git a/patches/server/0635-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0636-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0635-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0636-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0636-Implement-Keyed-on-World.patch b/patches/server/0637-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0636-Implement-Keyed-on-World.patch
rename to patches/server/0637-Implement-Keyed-on-World.patch
diff --git a/patches/server/0637-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0637-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0638-Item-Rarity-API.patch b/patches/server/0639-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0638-Item-Rarity-API.patch
rename to patches/server/0639-Item-Rarity-API.patch
diff --git a/patches/server/0639-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0639-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0640-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0641-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0640-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0641-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0641-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0641-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0642-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0643-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0642-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0643-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0643-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0643-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0644-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0645-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0644-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0645-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0645-Expose-protocol-version.patch b/patches/server/0646-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0645-Expose-protocol-version.patch
rename to patches/server/0646-Expose-protocol-version.patch
diff --git a/patches/server/0646-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0646-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0647-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0647-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0648-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0648-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0649-Add-bypass-host-check.patch b/patches/server/0650-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0649-Add-bypass-host-check.patch
rename to patches/server/0650-Add-bypass-host-check.patch
diff --git a/patches/server/0650-Set-area-affect-cloud-rotation.patch b/patches/server/0651-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0650-Set-area-affect-cloud-rotation.patch
rename to patches/server/0651-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0651-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0652-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0651-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0652-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0652-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0653-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0652-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0653-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0653-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0654-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0653-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0654-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0654-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0655-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0654-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0655-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0655-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0656-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0655-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0656-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0656-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0657-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0656-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0657-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0657-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0658-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0657-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0658-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0658-Added-PlayerDeepSleepEvent.patch b/patches/server/0659-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0658-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0659-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0659-More-World-API.patch b/patches/server/0660-More-World-API.patch
similarity index 100%
rename from patches/server/0659-More-World-API.patch
rename to patches/server/0660-More-World-API.patch
diff --git a/patches/server/0660-Added-PlayerBedFailEnterEvent.patch b/patches/server/0661-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0660-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0661-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0661-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0661-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0662-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0662-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0663-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0664-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0663-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0664-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0664-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0664-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0665-Add-Channel-initialization-listeners.patch b/patches/server/0666-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0665-Add-Channel-initialization-listeners.patch
rename to patches/server/0666-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0666-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0666-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0667-Add-more-WanderingTrader-API.patch b/patches/server/0668-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0667-Add-more-WanderingTrader-API.patch
rename to patches/server/0668-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0668-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0669-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0668-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0669-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0669-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0669-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0670-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0670-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0671-Inventory-close.patch b/patches/server/0672-Inventory-close.patch
similarity index 100%
rename from patches/server/0671-Inventory-close.patch
rename to patches/server/0672-Inventory-close.patch
diff --git a/patches/server/0672-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0672-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0673-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0673-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0674-Fix-CraftPotionBrewer-cache.patch b/patches/server/0675-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0674-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0675-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0675-Add-basic-Datapack-API.patch b/patches/server/0676-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0675-Add-basic-Datapack-API.patch
rename to patches/server/0676-Add-basic-Datapack-API.patch
diff --git a/patches/server/0676-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0677-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0676-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0677-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0677-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0677-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0678-Clear-SyncLoadInfo.patch b/patches/server/0679-Clear-SyncLoadInfo.patch
similarity index 100%
rename from patches/server/0678-Clear-SyncLoadInfo.patch
rename to patches/server/0679-Clear-SyncLoadInfo.patch
diff --git a/patches/server/0679-ItemStack-repair-check-API.patch b/patches/server/0680-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0679-ItemStack-repair-check-API.patch
rename to patches/server/0680-ItemStack-repair-check-API.patch
diff --git a/patches/server/0680-More-Enchantment-API.patch b/patches/server/0681-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0680-More-Enchantment-API.patch
rename to patches/server/0681-More-Enchantment-API.patch
diff --git a/patches/server/0681-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0681-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0682-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0682-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
index 71dfea345..b063d4443 100644
--- a/patches/server/0682-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
@@ -297,7 +297,7 @@ index 73ac55de9059a1d0f1da5bec0688dcd4bf5c8973..db2d6e7b2dc82c60d524dd2a018d28c2
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c820cc7f3be693f445937a157ac2477e36f906b4..ac7d3da1ca3b41e37daacb13865667614fde321b 100644
+index bade87f842bf36b948bdeacf6d22715a5b075f3e..274a8bf3d5009e4207ca05348e2f813f257fd934 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -174,6 +174,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0683-Add-Mob-lookAt-API.patch b/patches/server/0684-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0683-Add-Mob-lookAt-API.patch
rename to patches/server/0684-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0684-Add-Unix-domain-socket-support.patch b/patches/server/0685-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0684-Add-Unix-domain-socket-support.patch
rename to patches/server/0685-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0685-Add-EntityInsideBlockEvent.patch b/patches/server/0686-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0685-Add-EntityInsideBlockEvent.patch
rename to patches/server/0686-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0686-Attributes-API-for-item-defaults.patch b/patches/server/0687-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0686-Attributes-API-for-item-defaults.patch
rename to patches/server/0687-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0687-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0687-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0688-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0689-More-Lidded-Block-API.patch b/patches/server/0690-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0689-More-Lidded-Block-API.patch
rename to patches/server/0690-More-Lidded-Block-API.patch
diff --git a/patches/server/0690-Limit-item-frame-cursors-on-maps.patch b/patches/server/0691-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0690-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0691-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0691-Add-PufferFishStateChangeEvent.patch b/patches/server/0692-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0691-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0692-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0692-Add-PlayerKickEvent-causes.patch b/patches/server/0693-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0692-Add-PlayerKickEvent-causes.patch
rename to patches/server/0693-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0693-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0694-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0695-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0696-Add-BellRevealRaiderEvent.patch b/patches/server/0697-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0696-Add-BellRevealRaiderEvent.patch
rename to patches/server/0697-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0697-Fix-invulnerable-end-crystals.patch b/patches/server/0698-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0697-Fix-invulnerable-end-crystals.patch
rename to patches/server/0698-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0698-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0699-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0698-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0699-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0699-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0700-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 100%
rename from patches/server/0699-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0700-Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/patches/server/0700-Fix-dangerous-end-portal-logic.patch b/patches/server/0701-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0700-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0701-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0702-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0701-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0702-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0702-Make-item-validations-configurable.patch b/patches/server/0703-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0702-Make-item-validations-configurable.patch
rename to patches/server/0703-Make-item-validations-configurable.patch
diff --git a/patches/server/0703-Add-more-line-of-sight-methods.patch b/patches/server/0704-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/server/0703-Add-more-line-of-sight-methods.patch
rename to patches/server/0704-Add-more-line-of-sight-methods.patch
diff --git a/patches/server/0704-add-per-world-spawn-limits.patch b/patches/server/0705-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0704-add-per-world-spawn-limits.patch
rename to patches/server/0705-add-per-world-spawn-limits.patch
diff --git a/patches/server/0705-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0706-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0705-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0706-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0707-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0706-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0707-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch