From 41647af74caed955c1fd5b38d458ee59298ae5d4 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 3 Jul 2022 14:55:56 -0700
Subject: [PATCH] Do not use worldgen executor for api profile completions

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

diff --git a/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 77%
rename from patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
index b4a4b8d8a..aece8e971 100644
--- a/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch
+++ b/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch
@@ -10,13 +10,13 @@ out due to a sync load, as the worldgen threads will be
 stalling on profile lookups.
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 5f9e3d37c3ba79d26806374d73f87328cebb562d..206c6ce227ba19620185ac835af28d67caa76c40 100644
+index d7e22ddf89619b58516ccef1d75a4c33df61b73c..33ec7786cdf8c32e905d192fc8364418e47404d5 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -80,6 +80,22 @@ public class Util {
      private static final AtomicInteger WORKER_COUNT = new AtomicInteger(1);
-     private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap", -2); // Paper - add -2 priority
-     private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main", -1); // Paper - add -1 priority
+     private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap");
+     private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main");
 +    // Paper start - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread
 +    public static final ExecutorService PROFILE_EXECUTOR = Executors.newFixedThreadPool(2, new java.util.concurrent.ThreadFactory() {
 +
@@ -37,10 +37,10 @@ index 5f9e3d37c3ba79d26806374d73f87328cebb562d..206c6ce227ba19620185ac835af28d67
      public static LongSupplier timeSource = System::nanoTime;
      public static final Ticker TICKER = new Ticker() {
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 8d86645ef264287d01203afd7bba516e78be5743..4dff88bdf14675718572e4b3720c0250ce6e730e 100644
+index c7edbd12361cfd3dcf1359917d579fae4c3cc8a7..6c8a1d9c7696fa55dae6ba5e4ea50a0ffc7ea543 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-@@ -207,7 +207,7 @@ public class GameProfileCache {
+@@ -181,7 +181,7 @@ public class GameProfileCache {
              } else {
                  this.requests.put(username, CompletableFuture.supplyAsync(() -> {
                      return this.get(username);
@@ -62,3 +62,16 @@ index 0c7e29b589ab106013d979a20edc415b4b32a677..c5d5d90d10b30f30d1262367b3d75df4
                      Util.ifElse(profile, (profilex) -> {
                          Property property = Iterables.getFirst(profilex.getProperties().get("textures"), (Property)null);
                          if (property == null) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
+index 2d49bd6f3f017d43dfaa23cedf35040b64bcdcf8..9edc5e73819e0b55372f77c5e292eece74d837c7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
++++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
+@@ -121,7 +121,7 @@ public final class CraftPlayerProfile implements PlayerProfile {
+ 
+     @Override
+     public CompletableFuture<PlayerProfile> update() {
+-        return CompletableFuture.supplyAsync(this::getUpdatedProfile, Util.backgroundExecutor());
++        return CompletableFuture.supplyAsync(this::getUpdatedProfile, Util.PROFILE_EXECUTOR); // Paper - not a good idea to use BLOCKING OPERATIONS on the worldgen executor
+     }
+ 
+     private CraftPlayerProfile getUpdatedProfile() {
diff --git a/patches/server/0138-Add-UnknownCommandEvent.patch b/patches/server/0139-Add-UnknownCommandEvent.patch
similarity index 92%
rename from patches/server/0138-Add-UnknownCommandEvent.patch
rename to patches/server/0139-Add-UnknownCommandEvent.patch
index 2ef481f6d..800f58e3a 100644
--- a/patches/server/0138-Add-UnknownCommandEvent.patch
+++ b/patches/server/0139-Add-UnknownCommandEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 49d0e5e5cf1c529cbd0f4c58c88acf802f42a5bd..cf913f0678178d03c63eaa2b7a67e18abe17a7c5 100644
+index 20d1fafc33f207f5e922df9fa5e152e003717a1c..c55a18eadc2bef0c98abd46898e10a5110212c68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -888,7 +888,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0139-Basic-PlayerProfile-API.patch b/patches/server/0140-Basic-PlayerProfile-API.patch
similarity index 98%
rename from patches/server/0139-Basic-PlayerProfile-API.patch
rename to patches/server/0140-Basic-PlayerProfile-API.patch
index 58cfbda54..b0c4edc16 100644
--- a/patches/server/0139-Basic-PlayerProfile-API.patch
+++ b/patches/server/0140-Basic-PlayerProfile-API.patch
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d945ea3484d0350096046d43112490b94e3b9bcd
+index 0000000000000000000000000000000000000000..7a5b24419507d00817aa3e8950d89f5174823387
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,399 @@
@@ -185,7 +185,7 @@ index 0000000000000000000000000000000000000000..d945ea3484d0350096046d43112490b9
 +            final CraftPlayerProfile clone = clone();
 +            clone.complete(true);
 +            return clone;
-+        }, Util.backgroundExecutor());
++        }, Util.PROFILE_EXECUTOR);
 +    }
 +
 +    @Override
@@ -599,7 +599,7 @@ index a48a12a31a3d09a9373b688dcc093035f8f8a300..97b29bcb20e199c2d02457f8025e67e2
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index c7edbd12361cfd3dcf1359917d579fae4c3cc8a7..2a4f8aa6697ed6144440970c9abaf9f6e1a2c2ce 100644
+index 6c8a1d9c7696fa55dae6ba5e4ea50a0ffc7ea543..2347c7b44793aabe431b57bb1b44935fefbda6fe 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -136,6 +136,17 @@ public class GameProfileCache {
@@ -621,7 +621,7 @@ index c7edbd12361cfd3dcf1359917d579fae4c3cc8a7..2a4f8aa6697ed6144440970c9abaf9f6
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cf913f0678178d03c63eaa2b7a67e18abe17a7c5..c334fa4dcd0ecab1a1cdfe7ebb0b6615e710f164 100644
+index c55a18eadc2bef0c98abd46898e10a5110212c68..e66595c24210ed3f2daab2add7e8acc8cf881fdc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -241,6 +241,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -681,7 +681,7 @@ index cf913f0678178d03c63eaa2b7a67e18abe17a7c5..c334fa4dcd0ecab1a1cdfe7ebb0b6615
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-index 2d49bd6f3f017d43dfaa23cedf35040b64bcdcf8..661d8e9882509700faa9bc10a2e3074c5553af44 100644
+index 9edc5e73819e0b55372f77c5e292eece74d837c7..9001c9dc68dc05944eb839c3354bea29249daa92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 @@ -27,7 +27,7 @@ import org.bukkit.profile.PlayerProfile;
diff --git a/patches/server/0140-Shoulder-Entities-Release-API.patch b/patches/server/0141-Shoulder-Entities-Release-API.patch
similarity index 97%
rename from patches/server/0140-Shoulder-Entities-Release-API.patch
rename to patches/server/0141-Shoulder-Entities-Release-API.patch
index bb1d20db9..6278bc65f 100644
--- a/patches/server/0140-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0141-Shoulder-Entities-Release-API.patch
@@ -58,7 +58,7 @@ index 9aa134e56d661d033bb7229e6ab662534bf9cba9..794081610e52b7b8e04403510d1ad05f
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 2099056896954c700840f3c598f147e4983b86a1..ea024ec921a382e40c982cc529f13d08101ca131 100644
+index 2c934b7a2142a4d1ae21feeb95d23f22cfda3be0..3954ed194388c6487c6cd0303aea9e1b65a0f8ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -504,6 +504,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0141-Profile-Lookup-Events.patch b/patches/server/0142-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0141-Profile-Lookup-Events.patch
rename to patches/server/0142-Profile-Lookup-Events.patch
diff --git a/patches/server/0142-Block-player-logins-during-server-shutdown.patch b/patches/server/0143-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from patches/server/0142-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0143-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0143-Entity-fromMobSpawner.patch b/patches/server/0144-Entity-fromMobSpawner.patch
similarity index 100%
rename from patches/server/0143-Entity-fromMobSpawner.patch
rename to patches/server/0144-Entity-fromMobSpawner.patch
diff --git a/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0144-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0145-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0145-Implement-ensureServerConversions-API.patch b/patches/server/0146-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0145-Implement-ensureServerConversions-API.patch
rename to patches/server/0146-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0146-Implement-getI18NDisplayName.patch b/patches/server/0147-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0146-Implement-getI18NDisplayName.patch
rename to patches/server/0147-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0147-ProfileWhitelistVerifyEvent.patch b/patches/server/0148-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/server/0147-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0148-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0148-Fix-this-stupid-bullshit.patch b/patches/server/0149-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from patches/server/0148-Fix-this-stupid-bullshit.patch
rename to patches/server/0149-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0149-LivingEntity-setKiller.patch b/patches/server/0150-LivingEntity-setKiller.patch
similarity index 100%
rename from patches/server/0149-LivingEntity-setKiller.patch
rename to patches/server/0150-LivingEntity-setKiller.patch
diff --git a/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 100%
rename from patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 95%
rename from patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 8eb888811..24e5ff4f3 100644
--- a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a8bc19403fc82ef03e43afe8ddf5fa78890e8dda..22038142efe960acebba84a4cc81f5ce7eaa0512 100644
+index d4141a24cb5ba20e8c53c85206b32120ff18eb48..a57fad0a75fe18f70d3dd6cd5c6a2ab90eb0498d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -17,7 +17,7 @@ dependencies {
@@ -28,7 +28,7 @@ index a8bc19403fc82ef03e43afe8ddf5fa78890e8dda..22038142efe960acebba84a4cc81f5ce
      implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper
      implementation("org.ow2.asm:asm:9.3")
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index a4ec0d7791deed7cb64d4a35e19ceb3d9d798221..2e684d28948d23a310b5d5029903a871e6f9b1ca 100644
+index 051d7c7fc5796ad056ae1ba5e5e630fde8794108..c2e3d32e51902503af88f089e366e784f42d999a 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -290,7 +290,7 @@ public class SpigotConfig
diff --git a/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0155-Add-PlayerJumpEvent.patch b/patches/server/0156-Add-PlayerJumpEvent.patch
similarity index 100%
rename from patches/server/0155-Add-PlayerJumpEvent.patch
rename to patches/server/0156-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
similarity index 100%
rename from patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
rename to patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
similarity index 97%
rename from patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
index 5e405644f..197e172c8 100644
--- a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index 9016aced079108aeae09f030a672467a953ef93f..4170bda451df3db43e7d57d87d1abb81
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0b693866af8e0d8de275e87ca1232a03a6a35abe..7233d075b9c12c4beee872c204a4524c942f183d 100644
+index 4754f603ca1c80129f9ee3868b54d25c52a759cc..b956da482950b7383768d6bd60fa4360e179d7d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -218,6 +218,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch b/patches/server/0159-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from patches/server/0158-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0159-revert-serverside-behavior-of-keepalives.patch
index bcdc79776..7c5718dee 100644
--- a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0159-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 32c59e612519323c8ee1956a1a893354913d1fda..71e52f71ac06f66696f5ae9b79ab490c7389927f 100644
+index a38061ba575a2603b6b04382cb2f5c8396b05bdd..86f9991cfe6aca5923c64d8cdde6e90b9ba5591d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -240,7 +240,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0160-Add-PlayerArmorChangeEvent.patch b/patches/server/0161-Add-PlayerArmorChangeEvent.patch
similarity index 94%
rename from patches/server/0160-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0161-Add-PlayerArmorChangeEvent.patch
index 0747a7d62..fab2852fe 100644
--- a/patches/server/0160-Add-PlayerArmorChangeEvent.patch
+++ b/patches/server/0161-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7c50e9c28f9f26b42d2baa51d8fa735bb182ffa5..27a2ba075a2f7575b6788c66a121fc906b19a99d 100644
+index 20bc6684b0394fe08aa35c371bf668d8ebcf98b1..39635eae8b2f92ffb171c5cbb37bed5bd610266b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 92%
rename from patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
index 31dd1f90e..7b4e3a0b6 100644
--- a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 9fe3ec7e6bd194b825a1b29bcff9fcd5e21f22ad..5bf48f4fb0794a1eaea3783add9e5852997434f6 100644
+index d2f0450c6bae722bfa9162b027e723eb10b22c78..145f3eae6622453d47769e10fb30ce8d31d5f847 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -86,7 +86,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 96%
rename from patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
index cc8e752db..d0a52d572 100644
--- a/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@@ -5,7 +5,7 @@ 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 5577a560d41a2467bd713f2fa7511c83a73c2f2d..e6b9b19cde9c3576745a10e0a12317fc99577ae8 100644
+index 4e843d9e28f7775faba3e47ca5a725f7921490e6..28c3aca868c11da6f61b19b9b35072995c8be8bf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -691,6 +691,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 97%
rename from patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
index 73c67e8c1..8c4fa7bc1 100644
--- a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0164-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 e6b9b19cde9c3576745a10e0a12317fc99577ae8..ad0f91d57b5cbf0c4439993ad99ec7a484729a2e 100644
+index 28c3aca868c11da6f61b19b9b35072995c8be8bf..4022c4d3b2ce935f69460e4de21f1fad7c100b26 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -148,7 +148,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0165-AsyncTabCompleteEvent.patch b/patches/server/0166-AsyncTabCompleteEvent.patch
similarity index 98%
rename from patches/server/0165-AsyncTabCompleteEvent.patch
rename to patches/server/0166-AsyncTabCompleteEvent.patch
index a0bb7bd2e..5d8c632d7 100644
--- a/patches/server/0165-AsyncTabCompleteEvent.patch
+++ b/patches/server/0166-AsyncTabCompleteEvent.patch
@@ -72,7 +72,7 @@ index 86f9991cfe6aca5923c64d8cdde6e90b9ba5591d..7f17875e359855a25618a52bc2e844fe
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c334fa4dcd0ecab1a1cdfe7ebb0b6615e710f164..a9731e89f2cddc2ae256bf955945f4d2f3cd0c28 100644
+index e66595c24210ed3f2daab2add7e8acc8cf881fdc..7e3631a75a2221955199f746e9b8f406a744121a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2082,7 +2082,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0166-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0166-PlayerPickupExperienceEvent.patch
rename to patches/server/0167-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
similarity index 96%
rename from patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
index 3e9d938d7..b7043b48a 100644
--- a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7233d075b9c12c4beee872c204a4524c942f183d..e6ca45329c5f102ebf4abc729837108cad63a59f 100644
+index b956da482950b7383768d6bd60fa4360e179d7d8..153b5602f1c5f6ef7a184fc8c9cb72523fa3fccb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1346,7 +1346,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0170-PreCreatureSpawnEvent.patch b/patches/server/0171-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0170-PreCreatureSpawnEvent.patch
rename to patches/server/0171-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0171-Fill-Profile-Property-Events.patch b/patches/server/0172-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0171-Fill-Profile-Property-Events.patch
rename to patches/server/0172-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0173-Add-ArmorStand-Item-Meta.patch b/patches/server/0174-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0173-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0174-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0174-Extend-Player-Interact-cancellation.patch b/patches/server/0175-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0174-Extend-Player-Interact-cancellation.patch
rename to patches/server/0175-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0175-Tameable-getOwnerUniqueId-API.patch b/patches/server/0176-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0175-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0176-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0181-Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/server/0180-Player.setPlayerProfile-API.patch
rename to patches/server/0181-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0181-getPlayerUniqueId-API.patch b/patches/server/0182-getPlayerUniqueId-API.patch
similarity index 94%
rename from patches/server/0181-getPlayerUniqueId-API.patch
rename to patches/server/0182-getPlayerUniqueId-API.patch
index d908e8fdf..6c28496b9 100644
--- a/patches/server/0181-getPlayerUniqueId-API.patch
+++ b/patches/server/0182-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a9731e89f2cddc2ae256bf955945f4d2f3cd0c28..53834d226cf577413d1514c54f5a4b0294a432e7 100644
+index 7e3631a75a2221955199f746e9b8f406a744121a..4950f11c12f29cb363acd639c16c4aa8efafdd17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1704,6 +1704,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0182-Improved-Async-Task-Scheduler.patch b/patches/server/0183-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0182-Improved-Async-Task-Scheduler.patch
rename to patches/server/0183-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
similarity index 98%
rename from patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
index fa9de2b26..4b8b62f71 100644
--- a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
+++ b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
-index d86c2287cb9f4c8cf99e4374ef8a7135041670a1..2818495aa221f8195f095e39091bd478cebb3807 100644
+index 1369321f60ba0d8f754b1aad6dbc6d6ab990f2bf..c4f1de1413e37e91492e7dd3fa33da5ef87fdbd5 100644
 --- a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
 +++ b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
 @@ -16,6 +16,7 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
diff --git a/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0185-Flag-to-disable-the-channel-limit.patch b/patches/server/0186-Flag-to-disable-the-channel-limit.patch
similarity index 95%
rename from patches/server/0185-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0186-Flag-to-disable-the-channel-limit.patch
index bc569ac1d..003c9370b 100644
--- a/patches/server/0185-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0186-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 380bdc7cfa8980d5db29a15b29613fc62d75de2a..68a6bb89a5946fba7d4baeb009895d7ca975cbe8 100644
+index fd3304d1e58f0976cd048d4a265181a0f1251c2f..64f891db064ab1ad74479a5d7fb4d7828217afc7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -167,6 +167,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
similarity index 96%
rename from patches/server/0186-Add-openSign-method-to-HumanEntity.patch
rename to patches/server/0187-Add-openSign-method-to-HumanEntity.patch
index 460c383cf..e3578a257 100644
--- a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch
@@ -28,7 +28,7 @@ index 911843bf38ab750edd4a63417ba7a9deb6b64cb1..a0950f5902c3719dc31205ec43dca948
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index ea024ec921a382e40c982cc529f13d08101ca131..34e8ee0cc42c77715c62b0b4682f3df946266e11 100644
+index 3954ed194388c6487c6cd0303aea9e1b65a0f8ee..4ff81744b7c9113f57cf1fa89bb943902711b2dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -614,6 +614,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch b/patches/server/0188-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0187-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0188-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 94%
rename from patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index e87df1925..96b5ad6c8 100644
--- a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cd9f1bea29833c0d263d43f4a8c76908c0c54b89..2d6bb5e7dee7a0e7ddaf6e05a9a1f9df9f1d195d 100644
+index 7f17875e359855a25618a52bc2e844fe10258aaf..d729042a22f01decbf30d35d7842e43cab283c05 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3002,9 +3002,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0190-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0189-EndermanEscapeEvent.patch
rename to patches/server/0190-EndermanEscapeEvent.patch
diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0191-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0190-Enderman.teleportRandomly.patch
rename to patches/server/0191-Enderman.teleportRandomly.patch
diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
similarity index 96%
rename from patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
index 5ad567139..6ea8be62f 100644
--- a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch
@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e4d6fe5f19a575acfb08fcb8335f7519ed73b295..bd37a46aebe84e5d02b9ae40a57ed95c7c35c54b 100644
+index ddd956828996c9d7a86aa89a01cc5a2ee4606c30..2208dafab412df254bf4c17c1c03d1475b77fbd3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2072,6 +2072,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 97%
rename from patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch
index 5886ca984..9d60fcd9e 100644
--- a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0193-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 bd37a46aebe84e5d02b9ae40a57ed95c7c35c54b..96723a042c23d53a955c766d7899164684c32b74 100644
+index 2208dafab412df254bf4c17c1c03d1475b77fbd3..d394f7dd4ef1faa1b92a56945e5dab96b6dd17b8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1485,12 +1485,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0194-EndermanAttackPlayerEvent.patch b/patches/server/0195-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0194-EndermanAttackPlayerEvent.patch
rename to patches/server/0195-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0195-WitchConsumePotionEvent.patch b/patches/server/0196-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0195-WitchConsumePotionEvent.patch
rename to patches/server/0196-WitchConsumePotionEvent.patch
diff --git a/patches/server/0196-WitchThrowPotionEvent.patch b/patches/server/0197-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0196-WitchThrowPotionEvent.patch
rename to patches/server/0197-WitchThrowPotionEvent.patch
diff --git a/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0198-WitchReadyPotionEvent.patch b/patches/server/0199-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0198-WitchReadyPotionEvent.patch
rename to patches/server/0199-WitchReadyPotionEvent.patch
diff --git a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch b/patches/server/0200-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0199-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0200-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0202-Fix-CraftEntity-hashCode.patch b/patches/server/0203-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0202-Fix-CraftEntity-hashCode.patch
rename to patches/server/0203-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0205-Make-shield-blocking-delay-configurable.patch b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
similarity index 96%
rename from patches/server/0205-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0206-Make-shield-blocking-delay-configurable.patch
index 006c2a4b1..c2dd0c466 100644
--- a/patches/server/0205-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0206-Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 27a2ba075a2f7575b6788c66a121fc906b19a99d..1d82dab7fad130e6674d7f137ca29258cc7632a4 100644
+index 39635eae8b2f92ffb171c5cbb37bed5bd610266b..a2bf006f79b0c22827720e7d95828590cb52c8ef 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3697,12 +3697,24 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0206-Improve-EntityShootBowEvent.patch b/patches/server/0207-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0206-Improve-EntityShootBowEvent.patch
rename to patches/server/0207-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0207-PlayerReadyArrowEvent.patch b/patches/server/0208-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0207-PlayerReadyArrowEvent.patch
rename to patches/server/0208-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch
similarity index 98%
rename from patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch
rename to patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch
index 384fd823d..8de06d78b 100644
--- a/patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/server/0209-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 1d82dab7fad130e6674d7f137ca29258cc7632a4..da896f299072360a23cdfd025ed6f151a0441d4e 100644
+index a2bf006f79b0c22827720e7d95828590cb52c8ef..de16969a25bd72b4420e5ecbdb477a1adc51f2d1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1456,7 +1456,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0209-Expand-Explosions-API.patch b/patches/server/0210-Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/0209-Expand-Explosions-API.patch
rename to patches/server/0210-Expand-Explosions-API.patch
diff --git a/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0211-RangedEntity-API.patch b/patches/server/0212-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0211-RangedEntity-API.patch
rename to patches/server/0212-RangedEntity-API.patch
diff --git a/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0213-Implement-World.getEntity-UUID-API.patch b/patches/server/0214-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/0213-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0214-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0214-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from patches/server/0214-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0215-InventoryCloseEvent-Reason-API.patch
diff --git a/patches/server/0215-Vex-get-setSummoner-API.patch b/patches/server/0216-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0215-Vex-get-setSummoner-API.patch
rename to patches/server/0216-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 94%
rename from patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 5396c53de..848c40c38 100644
--- a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0217-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 c91e8300fe0cb673567f0b0e725a6d460dcebf31..4b99de786be5fbefb94a5484868b897ab0f86a27 100644
+index 8b9e569ccefaa5123c966590a9bba77cc8eec64d..ff79bb6e51d8c7e4b61509f7cf95b1282e7a844e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2426,6 +2426,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 94%
rename from patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 46f516cc0..93bf1ca34 100644
--- a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2a77dfc3045d7cbf035a4bc0cd25ee95555f83cd..d226f391e596e0303d0f8f29f594e0ddbe47bcd0 100644
+index a57fad0a75fe18f70d3dd6cd5c6a2ab90eb0498d..6dbac0f93481256dd57e76630ae9eea9d5c56849 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -26,6 +26,7 @@ dependencies {
diff --git a/patches/server/0218-add-more-information-to-Entity.toString.patch b/patches/server/0219-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from patches/server/0218-add-more-information-to-Entity.toString.patch
rename to patches/server/0219-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0219-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from patches/server/0219-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/patches/server/0220-EnderDragon-Events.patch b/patches/server/0221-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0220-EnderDragon-Events.patch
rename to patches/server/0221-EnderDragon-Events.patch
diff --git a/patches/server/0221-PlayerElytraBoostEvent.patch b/patches/server/0222-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0221-PlayerElytraBoostEvent.patch
rename to patches/server/0222-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0222-PlayerLaunchProjectileEvent.patch b/patches/server/0223-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0222-PlayerLaunchProjectileEvent.patch
rename to patches/server/0223-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0223-Improve-BlockPosition-inlining.patch b/patches/server/0224-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0223-Improve-BlockPosition-inlining.patch
rename to patches/server/0224-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0225-Vanished-players-don-t-have-rights.patch b/patches/server/0226-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/0225-Vanished-players-don-t-have-rights.patch
rename to patches/server/0226-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0226-Allow-disabling-armour-stand-ticking.patch b/patches/server/0227-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from patches/server/0226-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0227-Allow-disabling-armour-stand-ticking.patch
diff --git a/patches/server/0227-SkeletonHorse-Additions.patch b/patches/server/0228-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0227-SkeletonHorse-Additions.patch
rename to patches/server/0228-SkeletonHorse-Additions.patch
diff --git a/patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0229-Implement-Expanded-ArmorStand-API.patch b/patches/server/0230-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0229-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0230-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0230-AnvilDamageEvent.patch b/patches/server/0231-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0230-AnvilDamageEvent.patch
rename to patches/server/0231-AnvilDamageEvent.patch
diff --git a/patches/server/0231-Add-hand-to-bucket-events.patch b/patches/server/0232-Add-hand-to-bucket-events.patch
similarity index 99%
rename from patches/server/0231-Add-hand-to-bucket-events.patch
rename to patches/server/0232-Add-hand-to-bucket-events.patch
index 0c3849fc4..b514aa8de 100644
--- a/patches/server/0231-Add-hand-to-bucket-events.patch
+++ b/patches/server/0232-Add-hand-to-bucket-events.patch
@@ -86,7 +86,7 @@ index 90c8ef9995e834c245cc33f5e59ffdabd5a0b8cd..7c6c928da4e0f3ac54fa9b9ddce7b0e0
                  int i = blockposition.getX();
                  int j = blockposition.getY();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 49ec76720dea8c756817ded7d02bfea02f86d428..2dac07a71474fd9c92955914f121094fcad23212 100644
+index 1bc3edad4fa79b2efb34e92b4af492769a8fcf83..518e44f783f5062ce53e9907501bd3a54c8014bb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -422,6 +422,20 @@ public class CraftEventFactory {
diff --git a/patches/server/0232-Add-TNTPrimeEvent.patch b/patches/server/0233-Add-TNTPrimeEvent.patch
similarity index 98%
rename from patches/server/0232-Add-TNTPrimeEvent.patch
rename to patches/server/0233-Add-TNTPrimeEvent.patch
index 510fdc37c..ee73234df 100644
--- a/patches/server/0232-Add-TNTPrimeEvent.patch
+++ b/patches/server/0233-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 dc2e57bfc5e85c9ef548cb895b3fcd1c09c4dacb..21d26be5edbc05ac78c2f4a092594d772d98c982 100644
+index d0ebcc23d863be630b55245aa2604c108ee6c93a..3a6e5893181ed681099f2748abca738af45ec9c9 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
 @@ -532,6 +532,11 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0234-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from patches/server/0234-MC-135506-Experience-should-save-as-Integers.patch
rename to patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0236-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0235-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0236-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 98%
rename from patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 843e96207..b6ff8121b 100644
--- a/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -29,7 +29,7 @@ index 4f2dfe5d2b646a1a2f19414388af13b26d28d504..213c94cecc1103056ce83625f1e78cd6
  
      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 1e559d238441d28c52b3305c42dec0f6115b2626..547aea9a2ead3eff5690f18cfc351b01dd4cd395 100644
+index 0531b9c5b10fe250531b0c04cb2ffe2751e7d1c5..25df052247ba26b75e49c801587f71d0fed31c92 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -215,6 +215,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 99%
rename from patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
index 8059a352b..ef610b354 100644
--- a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -33,7 +33,7 @@ index b248c0f481436b1b101dc1f75eaaf8023f4ba0ea..02ea5304a3f99d69005ab1a7ea85e6a1
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 53834d226cf577413d1514c54f5a4b0294a432e7..3ffb9cb08dc3b71662364bd5553b895ddc0f9ab7 100644
+index 4950f11c12f29cb363acd639c16c4aa8efafdd17..9d5ff8b10c991443ebecc63989b3ba68acf756ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -907,6 +907,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0241-Optimize-BlockPosition-helper-methods.patch b/patches/server/0242-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0241-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0242-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 89%
rename from patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 891e5bf4d..e10d949ee 100644
--- a/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Restore vanilla 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 feef74e3a6d50344245c4a61ece5b2194af1072f..c55321ec37b500199eda375cabca21e666612b9c 100644
+index d139cbcf0b159372f229bef6ae49b45a74c163ad..d4d2d11cf19167410ec6ad3417495e7130330d11 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -184,7 +184,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0243-Slime-Pathfinder-Events.patch b/patches/server/0244-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0243-Slime-Pathfinder-Events.patch
rename to patches/server/0244-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0245-Optimize-CraftBlockData-Creation.patch b/patches/server/0246-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0245-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0246-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0246-Optimize-MappedRegistry.patch b/patches/server/0247-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0246-Optimize-MappedRegistry.patch
rename to patches/server/0247-Optimize-MappedRegistry.patch
diff --git a/patches/server/0247-Add-PhantomPreSpawnEvent.patch b/patches/server/0248-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0247-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0248-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0248-Add-More-Creeper-API.patch b/patches/server/0249-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0248-Add-More-Creeper-API.patch
rename to patches/server/0249-Add-More-Creeper-API.patch
diff --git a/patches/server/0249-Inventory-removeItemAnySlot.patch b/patches/server/0250-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0249-Inventory-removeItemAnySlot.patch
rename to patches/server/0250-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0251-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from patches/server/0251-Asynchronous-chunk-IO-and-loading.patch
rename to patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
index 65847ba2d..c97a1aa13 100644
--- a/patches/server/0251-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
@@ -2716,7 +2716,7 @@ index a81644df294c739b72fc638cd06a3976250caa50..d66ec02b09bb7ae46aae8e55f0062613
          } finally {
              chunkMap.callbackExecutor.run();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 547aea9a2ead3eff5690f18cfc351b01dd4cd395..f9b02224c455077ab37d60e830403681ca12ccc5 100644
+index 25df052247ba26b75e49c801587f71d0fed31c92..bde271171b035633ff263b6c60e85f2db5264879 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -316,6 +316,78 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2820,7 +2820,7 @@ index 0d536d72ac918fbd403397ff369d10143ee9c204..be677d437d17b74c6188ce1bd5fc6fdc
      private final String name;
      private final Comparator<T> comparator;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e0215f34f5f82cbd3a67f58a8a177fc886ccc72c..8e68e7c068fc819438ec9e08ca412faf38c661d8 100644
+index 14b102e8341d4cb10935e9d247d7451661a02017..a4bdfaaef7f4d340e7e818e7f5ed92f195d91a58 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -750,6 +750,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 98%
rename from patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
index 4f70bb612..dbe67aaff 100644
--- a/patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -28,7 +28,7 @@ index 0cf818fceddd76e7704fdc6625456787856b2815..ccdee183f02ab55723e16f41efce55dc
          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 da896f299072360a23cdfd025ed6f151a0441d4e..831e8c32c85a45daff36449f2d6ef57a522fa7cf 100644
+index de16969a25bd72b4420e5ecbdb477a1adc51f2d1..642b496926d8f6ef5ba5f12e44043d4d769f06ef 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3718,6 +3718,23 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0253-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0253-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0254-Improve-death-events.patch b/patches/server/0255-Improve-death-events.patch
similarity index 100%
rename from patches/server/0254-Improve-death-events.patch
rename to patches/server/0255-Improve-death-events.patch
diff --git a/patches/server/0255-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0255-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0256-Mob-Pathfinding-API.patch b/patches/server/0257-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0256-Mob-Pathfinding-API.patch
rename to patches/server/0257-Mob-Pathfinding-API.patch
diff --git a/patches/server/0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0260-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0260-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0261-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0261-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0262-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0262-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0263-Honor-EntityAgeable.ageLock.patch b/patches/server/0264-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0263-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0264-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0264-Configurable-connection-throttle-kick-message.patch b/patches/server/0265-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0264-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0265-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0265-Hook-into-CB-plugin-rewrites.patch b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0265-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0266-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0266-PreSpawnerSpawnEvent.patch b/patches/server/0267-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0266-PreSpawnerSpawnEvent.patch
rename to patches/server/0267-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0267-Add-LivingEntity-getTargetEntity.patch b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
similarity index 98%
rename from patches/server/0267-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0268-Add-LivingEntity-getTargetEntity.patch
index e1ca7bb29..99a05da4e 100644
--- a/patches/server/0267-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b4906b20b48badd4ebff662cb830b36f346b7977..9538c026f483cdfe2696e13208914eb25ad090b5 100644
+index b1af9e9a4e530854049d7907c099c169692b12ab..0d5157abac635da2fdfe25fb10d28e18ad94bd3a 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/0268-Add-sun-related-API.patch b/patches/server/0269-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0268-Add-sun-related-API.patch
rename to patches/server/0269-Add-sun-related-API.patch
diff --git a/patches/server/0269-Turtle-API.patch b/patches/server/0270-Turtle-API.patch
similarity index 100%
rename from patches/server/0269-Turtle-API.patch
rename to patches/server/0270-Turtle-API.patch
diff --git a/patches/server/0270-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0270-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
index 3982d6fa4..0dcb53c7c 100644
--- a/patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch
@@ -189,7 +189,7 @@ index 1b075033f0640433341957f6e26ebe25f18928ee..8b5eddce4845619603ccfeec158d97cb
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3ffb9cb08dc3b71662364bd5553b895ddc0f9ab7..0b13ff4c656615b19a4cdffa7390c4dd01c5a82d 100644
+index 9d5ff8b10c991443ebecc63989b3ba68acf756ca..f13551ecc96ddaffc1b45dc210de1fc7ee119695 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -762,7 +762,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0273-Add-more-Witch-API.patch b/patches/server/0274-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0273-Add-more-Witch-API.patch
rename to patches/server/0274-Add-more-Witch-API.patch
diff --git a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 98%
rename from patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
index c9bf5e12e..a53897608 100644
--- a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8e68e7c068fc819438ec9e08ca412faf38c661d8..a3da4721452597f7b2c3a505921df59f2ec7113d 100644
+index a4bdfaaef7f4d340e7e818e7f5ed92f195d91a58..9d95696c56682fb79a84ad7405e520b3484ec605 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -526,9 +526,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0276-Reset-players-airTicks-on-respawn.patch b/patches/server/0277-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0276-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0277-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 91%
rename from patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 1e32251a4..d60e33ca9 100644
--- a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0279-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 d7e22ddf89619b58516ccef1d75a4c33df61b73c..70b8b86ed827217e536e35a690160adf9e974bb5 100644
+index 33ec7786cdf8c32e905d192fc8364418e47404d5..67567eb58beddc06eae4d8e7af3b3c0962405512 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -78,8 +78,8 @@ public class Util {
@@ -23,10 +23,10 @@ index d7e22ddf89619b58516ccef1d75a4c33df61b73c..70b8b86ed827217e536e35a690160adf
 -    private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main");
 +    private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap", -2); // Paper - add -2 priority
 +    private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main", -1); // Paper - add -1 priority
-     private static final ExecutorService IO_POOL = makeIoExecutor();
-     public static LongSupplier timeSource = System::nanoTime;
-     public static final Ticker TICKER = new Ticker() {
-@@ -121,14 +121,18 @@ public class Util {
+     // Paper start - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread
+     public static final ExecutorService PROFILE_EXECUTOR = Executors.newFixedThreadPool(2, new java.util.concurrent.ThreadFactory() {
+ 
+@@ -137,14 +137,18 @@ public class Util {
          return Instant.now().toEpochMilli();
      }
  
@@ -49,7 +49,7 @@ index d7e22ddf89619b58516ccef1d75a4c33df61b73c..70b8b86ed827217e536e35a690160adf
                      @Override
                      protected void onTermination(Throwable throwable) {
                          if (throwable != null) {
-@@ -144,6 +148,7 @@ public class Util {
+@@ -160,6 +164,7 @@ public class Util {
                  return forkJoinWorkerThread;
              }, Util::onThreadException, true);
          }
diff --git a/patches/server/0279-Optimize-World-Time-Updates.patch b/patches/server/0280-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0279-Optimize-World-Time-Updates.patch
rename to patches/server/0280-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0280-Restore-custom-InventoryHolder-support.patch b/patches/server/0281-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0280-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0281-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0281-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0282-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0282-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0283-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 98%
rename from patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
index 5507ce428..ccb2d302f 100644
--- a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index 53717a4a2bfd841346c00b5f854899e23661122c..3fadf6b46cc722ad81cf810c0761cf71
  
                  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 a3da4721452597f7b2c3a505921df59f2ec7113d..290ff4431817e18433b04e4d9523485f131cbc72 100644
+index 9d95696c56682fb79a84ad7405e520b3484ec605..8c1329e62f02ddbb8e9f40e6bf8fcea68d92a498 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1598,6 +1598,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0284-Make-the-default-permission-message-configurable.patch b/patches/server/0285-Make-the-default-permission-message-configurable.patch
similarity index 95%
rename from patches/server/0284-Make-the-default-permission-message-configurable.patch
rename to patches/server/0285-Make-the-default-permission-message-configurable.patch
index 28c61fa05..5f0e175a1 100644
--- a/patches/server/0284-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0285-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index b506cd11b76901827cbe66f46db8df400f7015de..13a5062e539f6f43e6fe582318c36302
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0b13ff4c656615b19a4cdffa7390c4dd01c5a82d..8dc5d79130949ec0b38737060124fe4421af1fe9 100644
+index f13551ecc96ddaffc1b45dc210de1fc7ee119695..1f3a4671527ebbc32ac8ec6b7f766c23bde1d2a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2608,6 +2608,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0286-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0287-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0287-force-entity-dismount-during-teleportation.patch b/patches/server/0288-force-entity-dismount-during-teleportation.patch
similarity index 98%
rename from patches/server/0287-force-entity-dismount-during-teleportation.patch
rename to patches/server/0288-force-entity-dismount-during-teleportation.patch
index fa324c4ab..96e9ef421 100644
--- a/patches/server/0287-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0288-force-entity-dismount-during-teleportation.patch
@@ -93,7 +93,7 @@ index 236b59f5119a4f91919ab93c8edd5269ea34b1ee..ce5bb09aef3c2d8a2d30f3887e4c7e3e
              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 9538c026f483cdfe2696e13208914eb25ad090b5..7446b9d43647faa042fccb912833c2ef0d0261c4 100644
+index 0d5157abac635da2fdfe25fb10d28e18ad94bd3a..4a51a12cf57e4cbf10d9a7fd03c319573422c858 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3379,9 +3379,15 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0288-Add-more-Zombie-API.patch b/patches/server/0289-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0288-Add-more-Zombie-API.patch
rename to patches/server/0289-Add-more-Zombie-API.patch
diff --git a/patches/server/0289-Book-Size-Limits.patch b/patches/server/0290-Book-Size-Limits.patch
similarity index 96%
rename from patches/server/0289-Book-Size-Limits.patch
rename to patches/server/0290-Book-Size-Limits.patch
index 1b514cd45..baf0dc46f 100644
--- a/patches/server/0289-Book-Size-Limits.patch
+++ b/patches/server/0290-Book-Size-Limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 290ff4431817e18433b04e4d9523485f131cbc72..214b84ff959b7b658db887aafa36431fa6a6b488 100644
+index 8c1329e62f02ddbb8e9f40e6bf8fcea68d92a498..77e8d224dd669e3ce8cd70c95b0aba6d1483cc90 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1049,6 +1049,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch b/patches/server/0291-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0290-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0291-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0291-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0292-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0295-BlockDestroyEvent.patch b/patches/server/0296-BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/0295-BlockDestroyEvent.patch
rename to patches/server/0296-BlockDestroyEvent.patch
diff --git a/patches/server/0296-Async-command-map-building.patch b/patches/server/0297-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0296-Async-command-map-building.patch
rename to patches/server/0297-Async-command-map-building.patch
diff --git a/patches/server/0297-Implement-Brigadier-Mojang-API.patch b/patches/server/0298-Implement-Brigadier-Mojang-API.patch
similarity index 98%
rename from patches/server/0297-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0298-Implement-Brigadier-Mojang-API.patch
index e7dbd2b1d..1b4b9515e 100644
--- a/patches/server/0297-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0298-Implement-Brigadier-Mojang-API.patch
@@ -10,7 +10,7 @@ Adds CommandRegisteredEvent
   - Allows manipulating the CommandNode to add more children/metadata for the client
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d226f391e596e0303d0f8f29f594e0ddbe47bcd0..47005e625ba323b93855934b447566246509eabf 100644
+index 6dbac0f93481256dd57e76630ae9eea9d5c56849..e260462933a9f7065b2360e6bf9e4ee56069a705 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,6 +8,7 @@ plugins {
@@ -81,7 +81,7 @@ index 4c9773997c63f7b2c8465b19810068f11367466b..a8f3a84615a640d2949d268ef1ac81a0
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 214b84ff959b7b658db887aafa36431fa6a6b488..c3d5fc95d4faa3dce9670d84c7057fa92170010d 100644
+index 77e8d224dd669e3ce8cd70c95b0aba6d1483cc90..35d65cf4af1990f2aea2767216cc1d838f7473b7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -790,8 +790,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0299-Limit-Client-Sign-length-more.patch b/patches/server/0300-Limit-Client-Sign-length-more.patch
similarity index 97%
rename from patches/server/0299-Limit-Client-Sign-length-more.patch
rename to patches/server/0300-Limit-Client-Sign-length-more.patch
index bb9014beb..a90e56253 100644
--- a/patches/server/0299-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0300-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 c3d5fc95d4faa3dce9670d84c7057fa92170010d..5384fe5c20141d1581ed31420b95d2b148e38d3e 100644
+index 35d65cf4af1990f2aea2767216cc1d838f7473b7..ed951f4645e8ab6c070ed267a665b81bca19fbbb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -276,6 +276,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0305-Entity-getEntitySpawnReason.patch b/patches/server/0306-Entity-getEntitySpawnReason.patch
similarity index 98%
rename from patches/server/0305-Entity-getEntitySpawnReason.patch
rename to patches/server/0306-Entity-getEntitySpawnReason.patch
index 7e756750c..e78b90f0a 100644
--- a/patches/server/0305-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0306-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 f9b02224c455077ab37d60e830403681ca12ccc5..40a0f98acf26e104912ff2db71aab744a6c727cb 100644
+index bde271171b035633ff263b6c60e85f2db5264879..65eaf93c135871b3898cd418bfe3aca8368e092e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1212,6 +1212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 96%
rename from patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
index d6bdbb059..340a32e06 100644
--- a/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch
@@ -22,7 +22,7 @@ index d6f34adbdf45bbef4a39e629dd7cb6d7fcb5db0f..7881176a900daa3306c691454f688c1f
          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 5384fe5c20141d1581ed31420b95d2b148e38d3e..9f8f29f3908294738943e698badd002c80fa6569 100644
+index ed951f4645e8ab6c070ed267a665b81bca19fbbb..63f0b837b875ddd7bc85948eed013f627e202994 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2501,7 +2501,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0307-Fire-event-on-GS4-query.patch b/patches/server/0308-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0307-Fire-event-on-GS4-query.patch
rename to patches/server/0308-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0308-Implement-PlayerPostRespawnEvent.patch b/patches/server/0309-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0308-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0309-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0310-Server-Tick-Events.patch b/patches/server/0311-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0310-Server-Tick-Events.patch
rename to patches/server/0311-Server-Tick-Events.patch
diff --git a/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0313-Add-Heightmap-API.patch b/patches/server/0314-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0313-Add-Heightmap-API.patch
rename to patches/server/0314-Add-Heightmap-API.patch
diff --git a/patches/server/0314-Mob-Spawner-API-Enhancements.patch b/patches/server/0315-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0314-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0315-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch
index 2e66f1158..93a9a539c 100644
--- a/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0316-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 9f8f29f3908294738943e698badd002c80fa6569..f4ced406329413e47d3d088d629cd799a57d9abb 100644
+index 63f0b837b875ddd7bc85948eed013f627e202994..54a4d4061b90a13b79d1dc0fa327ab133754b458 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -467,7 +467,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 95%
rename from patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index 27e4894f7..d8d7ede2a 100644
--- a/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -29,7 +29,7 @@ index 7d1ca1dbd0c1f882b4c59fb6c56e9ba86d81ae42..97e964030a5cc449543252933f8a7b48
  
      public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8dc5d79130949ec0b38737060124fe4421af1fe9..5ca45150a429a01e7871c9fd4248034b942b70bf 100644
+index 1f3a4671527ebbc32ac8ec6b7f766c23bde1d2a3..0b1917ac2f30f9f5e0b3f7ec5fa4c38d0d501f92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2071,7 +2071,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0318-Implement-CraftBlockSoundGroup.patch b/patches/server/0319-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0318-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0319-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 99%
rename from patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 531f7c450..81325986a 100644
--- a/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -64,7 +64,7 @@ index 97e964030a5cc449543252933f8a7b4800833e69..40aa6abf0d3a814de194d754d5b136f3
          // CraftBukkit start
          // this.updateMobSpawningFlags();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 40a0f98acf26e104912ff2db71aab744a6c727cb..af52ccf87e1c6901cc56ff01bda3750e808b736f 100644
+index 65eaf93c135871b3898cd418bfe3aca8368e092e..aa77a3dbbcb77fb6f3ad070b83426042dd284aa0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -63,6 +63,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
diff --git a/patches/server/0320-ChunkMapDistance-CME.patch b/patches/server/0321-ChunkMapDistance-CME.patch
similarity index 100%
rename from patches/server/0320-ChunkMapDistance-CME.patch
rename to patches/server/0321-ChunkMapDistance-CME.patch
diff --git a/patches/server/0321-Chunk-debug-command.patch b/patches/server/0322-Chunk-debug-command.patch
similarity index 100%
rename from patches/server/0321-Chunk-debug-command.patch
rename to patches/server/0322-Chunk-debug-command.patch
diff --git a/patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0323-Expose-the-internal-current-tick.patch b/patches/server/0324-Expose-the-internal-current-tick.patch
similarity index 90%
rename from patches/server/0323-Expose-the-internal-current-tick.patch
rename to patches/server/0324-Expose-the-internal-current-tick.patch
index f1c4f7b95..f553afb47 100644
--- a/patches/server/0323-Expose-the-internal-current-tick.patch
+++ b/patches/server/0324-Expose-the-internal-current-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5ca45150a429a01e7871c9fd4248034b942b70bf..b395d3a20a1c71bfe18e7344b910f545630b7e92 100644
+index 0b1917ac2f30f9f5e0b3f7ec5fa4c38d0d501f92..183ab1a1bc7e761a034e1301e2563d07582dfa26 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2649,5 +2649,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0324-Fix-World-isChunkGenerated-calls.patch b/patches/server/0325-Fix-World-isChunkGenerated-calls.patch
similarity index 99%
rename from patches/server/0324-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0325-Fix-World-isChunkGenerated-calls.patch
index 6f1ffae9e..7d7f8203c 100644
--- a/patches/server/0324-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0325-Fix-World-isChunkGenerated-calls.patch
@@ -200,7 +200,7 @@ index e734d82c2863caca8abc6bb8bb82882e971c36a8..a96a6af2bcec3134b7caa32299bd07af
              } catch (Throwable throwable) {
                  if (dataoutputstream != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d795014028cfa9ebd6f986b8ddd3d6477f189fa7..65edea6420256384a108663761ac9619ba110a8e 100644
+index 7489ac7569454560adcae2005317d83bbe7e98c5..5c3744860ebbb54dc38200c1557d98f995de6c3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -294,9 +294,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0327-Configurable-projectile-relative-velocity.patch b/patches/server/0328-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0327-Configurable-projectile-relative-velocity.patch
rename to patches/server/0328-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0328-offset-item-frame-ticking.patch b/patches/server/0329-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0328-offset-item-frame-ticking.patch
rename to patches/server/0329-offset-item-frame-ticking.patch
diff --git a/patches/server/0329-Fix-MC-158900.patch b/patches/server/0330-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0329-Fix-MC-158900.patch
rename to patches/server/0330-Fix-MC-158900.patch
diff --git a/patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch
similarity index 95%
rename from patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch
index cf43c5166..1e411abeb 100644
--- a/patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0331-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 7446b9d43647faa042fccb912833c2ef0d0261c4..b521be6552d4fbf115a2f829b68fc7c5fff72a9a 100644
+index 4a51a12cf57e4cbf10d9a7fd03c319573422c858..90f6fcb6c0a53133ecf7d9adbd5e526e29be3fa2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3596,9 +3596,14 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0331-Dont-send-unnecessary-sign-update.patch b/patches/server/0332-Dont-send-unnecessary-sign-update.patch
similarity index 92%
rename from patches/server/0331-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0332-Dont-send-unnecessary-sign-update.patch
index 8e9d2888d..65e408f78 100644
--- a/patches/server/0331-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0332-Dont-send-unnecessary-sign-update.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f4ced406329413e47d3d088d629cd799a57d9abb..891bf788ae5fe9a01399737f095b9d0adf06a5fe 100644
+index 54a4d4061b90a13b79d1dc0fa327ab133754b458..ca5342785c49d459203087184baa341da6c93f1f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3092,6 +3092,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0332-Add-option-to-disable-pillager-patrols.patch b/patches/server/0333-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0332-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0333-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 92%
rename from patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 3c84ca770..a3bd2f610 100644
--- a/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0334-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 891bf788ae5fe9a01399737f095b9d0adf06a5fe..912e98d589f7469c6ea000d28f87e3fbe1ef3aab 100644
+index ca5342785c49d459203087184baa341da6c93f1f..fcbd099d77b4dec7a91da2b7fb219c300482a83b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1791,6 +1791,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0334-Flat-bedrock-generator-settings.patch b/patches/server/0335-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0334-Flat-bedrock-generator-settings.patch
rename to patches/server/0335-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0337-Duplicate-UUID-Resolve-Option.patch b/patches/server/0338-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0337-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0338-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0338-Optimize-Hoppers.patch b/patches/server/0339-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0338-Optimize-Hoppers.patch
rename to patches/server/0339-Optimize-Hoppers.patch
diff --git a/patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch
index 48c682ae2..b4a66435d 100644
--- a/patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0344-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 c20d6f1d328ec6946a00488880a296f582dcf212..48d561e757c266353e48abf2a2f06571aa5d4623 100644
+index aa77a3dbbcb77fb6f3ad070b83426042dd284aa0..9993b6a8f40896166c2f86befa7222c6e714da81 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -391,6 +391,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0344-Fix-items-not-falling-correctly.patch b/patches/server/0345-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0344-Fix-items-not-falling-correctly.patch
rename to patches/server/0345-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0345-Lag-compensate-eating.patch b/patches/server/0346-Lag-compensate-eating.patch
similarity index 97%
rename from patches/server/0345-Lag-compensate-eating.patch
rename to patches/server/0346-Lag-compensate-eating.patch
index 5fc3b9633..696b8217e 100644
--- a/patches/server/0345-Lag-compensate-eating.patch
+++ b/patches/server/0346-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 b521be6552d4fbf115a2f829b68fc7c5fff72a9a..26f59e695ef68d1cf33e649ca370f8320d515201 100644
+index 90f6fcb6c0a53133ecf7d9adbd5e526e29be3fa2..dc885d9a20205bfa3b77e315ebe17287a6c3d4bf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3539,6 +3539,11 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0348-Add-effect-to-block-break-naturally.patch b/patches/server/0349-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0348-Add-effect-to-block-break-naturally.patch
rename to patches/server/0349-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0349-Entity-Activation-Range-2.0.patch b/patches/server/0350-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0349-Entity-Activation-Range-2.0.patch
rename to patches/server/0350-Entity-Activation-Range-2.0.patch
index 6fe7e08dc..109b43cb5 100644
--- a/patches/server/0349-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0350-Entity-Activation-Range-2.0.patch
@@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
 Adds villagers as separate config
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 63a146cdeed5f01d63488d2e74ad0c80343f5077..b2a8faec6562d784b3f16fe968c778f9abfedeb5 100644
+index 9993b6a8f40896166c2f86befa7222c6e714da81..ff902ae5a96616bb70897d9326fc65a3261b07d9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2,7 +2,6 @@ package net.minecraft.server.level;
diff --git a/patches/server/0350-Increase-Light-Queue-Size.patch b/patches/server/0351-Increase-Light-Queue-Size.patch
similarity index 93%
rename from patches/server/0350-Increase-Light-Queue-Size.patch
rename to patches/server/0351-Increase-Light-Queue-Size.patch
index c12922b67..cb48d2f26 100644
--- a/patches/server/0350-Increase-Light-Queue-Size.patch
+++ b/patches/server/0351-Increase-Light-Queue-Size.patch
@@ -14,7 +14,7 @@ light engine on shutdown...
 The queue size only puts a cap on max loss, doesn't solve that problem.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3e0e9ae6eb0cdf3e2c53c894cc65277bc4e73b67..8de56cabd8fdc68e136d41c4d172f3574e21e57a 100644
+index 4a9addec6c1f08718902da7d3f3628a0900e4c1d..f7427ea6bf11ef837dd38d25cd3abed57de5e8de 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -777,7 +777,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0351-Fix-Light-Command.patch b/patches/server/0352-Fix-Light-Command.patch
similarity index 100%
rename from patches/server/0351-Fix-Light-Command.patch
rename to patches/server/0352-Fix-Light-Command.patch
diff --git a/patches/server/0352-Anti-Xray.patch b/patches/server/0353-Anti-Xray.patch
similarity index 99%
rename from patches/server/0352-Anti-Xray.patch
rename to patches/server/0353-Anti-Xray.patch
index d5b3a3ab6..ca9d89a27 100644
--- a/patches/server/0352-Anti-Xray.patch
+++ b/patches/server/0353-Anti-Xray.patch
@@ -1017,7 +1017,7 @@ index 0000000000000000000000000000000000000000..80a2dfb266ae1221680a7b24fee2f7e2
 +    }
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index 518a00886f7bde1de95150366541fc992f178246..15b6e73413eeaef4214889fc34f9af8093574b9a 100644
+index fa191f418079a8ee24326c5952d12d4481f57aef..28c54542f8c4168c6da8e9d897d33569fc145caf 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 @@ -1,5 +1,6 @@
@@ -1606,7 +1606,7 @@ index cf48c93d89da53e0ec771e5c2c8582e30b35e3f5..518dfbb7dbd4221937636cf46d27109d
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b395d3a20a1c71bfe18e7344b910f545630b7e92..de114eda44d475c50f25f8dfedf17c41e783c5d9 100644
+index 183ab1a1bc7e761a034e1301e2563d07582dfa26..9df2d6ea71fb8a4efab6e6a0d1bc3cdad8768645 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2226,7 +2226,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0353-Implement-alternative-item-despawn-rate.patch b/patches/server/0354-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0353-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0354-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0354-Tracking-Range-Improvements.patch b/patches/server/0355-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0354-Tracking-Range-Improvements.patch
rename to patches/server/0355-Tracking-Range-Improvements.patch
diff --git a/patches/server/0355-Fix-items-vanishing-through-end-portal.patch b/patches/server/0356-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/0355-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0356-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0356-implement-optional-per-player-mob-spawns.patch b/patches/server/0357-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0356-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0357-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from patches/server/0357-Avoid-hopper-searches-if-there-are-no-items.patch
rename to patches/server/0358-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0358-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0359-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0359-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0360-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0360-Add-debug-for-sync-chunk-loads.patch b/patches/server/0361-Add-debug-for-sync-chunk-loads.patch
similarity index 99%
rename from patches/server/0360-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0361-Add-debug-for-sync-chunk-loads.patch
index 04d213e70..b6c8ef573 100644
--- a/patches/server/0360-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0361-Add-debug-for-sync-chunk-loads.patch
@@ -323,7 +323,7 @@ index c12c03b9e79f264ee593373f8a72ed37c0ae8514..509b2ee115584ce80717cc12a7ab548d
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bbe5e04ac07b47c143c46b3f728b8d5f968cc7f0..6c3e14ebc72f179848dfb93f17864843c8a12575 100644
+index 57abbcd9d59ea29e2feb238ee342f28a66122006..2531592ba605b15f16d7438829de51de65d7305c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -389,6 +389,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0361-Remove-garbage-Java-version-check.patch b/patches/server/0362-Remove-garbage-Java-version-check.patch
similarity index 91%
rename from patches/server/0361-Remove-garbage-Java-version-check.patch
rename to patches/server/0362-Remove-garbage-Java-version-check.patch
index c4e1fb1a9..a9dfc5015 100644
--- a/patches/server/0361-Remove-garbage-Java-version-check.patch
+++ b/patches/server/0362-Remove-garbage-Java-version-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove garbage Java version check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index edda95afdde52df3a809c3826a3f099d5b4691ad..94b46dde76b186a441e6b0ef64553dcab5dfa717 100644
+index 2272a3d4cc3877e1f40d77036effa471782aeba8..fb685e13025bc571896bc999814cb99a17bfb788 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -194,10 +194,6 @@ public class Main {
diff --git a/patches/server/0362-Add-ThrownEggHatchEvent.patch b/patches/server/0363-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0362-Add-ThrownEggHatchEvent.patch
rename to patches/server/0363-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0363-Entity-Jump-API.patch b/patches/server/0364-Entity-Jump-API.patch
similarity index 97%
rename from patches/server/0363-Entity-Jump-API.patch
rename to patches/server/0364-Entity-Jump-API.patch
index d818cc844..8b13df52a 100644
--- a/patches/server/0363-Entity-Jump-API.patch
+++ b/patches/server/0364-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 26f59e695ef68d1cf33e649ca370f8320d515201..12d90147d5d10f074380c0faeff2ceb399c7bda2 100644
+index dc885d9a20205bfa3b77e315ebe17287a6c3d4bf..34509a40933eb48ad1fc745fa4ee7709cdd15b92 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3215,8 +3215,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0364-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0364-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0365-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0365-Make-the-GUI-graph-fancier.patch b/patches/server/0366-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0365-Make-the-GUI-graph-fancier.patch
rename to patches/server/0366-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 93%
rename from patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
index ae52e5c02..486014f2b 100644
--- a/patches/server/0366-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0367-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4fc682e1b7de1fe68aac90134c2bb313b5f6842a..5e1f13641140dca8982af8fd876230f7700c54a7 100644
+index 64cd5b2bc4032bfb0c917cc33884062ddba2738f..3aa82c7d26ef9fed3d4b670ac330204b55609396 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -345,13 +345,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0367-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0368-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0367-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0368-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0368-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0369-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0369-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0370-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0369-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0370-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0370-Optimise-Chunk-getFluid.patch b/patches/server/0371-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0370-Optimise-Chunk-getFluid.patch
rename to patches/server/0371-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 89%
rename from patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch
index 0af07e820..45ea27881 100644
--- a/patches/server/0371-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0372-Set-spigots-verbose-world-setting-to-false-by-def.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index d4f035aca1d63596fd52b21e34c69e8d08e24e7a..32f8a6aed0f69ad07ab5b42fee38a3471a59d426 100644
+index 9c9723e13b5440d4803a7268057d63cbdc973b77..40984144a062230fd45cc6c707b03e5cd7d89efc 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -20,7 +20,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0372-Add-tick-times-API-and-mspt-command.patch b/patches/server/0373-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/server/0372-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0373-Add-tick-times-API-and-mspt-command.patch
index e04fd5826..9d161b86e 100644
--- a/patches/server/0372-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0373-Add-tick-times-API-and-mspt-command.patch
@@ -189,7 +189,7 @@ index f7427ea6bf11ef837dd38d25cd3abed57de5e8de..ce7b96819bf8d7e992c2aafd3013e8a9
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index de114eda44d475c50f25f8dfedf17c41e783c5d9..9e2a90b2b5173667f336d64da111221d0093a7d4 100644
+index 9df2d6ea71fb8a4efab6e6a0d1bc3cdad8768645..8817a62f12a67b2be69de8c6cfbf89b8a6b618bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2471,6 +2471,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0373-Expose-MinecraftServer-isRunning.patch b/patches/server/0374-Expose-MinecraftServer-isRunning.patch
similarity index 90%
rename from patches/server/0373-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0374-Expose-MinecraftServer-isRunning.patch
index 673090961..6d3fc04ad 100644
--- a/patches/server/0373-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0374-Expose-MinecraftServer-isRunning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9e2a90b2b5173667f336d64da111221d0093a7d4..bfbf43661acbdcda1417b1782579c603022a0adb 100644
+index 8817a62f12a67b2be69de8c6cfbf89b8a6b618bf..883ee423077b016846b99e9e8597b2a8e70af0d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2664,5 +2664,10 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0374-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0374-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0375-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0375-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0375-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0376-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0376-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0376-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0377-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0377-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0377-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0378-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0378-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 96%
rename from patches/server/0378-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 4a055099d..0fd4705a1 100644
--- a/patches/server/0378-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0379-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -26,7 +26,7 @@ index 43011f5e8cbdf28400701465dd6e1614506d4ece..8d99c45e10da9d8a54a12b1039515da0
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6c3e14ebc72f179848dfb93f17864843c8a12575..a08a996722095b01720fa985ca7165a41a932056 100644
+index 2531592ba605b15f16d7438829de51de65d7305c..cf0976f7352919197a322fb4f7f8e20c24509db5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2291,7 +2291,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0379-Don-t-tick-dead-players.patch b/patches/server/0380-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0379-Don-t-tick-dead-players.patch
rename to patches/server/0380-Don-t-tick-dead-players.patch
diff --git a/patches/server/0380-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0380-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0381-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0382-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0381-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0382-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0384-Improved-Watchdog-Support.patch b/patches/server/0385-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0384-Improved-Watchdog-Support.patch
rename to patches/server/0385-Improved-Watchdog-Support.patch
index e23b48f83..d282e6eca 100644
--- a/patches/server/0384-Improved-Watchdog-Support.patch
+++ b/patches/server/0385-Improved-Watchdog-Support.patch
@@ -330,7 +330,7 @@ index 89f4ea65b20e773bd3782c41db3a2af7b5b405f3..3fe94e580d2aaae9616ba83c0d3a4468
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bfbf43661acbdcda1417b1782579c603022a0adb..602838f3615e4fac1798a99bd2d322c0b2b94863 100644
+index 883ee423077b016846b99e9e8597b2a8e70af0d2..cd5a34fdd086d5b9d59897cc4319fe81ccdfebcc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2071,7 +2071,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0385-Optimize-Pathfinding.patch b/patches/server/0386-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0385-Optimize-Pathfinding.patch
rename to patches/server/0386-Optimize-Pathfinding.patch
diff --git a/patches/server/0386-Reduce-Either-Optional-allocation.patch b/patches/server/0387-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0386-Reduce-Either-Optional-allocation.patch
rename to patches/server/0387-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0387-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0387-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0388-Prevent-opening-inventories-when-frozen.patch b/patches/server/0389-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0388-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0389-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0389-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0390-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0389-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0390-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 94%
rename from patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch
index ae418d0c6..692a677c5 100644
--- a/patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -7,7 +7,7 @@ Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 12d90147d5d10f074380c0faeff2ceb399c7bda2..62be04836b57063b4c3dc3dfb05f2e556b062702 100644
+index 34509a40933eb48ad1fc745fa4ee7709cdd15b92..f9ec497b3212a2c2d87edc4350d8479c6c20abbd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3312,10 +3312,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0391-Implement-Player-Client-Options-API.patch b/patches/server/0392-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0391-Implement-Player-Client-Options-API.patch
rename to patches/server/0392-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0393-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/0393-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch
similarity index 98%
rename from patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch
index c391433ce..054bc1f7d 100644
--- a/patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch
@@ -37,7 +37,7 @@ index be677d437d17b74c6188ce1bd5fc6fdc228fd92f..78fbb4c3e52e900956ae0811aaf934c8
      public static final TicketType<ChunkPos> UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1);
      public static final TicketType<Unit> PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 912e98d589f7469c6ea000d28f87e3fbe1ef3aab..766a5ce5d18aed80e37075f7cfc3b6cb9d33e63a 100644
+index fcbd099d77b4dec7a91da2b7fb219c300482a83b..ec82608da0d39a1b60d1595cee9aeae3efef9fac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -238,6 +238,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -74,7 +74,7 @@ index 912e98d589f7469c6ea000d28f87e3fbe1ef3aab..766a5ce5d18aed80e37075f7cfc3b6cb
          this.server.getProfiler().push("keepAlive");
          // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index b070624c7ee85b6692f1f44ded6c78139925b669..22a2380388ed9fd6d28edbfbbb5ed3f646217525 100644
+index 8b5eddce4845619603ccfeec158d97cb86568e0d..ec2825b6d276b6200c4bec5580d012f1eaed722e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -93,7 +93,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch
index e1c100d03..984cebcdf 100644
--- a/patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 62be04836b57063b4c3dc3dfb05f2e556b062702..2021b9592a1a32981075d169a61aef2e7f827192 100644
+index f9ec497b3212a2c2d87edc4350d8479c6c20abbd..d6dc08d5501cc8b09cec3da107506760a99f5f81 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2090,7 +2090,16 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0398-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0398-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0399-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0399-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0401-Villager-Restocks-API.patch b/patches/server/0402-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0401-Villager-Restocks-API.patch
rename to patches/server/0402-Villager-Restocks-API.patch
diff --git a/patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 95%
rename from patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 26745ac49..6b21e3f04 100644
--- a/patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 766a5ce5d18aed80e37075f7cfc3b6cb9d33e63a..1bf72668a7fab7fc9a327c2403faf2260ccddb31 100644
+index ec82608da0d39a1b60d1595cee9aeae3efef9fac..2c46a7853edda6f9b6a057e1e3ab0919dcd5436d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -918,7 +918,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0403-Expose-game-version.patch b/patches/server/0404-Expose-game-version.patch
similarity index 89%
rename from patches/server/0403-Expose-game-version.patch
rename to patches/server/0404-Expose-game-version.patch
index 91eb7c28c..9809db40e 100644
--- a/patches/server/0403-Expose-game-version.patch
+++ b/patches/server/0404-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 602838f3615e4fac1798a99bd2d322c0b2b94863..3ebb0b615d337474f11bb00adcea32cb18de2706 100644
+index cd5a34fdd086d5b9d59897cc4319fe81ccdfebcc..22d9196d190bcf12ecea5cc3df8945277607b0a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -575,6 +575,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0404-Optimize-Voxel-Shape-Merging.patch b/patches/server/0405-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0404-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0405-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 7f53e3110..c60071ba3 100644
--- a/patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5e79ad04aed13462d1d187a71801aeb2628495e8..344d93f1d7f25a3f26064469e78dd698af66dc0d 100644
+index fcc959aaed86d1e1c6fe551e534bebbd0fb967a4..1b9e91b20dd9a9375a0a2a6a4d7a0bcdce9e7b1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -28,6 +28,7 @@ public class Main {
diff --git a/patches/server/0406-misc-debugging-dumps.patch b/patches/server/0407-misc-debugging-dumps.patch
similarity index 98%
rename from patches/server/0406-misc-debugging-dumps.patch
rename to patches/server/0407-misc-debugging-dumps.patch
index 7a7755588..f8b80338d 100644
--- a/patches/server/0406-misc-debugging-dumps.patch
+++ b/patches/server/0407-misc-debugging-dumps.patch
@@ -74,7 +74,7 @@ index ec2825b6d276b6200c4bec5580d012f1eaed722e..e51c03e05c4407ad3a51e573a5e79b00
                  this.connection.send(new ClientboundDisconnectPacket(ichatmutablecomponent));
                  this.connection.disconnect(ichatmutablecomponent);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3ebb0b615d337474f11bb00adcea32cb18de2706..af8269bc1bf737e80ab7bc9a353b262871af454a 100644
+index 22d9196d190bcf12ecea5cc3df8945277607b0a2..f7e8982819199dd3e3fd9a7fee1feca8a7626a13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -998,6 +998,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0407-Prevent-teleporting-dead-entities.patch b/patches/server/0408-Prevent-teleporting-dead-entities.patch
similarity index 92%
rename from patches/server/0407-Prevent-teleporting-dead-entities.patch
rename to patches/server/0408-Prevent-teleporting-dead-entities.patch
index 58338e3da..bbb2ca663 100644
--- a/patches/server/0407-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0408-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1bf72668a7fab7fc9a327c2403faf2260ccddb31..8c1800836497803cfcd8bca4ddd340003e4cc1d5 100644
+index 2c46a7853edda6f9b6a057e1e3ab0919dcd5436d..5157c257a3480b4f26d4a5830c36725af2d4bd4b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1559,6 +1559,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0409-Implement-Mob-Goal-API.patch b/patches/server/0410-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0409-Implement-Mob-Goal-API.patch
rename to patches/server/0410-Implement-Mob-Goal-API.patch
index df921cc1c..1896f7081 100644
--- a/patches/server/0409-Implement-Mob-Goal-API.patch
+++ b/patches/server/0410-Implement-Mob-Goal-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6def770d18acc25b9bda1917688039448b36309d..fa5c1be5e225ba5736ec0ef3f588f79eecce0c73 100644
+index a1a8c4778742584125d6084fa761b1bc86f6a842..a02f53c6ee0111e07d78a718a6ca0ec708f70cfc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -37,6 +37,7 @@ dependencies {
@@ -789,7 +789,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index af8269bc1bf737e80ab7bc9a353b262871af454a..f6adc73c6c1cdf0a182131b87edd103966212017 100644
+index f7e8982819199dd3e3fd9a7fee1feca8a7626a13..08a381e66471edab5c133af7dc7edb0731722ae7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2677,5 +2677,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0410-Add-villager-reputation-API.patch b/patches/server/0411-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0410-Add-villager-reputation-API.patch
rename to patches/server/0411-Add-villager-reputation-API.patch
diff --git a/patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 96%
rename from patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
index e6d330bc6..4239e066f 100644
--- a/patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index cd28e59602cba810c0c123f01b992f6eef0ea207..7fd92f0dd2f8a8bcd6a26e91966641c35d35bf91 100644
+index 22da112f45ddb20d113550eae67ac08eb2fcb727..f80bdb38cf377684382bb817fedbeb8d5aae4704 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -640,16 +640,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0412-ExperienceOrbMergeEvent.patch b/patches/server/0413-ExperienceOrbMergeEvent.patch
similarity index 94%
rename from patches/server/0412-ExperienceOrbMergeEvent.patch
rename to patches/server/0413-ExperienceOrbMergeEvent.patch
index 6f4951481..1ff06b677 100644
--- a/patches/server/0412-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0413-ExperienceOrbMergeEvent.patch
@@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7fd92f0dd2f8a8bcd6a26e91966641c35d35bf91..1507a172d10986f717cbdaae9890e28c917cf4b3 100644
+index f80bdb38cf377684382bb817fedbeb8d5aae4704..9b94df9940040f51fdcc1af5c7da96117af9017e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -650,7 +650,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0413-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0413-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0414-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0415-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0414-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0415-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0415-Potential-bed-API.patch b/patches/server/0416-Potential-bed-API.patch
similarity index 95%
rename from patches/server/0415-Potential-bed-API.patch
rename to patches/server/0416-Potential-bed-API.patch
index f7b3635cf..d63e2bb9e 100644
--- a/patches/server/0415-Potential-bed-API.patch
+++ b/patches/server/0416-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 9d6c3cb06cf1096fc9bffe5123bf19df13fdded6..b68e1f8c9acb05ef38ec9d35ee68748c5a31abe7 100644
+index 3866c466fcc40f17f88063acb939f9091708a92f..3a14cc3d0d692c8bbc90de1b1c5731158b1323e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 96%
rename from patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
index ca7d3a480..4068078ec 100644
--- a/patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index 407cfb88d3a6c9c699ca42df2642d9f6fad87cbd..df40ab29f928fa31ccedb9afb64da7e1
          // CraftBukkit end
          if (this.getConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f6adc73c6c1cdf0a182131b87edd103966212017..9ad5772fcb115d47cc4c0ff8d7f4ffeaa5b7edee 100644
+index 08a381e66471edab5c133af7dc7edb0731722ae7..0e4a3acef2f3e422a01e76757faa80c4005ef5ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1007,6 +1007,35 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0419-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0419-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0421-Ensure-safe-gateway-teleport.patch b/patches/server/0422-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0421-Ensure-safe-gateway-teleport.patch
rename to patches/server/0422-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0422-Add-option-for-console-having-all-permissions.patch b/patches/server/0423-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0422-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0423-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch
similarity index 97%
rename from patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch
rename to patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch
index b71457af4..7c253c911 100644
--- a/patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch
@@ -8,7 +8,7 @@ so inline where possible, and avoid the abstraction of the
 Either class.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a08a996722095b01720fa985ca7165a41a932056..13354b9e626ce7fec74cbaac68304a912517c40e 100644
+index cf0976f7352919197a322fb4f7f8e20c24509db5..443044aa09b80bdbbcd202b53d265c635b50015f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2250,19 +2250,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0427-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0428-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0427-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0428-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0428-Maps-shouldn-t-load-chunks.patch b/patches/server/0429-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0428-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0429-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0431-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0431-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0432-Fix-sand-duping.patch b/patches/server/0433-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0432-Fix-sand-duping.patch
rename to patches/server/0433-Fix-sand-duping.patch
diff --git a/patches/server/0433-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0433-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch
index 2b4f2ab7d..ac3be39df 100644
--- a/patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8c1800836497803cfcd8bca4ddd340003e4cc1d5..1049563602ead577f24bb4b698ffb2fb386cdf21 100644
+index 5157c257a3480b4f26d4a5830c36725af2d4bd4b..2daac5b9e7a9855a919024040bed4c065dce697a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1373,6 +1373,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0435-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0435-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0436-Improve-Arrow-API.patch b/patches/server/0437-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0436-Improve-Arrow-API.patch
rename to patches/server/0437-Improve-Arrow-API.patch
diff --git a/patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 95%
rename from patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 7c474a670..764c4e8bb 100644
--- a/patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1049563602ead577f24bb4b698ffb2fb386cdf21..656b8d83d5f78ab32f7980e6aa5eacd61f1bc598 100644
+index 2daac5b9e7a9855a919024040bed4c065dce697a..b3fa92cc2ff977107f310a8d95c0d63aa446295e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2997,9 +2997,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0438-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0438-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0439-Add-permission-for-command-blocks.patch b/patches/server/0440-Add-permission-for-command-blocks.patch
similarity index 98%
rename from patches/server/0439-Add-permission-for-command-blocks.patch
rename to patches/server/0440-Add-permission-for-command-blocks.patch
index 86c9ce83e..776e9d251 100644
--- a/patches/server/0439-Add-permission-for-command-blocks.patch
+++ b/patches/server/0440-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index 312768054e02847bbc7d2ec7fa6198dad52b86d2..32a6b4d8e6c8f9c05cc7ca811c2188aa
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 656b8d83d5f78ab32f7980e6aa5eacd61f1bc598..32786e1c13ffda722aaabf518e2ace7f13e0bf96 100644
+index b3fa92cc2ff977107f310a8d95c0d63aa446295e..30d0c22d4576f0aef49bb9fb08ff3c9a8edf8d5a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -829,7 +829,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0440-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0440-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 98%
rename from patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 4a5e1e0c0..d521f38ad 100644
--- a/patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -102,7 +102,7 @@ index 30d0c22d4576f0aef49bb9fb08ff3c9a8edf8d5a..41250053943118526ee36e296b19c1a6
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9ad5772fcb115d47cc4c0ff8d7f4ffeaa5b7edee..97f80d43c7f88c9cae6bf2beb9ceb59743bcae60 100644
+index 0e4a3acef2f3e422a01e76757faa80c4005ef5ca..0da8bcdd6b0071742e852ecb1df18a3d123f94ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -947,8 +947,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0442-Paper-dumpitem-command.patch b/patches/server/0443-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0442-Paper-dumpitem-command.patch
rename to patches/server/0443-Paper-dumpitem-command.patch
diff --git a/patches/server/0443-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0443-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0444-Improve-Legacy-Component-serialization-size.patch b/patches/server/0445-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0444-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0445-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0445-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0446-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0445-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0446-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index a3c2f518e..45909ac8e 100644
--- a/patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 97f80d43c7f88c9cae6bf2beb9ceb59743bcae60..0efc62fce74e545ed87fa96c25f1178945c87ea5 100644
+index 0da8bcdd6b0071742e852ecb1df18a3d123f94ef..df8a2fa9d38fd07e12e42bf2506e4d750a8ecab4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -356,7 +356,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0447-incremental-chunk-and-player-saving.patch b/patches/server/0448-incremental-chunk-and-player-saving.patch
similarity index 99%
rename from patches/server/0447-incremental-chunk-and-player-saving.patch
rename to patches/server/0448-incremental-chunk-and-player-saving.patch
index 76d3f4f4c..ede8ef131 100644
--- a/patches/server/0447-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0448-incremental-chunk-and-player-saving.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] incremental chunk and player saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d40623b3ed69a0821057f82e6164b4c94b4a7087..54a155295ed2ee2386f180bf8f5d413984febe96 100644
+index 049ec7c3be31f957e0a662a16939d5ef1868a4e3..9ce0c366b81ee8468cfcca1bd9fb8ed49ffea0ba 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -851,7 +851,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -256,7 +256,7 @@ index 1d9a0f6effa1654609f4d0752ec69eed6ab7134b..585892f19bc0aea89889a358c0407f29
      public void close() throws IOException {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 13354b9e626ce7fec74cbaac68304a912517c40e..69611eaafe2edc0e937f54b63bfbf3a23ca7a857 100644
+index 443044aa09b80bdbbcd202b53d265c635b50015f..848690e6dfaec00ec9b8a8397d2a6d37f24c8d12 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1082,6 +1082,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0448-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0448-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0449-Support-old-UUID-format-for-NBT.patch b/patches/server/0450-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0449-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0450-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0450-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0450-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0451-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0451-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0452-Remove-some-streams-from-structures.patch b/patches/server/0453-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0452-Remove-some-streams-from-structures.patch
rename to patches/server/0453-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0453-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0453-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0454-Support-components-in-ItemMeta.patch b/patches/server/0455-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0454-Support-components-in-ItemMeta.patch
rename to patches/server/0455-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0455-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0455-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0456-Add-entity-liquid-API.patch b/patches/server/0457-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0456-Add-entity-liquid-API.patch
rename to patches/server/0457-Add-entity-liquid-API.patch
diff --git a/patches/server/0457-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0458-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0457-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0458-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0458-Spawn-player-in-correct-world-on-login.patch b/patches/server/0459-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0458-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0459-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0459-Add-PrepareResultEvent.patch b/patches/server/0460-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0459-Add-PrepareResultEvent.patch
rename to patches/server/0460-Add-PrepareResultEvent.patch
diff --git a/patches/server/0460-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 90%
rename from patches/server/0460-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index bf202084b..3c25c05af 100644
--- a/patches/server/0460-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cf04841c7e30b9f45c4922977c12e0fed6049450..e76049a976bdfdf4a324a77e7a1721bd4303b058 100644
+index cf691b94b478dc058af706e1f2d13b51df231779..289073daacc2d477e965e668c6fb4041d27e3f8c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3410,7 +3410,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0461-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/0461-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0462-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0462-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0463-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0463-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0464-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0464-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0465-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0465-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0466-Fix-SPIGOT-5989.patch b/patches/server/0467-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0466-Fix-SPIGOT-5989.patch
rename to patches/server/0467-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0467-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0467-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0468-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0468-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0469-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0469-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0470-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 90%
rename from patches/server/0470-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index 1f8215e3b..9703debc5 100644
--- a/patches/server/0470-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f05c909f65240d3a9a71ac620c395d1e6a724fcd..324498a6add5288f175510ddd754ea2199d37cb7 100644
+index 4618e1a360c3d5cd875b646c57ce5c16d476976d..cb89a0c83a3c307f99581b7838308f70eccb774d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2093,6 +2093,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0471-Fix-some-rails-connecting-improperly.patch b/patches/server/0472-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0471-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0472-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0472-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0472-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0473-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0473-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0474-Brand-support.patch b/patches/server/0475-Brand-support.patch
similarity index 97%
rename from patches/server/0474-Brand-support.patch
rename to patches/server/0475-Brand-support.patch
index a8bc0226b..776b9da05 100644
--- a/patches/server/0474-Brand-support.patch
+++ b/patches/server/0475-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 08d28184c7e90878b72a606c7800cfffba90472c..84943c80d4a331b18652854f3ae75b509fde806b 100644
+index 41250053943118526ee36e296b19c1a68c434aa5..05c18c233c8400c2031f9d7b3e5ce230dd89a25f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -279,6 +279,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0475-Add-setMaxPlayers-API.patch b/patches/server/0476-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0475-Add-setMaxPlayers-API.patch
rename to patches/server/0476-Add-setMaxPlayers-API.patch
index 81efa8dd1..2a2da94df 100644
--- a/patches/server/0475-Add-setMaxPlayers-API.patch
+++ b/patches/server/0476-Add-setMaxPlayers-API.patch
@@ -18,7 +18,7 @@ index be7a25560cd5521ddfe4793c7e51b1036fc8a19c..869fa7c3913185c3537185426e75c076
      private int simulationDistance;
      private boolean allowCheatsForAllPlayers;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0efc62fce74e545ed87fa96c25f1178945c87ea5..d7d1c374aac8d7ba9b1eeed41b5caa20add19d72 100644
+index df8a2fa9d38fd07e12e42bf2506e4d750a8ecab4..06557989fd7e48d75b751cc1aa1fdd638e00d41d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -670,6 +670,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0476-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0476-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0477-Don-t-require-FACING-data.patch b/patches/server/0478-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0477-Don-t-require-FACING-data.patch
rename to patches/server/0478-Don-t-require-FACING-data.patch
diff --git a/patches/server/0478-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 96%
rename from patches/server/0478-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index b4a400084..96207f9e1 100644
--- a/patches/server/0478-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 980eda5fb86381f0c54e22e94d273bd5639f1a3b..b763d925a9db7deb5d6a0090498370355bc17554 100644
+index 848690e6dfaec00ec9b8a8397d2a6d37f24c8d12..bb8d5868275407fe3c5eb29174bf1970cae498f9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1850,6 +1850,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0479-Add-moon-phase-API.patch b/patches/server/0480-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0479-Add-moon-phase-API.patch
rename to patches/server/0480-Add-moon-phase-API.patch
diff --git a/patches/server/0480-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from patches/server/0480-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0481-Prevent-headless-pistons-from-being-created.patch b/patches/server/0482-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0481-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0482-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0482-Add-BellRingEvent.patch b/patches/server/0483-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0482-Add-BellRingEvent.patch
rename to patches/server/0483-Add-BellRingEvent.patch
diff --git a/patches/server/0483-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0484-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0483-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0484-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0484-Buffer-joins-to-world.patch b/patches/server/0485-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0484-Buffer-joins-to-world.patch
rename to patches/server/0485-Buffer-joins-to-world.patch
diff --git a/patches/server/0485-Eigencraft-redstone-implementation.patch b/patches/server/0486-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0485-Eigencraft-redstone-implementation.patch
rename to patches/server/0486-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0486-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 97%
rename from patches/server/0486-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 9b9a7e3bc..3c9abb3a4 100644
--- a/patches/server/0486-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -25,7 +25,7 @@ index 43759cdf3da0796d7969c6504ac9a6986c0f0518..750fef0f5b908b776a7306e54653eba4
  
                      this.connection.send(new ClientboundLoginDisconnectPacket(ichatmutablecomponent));
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index ae93ca7bcc7347ee165cbb0e9fd20aa3da54616c..25d96d74a656765c92e8df0bb8563947f5587f3b 100644
+index e51c03e05c4407ad3a51e573a5e79b003f86d9f1..000ee7e12a1c756e065e99ebdbcf4a51047ec4d3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -111,7 +111,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
diff --git a/patches/server/0487-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0487-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0488-Fix-CraftTeam-null-check.patch b/patches/server/0489-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0488-Fix-CraftTeam-null-check.patch
rename to patches/server/0489-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0489-Add-more-Evoker-API.patch b/patches/server/0490-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0489-Add-more-Evoker-API.patch
rename to patches/server/0490-Add-more-Evoker-API.patch
diff --git a/patches/server/0490-Add-methods-to-get-translation-keys.patch b/patches/server/0491-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0490-Add-methods-to-get-translation-keys.patch
rename to patches/server/0491-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0491-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0491-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0492-Cache-block-data-strings.patch b/patches/server/0493-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0492-Cache-block-data-strings.patch
rename to patches/server/0493-Cache-block-data-strings.patch
diff --git a/patches/server/0493-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0493-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0494-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 97%
rename from patches/server/0494-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch
index 4b237acda..53f2348da 100644
--- a/patches/server/0494-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index b68e1f8c9acb05ef38ec9d35ee68748c5a31abe7..a9c46bd7173d44191c3e9f273e0e1c576ac30a26 100644
+index 3a14cc3d0d692c8bbc90de1b1c5731158b1323e5..acf609e8d880156ba980b701816c475166c27bdb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -459,6 +459,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0495-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0495-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0496-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 96%
rename from patches/server/0496-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch
index 2c2369676..0995c638c 100644
--- a/patches/server/0496-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 924fbf224ae04cba02cf41f37caa9424dfa69d1d..7fd363b20a50d63ad61d365519264e27921ed47e 100644
+index bb8d5868275407fe3c5eb29174bf1970cae498f9..2ac0db36942ecb6dd073bc08f42fb3d1a6c12f6d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1287,6 +1287,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0497-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0497-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0498-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0498-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0499-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0499-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0500-Entity-isTicking.patch b/patches/server/0501-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0500-Entity-isTicking.patch
rename to patches/server/0501-Entity-isTicking.patch
diff --git a/patches/server/0501-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0501-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0502-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0502-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0503-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0503-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0504-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch
similarity index 98%
rename from patches/server/0504-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch
index 65cfbec9d..06229ba91 100644
--- a/patches/server/0504-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2e6bb067197121c72d249fc31ce46b8b0b17263b..979bdc8a7547e96d3a9dcf9597b58d6a8a4aeee7 100644
+index df8e091e72901518ef21903bd3890988ea4a5645..bbe945c7c26ece9d8589f46388d0e465f07b1e81 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -536,9 +536,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0505-Optimise-getType-calls.patch b/patches/server/0506-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0505-Optimise-getType-calls.patch
rename to patches/server/0506-Optimise-getType-calls.patch
diff --git a/patches/server/0506-Villager-resetOffers.patch b/patches/server/0507-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0506-Villager-resetOffers.patch
rename to patches/server/0507-Villager-resetOffers.patch
diff --git a/patches/server/0507-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0507-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0508-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0508-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0509-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0509-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0510-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0511-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0510-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0511-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0511-Player-elytra-boost-API.patch b/patches/server/0512-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0511-Player-elytra-boost-API.patch
rename to patches/server/0512-Player-elytra-boost-API.patch
diff --git a/patches/server/0512-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0513-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0512-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0513-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0513-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0513-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0514-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0514-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0515-Add-getOfflinePlayerIfCached-String.patch
index 070e05ac2..9f67c426f 100644
--- a/patches/server/0514-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d7d1c374aac8d7ba9b1eeed41b5caa20add19d72..ae0395fb03177f29707d14a4ddd090eafe06d1f4 100644
+index 06557989fd7e48d75b751cc1aa1fdd638e00d41d..9dad601fd1c5e45ce374c9411324b1402eb4e906 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1799,6 +1799,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0515-Add-ignore-discounts-API.patch b/patches/server/0516-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0515-Add-ignore-discounts-API.patch
rename to patches/server/0516-Add-ignore-discounts-API.patch
diff --git a/patches/server/0516-Toggle-for-removing-existing-dragon.patch b/patches/server/0517-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0516-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0517-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0517-Fix-client-lag-on-advancement-loading.patch b/patches/server/0518-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0517-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0518-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0518-Item-no-age-no-player-pickup.patch b/patches/server/0519-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0518-Item-no-age-no-player-pickup.patch
rename to patches/server/0519-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0519-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0519-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0520-Beacon-API-custom-effect-ranges.patch b/patches/server/0521-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0520-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0521-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0521-Add-API-for-quit-reason.patch b/patches/server/0522-Add-API-for-quit-reason.patch
similarity index 98%
rename from patches/server/0521-Add-API-for-quit-reason.patch
rename to patches/server/0522-Add-API-for-quit-reason.patch
index 35d9284fc..4e52eb99e 100644
--- a/patches/server/0521-Add-API-for-quit-reason.patch
+++ b/patches/server/0522-Add-API-for-quit-reason.patch
@@ -37,7 +37,7 @@ index 315ada5d45e8681a8f0695410201758d8748b7ec..f0ef38377ae735800323c486d9e42cd0
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, @Nullable ProfilePublicKey publicKey) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile, publicKey);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 979bdc8a7547e96d3a9dcf9597b58d6a8a4aeee7..3c608f12c2500d11bd209c3c8797a9909165668c 100644
+index bbe945c7c26ece9d8589f46388d0e465f07b1e81..336274ad506034bbed408c2f62aa520a39d5d49d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -469,6 +469,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0522-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0522-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0523-Expose-world-spawn-angle.patch b/patches/server/0524-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0523-Expose-world-spawn-angle.patch
rename to patches/server/0524-Expose-world-spawn-angle.patch
diff --git a/patches/server/0524-Add-Destroy-Speed-API.patch b/patches/server/0525-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0524-Add-Destroy-Speed-API.patch
rename to patches/server/0525-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0525-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0525-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0526-Add-LivingEntity-clearActiveItem.patch b/patches/server/0527-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0526-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0527-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0527-Add-PlayerItemCooldownEvent.patch b/patches/server/0528-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0527-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0528-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0529-More-lightning-API.patch b/patches/server/0530-More-lightning-API.patch
similarity index 100%
rename from patches/server/0529-More-lightning-API.patch
rename to patches/server/0530-More-lightning-API.patch
diff --git a/patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
index 861957b00..6a2330f0d 100644
--- a/patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -45,7 +45,7 @@ index 22f36cd3df49160f1b6668befdd05c2268edaa49..e39965c2e50bc8ee424ea07819346e06
              } else if (entity.level.isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e76049a976bdfdf4a324a77e7a1721bd4303b058..c2508c15eca1a0dbc1a368025651ec2a20b2cbb6 100644
+index 289073daacc2d477e965e668c6fb4041d27e3f8c..9310770edd38107211dafb94529d0edc73889e85 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3332,7 +3332,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0531-Added-missing-default-perms-for-commands.patch b/patches/server/0532-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0531-Added-missing-default-perms-for-commands.patch
rename to patches/server/0532-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0532-Add-PlayerShearBlockEvent.patch b/patches/server/0533-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0532-Add-PlayerShearBlockEvent.patch
rename to patches/server/0533-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0534-Limit-recipe-packets.patch b/patches/server/0535-Limit-recipe-packets.patch
similarity index 96%
rename from patches/server/0534-Limit-recipe-packets.patch
rename to patches/server/0535-Limit-recipe-packets.patch
index df003fee2..b8d2cfaca 100644
--- a/patches/server/0534-Limit-recipe-packets.patch
+++ b/patches/server/0535-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3c608f12c2500d11bd209c3c8797a9909165668c..517c036be37f7ecd51f3a417b3ae800fa2d1ba08 100644
+index 336274ad506034bbed408c2f62aa520a39d5d49d..47c36be46c8d24c243f2d5db9a3d07eb5c177809 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -248,6 +248,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0535-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0536-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0535-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0536-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0536-Player-Chunk-Load-Unload-Events.patch b/patches/server/0537-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0536-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0537-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0538-Expose-LivingEntity-hurt-direction.patch b/patches/server/0539-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0538-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0539-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 91%
rename from patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index fb5ec2223..5c4a71438 100644
--- a/patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b0aec2a6174048f38dd85360a4dda883ecff7111..46189c02e94af8520bf7e226f3924ba8952e72d6 100644
+index c2eefe215f47e36cc2b8476750ae00ec88f826a6..7f8dbc94ad04ff58e0ee7591b42e268ee4b75576 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -263,6 +263,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0542-Implement-TargetHitEvent.patch b/patches/server/0543-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0542-Implement-TargetHitEvent.patch
rename to patches/server/0543-Implement-TargetHitEvent.patch
diff --git a/patches/server/0543-MC-4-Fix-item-position-desync.patch b/patches/server/0544-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0543-MC-4-Fix-item-position-desync.patch
rename to patches/server/0544-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0544-Additional-Block-Material-API-s.patch b/patches/server/0545-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0544-Additional-Block-Material-API-s.patch
rename to patches/server/0545-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0545-Fix-harming-potion-dupe.patch b/patches/server/0546-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0545-Fix-harming-potion-dupe.patch
rename to patches/server/0546-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0547-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0547-Cache-burn-durations.patch b/patches/server/0548-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0547-Cache-burn-durations.patch
rename to patches/server/0548-Cache-burn-durations.patch
diff --git a/patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0549-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0550-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0551-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 95%
rename from patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch
index 37ba0806a..8e7ec11fd 100644
--- a/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0552-Fix-interact-event-not-being-called-in-adventure.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 517c036be37f7ecd51f3a417b3ae800fa2d1ba08..937d5bb2f0686863447c612c9c786f8a412d704b 100644
+index 47c36be46c8d24c243f2d5db9a3d07eb5c177809..25e8e284ab83e0b3d8ef943f287b24ab6aed9447 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1779,7 +1779,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0552-Zombie-API-breaking-doors.patch b/patches/server/0553-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0552-Zombie-API-breaking-doors.patch
rename to patches/server/0553-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0553-Fix-nerfed-slime-when-splitting.patch b/patches/server/0554-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0553-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0554-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0554-Add-EntityLoadCrossbowEvent.patch b/patches/server/0555-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0554-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0555-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0555-Guardian-beam-workaround.patch b/patches/server/0556-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0555-Guardian-beam-workaround.patch
rename to patches/server/0556-Guardian-beam-workaround.patch
diff --git a/patches/server/0556-Added-WorldGameRuleChangeEvent.patch b/patches/server/0557-Added-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from patches/server/0556-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0557-Added-WorldGameRuleChangeEvent.patch
index e521db51a..8a0cf08ab 100644
--- a/patches/server/0556-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0557-Added-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 800325a544bb9f228ccbeb0a52d7f380a8c6083e..3c93bfeb94168f832904a8462ae23b06
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 880aeefbda1cba04accf9075240c88c027b5763c..8d6828c93eb76c2df4287df6f6ab9419bd05f2e7 100644
+index edf538cfa6f73bce65b5d50d014d8fd2fbca5d3d..34b3f25d4e76db2ca3dd44c55cdec3e5b1947395 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1798,8 +1798,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0557-Added-ServerResourcesReloadedEvent.patch b/patches/server/0558-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0557-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0558-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0559-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0559-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0559-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0560-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0559-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0560-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0560-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0561-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0560-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0561-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0562-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0562-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0562-Configurable-door-breaking-difficulty.patch b/patches/server/0563-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0562-Configurable-door-breaking-difficulty.patch
rename to patches/server/0563-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0563-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0564-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0563-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0564-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0565-Implement-API-to-expose-exact-interaction-point.patch
similarity index 97%
rename from patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0565-Implement-API-to-expose-exact-interaction-point.patch
index cb48ca350..42eec5e1c 100644
--- a/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0565-Implement-API-to-expose-exact-interaction-point.patch
@@ -18,7 +18,7 @@ index 32c78828b0c85949832dc25843c881b8eecc63d6..06e7a8b8227260c002a88119544b99a1
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f89228c0c38c4acc299248e7d9639442eedca08b..a45ed570a7bf1becbc91c97c3890e99c0e5ebc0c 100644
+index 5162109ea1f8284f0302306f8dac3048ce0b7010..7bafab016aeb3b1177b23f44696e7178f25d414a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -56,7 +56,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
diff --git a/patches/server/0565-Remove-stale-POIs.patch b/patches/server/0566-Remove-stale-POIs.patch
similarity index 91%
rename from patches/server/0565-Remove-stale-POIs.patch
rename to patches/server/0566-Remove-stale-POIs.patch
index e2797a5f1..5d8475418 100644
--- a/patches/server/0565-Remove-stale-POIs.patch
+++ b/patches/server/0566-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7fd363b20a50d63ad61d365519264e27921ed47e..61e836ac09f91897e3edad17e4fa619a0b3f92f1 100644
+index 2ac0db36942ecb6dd073bc08f42fb3d1a6c12f6d..853929fb1ae428baf9f7cd3f49fdadd52e0c3401 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1915,6 +1915,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0566-Fix-villager-boat-exploit.patch b/patches/server/0567-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0566-Fix-villager-boat-exploit.patch
rename to patches/server/0567-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0567-Add-sendOpLevel-API.patch b/patches/server/0568-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0567-Add-sendOpLevel-API.patch
rename to patches/server/0568-Add-sendOpLevel-API.patch
diff --git a/patches/server/0568-Add-PaperRegistry.patch b/patches/server/0569-Add-PaperRegistry.patch
similarity index 100%
rename from patches/server/0568-Add-PaperRegistry.patch
rename to patches/server/0569-Add-PaperRegistry.patch
diff --git a/patches/server/0569-Add-StructuresLocateEvent.patch b/patches/server/0570-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0569-Add-StructuresLocateEvent.patch
rename to patches/server/0570-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0570-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0571-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0570-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0571-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0572-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0573-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0573-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0573-Make-schedule-command-per-world.patch b/patches/server/0574-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0573-Make-schedule-command-per-world.patch
rename to patches/server/0574-Make-schedule-command-per-world.patch
diff --git a/patches/server/0574-Configurable-max-leash-distance.patch b/patches/server/0575-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0574-Configurable-max-leash-distance.patch
rename to patches/server/0575-Configurable-max-leash-distance.patch
diff --git a/patches/server/0575-Implement-BlockPreDispenseEvent.patch b/patches/server/0576-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0575-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0576-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0577-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0578-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0578-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0579-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0579-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0581-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0580-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0581-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0581-add-DragonEggFormEvent.patch b/patches/server/0582-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0581-add-DragonEggFormEvent.patch
rename to patches/server/0582-add-DragonEggFormEvent.patch
diff --git a/patches/server/0582-EntityMoveEvent.patch b/patches/server/0583-EntityMoveEvent.patch
similarity index 92%
rename from patches/server/0582-EntityMoveEvent.patch
rename to patches/server/0583-EntityMoveEvent.patch
index 0aec7d28e..c1f9bb438 100644
--- a/patches/server/0582-EntityMoveEvent.patch
+++ b/patches/server/0583-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 18f050a80f9928bae3c1a0288f152907090644b7..49f481d34eec97c2bd4f0780e97ce2d41ed04b34 100644
+index 3d8917c3baa0c308fe85cafcd332bfbe9bffede9..20d9fc16c4fffd6eaf4d8048dc93068a9e5d3b7c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1493,6 +1493,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index 18f050a80f9928bae3c1a0288f152907090644b7..49f481d34eec97c2bd4f0780e97ce2d4
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 61e836ac09f91897e3edad17e4fa619a0b3f92f1..406c0b3ac5e6315789618075821e34fd7d3762f4 100644
+index 853929fb1ae428baf9f7cd3f49fdadd52e0c3401..ca2e1f7735352ece4a05a21539e5606b16322322 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index 61e836ac09f91897e3edad17e4fa619a0b3f92f1..406c0b3ac5e6315789618075821e34fd
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c2508c15eca1a0dbc1a368025651ec2a20b2cbb6..5ad9e0c4a00fee75a173904866cd7d210433a3e4 100644
+index 9310770edd38107211dafb94529d0edc73889e85..20816ccecd427ca747719dea5fd6c2d5544b71ff 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3278,6 +3278,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 91%
rename from patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch
index 343f6700c..1954931c8 100644
--- a/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 406c0b3ac5e6315789618075821e34fd7d3762f4..951d5fed0d688591fe6d38374a9fd340c8ab93cf 100644
+index ca2e1f7735352ece4a05a21539e5606b16322322..a5199e0a95e1bb85c06de612ed7a54bec215deae 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1489,6 +1489,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0584-Inline-shift-direction-fields.patch b/patches/server/0585-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0584-Inline-shift-direction-fields.patch
rename to patches/server/0585-Inline-shift-direction-fields.patch
diff --git a/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 95%
rename from patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch
index f3c5cbca9..e71e9cff7 100644
--- a/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7893c10295abcd6ab2e3c4458c31f0b8914ba4c3..7570d5254b5807e967e7ab2560f091a9d601a876 100644
+index 9ccfe52a61b72addfa675af797ea4bafbff30bdb..82d8a8c2199673315c7b52e694f798cc59c5f96c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -396,13 +396,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0587-living-entity-allow-attribute-registration.patch b/patches/server/0588-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0587-living-entity-allow-attribute-registration.patch
rename to patches/server/0588-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0588-fix-dead-slime-setSize-invincibility.patch b/patches/server/0589-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0588-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0589-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch
similarity index 99%
rename from patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0591-Add-support-for-hex-color-codes-in-console.patch
index af8cfa7f0..6805eaffe 100644
--- a/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch
+++ b/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch
@@ -282,7 +282,7 @@ index 0000000000000000000000000000000000000000..b4d0b7ecd56ab952319946854168c129
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9e943c5d3a5ee91bc8a3f77d14e1413d0a1ecdb7..d61acd95810f735245b15555f9bf2022e5bc3683 100644
+index 20d9fc16c4fffd6eaf4d8048dc93068a9e5d3b7c..67c2ad20d0c1d63dcd43d9570fbcb5b9a30f4ee1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1670,7 +1670,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0591-Expose-Tracked-Players.patch b/patches/server/0592-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0591-Expose-Tracked-Players.patch
rename to patches/server/0592-Expose-Tracked-Players.patch
diff --git a/patches/server/0592-Remove-streams-from-SensorNearest.patch b/patches/server/0593-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0592-Remove-streams-from-SensorNearest.patch
rename to patches/server/0593-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0594-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0594-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0594-Improve-ServerGUI.patch b/patches/server/0595-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0594-Improve-ServerGUI.patch
rename to patches/server/0595-Improve-ServerGUI.patch
diff --git a/patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0596-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0596-fix-converting-txt-to-json-file.patch b/patches/server/0597-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0596-fix-converting-txt-to-json-file.patch
rename to patches/server/0597-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0597-Add-worldborder-events.patch b/patches/server/0598-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0597-Add-worldborder-events.patch
rename to patches/server/0598-Add-worldborder-events.patch
diff --git a/patches/server/0598-added-PlayerNameEntityEvent.patch b/patches/server/0599-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0598-added-PlayerNameEntityEvent.patch
rename to patches/server/0599-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0599-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0600-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0599-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0600-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0600-Add-recipe-to-cook-events.patch b/patches/server/0601-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0600-Add-recipe-to-cook-events.patch
rename to patches/server/0601-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0601-Add-Block-isValidTool.patch b/patches/server/0602-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0601-Add-Block-isValidTool.patch
rename to patches/server/0602-Add-Block-isValidTool.patch
diff --git a/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0603-Allow-using-signs-inside-spawn-protection.patch
similarity index 94%
rename from patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0603-Allow-using-signs-inside-spawn-protection.patch
index 99c0a46e2..b541d545e 100644
--- a/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0603-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 937d5bb2f0686863447c612c9c786f8a412d704b..3d4e75e1a2aeb6776be464e3614b818af8d6b16d 100644
+index 25e8e284ab83e0b3d8ef943f287b24ab6aed9447..a45b2909300e0a66d92702eb85e541e621d27fea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1771,7 +1771,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0603-Expand-world-key-API.patch b/patches/server/0604-Expand-world-key-API.patch
similarity index 97%
rename from patches/server/0603-Expand-world-key-API.patch
rename to patches/server/0604-Expand-world-key-API.patch
index a19806718..64eba607f 100644
--- a/patches/server/0603-Expand-world-key-API.patch
+++ b/patches/server/0604-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index ee5e59c37301d9a806e2f696d52d9d217b232833..bb5d22125b6cd4e60d2b7e2e00af158c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ae0395fb03177f29707d14a4ddd090eafe06d1f4..484e0a506f29189b14fd5570ad926d941513ca43 100644
+index 9dad601fd1c5e45ce374c9411324b1402eb4e906..280edb675f19be2b88c2b8075c3d865726ce9f7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1139,9 +1139,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0605-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0605-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0605-Item-Rarity-API.patch b/patches/server/0606-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0605-Item-Rarity-API.patch
rename to patches/server/0606-Item-Rarity-API.patch
diff --git a/patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0607-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0608-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0607-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0608-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0609-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0609-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0610-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0609-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0610-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index d9963a995..a1114d03f 100644
--- a/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0611-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d4e75e1a2aeb6776be464e3614b818af8d6b16d..dfeeaa4b5a8fc7cff043223291e56381857f38b6 100644
+index a45b2909300e0a66d92702eb85e541e621d27fea..f582c7c41022c8b94ea6c7bc0ac9312499e7c434 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1221,7 +1221,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0611-Entity-load-save-limit-per-chunk.patch b/patches/server/0612-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0611-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0612-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0612-Expose-protocol-version.patch b/patches/server/0613-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0612-Expose-protocol-version.patch
rename to patches/server/0613-Expose-protocol-version.patch
diff --git a/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0614-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 98%
rename from patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0614-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 52ac6d184..4faeb7853 100644
--- a/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0614-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dfeeaa4b5a8fc7cff043223291e56381857f38b6..0cf314dcd57db6ea9b27fc008729df700fd97de1 100644
+index f582c7c41022c8b94ea6c7bc0ac9312499e7c434..6fb7bfd504839cc4a6f38ec9f99a571a1396e222 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -803,12 +803,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0615-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0615-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 92%
rename from patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index bd11a625a..52f5ed46e 100644
--- a/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0616-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5ad9e0c4a00fee75a173904866cd7d210433a3e4..2d892c04efc4db941bf8ad57029589b55d0155f7 100644
+index 20816ccecd427ca747719dea5fd6c2d5544b71ff..85a0a295ce7739e340ada69e5a970b742dd95004 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3752,6 +3752,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0616-Add-bypass-host-check.patch b/patches/server/0617-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0616-Add-bypass-host-check.patch
rename to patches/server/0617-Add-bypass-host-check.patch
diff --git a/patches/server/0617-Set-area-affect-cloud-rotation.patch b/patches/server/0618-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0617-Set-area-affect-cloud-rotation.patch
rename to patches/server/0618-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0619-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 90%
rename from patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0619-add-isDeeplySleeping-to-HumanEntity.patch
index 2a99c85e9..18ba539fd 100644
--- a/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0619-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a9c46bd7173d44191c3e9f273e0e1c576ac30a26..73517e2cc98e9cda6e577976232a6c9314226ece 100644
+index acf609e8d880156ba980b701816c475166c27bdb..6149e74262ca6c4c00686a89c273c59bfaac3e05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -122,6 +122,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0620-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0620-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0621-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0621-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0622-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0622-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0623-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0623-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch
index 0246d2de0..948edcfd7 100644
--- a/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0624-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0cf314dcd57db6ea9b27fc008729df700fd97de1..d9d0811cef7a5fcbc7f4fcb9de6a874268345b16 100644
+index 6fb7bfd504839cc4a6f38ec9f99a571a1396e222..33354c6ca4005d3ae1aedc4fac57dcd047bab853 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1986,6 +1986,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0624-Added-PlayerDeepSleepEvent.patch b/patches/server/0625-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0624-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0625-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0625-More-World-API.patch b/patches/server/0626-More-World-API.patch
similarity index 97%
rename from patches/server/0625-More-World-API.patch
rename to patches/server/0626-More-World-API.patch
index c3e37d359..ec159f445 100644
--- a/patches/server/0625-More-World-API.patch
+++ b/patches/server/0626-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8d6828c93eb76c2df4287df6f6ab9419bd05f2e7..4ba0106e5dd95dbe5cf1db091abf34dea330fb54 100644
+index 34b3f25d4e76db2ca3dd44c55cdec3e5b1947395..5d512fc061b5a1301c01bffeaa7b55461444d2e0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1967,6 +1967,65 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0626-Added-PlayerBedFailEnterEvent.patch b/patches/server/0627-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0626-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0627-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0628-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0629-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0629-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0630-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0629-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0630-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 15de10396..479021330 100644
--- a/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0631-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d9d0811cef7a5fcbc7f4fcb9de6a874268345b16..dde41b71132354eb52fe34408afcbade41da41f3 100644
+index 33354c6ca4005d3ae1aedc4fac57dcd047bab853..24025a814b2659829983c902f40214a2b7b6bcf4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2674,7 +2674,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0631-Add-Channel-initialization-listeners.patch b/patches/server/0632-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0631-Add-Channel-initialization-listeners.patch
rename to patches/server/0632-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0633-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0633-Add-more-WanderingTrader-API.patch b/patches/server/0634-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0633-Add-more-WanderingTrader-API.patch
rename to patches/server/0634-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0634-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0635-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0634-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0635-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0636-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0637-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0637-Inventory-close.patch b/patches/server/0638-Inventory-close.patch
similarity index 100%
rename from patches/server/0637-Inventory-close.patch
rename to patches/server/0638-Inventory-close.patch
diff --git a/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0639-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0640-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0640-Fix-CraftPotionBrewer-cache.patch b/patches/server/0641-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0640-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0641-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0641-Add-basic-Datapack-API.patch b/patches/server/0642-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0641-Add-basic-Datapack-API.patch
rename to patches/server/0642-Add-basic-Datapack-API.patch
index 8c36ebc12..e7f1c409b 100644
--- a/patches/server/0641-Add-basic-Datapack-API.patch
+++ b/patches/server/0642-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 484e0a506f29189b14fd5570ad926d941513ca43..67918c88f1db2c84067cf707407ce9bd3c70f31d 100644
+index 280edb675f19be2b88c2b8075c3d865726ce9f7f..68f46b7ade51b896b4044df3b737dd0e08a2b991 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -278,6 +278,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0642-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0643-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0642-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0643-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch
similarity index 98%
rename from patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch
index 85d9c55a4..8e749b7f5 100644
--- a/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0644-additions-to-PlayerGameModeChangeEvent.patch
@@ -126,7 +126,7 @@ index 06e7a8b8227260c002a88119544b99a11eec8a09..4d907501dfe7f1a4641542291f4abdd0
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dde41b71132354eb52fe34408afcbade41da41f3..e53f086238977320bdbb98547b5dda93a4e6581e 100644
+index 24025a814b2659829983c902f40214a2b7b6bcf4..c9da8961af6ae392230355ef722e5f9be4e3fc5c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2683,7 +2683,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0644-ItemStack-repair-check-API.patch b/patches/server/0645-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0644-ItemStack-repair-check-API.patch
rename to patches/server/0645-ItemStack-repair-check-API.patch
diff --git a/patches/server/0645-More-Enchantment-API.patch b/patches/server/0646-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0645-More-Enchantment-API.patch
rename to patches/server/0646-More-Enchantment-API.patch
diff --git a/patches/server/0646-Move-range-check-for-block-placing-up.patch b/patches/server/0647-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0646-Move-range-check-for-block-placing-up.patch
rename to patches/server/0647-Move-range-check-for-block-placing-up.patch
index 3aed956bd..adbb6b008 100644
--- a/patches/server/0646-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0647-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e53f086238977320bdbb98547b5dda93a4e6581e..b5b130785cb0009f58b65b1cc4dba9f006ba1d7a 100644
+index c9da8961af6ae392230355ef722e5f9be4e3fc5c..f3a8b36956dbb8b9396bac4fc17aae7a3cb1d594 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1763,6 +1763,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0648-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0648-Fix-and-optimise-world-force-upgrading.patch
index 4f5ea3247..7bf0aea36 100644
--- a/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0648-Fix-and-optimise-world-force-upgrading.patch
@@ -356,7 +356,7 @@ index a96a6af2bcec3134b7caa32299bd07af50e83b89..0d96d1c0b66c57c680759f3567ef1b0c
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 67918c88f1db2c84067cf707407ce9bd3c70f31d..649f78cc3491d0a14627485eadb67315135fda27 100644
+index 68f46b7ade51b896b4044df3b737dd0e08a2b991..338bd6a9c448f73b5df6d8be630bba0846cc8464 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1200,12 +1200,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0648-Add-Mob-lookAt-API.patch b/patches/server/0649-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0648-Add-Mob-lookAt-API.patch
rename to patches/server/0649-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0649-Add-Unix-domain-socket-support.patch b/patches/server/0650-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0649-Add-Unix-domain-socket-support.patch
rename to patches/server/0650-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0650-Add-EntityInsideBlockEvent.patch b/patches/server/0651-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0650-Add-EntityInsideBlockEvent.patch
rename to patches/server/0651-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0651-Attributes-API-for-item-defaults.patch b/patches/server/0652-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0651-Attributes-API-for-item-defaults.patch
rename to patches/server/0652-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 97%
rename from patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch
index 5690474f5..d09e30fb4 100644
--- a/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0653-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 951d5fed0d688591fe6d38374a9fd340c8ab93cf..b19f6e48c106feed9c9c4c24c6b46fb7ac91800d 100644
+index a5199e0a95e1bb85c06de612ed7a54bec215deae..a19be39c5b4552ebfa74634c0cc004f9de0a9eff 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -493,8 +493,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -95,7 +95,7 @@ index 401787a5b55384b9ab7755e822b3b881dc45ac45..e537a8df45c31efa80cb898cbef9c3a0
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4ba0106e5dd95dbe5cf1db091abf34dea330fb54..b6c43ae3703a302aa82cc0bc7f99a1502d2fd822 100644
+index 5d512fc061b5a1301c01bffeaa7b55461444d2e0..d8b88d9b233adba73442ff8af46ce17a3deae292 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1189,7 +1189,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0653-More-Lidded-Block-API.patch b/patches/server/0654-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0653-More-Lidded-Block-API.patch
rename to patches/server/0654-More-Lidded-Block-API.patch
diff --git a/patches/server/0654-Limit-item-frame-cursors-on-maps.patch b/patches/server/0655-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0654-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0655-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0655-Add-PlayerKickEvent-causes.patch b/patches/server/0656-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0655-Add-PlayerKickEvent-causes.patch
rename to patches/server/0656-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0656-Add-PufferFishStateChangeEvent.patch b/patches/server/0657-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0656-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0657-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0658-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0658-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0659-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0659-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0660-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0660-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0660-Add-BellRevealRaiderEvent.patch b/patches/server/0661-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0660-Add-BellRevealRaiderEvent.patch
rename to patches/server/0661-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0661-Fix-invulnerable-end-crystals.patch b/patches/server/0662-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0661-Fix-invulnerable-end-crystals.patch
rename to patches/server/0662-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0662-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0663-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0662-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0663-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0663-Fix-dangerous-end-portal-logic.patch b/patches/server/0664-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0663-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0664-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0665-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0665-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0665-Make-item-validations-configurable.patch b/patches/server/0666-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0665-Make-item-validations-configurable.patch
rename to patches/server/0666-Make-item-validations-configurable.patch
diff --git a/patches/server/0666-Line-Of-Sight-Changes.patch b/patches/server/0667-Line-Of-Sight-Changes.patch
similarity index 98%
rename from patches/server/0666-Line-Of-Sight-Changes.patch
rename to patches/server/0667-Line-Of-Sight-Changes.patch
index 0776c491e..e20e5491d 100644
--- a/patches/server/0666-Line-Of-Sight-Changes.patch
+++ b/patches/server/0667-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2d892c04efc4db941bf8ad57029589b55d0155f7..ecb499ed17df00afcc0898d35b05b260f1d3fe6e 100644
+index 85a0a295ce7739e340ada69e5a970b742dd95004..ca484fdd712a0815fc44521e42550b1529dc3edb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3481,7 +3481,8 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0667-add-per-world-spawn-limits.patch b/patches/server/0668-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0667-add-per-world-spawn-limits.patch
rename to patches/server/0668-add-per-world-spawn-limits.patch
index 2a6c71649..075139ae5 100644
--- a/patches/server/0667-add-per-world-spawn-limits.patch
+++ b/patches/server/0668-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b6c43ae3703a302aa82cc0bc7f99a1502d2fd822..acd935f7b9652ae4e778d865e9be1f0bfe906fe0 100644
+index d8b88d9b233adba73442ff8af46ce17a3deae292..b79b0b78e3e69c2b5c9aa21cf63fe5cc8ea506ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -205,6 +205,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0669-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0669-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0669-Add-more-LimitedRegion-API.patch b/patches/server/0670-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0669-Add-more-LimitedRegion-API.patch
rename to patches/server/0670-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0671-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0671-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0671-Missing-Entity-Behavior-API.patch b/patches/server/0672-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0671-Missing-Entity-Behavior-API.patch
rename to patches/server/0672-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0673-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0673-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 65ae0f92e..397c54609 100644
--- a/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0673-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4e356271ba54d51c4778314c86495136bfbd8704..3ebd5dc1df6fc637fe3350caa2cb069c15405737 100644
+index c8e99e115c0c40834cc73c8373bb757ea7e1e88f..83129a209741b42d98993d48f2d3f98183671707 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1146,7 +1146,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0674-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0674-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 96%
rename from patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch
index 3c341d470..1d0bacc7f 100644
--- a/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0675-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b19f6e48c106feed9c9c4c24c6b46fb7ac91800d..86f3c9be119aba7ec447d6887f40c2671203fb25 100644
+index a19be39c5b4552ebfa74634c0cc004f9de0a9eff..8c61dc53f4874ab7013938abdf5d65a608369474 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,7 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0676-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0676-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0676-Adds-PlayerArmSwingEvent.patch b/patches/server/0677-Adds-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0676-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0677-Adds-PlayerArmSwingEvent.patch
index 5eba2f218..23dceed6d 100644
--- a/patches/server/0676-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0677-Adds-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3ebd5dc1df6fc637fe3350caa2cb069c15405737..0e5d424c5af7429a95a5906572b5ff0fbb221dd4 100644
+index 83129a209741b42d98993d48f2d3f98183671707..b3cc17742c095a4fe7a4a43fbd7fe27284c34825 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2437,7 +2437,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 98%
rename from patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch
index dffce5874..d53889b10 100644
--- a/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0678-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -17,7 +17,7 @@ index f5b37334d21c3c3812b4f343e5af17234dd9f907..5db3349f4e366caef84b0d1e811c031e
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0e5d424c5af7429a95a5906572b5ff0fbb221dd4..853e7edbb977394d2860ce3f63e4712c921bc741 100644
+index b3cc17742c095a4fe7a4a43fbd7fe27284c34825..9a9f4b985c01c8e076d26c22c37d090bb7348371 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -474,7 +474,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0679-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 97%
rename from patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0679-Add-config-for-mobs-immune-to-default-effects.patch
index 1f6396826..84d669db4 100644
--- a/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0679-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ecb499ed17df00afcc0898d35b05b260f1d3fe6e..378c0848db27a45c79acff43aa6068d1852a3beb 100644
+index ca484fdd712a0815fc44521e42550b1529dc3edb..7f39a4955b4819e8a908f4cbf951d707c34fa4a8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1153,7 +1153,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0680-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0679-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0680-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0681-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0680-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0681-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 98%
rename from patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch
index f64d6e096..30867e6cf 100644
--- a/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0682-Rate-options-and-timings-for-sensors-and-behaviors.patch
@@ -9,7 +9,7 @@ This adds config options to specify the tick rate for sensors
  ones might need tweaking.
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 9fdc3e9936262b8eb8d502c4dd2ba47a7eceacce..3b717a6a1be16f780923e7ae3269462d3d082615 100644
+index 3f540dc05315103ef97fd53628f681c67f7e7c2d..23e564b05ba438924180c91f9b19a60731eedd1b 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -114,6 +114,14 @@ public final class MinecraftTimings {
diff --git a/patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0683-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0683-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0683-Stinger-API.patch b/patches/server/0684-Stinger-API.patch
similarity index 100%
rename from patches/server/0683-Stinger-API.patch
rename to patches/server/0684-Stinger-API.patch
diff --git a/patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0685-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0685-Add-System.out-err-catcher.patch b/patches/server/0686-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0685-Add-System.out-err-catcher.patch
rename to patches/server/0686-Add-System.out-err-catcher.patch
index 868ac8edd..0394eb626 100644
--- a/patches/server/0685-Add-System.out-err-catcher.patch
+++ b/patches/server/0686-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 649f78cc3491d0a14627485eadb67315135fda27..61879f872dfc56890246a96f44f4a397b19c63d3 100644
+index 338bd6a9c448f73b5df6d8be630bba0846cc8464..cda678a4742ba5e466dea18838e7e0c0f80a47b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -280,6 +280,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0686-Fix-test-not-bootstrapping.patch b/patches/server/0687-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0686-Fix-test-not-bootstrapping.patch
rename to patches/server/0687-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0688-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0688-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0688-Improve-boat-collision-performance.patch b/patches/server/0689-Improve-boat-collision-performance.patch
similarity index 94%
rename from patches/server/0688-Improve-boat-collision-performance.patch
rename to patches/server/0689-Improve-boat-collision-performance.patch
index 14e93cde6..b577a2e90 100644
--- a/patches/server/0688-Improve-boat-collision-performance.patch
+++ b/patches/server/0689-Improve-boat-collision-performance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improve boat collision performance
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 70b8b86ed827217e536e35a690160adf9e974bb5..5f9e3d37c3ba79d26806374d73f87328cebb562d 100644
+index 67567eb58beddc06eae4d8e7af3b3c0962405512..206c6ce227ba19620185ac835af28d67caa76c40 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
-@@ -94,6 +94,7 @@ public class Util {
+@@ -110,6 +110,7 @@ public class Util {
      }).findFirst().orElseThrow(() -> {
          return new IllegalStateException("No jar file system provider found");
      });
@@ -17,7 +17,7 @@ index 70b8b86ed827217e536e35a690160adf9e974bb5..5f9e3d37c3ba79d26806374d73f87328
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 378c0848db27a45c79acff43aa6068d1852a3beb..84d8edf3afe0a2a41092d8d2a0b940d1b949da8b 100644
+index 7f39a4955b4819e8a908f4cbf951d707c34fa4a8..b6af4e6b146cc6ceb769a0d1e0d253f0b0f844d2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1341,7 +1341,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch
index 0a778bea7..53b8389ed 100644
--- a/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits.
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 853e7edbb977394d2860ce3f63e4712c921bc741..b23e649f3833ef323643ba4c2b209a7ceca44e6f 100644
+index 9a9f4b985c01c8e076d26c22c37d090bb7348371..28c04f16ddabe33518634759d9a1ea3c7462cb91 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -413,7 +413,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0691-Add-PlayerSetSpawnEvent.patch b/patches/server/0692-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0691-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0692-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 94%
rename from patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch
index b4d44f1e4..b4a083a5f 100644
--- a/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make hoppers respect inventory max stack size
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 9cb783a3001291ddba44776c6bff0c6369684399..8ab1d401ed55d4cce55704317cbffe53ebc9f119 100644
+index a7ac6b528aecae528a17af157f8ec29371e4484c..ccad692aba2ed77259f6814d88f01b91ed9d229b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -586,17 +586,19 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
diff --git a/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0694-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0693-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0694-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0695-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0694-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0695-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0695-Added-EntityDamageItemEvent.patch b/patches/server/0696-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0695-Added-EntityDamageItemEvent.patch
rename to patches/server/0696-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0696-Optimize-indirect-passenger-iteration.patch b/patches/server/0697-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0696-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0697-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0699-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0699-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0700-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0699-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0700-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0700-Clear-bucket-NBT-after-dispense.patch b/patches/server/0701-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0700-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0701-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0702-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0702-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0702-Add-BlockBreakBlockEvent.patch b/patches/server/0703-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0702-Add-BlockBreakBlockEvent.patch
rename to patches/server/0703-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0704-More-CommandBlock-API.patch b/patches/server/0705-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0704-More-CommandBlock-API.patch
rename to patches/server/0705-More-CommandBlock-API.patch
diff --git a/patches/server/0705-Add-missing-team-sidebar-display-slots.patch b/patches/server/0706-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0705-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0706-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0706-Add-back-EntityPortalExitEvent.patch b/patches/server/0707-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0706-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0707-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 93%
rename from patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch
index 34ab05cb3..e8be3377c 100644
--- a/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 86f3c9be119aba7ec447d6887f40c2671203fb25..5f35cfe1ab67cc77d4b7ad4e440bf1d4dc6642c6 100644
+index 8c61dc53f4874ab7013938abdf5d65a608369474..9b9653e2a88e63932884cfd392ac372a1b0da12b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -775,6 +775,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index 86f3c9be119aba7ec447d6887f40c2671203fb25..5f35cfe1ab67cc77d4b7ad4e440bf1d4
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index acd935f7b9652ae4e778d865e9be1f0bfe906fe0..7a2a8e1aeca2002378a40be5cef32238350086a7 100644
+index b79b0b78e3e69c2b5c9aa21cf63fe5cc8ea506ca..422655d6ab17d075d045df8e5ce1666c92f9321a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -691,6 +691,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0708-Get-entity-default-attributes.patch b/patches/server/0709-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0708-Get-entity-default-attributes.patch
rename to patches/server/0709-Get-entity-default-attributes.patch
diff --git a/patches/server/0709-Left-handed-API.patch b/patches/server/0710-Left-handed-API.patch
similarity index 100%
rename from patches/server/0709-Left-handed-API.patch
rename to patches/server/0710-Left-handed-API.patch
diff --git a/patches/server/0710-Add-advancement-display-API.patch b/patches/server/0711-Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/0710-Add-advancement-display-API.patch
rename to patches/server/0711-Add-advancement-display-API.patch
diff --git a/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0712-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0712-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0712-Add-critical-damage-API.patch b/patches/server/0713-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0712-Add-critical-damage-API.patch
rename to patches/server/0713-Add-critical-damage-API.patch
diff --git a/patches/server/0713-Fix-issues-with-mob-conversion.patch b/patches/server/0714-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0713-Fix-issues-with-mob-conversion.patch
rename to patches/server/0714-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0714-Add-isCollidable-methods-to-various-places.patch b/patches/server/0715-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0714-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0715-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0715-Goat-ram-API.patch b/patches/server/0716-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0715-Goat-ram-API.patch
rename to patches/server/0716-Goat-ram-API.patch
diff --git a/patches/server/0716-Add-API-for-resetting-a-single-score.patch b/patches/server/0717-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0716-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0717-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0718-Vanilla-command-permission-fixes.patch b/patches/server/0719-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0718-Vanilla-command-permission-fixes.patch
rename to patches/server/0719-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0719-Make-CallbackExecutor-strict-again.patch b/patches/server/0720-Make-CallbackExecutor-strict-again.patch
similarity index 100%
rename from patches/server/0719-Make-CallbackExecutor-strict-again.patch
rename to patches/server/0720-Make-CallbackExecutor-strict-again.patch
diff --git a/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 100%
rename from patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 8625d2dd2..a40966402 100644
--- a/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5f35cfe1ab67cc77d4b7ad4e440bf1d4dc6642c6..3fc394d82217a273dad07b44cc18a66e1e3886c6 100644
+index 9b9653e2a88e63932884cfd392ac372a1b0da12b..9d871a9dfeca169db3b598fe2ad5a23bfc88dd6f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1333,9 +1333,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch
similarity index 100%
rename from patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch
rename to patches/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0723-Fix-GameProfileCache-concurrency.patch b/patches/server/0724-Fix-GameProfileCache-concurrency.patch
similarity index 98%
rename from patches/server/0723-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0724-Fix-GameProfileCache-concurrency.patch
index 1c8bd06db..400971f5f 100644
--- a/patches/server/0723-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0724-Fix-GameProfileCache-concurrency.patch
@@ -7,7 +7,7 @@ Separate lookup and state access locks prevent lookups
 from stalling simple state access/write calls
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index 2a4f8aa6697ed6144440970c9abaf9f6e1a2c2ce..8d86645ef264287d01203afd7bba516e78be5743 100644
+index 2347c7b44793aabe431b57bb1b44935fefbda6fe..4dff88bdf14675718572e4b3720c0250ce6e730e 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -62,6 +62,11 @@ public class GameProfileCache {
diff --git a/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch
similarity index 100%
rename from patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch
rename to patches/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
similarity index 100%
rename from patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
rename to patches/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
diff --git a/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch
similarity index 100%
rename from patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch
rename to patches/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch