From cc45a355a4e76f749e4618a61b233f40a3c05180 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Mon, 28 Feb 2022 19:25:13 -0800
Subject: [PATCH] move decompile fixes to start of git history

---
 patches/server/0005-MC-Dev-fixes.patch        | 80 ++++++++++++++++++-
 ...Check-from-C.patch => 0006-CB-fixes.patch} | 11 +--
 ...006-MC-Utils.patch => 0007-MC-Utils.patch} |  2 +-
 ...eted.patch => 0008-Not-implemeneted.patch} |  0
 ...Metrics.patch => 0009-Paper-Metrics.patch} |  4 +-
 ...MinecraftKey-Information-to-Objects.patch} |  0
 ...Timings-v2.patch => 0011-Timings-v2.patch} |  4 +-
 ...option-to-load-extra-plugin-jars-no.patch} |  0
 ...2-Adventure.patch => 0013-Adventure.patch} |  0
 ...ctus-bamboo-and-reed-growth-heights.patch} |  0
 ...igurable-baby-zombie-movement-speed.patch} |  2 +-
 ...16-Configurable-fishing-time-ranges.patch} |  0
 ...-mobs-to-jump-and-take-water-damage.patch} |  2 +-
 ...despawn-distances-for-living-entiti.patch} |  2 +-
 ...-Allow-for-toggling-of-spawn-chunks.patch} |  0
 ...k-and-tnt-entities-at-the-specified.patch} |  0
 ...ent-crashes-server-lists-and-Mojang.patch} |  0
 ...0022-Implement-Paper-VersionChecker.patch} |  2 +-
 ...-version-history-to-version-command.patch} |  0
 ...=> 0024-Player-affects-spawning-API.patch} |  2 +-
 ...e-invalid-mob-spawner-tile-entities.patch} |  2 +-
 ...26-Further-improve-server-tick-loop.patch} |  0
 ...27-Only-refresh-abilities-if-needed.patch} |  0
 ...API.patch => 0028-Entity-Origin-API.patch} |  2 +-
 ...vent-tile-entity-and-entity-crashes.patch} |  0
 ...figurable-top-of-nether-void-damage.patch} |  0
 ...-before-converting-and-renaming-pla.patch} |  2 +-
 ... => 0032-Always-tick-falling-blocks.patch} |  0
 ...ch => 0033-Configurable-end-credits.patch} |  2 +-
 ...explosions-processing-dead-entities.patch} |  2 +-
 ...s.patch => 0035-Optimize-explosions.patch} |  0
 ...=> 0036-Disable-explosion-knockback.patch} |  0
 ...under.patch => 0037-Disable-thunder.patch} |  2 +-
 ....patch => 0038-Disable-ice-and-snow.patch} |  2 +-
 ...-Configurable-mob-spawner-tick-rate.patch} |  2 +-
 ...0-Implement-PlayerLocaleChangeEvent.patch} |  2 +-
 ...ayer-View-Distance-API-placeholders.patch} |  0
 ...patch => 0042-Add-BeaconEffectEvent.patch} |  0
 ...igurable-container-update-tick-rate.patch} |  0
 ...0044-Use-UserCache-for-player-heads.patch} |  0
 ...> 0045-Disable-spigot-tick-limiters.patch} |  0
 ...=> 0046-Add-PlayerInitialSpawnEvent.patch} |  2 +-
 ...rable-Disabling-Cat-Chest-Detection.patch} |  0
 ...8-Ensure-commands-are-not-ran-async.patch} |  0
 ...hunks-are-slime-spawn-chunks-toggle.patch} |  0
 ...ch => 0050-Expose-server-CommandMap.patch} |  0
 ...-informative-in-maxHealth-exception.patch} |  0
 ...> 0052-Ensure-inv-drag-is-in-bounds.patch} |  2 +-
 ...0053-Player-Tab-List-and-Title-APIs.patch} |  2 +-
 ...d-configurable-portal-search-radius.patch} |  0
 ...patch => 0055-Add-velocity-warnings.patch} |  0
 ...le-inter-world-teleportation-safety.patch} |  0
 ... 0057-Add-exception-reporting-event.patch} |  0
 ...don-t-need-to-when-cerealising-text.patch} |  2 +-
 ...reboards-for-non-players-by-default.patch} |  0
 ...orking-with-arrows-stuck-in-living-.patch} |  0
 ....patch => 0061-Chunk-Save-Reattempt.patch} |  2 +-
 ... => 0062-Complete-resource-pack-API.patch} |  0
 ...ding-permissions.yml-before-plugins.patch} |  2 +-
 ...low-Reloading-of-Custom-Permissions.patch} |  0
 ...h => 0065-Remove-Metadata-on-reload.patch} |  0
 ...66-Handle-Item-Meta-Inconsistencies.patch} |  0
 ...rable-Non-Player-Arrow-Despawn-Rate.patch} |  0
 ...atch => 0068-Add-World-Util-Methods.patch} |  2 +-
 ...-Custom-replacement-for-eaten-items.patch} |  0
 ...h-absorb-values-and-repair-bad-data.patch} |  0
 ...71-Use-a-Shared-Random-for-Entities.patch} |  0
 ...e-spawn-chances-for-skeleton-horses.patch} |  2 +-
 ...dBounds-and-getBlockState-for-inlin.patch} |  0
 ...kPhysicsEvent-if-a-plugin-has-a-lis.patch} |  2 +-
 ...ntity-AddTo-RemoveFrom-World-Events.patch} |  2 +-
 ...6-Configurable-Chunk-Inhabited-Time.patch} |  2 +-
 ...t.patch => 0077-EntityPathfindEvent.patch} |  2 +-
 ...gionFileCache-and-make-configurable.patch} |  2 +-
 ...-Do-not-load-chunks-for-Pathfinding.patch} |  0
 ...080-Add-PlayerUseUnknownEntityEvent.patch} |  2 +-
 ...Configurable-Grass-Spread-Tick-Rate.patch} |  0
 ...-BlockPlaceEvent-triggering-physics.patch} |  0
 ...its.patch => 0083-Optimize-DataBits.patch} |  0
 ...illa-per-world-scoreboard-coloring-.patch} |  0
 ...d-for-setting-passengers-on-players.patch} |  0
 ... 0086-Configurable-Player-Collision.patch} |  2 +-
 ...nt-to-allow-plugins-to-handle-clien.patch} |  0
 ...> 0088-Configurable-RCON-IP-address.patch} |  0
 ...tyRegainHealthEvent-isFastRegen-API.patch} |  0
 ...to-configure-frosted_ice-properties.patch} |  0
 ...possibility-for-getServer-singleton.patch} |  0
 ...tem-frames-performance-and-bug-fixe.patch} |  2 +-
 ...API-Replenishable-Lootables-Feature.patch} |  2 +-
 ...-scoreboard-teams-to-scoreboard.dat.patch} |  4 +-
 ...em-property-for-disabling-watchdoge.patch} |  0
 ...0096-Optimize-UserCache-Thread-Safe.patch} |  0
 ...-Optional-TNT-doesn-t-move-in-water.patch} |  2 +-
 ...-redstone-torch-rapid-clock-removal.patch} |  0
 ...h => 0099-Add-server-name-parameter.patch} |  2 +-
 ...n-Wither-Death-sounds-to-same-world.patch} |  0
 ...tch => 0101-Fix-Old-Sign-Conversion.patch} |  0
 ...locking-on-Network-Manager-creation.patch} |  2 +-
 ...-profiles-that-have-no-UUID-and-no-.patch} |  2 +-
 ...etting-for-proxy-online-mode-status.patch} |  2 +-
 ...timise-BlockState-s-hashCode-equals.patch} |  0
 ...nfigurable-packet-in-spam-threshold.patch} |  4 +-
 ...7-Configurable-flying-kick-messages.patch} |  4 +-
 ...k-reference-on-Craft-Entity-removal.patch} |  0
 ...ion-to-remove-corrupt-tile-entities.patch} |  2 +-
 ...nt.patch => 0110-Add-EntityZapEvent.patch} |  0
 ...-from-ArmorStand-and-SpawnEgg-items.patch} |  0
 ...12-Cache-user-authenticator-threads.patch} |  0
 ...-Allow-Reloading-of-Command-Aliases.patch} |  0
 ...-Add-source-to-PlayerExpChangeEvent.patch} |  0
 ...-Don-t-let-fishinghooks-use-portals.patch} |  0
 ... => 0116-Add-ProjectileCollideEvent.patch} |  2 +-
 ...ent-Pathfinding-out-of-World-Border.patch} |  2 +-
 ...mize-World.isLoaded-BlockPosition-Z.patch} |  0
 ...Bound-Treasure-Maps-to-World-Border.patch} |  0
 ...igurable-Cartographer-Treasure-Maps.patch} |  0
 ... => 0121-Optimize-ItemStack.isEmpty.patch} |  0
 ...o-control-if-armour-stands-can-move.patch} |  0
 ...=> 0123-String-based-Action-Bar-API.patch} |  2 +-
 ...4-Properly-fix-item-duplication-bug.patch} |  2 +-
 ...-API-s.patch => 0125-Firework-API-s.patch} |  0
 ... 0126-PlayerTeleportEndGatewayEvent.patch} |  0
 ...ovide-E-TE-Chunk-count-stat-methods.patch} |  2 +-
 ...h => 0128-Enforce-Sync-Player-Saves.patch} |  2 +-
 ...low-entities-to-ride-themselves-572.patch} |  2 +-
 ...I-for-Reason-Source-Triggering-play.patch} |  0
 ...patch => 0131-Cap-Entity-Collisions.patch} |  2 +-
 ...-CraftScheduler-Async-Task-Debugger.patch} |  0
 ...> 0133-Do-not-let-armorstands-drown.patch} |  0
 ...ore-aggressive-in-the-chunk-unload-.patch} |  0
 ...e-async-calls-to-restart-the-server.patch} |  0
 ...e-parrots-stay-on-shoulders-despite.patch} |  2 +-
 ...-option-to-prevent-player-names-fro.patch} |  2 +-
 ...leAppender-for-console-improvements.patch} |  2 +-
 ...rable-option-to-disable-creeper-lin.patch} |  4 +-
 ....patch => 0140-Item-canEntityPickup.patch} |  4 +-
 ...layerPickupItemEvent-setFlyAtPlayer.patch} |  0
 ...> 0142-PlayerAttemptPickupItemEvent.patch} |  0
 ...tch => 0143-Add-UnknownCommandEvent.patch} |  0
 ...tch => 0144-Basic-PlayerProfile-API.patch} |  0
 ... 0145-Shoulder-Entities-Release-API.patch} |  0
 ...patch => 0146-Profile-Lookup-Events.patch} |  0
 ...layer-logins-during-server-shutdown.patch} |  0
 ...patch => 0148-Entity-fromMobSpawner.patch} |  4 +-
 ...9-Improve-the-Saddle-API-for-Horses.patch} |  0
 ...plement-ensureServerConversions-API.patch} |  0
 ...> 0151-Implement-getI18NDisplayName.patch} |  0
 ...=> 0152-ProfileWhitelistVerifyEvent.patch} |  2 +-
 ...ch => 0153-Fix-this-stupid-bullshit.patch} |  0
 ...atch => 0154-LivingEntity-setKiller.patch} |  0
 ...wns-should-honor-nametags-and-leash.patch} |  0
 ...mer-when-spawner-event-is-cancelled.patch} |  2 +-
 ...a-custom-authentication-servers-dow.patch} |  2 +-
 ...-prefixes-using-Log4J-configuration.patch} |  2 +-
 ...-Log4J-Configuration-Plugin-Loggers.patch} |  0
 ...t.patch => 0160-Add-PlayerJumpEvent.patch} |  2 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |  2 +-
 ...t-protocol-version-and-virtual-host.patch} |  2 +-
 ...t-serverside-behavior-of-keepalives.patch} |  2 +-
 ...Effects-only-to-players-who-can-see.patch} |  0
 ... => 0165-Add-PlayerArmorChangeEvent.patch} |  0
 ...om-being-processed-when-the-player-.patch} |  0
 ...7-Fix-MC-117075-TE-Unload-Lag-Spike.patch} |  0
 ...-implementations-for-captured-block.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  0
 ...patch => 0170-AsyncTabCompleteEvent.patch} |  2 +-
 ...=> 0171-PlayerPickupExperienceEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  0
 ...patch => 0174-PreCreatureSpawnEvent.patch} |  0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0176-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  2 +-
 ...ch => 0178-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0180-Tameable-getOwnerUniqueId-API.patch} |  2 +-
 ...-crits-helps-mitigate-hacked-client.patch} |  0
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  0
 ...=> 0185-Player.setPlayerProfile-API.patch} |  0
 ...patch => 0186-getPlayerUniqueId-API.patch} |  0
 ... 0187-Improved-Async-Task-Scheduler.patch} |  0
 ... => 0188-Upstream-config-migrations.patch} |  2 +-
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...1-Flag-to-disable-the-channel-limit.patch} |  0
 ...-Add-openSign-method-to-HumanEntity.patch} |  0
 ...rable-sprint-interruption-on-attack.patch} |  0
 ...allowed-colored-signs-to-be-created.patch} |  2 +-
 ...t.patch => 0195-EndermanEscapeEvent.patch} |  0
 ...h => 0196-Enderman.teleportRandomly.patch} |  0
 ...197-Block-Enderpearl-Travel-Exploit.patch} |  2 +-
 ...d.spawnParticle-API-and-add-Builder.patch} |  4 +-
 ...ted-Ice-from-loading-holding-chunks.patch} |  0
 ...h => 0200-EndermanAttackPlayerEvent.patch} |  0
 ...tch => 0201-WitchConsumePotionEvent.patch} |  2 +-
 ...patch => 0202-WitchThrowPotionEvent.patch} |  2 +-
 ...tem-entities-with-World.spawnEntity.patch} |  0
 ...patch => 0204-WitchReadyPotionEvent.patch} |  2 +-
 ...205-ItemStack-getMaxItemUseDuration.patch} |  0
 ...ement-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  2 +-
 ...ch => 0208-Fix-CraftEntity-hashCode.patch} |  2 +-
 ...e-Alternative-LootPool-Luck-Formula.patch} |  2 +-
 ...ls-when-failing-to-save-player-data.patch} |  2 +-
 ...-shield-blocking-delay-configurable.patch} |  0
 ...=> 0212-Improve-EntityShootBowEvent.patch} |  0
 ...patch => 0213-PlayerReadyArrowEvent.patch} |  0
 ...lement-EntityKnockbackByEntityEvent.patch} |  2 +-
 ...patch => 0215-Expand-Explosions-API.patch} |  2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0217-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  4 +-
 ...-Implement-World.getEntity-UUID-API.patch} |  2 +-
 ...0220-InventoryCloseEvent-Reason-API.patch} |  2 +-
 ...tch => 0221-Vex-get-setSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  2 +-
 ...-if-stack-size-above-max-stack-size.patch} |  2 +-
 ...-to-keep-logging-IO-off-main-thread.patch} |  2 +-
 ...more-information-to-Entity.toString.patch} |  2 +-
 ...tMagicNumbers.isSupportedApiVersion.patch} |  2 +-
 ...ts.patch => 0227-EnderDragon-Events.patch} |  2 +-
 ...atch => 0228-PlayerElytraBoostEvent.patch} |  0
 ...=> 0229-PlayerLaunchProjectileEvent.patch} |  0
 ...0230-Improve-BlockPosition-inlining.patch} |  2 +-
 ...-armor-stands-from-doing-entity-loo.patch} |  0
 ...-Vanished-players-don-t-have-rights.patch} |  0
 ...llow-disabling-armour-stand-ticking.patch} |  2 +-
 ...tch => 0234-SkeletonHorse-Additions.patch} |  2 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...6-Implement-Expanded-ArmorStand-API.patch} |  0
 ...vent.patch => 0237-AnvilDamageEvent.patch} |  0
 ...h => 0238-Add-hand-to-bucket-events.patch} |  0
 ...ent.patch => 0239-Add-TNTPrimeEvent.patch} |  0
 ...d-make-tab-spam-limits-configurable.patch} |  4 +-
 ...-Experience-should-save-as-Integers.patch} |  0
 ...ent-rendering-skulls-from-same-user.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} | 13 +--
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  2 +-
 ...5-Use-ConcurrentHashMap-in-JsonList.patch} |  0
 ...6-Use-a-Queue-for-Queueing-Commands.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...timize-BlockPosition-helper-methods.patch} |  2 +-
 ...efault-mob-spawn-range-and-water-an.patch} |  2 +-
 ...tch => 0250-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ...52-Optimize-CraftBlockData-Creation.patch} |  0
 ...tch => 0253-Optimize-MappedRegistry.patch} |  0
 ...ch => 0254-Add-PhantomPreSpawnEvent.patch} |  2 +-
 ....patch => 0255-Add-More-Creeper-API.patch} |  2 +-
 ...=> 0256-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  2 +-
 ...8-Asynchronous-chunk-IO-and-loading.patch} |  4 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0261-Improve-death-events.patch} |  0
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0263-Mob-Pathfinding-API.patch} |  2 +-
 ...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} |  2 +-
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ...rseException-in-Entity-and-TE-names.patch} |  0
 ...=> 0270-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  2 +-
 ...> 0272-Hook-into-CB-plugin-rewrites.patch} |  0
 ....patch => 0273-PreSpawnerSpawnEvent.patch} |  2 +-
 ...74-Add-LivingEntity-getTargetEntity.patch} |  0
 ...I.patch => 0275-Add-sun-related-API.patch} |  2 +-
 ...Turtle-API.patch => 0276-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 => 0280-Add-more-Witch-API.patch} |  2 +-
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  2 +-
 ...3-Reset-players-airTicks-on-respawn.patch} |  0
 ...after-profile-lookups-if-not-needed.patch} |  2 +-
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  0
 ...=> 0286-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0288-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0289-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 => 0295-Add-more-Zombie-API.patch} |  2 +-
 ...mits.patch => 0296-Book-Size-Limits.patch} |  4 +-
 ...0297-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 => 0302-BlockDestroyEvent.patch} |  0
 ... => 0303-Async-command-map-building.patch} |  0
 ...0304-Implement-Brigadier-Mojang-API.patch} |  4 +-
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ... 0306-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} |  2 +-
 ...ggleEvent-when-whitelist-is-toggled.patch} |  2 +-
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0313-Entity-getEntitySpawnReason.patch} |  4 +-
 ...ty-Metadata-for-all-tracked-players.patch} |  2 +-
 ...tch => 0315-Fire-event-on-GS4-query.patch} |  2 +-
 ...16-Implement-PlayerPostRespawnEvent.patch} |  2 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |  2 +-
 ...ts.patch => 0318-Server-Tick-Events.patch} |  0
 ...319-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0321-Add-Heightmap-API.patch} |  2 +-
 ...> 0322-Mob-Spawner-API-Enhancements.patch} |  2 +-
 ...-to-changed-postToMainThread-method.patch} |  2 +-
 ...-item-frames-are-modified-MC-123450.patch} |  2 +-
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...26-improve-CraftWorld-isChunkLoaded.patch} |  2 +-
 ...0327-Implement-CraftBlockSoundGroup.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  4 +-
 ....patch => 0329-ChunkMapDistance-CME.patch} |  2 +-
 ...d.patch => 0330-Chunk-debug-command.patch} |  0
 ...31-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...32-Expose-the-internal-current-tick.patch} |  0
 ...33-Fix-World-isChunkGenerated-calls.patch} |  2 +-
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  2 +-
 ...urable-projectile-relative-velocity.patch} |  0
 ...h => 0337-offset-item-frame-ticking.patch} |  0
 ...-158900.patch => 0338-Fix-MC-158900.patch} |  2 +-
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ...0-Dont-send-unnecessary-sign-update.patch} |  2 +-
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...r-when-player-hand-set-to-empty-typ.patch} |  2 +-
 ...343-Flat-bedrock-generator-settings.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ... 0346-Duplicate-UUID-Resolve-Option.patch} |  0
 ...pers.patch => 0347-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 +-
 ...353-Fix-items-not-falling-correctly.patch} |  2 +-
 ...patch => 0354-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  2 +-
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0358-Entity-Activation-Range-2.0.patch} |  6 +-
 ...h => 0359-Increase-Light-Queue-Size.patch} |  2 +-
 ...and.patch => 0360-Fix-Light-Command.patch} |  0
 ...0-Anti-Xray.patch => 0361-Anti-Xray.patch} | 18 ++---
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...=> 0363-Tracking-Range-Improvements.patch} |  0
 ...-items-vanishing-through-end-portal.patch} |  2 +-
 ...ment-optional-per-player-mob-spawns.patch} |  2 +-
 ...pper-searches-if-there-are-no-items.patch} | 11 +--
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  0
 ...0369-Add-debug-for-sync-chunk-loads.patch} |  2 +-
 ...w-overriding-the-java-version-check.patch} |  2 +-
 ...tch => 0371-Add-ThrownEggHatchEvent.patch} |  0
 ...p-API.patch => 0372-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  2 +-
 ... => 0374-Make-the-GUI-graph-fancier.patch} |  2 +-
 ...75-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...ipwire-hook-placement-before-update.patch} |  0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  0
 ...chance-of-villager-zombie-infection.patch} |  0
 ...tch => 0379-Optimise-Chunk-getFluid.patch} |  0
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...Add-tick-times-API-and-mspt-command.patch} |  0
 ...82-Expose-MinecraftServer-isRunning.patch} |  0
 ...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 => 0388-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 => 0393-Improved-Watchdog-Support.patch} |  0
 ....patch => 0394-Optimize-Pathfinding.patch} |  0
 ...5-Reduce-Either-Optional-allocation.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...98-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  0
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...2-Broadcast-join-message-to-console.patch} |  0
 ...Chunk-Post-Processing-deadlock-risk.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  0
 ...oad-Chunks-for-Login-Asynchronously.patch} |  0
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  0
 ...patch => 0411-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  0
 ...n.patch => 0413-Expose-game-version.patch} |  0
 ...> 0414-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ....patch => 0416-misc-debugging-dumps.patch} |  0
 ...7-Prevent-teleporting-dead-entities.patch} |  0
 ...traces-in-log-messages-crash-report.patch} |  4 +-
 ...atch => 0419-Implement-Mob-Goal-API.patch} |  2 +-
 ...=> 0420-Add-villager-reputation-API.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ...tch => 0422-ExperienceOrbMergeEvent.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...API.patch => 0425-Potential-bed-API.patch} |  2 +-
 ...ait-for-Async-Tasks-during-shutdown.patch} |  0
 ...er-respects-game-and-entity-rules-f.patch} |  0
 ...nd-End-Portal-Frames-from-being-des.patch} |  2 +-
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  2 +-
 ...> 0431-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  2 +-
 ...rCloseEnoughForSpawning-to-use-dist.patch} |  4 +-
 ...ance-map-to-optimise-entity-tracker.patch} |  4 +-
 ...Levels-chunk-level-checking-methods.patch} |  2 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |  2 +-
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0438-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  2 +-
 ...uping.patch => 0443-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  2 +-
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0446-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  2 +-
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...9-Add-permission-for-command-blocks.patch} |  2 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  2 +-
 ...d-Difficulty-Remembering-Difficulty.patch} |  2 +-
 ...atch => 0452-Paper-dumpitem-command.patch} |  0
 ...53-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} |  6 +-
 ...e-operations-for-updating-light-dat.patch} |  0
 ...459-Support-old-UUID-format-for-NBT.patch} | 28 +------
 ...p-duplicated-GameProfile-Properties.patch} |  2 +-
 ...vert-legacy-attributes-in-Item-Meta.patch} |  2 +-
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...0464-Support-components-in-ItemMeta.patch} |  2 +-
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0466-Add-entity-liquid-API.patch} |  4 +-
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  2 +-
 ...atch => 0469-Add-PrepareResultEvent.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} |  0
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  2 +-
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  2 +-
 ...ve-range-check-for-block-placing-up.patch} |  2 +-
 ...-5989.patch => 0477-Fix-SPIGOT-5989.patch} |  2 +-
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0485-Brand-support.patch} |  0
 ...patch => 0486-Add-setMaxPlayers-API.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0488-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  4 +-
 ...PI.patch => 0490-Add-moon-phase-API.patch} |  2 +-
 ...prove-Chunk-Status-Transition-Speed.patch} |  2 +-
 ...headless-pistons-from-being-created.patch} |  4 +-
 ...ent.patch => 0493-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  4 +-
 ...patch => 0495-Buffer-joins-to-world.patch} |  2 +-
 ...=> 0496-Optimize-redstone-algorithm.patch} |  2 +-
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0499-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0500-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0503-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  6 +-
 ...l-open-container-api-to-HumanEntity.patch} |  2 +-
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  2 +-
 ...-capture-to-capture-all-items-added.patch} |  2 +-
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  2 +-
 ...track-plugin-scoreboards-by-default.patch} |  2 +-
 ...king.patch => 0511-Entity-isTicking.patch} |  4 +-
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  2 +-
 ...-large-move-vectors-crashing-server.patch} |  2 +-
 ...atch => 0516-Optimise-getType-calls.patch} |  0
 ....patch => 0517-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} |  2 +-
 ...tch => 0522-Player-elytra-boost-API.patch} |  0
 ...23-Fixed-TileEntityBell-memory-leak.patch} |  2 +-
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0526-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  4 +-
 ...x-client-lag-on-advancement-loading.patch} |  2 +-
 ...> 0529-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...531-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0532-Add-API-for-quit-reason.patch} |  4 +-
 ...ng-Trader-spawn-rate-config-options.patch} |  4 +-
 ...rove-performance-of-the-end-generat.patch} |  0
 ...ch => 0535-Expose-world-spawn-angle.patch} |  4 +-
 ...patch => 0536-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...38-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0539-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0540-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  2 +-
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0543-Add-PlayerShearBlockEvent.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  0
 ....patch => 0545-Limit-recipe-packets.patch} |  4 +-
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0547-MC-4-Fix-item-position-desync.patch} |  4 +-
 ...548-Player-Chunk-Load-Unload-Events.patch} |  0
 ...9-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...-invalid-ingredient-lists-in-Villag.patch} |  0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |  2 +-
 ...ch => 0554-Implement-TargetHitEvent.patch} |  0
 ...555-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0556-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0558-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  2 +-
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  2 +-
 ...h => 0563-Zombie-API-breaking-doors.patch} |  0
 ...564-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0565-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0566-Guardian-beam-workaround.patch} |  0
 ...0567-Added-WorldGameRuleChangeEvent.patch} |  2 +-
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  2 +-
 ...mplemented-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  4 +-
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...I-to-expose-exact-interaction-point.patch} |  0
 ...OIs.patch => 0576-Remove-stale-POIs.patch} |  2 +-
 ...h => 0577-Fix-villager-boat-exploit.patch} |  2 +-
 ...I.patch => 0578-Add-sendOpLevel-API.patch} |  0
 ...ch => 0579-Add-StructureLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  2 +-
 ...leHitEvent-call-when-fireballs-dead.patch} |  2 +-
 ...nent-with-empty-text-instead-of-thr.patch} |  2 +-
 ...583-Make-schedule-command-per-world.patch} |  0
 ...584-Configurable-max-leash-distance.patch} |  2 +-
 ...585-Implement-BlockPreDispenseEvent.patch} |  0
 ...-API.patch => 0586-added-Wither-API.patch} |  0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  2 +-
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  0
 ...shield-blocking-on-dimension-change.patch} |  0
 ...atch => 0592-add-DragonEggFormEvent.patch} |  2 +-
 ...Event.patch => 0593-EntityMoveEvent.patch} |  4 +-
 ...isable-pathfinding-updates-on-block.patch} |  2 +-
 ... 0595-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  2 +-
 ...ix-dead-slime-setSize-invincibility.patch} |  0
 ...pes-should-return-an-immutable-list.patch} |  0
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...atch => 0602-Expose-Tracked-Players.patch} |  2 +-
 ...3-Remove-streams-from-SensorNearest.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  2 +-
 ...GUI.patch => 0605-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...607-fix-converting-txt-to-json-file.patch} |  2 +-
 ...atch => 0608-Add-worldborder-events.patch} |  0
 ...=> 0609-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0611-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0612-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  2 +-
 ...ch => 0614-Implement-Keyed-on-World.patch} |  2 +-
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0616-Item-Rarity-API.patch} |  2 +-
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...py-TESign-isEditable-from-snapshots.patch} |  2 +-
 ...d-item-when-player-has-disconnected.patch} |  2 +-
 ...elist-use-configurable-kick-message.patch} |  0
 ...gnore-result-of-PlayerEditBookEvent.patch} |  2 +-
 ...22-Entity-load-save-limit-per-chunk.patch} |  0
 ...block-falling-causing-client-desync.patch} |  0
 ...tch => 0624-Expose-protocol-version.patch} |  2 +-
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |  2 +-
 ...ab-completions-for-brigadier-comman.patch} |  2 +-
 ...temConsumeEvent-cancelling-properly.patch} |  0
 ...patch => 0628-Add-bypass-host-check.patch} |  0
 ...0629-Set-area-affect-cloud-rotation.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  2 +-
 ...ting-give-items-on-item-drop-cancel.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ...ix-PigZombieAngerEvent-cancellation.patch} |  2 +-
 ...-checkReach-check-for-Shulker-boxes.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  2 +-
 ... => 0637-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0638-More-World-API.patch} |  2 +-
 ... 0639-Added-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |  2 +-
 ...acon-activation-deactivation-events.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  4 +-
 ...dd-Channel-initialization-listeners.patch} |  2 +-
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0646-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  2 +-
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0650-Inventory-close.patch} |  2 +-
 ...reateEvent-players-and-end-platform.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  2 +-
 ...=> 0653-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0654-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  0
 ... => 0657-ItemStack-repair-check-API.patch} |  2 +-
 ....patch => 0658-More-Enchantment-API.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0660-Add-Mob-lookAt-API.patch} |  0
 ...0661-Add-Unix-domain-socket-support.patch} |  0
 ... => 0662-Add-EntityInsideBlockEvent.patch} |  0
 ...63-Attributes-API-for-item-defaults.patch} |  2 +-
 ...ause-to-Weather-ThunderChangeEvents.patch} |  4 +-
 ...patch => 0665-More-Lidded-Block-API.patch} |  0
 ...66-Limit-item-frame-cursors-on-maps.patch} |  2 +-
 ... => 0667-Add-PlayerKickEvent-causes.patch} |  8 +-
 ...0668-Add-PufferFishStateChangeEvent.patch} |  2 +-
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ReentrantLo.patch} | 19 ++---
 ...-to-fix-items-merging-through-walls.patch} |  2 +-
 ...h => 0672-Add-BellRevealRaiderEvent.patch} |  0
 ... 0673-Fix-invulnerable-end-crystals.patch} |  2 +-
 ...74-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0675-Fix-dangerous-end-portal-logic.patch} |  2 +-
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  2 +-
 ...-Make-item-validations-configurable.patch} |  4 +-
 ...patch => 0678-Line-Of-Sight-Changes.patch} |  2 +-
 ... => 0679-add-per-world-spawn-limits.patch} |  2 +-
 ...plashEvent-for-water-splash-potions.patch} |  0
 ... => 0681-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  0
 ...=> 0683-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} |  4 +-
 ...rom-signs-not-firing-command-events.patch} |  0
 ...ch => 0688-Adds-PlayerArmSwingEvent.patch} |  2 +-
 ...-event-leave-message-not-being-sent.patch} |  4 +-
 ...-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} |  0
 ...-bunch-of-missing-forceDrop-toggles.patch} |  4 +-
 ...inger-API.patch => 0695-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0697-Add-System.out-err-catcher.patch} |  2 +-
 ... => 0698-Fix-test-not-bootstrapping.patch} |  0
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...-Improve-boat-collision-performance.patch} |  0
 ...AFK-kick-while-watching-end-credits.patch} |  2 +-
 ...iting-of-comments-to-server.propert.patch} |  0
 ...tch => 0703-Add-PlayerSetSpawnEvent.patch} |  0
 ...rs-respect-inventory-max-stack-size.patch} |  2 +-
 ...ize-entity-tracker-passenger-checks.patch} |  2 +-
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...=> 0707-Added-EntityDamageItemEvent.patch} |  0
 ...timize-indirect-passenger-iteration.patch} |  2 +-
 ...osition-losing-precision-millions-o.patch} |  0
 ...em-frame-map-cursor-update-interval.patch} |  2 +-
 ...Make-EntityUnleashEvent-cancellable.patch} |  2 +-
 ...712-Clear-bucket-NBT-after-dispense.patch} |  0
 ...ct-despawn-rate-in-item-merge-check.patch} |  2 +-
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0715-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0717-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0719-Add-back-EntityPortalExitEvent.patch} |  2 +-
 ...-find-targets-for-lightning-strikes.patch} |  4 +-
 ... 0721-Get-entity-default-attributes.patch} |  2 +-
 ...d-API.patch => 0722-Left-handed-API.patch} |  0
 ...=> 0723-Add-advancement-display-API.patch} |  0
 ...4-Add-ItemFactory-getMonsterEgg-API.patch} |  2 +-
 ...tch => 0725-Add-critical-damage-API.patch} |  0
 ...0726-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  0
 ...-ram-API.patch => 0728-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...0-Add-Raw-Byte-Entity-Serialization.patch} |  4 +-
 ...31-Vanilla-command-permission-fixes.patch} |  0
 ...-Make-CallbackExecutor-strict-again.patch} |  2 +-
 ...server-to-unload-chunks-at-request-.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} |  2 +-
 ...e-recursion-for-chunkholder-updates.patch} |  0
 ...ocking-from-state-access-in-UserCac.patch} |  2 +-
 ...hunks-refusing-to-unload-at-low-TPS.patch} |  0
 ...et-level-changes-while-unloading-pl.patch} |  2 +-
 ...et-level-changes-when-updating-chun.patch} |  0
 ...profile-lookups-to-worldgen-threads.patch} |  0
 ...g-when-the-async-catcher-is-tripped.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  4 +-
 ...lls-removing-tickets-for-sync-loads.patch} |  0
 ...tize-ResourceLocation-error-logging.patch} |  2 +-
 ...=> 0745-Optimise-general-POI-access.patch} |  0
 ...rolled-flushing-for-network-manager.patch} |  0
 ...tch => 0747-Add-more-async-catchers.patch} |  2 +-
 ...te-entity-bounding-box-lookup-calls.patch} |  6 +-
 ... 0749-Optimise-chunk-tick-iteration.patch} |  4 +-
 ...> 0750-Execute-chunk-tasks-mid-tick.patch} |  6 +-
 ... => 0751-Do-not-copy-visible-chunks.patch} |  4 +-
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  4 +-
 ...lly-inline-methods-in-BlockPosition.patch} |  4 +-
 ... 0756-Distance-manager-tick-timings.patch} |  0
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  2 +-
 ...h => 0759-Add-packet-limiter-config.patch} |  2 +-
 ... 0760-Lag-compensate-block-breaking.patch} |  2 +-
 ...Stem-registry-when-loading-default-.patch} |  2 +-
 ...our-chunk-data-off-disk-when-conver.patch} |  0
 ...sh-calls-for-entity-tracker-packets.patch} |  2 +-
 ...-lookup-fluid-state-when-raytracing.patch} |  0
 ...atch => 0765-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  4 +-
 ...7-Do-not-run-raytrace-logic-for-AIR.patch} |  0
 ...rimise-map-impl-for-tracked-players.patch} |  2 +-
 ...imise-BlockSoil-nearby-water-lookup.patch} |  0
 ...ition-of-entities-to-entity-ticklis.patch} |  0
 ... 0771-Optimise-random-block-ticking.patch} |  4 +-
 ...2-Optimise-non-flush-packet-sending.patch} |  0
 ...0773-Optimise-nearby-player-lookups.patch} |  4 +-
 ...=> 0774-Optimise-WorldServer-notify.patch} |  4 +-
 ...0775-Remove-streams-for-villager-AI.patch} |  0
 ...> 0776-Rewrite-dataconverter-system.patch} |  2 +-
 ...city-compression-and-cipher-natives.patch} |  2 +-
 ...hread-worker-count-for-low-core-cou.patch} |  2 +-
 ...tity-loads-in-CraftChunk-getEntitie.patch} |  2 +-
 ...ifications-to-critical-entity-state.patch} |  0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  2 +-
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  2 +-
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0786-Ensure-valid-vehicle-status.patch} |  0
 ...ftlocked-end-exit-portal-generation.patch} |  0
 ...r-causing-a-crash-when-trying-to-ge.patch} |  0
 ...-t-log-debug-logging-being-disabled.patch} |  2 +-
 ...axolotls-from-buckets-as-persistent.patch} |  0
 ...ous-menus-with-empty-level-accesses.patch} |  0
 ...-O-threads-with-chunk-data-while-fl.patch} |  2 +-
 ...h => 0793-Preserve-overstacked-loot.patch} |  2 +-
 ...ate-head-rotation-in-missing-places.patch} |  2 +-
 ...unintended-light-block-manipulation.patch} |  0
 ...piglins-and-hoglins-towards-mob-cap.patch} | 11 +--
 ...0797-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  2 +-
 ...ion-for-logging-player-ip-addresses.patch} |  4 +-
 ... => 0800-Configurable-feature-seeds.patch} |  0
 ...pper-didnt-account-for-entity-sende.patch} |  0
 ... 0802-Add-root-admin-user-detection.patch} |  2 +-
 ...ays-allow-item-changing-in-Fireball.patch} |  0
 ...t-attempt-to-teleport-dead-entities.patch} |  2 +-
 ...pare-event-not-working-with-zero-xp.patch} |  0
 ...ive-velocity-through-repeated-crits.patch} |  0
 ...e-code-using-deprecated-for-removal.patch} |  2 +-
 ...ch => 0808-Rewrite-the-light-engine.patch} |  2 +-
 ...ochunk-light-sources-unless-it-is-m.patch} |  0
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  0
 ...e-unnecessary-itemmeta-from-clients.patch} |  0
 ...ier-changing-growth-for-other-crops.patch} |  2 +-
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0815-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0816-Add-player-health-update-API.patch} |  0
 ...tch => 0817-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  4 +-
 ...n-checking-in-player-move-packet-ha.patch} |  2 +-
 ...ch => 0821-Actually-unload-POI-data.patch} |  2 +-
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  0
 ...te-Log4j.patch => 0823-Update-Log4j.patch} |  2 +-
 ...patch => 0824-Add-more-Campfire-API.patch} |  2 +-
 ...data-to-disk-if-it-serializes-witho.patch} |  2 +-
 ...26-Fix-tripwire-state-inconsistency.patch} |  0
 ...uid-logging-on-Block-breakNaturally.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  2 +-
 ... => 0829-Improve-scoreboard-entries.patch} |  0
 ...ch => 0830-Entity-powdered-snow-API.patch} |  2 +-
 ...0831-Add-API-for-item-entity-health.patch} |  0
 ...-type-tags-suggestions-in-selectors.patch} |  0
 ...ax-block-light-for-monster-spawning.patch} |  0
 ...pistons-and-BlockPistonRetractEvent.patch} |  0
 ...plifiers-greater-than-127-correctly.patch} |  0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...=> 0837-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0838-Bucketable-API.patch} |  0
 ...layer-world-in-endPortalSoundRadius.patch} |  0
 ...es.patch => 0840-Validate-usernames.patch} |  0
 ...ing-configs-with-more-long-comments.patch} |  0
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  2 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...6-Multiple-Entries-with-Scoreboards.patch} |  0
 ...847-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...0850-Fix-xp-reward-for-baby-zombies.patch} |  0
 ...0851-Kick-on-main-for-illegal-chars.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  0
 ...ent.patch => 0853-Fix-NotePlayEvent.patch} |  0
 ....patch => 0854-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0855-Dolphin-API.patch} |  0
 ...h => 0856-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  0
 ...0859-Add-config-for-stronghold-seed.patch} |  0
 ...h => 0860-Implement-regenerateChunk.patch} |  2 +-
 ...tions-thrown-during-chat-processing.patch} |  0
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0864-Add-GameEvent-tags.patch} |  0
 ...-Replace-player-chunk-loader-system.patch} |  2 +-
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...867-Replace-ticket-level-propagator.patch} |  0
 ...tch => 0868-Furnace-RecipesUsed-API.patch} |  0
 ...gurable-sculk-sensor-listener-range.patch} |  0
 ...d-missing-block-data-mins-and-maxes.patch} |  0
 ...fault-CustomSpawners-in-custom-worl.patch} |  0
 ...-worldlist-before-initing-the-world.patch} |  0
 ... => 0873-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0874-Custom-Potion-Mixes.patch} |  0
 870 files changed, 493 insertions(+), 474 deletions(-)
 rename patches/server/{0874-Fix-missing-Level-LevelStem-in-StructureCheck-from-C.patch => 0006-CB-fixes.patch} (89%)
 rename patches/server/{0006-MC-Utils.patch => 0007-MC-Utils.patch} (99%)
 rename patches/server/{0007-Not-implemeneted.patch => 0008-Not-implemeneted.patch} (100%)
 rename patches/server/{0008-Paper-Metrics.patch => 0009-Paper-Metrics.patch} (99%)
 rename patches/server/{0009-Add-MinecraftKey-Information-to-Objects.patch => 0010-Add-MinecraftKey-Information-to-Objects.patch} (100%)
 rename patches/server/{0010-Timings-v2.patch => 0011-Timings-v2.patch} (99%)
 rename patches/server/{0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%)
 rename patches/server/{0012-Adventure.patch => 0013-Adventure.patch} (100%)
 rename patches/server/{0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch => 0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch} (100%)
 rename patches/server/{0014-Configurable-baby-zombie-movement-speed.patch => 0015-Configurable-baby-zombie-movement-speed.patch} (97%)
 rename patches/server/{0015-Configurable-fishing-time-ranges.patch => 0016-Configurable-fishing-time-ranges.patch} (100%)
 rename patches/server/{0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch => 0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch} (97%)
 rename patches/server/{0017-Add-configurable-despawn-distances-for-living-entiti.patch => 0018-Add-configurable-despawn-distances-for-living-entiti.patch} (97%)
 rename patches/server/{0018-Allow-for-toggling-of-spawn-chunks.patch => 0019-Allow-for-toggling-of-spawn-chunks.patch} (100%)
 rename patches/server/{0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch => 0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch} (100%)
 rename patches/server/{0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch => 0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch} (100%)
 rename patches/server/{0021-Implement-Paper-VersionChecker.patch => 0022-Implement-Paper-VersionChecker.patch} (98%)
 rename patches/server/{0022-Add-version-history-to-version-command.patch => 0023-Add-version-history-to-version-command.patch} (100%)
 rename patches/server/{0023-Player-affects-spawning-API.patch => 0024-Player-affects-spawning-API.patch} (98%)
 rename patches/server/{0024-Remove-invalid-mob-spawner-tile-entities.patch => 0025-Remove-invalid-mob-spawner-tile-entities.patch} (93%)
 rename patches/server/{0025-Further-improve-server-tick-loop.patch => 0026-Further-improve-server-tick-loop.patch} (100%)
 rename patches/server/{0026-Only-refresh-abilities-if-needed.patch => 0027-Only-refresh-abilities-if-needed.patch} (100%)
 rename patches/server/{0027-Entity-Origin-API.patch => 0028-Entity-Origin-API.patch} (98%)
 rename patches/server/{0028-Prevent-tile-entity-and-entity-crashes.patch => 0029-Prevent-tile-entity-and-entity-crashes.patch} (100%)
 rename patches/server/{0029-Configurable-top-of-nether-void-damage.patch => 0030-Configurable-top-of-nether-void-damage.patch} (100%)
 rename patches/server/{0030-Check-online-mode-before-converting-and-renaming-pla.patch => 0031-Check-online-mode-before-converting-and-renaming-pla.patch} (92%)
 rename patches/server/{0031-Always-tick-falling-blocks.patch => 0032-Always-tick-falling-blocks.patch} (100%)
 rename patches/server/{0032-Configurable-end-credits.patch => 0033-Configurable-end-credits.patch} (94%)
 rename patches/server/{0033-Fix-lag-from-explosions-processing-dead-entities.patch => 0034-Fix-lag-from-explosions-processing-dead-entities.patch} (92%)
 rename patches/server/{0034-Optimize-explosions.patch => 0035-Optimize-explosions.patch} (100%)
 rename patches/server/{0035-Disable-explosion-knockback.patch => 0036-Disable-explosion-knockback.patch} (100%)
 rename patches/server/{0036-Disable-thunder.patch => 0037-Disable-thunder.patch} (95%)
 rename patches/server/{0037-Disable-ice-and-snow.patch => 0038-Disable-ice-and-snow.patch} (94%)
 rename patches/server/{0038-Configurable-mob-spawner-tick-rate.patch => 0039-Configurable-mob-spawner-tick-rate.patch} (96%)
 rename patches/server/{0039-Implement-PlayerLocaleChangeEvent.patch => 0040-Implement-PlayerLocaleChangeEvent.patch} (96%)
 rename patches/server/{0040-Per-Player-View-Distance-API-placeholders.patch => 0041-Per-Player-View-Distance-API-placeholders.patch} (100%)
 rename patches/server/{0041-Add-BeaconEffectEvent.patch => 0042-Add-BeaconEffectEvent.patch} (100%)
 rename patches/server/{0042-Configurable-container-update-tick-rate.patch => 0043-Configurable-container-update-tick-rate.patch} (100%)
 rename patches/server/{0043-Use-UserCache-for-player-heads.patch => 0044-Use-UserCache-for-player-heads.patch} (100%)
 rename patches/server/{0044-Disable-spigot-tick-limiters.patch => 0045-Disable-spigot-tick-limiters.patch} (100%)
 rename patches/server/{0045-Add-PlayerInitialSpawnEvent.patch => 0046-Add-PlayerInitialSpawnEvent.patch} (95%)
 rename patches/server/{0046-Configurable-Disabling-Cat-Chest-Detection.patch => 0047-Configurable-Disabling-Cat-Chest-Detection.patch} (100%)
 rename patches/server/{0047-Ensure-commands-are-not-ran-async.patch => 0048-Ensure-commands-are-not-ran-async.patch} (100%)
 rename patches/server/{0048-All-chunks-are-slime-spawn-chunks-toggle.patch => 0049-All-chunks-are-slime-spawn-chunks-toggle.patch} (100%)
 rename patches/server/{0049-Expose-server-CommandMap.patch => 0050-Expose-server-CommandMap.patch} (100%)
 rename patches/server/{0050-Be-a-bit-more-informative-in-maxHealth-exception.patch => 0051-Be-a-bit-more-informative-in-maxHealth-exception.patch} (100%)
 rename patches/server/{0051-Ensure-inv-drag-is-in-bounds.patch => 0052-Ensure-inv-drag-is-in-bounds.patch} (92%)
 rename patches/server/{0052-Player-Tab-List-and-Title-APIs.patch => 0053-Player-Tab-List-and-Title-APIs.patch} (98%)
 rename patches/server/{0053-Add-configurable-portal-search-radius.patch => 0054-Add-configurable-portal-search-radius.patch} (100%)
 rename patches/server/{0054-Add-velocity-warnings.patch => 0055-Add-velocity-warnings.patch} (100%)
 rename patches/server/{0055-Configurable-inter-world-teleportation-safety.patch => 0056-Configurable-inter-world-teleportation-safety.patch} (100%)
 rename patches/server/{0056-Add-exception-reporting-event.patch => 0057-Add-exception-reporting-event.patch} (100%)
 rename patches/server/{0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch => 0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch} (93%)
 rename patches/server/{0058-Disable-Scoreboards-for-non-players-by-default.patch => 0059-Disable-Scoreboards-for-non-players-by-default.patch} (100%)
 rename patches/server/{0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch => 0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch} (100%)
 rename patches/server/{0060-Chunk-Save-Reattempt.patch => 0061-Chunk-Save-Reattempt.patch} (96%)
 rename patches/server/{0061-Complete-resource-pack-API.patch => 0062-Complete-resource-pack-API.patch} (100%)
 rename patches/server/{0062-Default-loading-permissions.yml-before-plugins.patch => 0063-Default-loading-permissions.yml-before-plugins.patch} (96%)
 rename patches/server/{0063-Allow-Reloading-of-Custom-Permissions.patch => 0064-Allow-Reloading-of-Custom-Permissions.patch} (100%)
 rename patches/server/{0064-Remove-Metadata-on-reload.patch => 0065-Remove-Metadata-on-reload.patch} (100%)
 rename patches/server/{0065-Handle-Item-Meta-Inconsistencies.patch => 0066-Handle-Item-Meta-Inconsistencies.patch} (100%)
 rename patches/server/{0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch => 0067-Configurable-Non-Player-Arrow-Despawn-Rate.patch} (100%)
 rename patches/server/{0067-Add-World-Util-Methods.patch => 0068-Add-World-Util-Methods.patch} (96%)
 rename patches/server/{0068-Custom-replacement-for-eaten-items.patch => 0069-Custom-replacement-for-eaten-items.patch} (100%)
 rename patches/server/{0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch => 0070-handle-NaN-health-absorb-values-and-repair-bad-data.patch} (100%)
 rename patches/server/{0070-Use-a-Shared-Random-for-Entities.patch => 0071-Use-a-Shared-Random-for-Entities.patch} (100%)
 rename patches/server/{0071-Configurable-spawn-chances-for-skeleton-horses.patch => 0072-Configurable-spawn-chances-for-skeleton-horses.patch} (96%)
 rename patches/server/{0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0073-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (100%)
 rename patches/server/{0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch => 0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch} (98%)
 rename patches/server/{0074-Entity-AddTo-RemoveFrom-World-Events.patch => 0075-Entity-AddTo-RemoveFrom-World-Events.patch} (92%)
 rename patches/server/{0075-Configurable-Chunk-Inhabited-Time.patch => 0076-Configurable-Chunk-Inhabited-Time.patch} (96%)
 rename patches/server/{0076-EntityPathfindEvent.patch => 0077-EntityPathfindEvent.patch} (98%)
 rename patches/server/{0077-Sanitise-RegionFileCache-and-make-configurable.patch => 0078-Sanitise-RegionFileCache-and-make-configurable.patch} (95%)
 rename patches/server/{0078-Do-not-load-chunks-for-Pathfinding.patch => 0079-Do-not-load-chunks-for-Pathfinding.patch} (100%)
 rename patches/server/{0079-Add-PlayerUseUnknownEntityEvent.patch => 0080-Add-PlayerUseUnknownEntityEvent.patch} (97%)
 rename patches/server/{0080-Configurable-Grass-Spread-Tick-Rate.patch => 0081-Configurable-Grass-Spread-Tick-Rate.patch} (100%)
 rename patches/server/{0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch => 0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch} (100%)
 rename patches/server/{0082-Optimize-DataBits.patch => 0083-Optimize-DataBits.patch} (100%)
 rename patches/server/{0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch => 0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch} (100%)
 rename patches/server/{0084-Workaround-for-setting-passengers-on-players.patch => 0085-Workaround-for-setting-passengers-on-players.patch} (100%)
 rename patches/server/{0085-Configurable-Player-Collision.patch => 0086-Configurable-Player-Collision.patch} (98%)
 rename patches/server/{0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch => 0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch} (100%)
 rename patches/server/{0087-Configurable-RCON-IP-address.patch => 0088-Configurable-RCON-IP-address.patch} (100%)
 rename patches/server/{0088-EntityRegainHealthEvent-isFastRegen-API.patch => 0089-EntityRegainHealthEvent-isFastRegen-API.patch} (100%)
 rename patches/server/{0089-Add-ability-to-configure-frosted_ice-properties.patch => 0090-Add-ability-to-configure-frosted_ice-properties.patch} (100%)
 rename patches/server/{0090-remove-null-possibility-for-getServer-singleton.patch => 0091-remove-null-possibility-for-getServer-singleton.patch} (100%)
 rename patches/server/{0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (98%)
 rename patches/server/{0092-LootTable-API-Replenishable-Lootables-Feature.patch => 0093-LootTable-API-Replenishable-Lootables-Feature.patch} (99%)
 rename patches/server/{0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch => 0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch} (89%)
 rename patches/server/{0094-System-property-for-disabling-watchdoge.patch => 0095-System-property-for-disabling-watchdoge.patch} (100%)
 rename patches/server/{0095-Optimize-UserCache-Thread-Safe.patch => 0096-Optimize-UserCache-Thread-Safe.patch} (100%)
 rename patches/server/{0096-Optional-TNT-doesn-t-move-in-water.patch => 0097-Optional-TNT-doesn-t-move-in-water.patch} (97%)
 rename patches/server/{0097-Faster-redstone-torch-rapid-clock-removal.patch => 0098-Faster-redstone-torch-rapid-clock-removal.patch} (100%)
 rename patches/server/{0098-Add-server-name-parameter.patch => 0099-Add-server-name-parameter.patch} (90%)
 rename patches/server/{0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0100-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (100%)
 rename patches/server/{0100-Fix-Old-Sign-Conversion.patch => 0101-Fix-Old-Sign-Conversion.patch} (100%)
 rename patches/server/{0101-Avoid-blocking-on-Network-Manager-creation.patch => 0102-Avoid-blocking-on-Network-Manager-creation.patch} (96%)
 rename patches/server/{0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch => 0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch} (92%)
 rename patches/server/{0103-Add-setting-for-proxy-online-mode-status.patch => 0104-Add-setting-for-proxy-online-mode-status.patch} (97%)
 rename patches/server/{0104-Optimise-BlockState-s-hashCode-equals.patch => 0105-Optimise-BlockState-s-hashCode-equals.patch} (100%)
 rename patches/server/{0105-Configurable-packet-in-spam-threshold.patch => 0106-Configurable-packet-in-spam-threshold.patch} (92%)
 rename patches/server/{0106-Configurable-flying-kick-messages.patch => 0107-Configurable-flying-kick-messages.patch} (93%)
 rename patches/server/{0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch => 0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch} (100%)
 rename patches/server/{0108-Option-to-remove-corrupt-tile-entities.patch => 0109-Option-to-remove-corrupt-tile-entities.patch} (95%)
 rename patches/server/{0109-Add-EntityZapEvent.patch => 0110-Add-EntityZapEvent.patch} (100%)
 rename patches/server/{0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch => 0111-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch} (100%)
 rename patches/server/{0111-Cache-user-authenticator-threads.patch => 0112-Cache-user-authenticator-threads.patch} (100%)
 rename patches/server/{0112-Allow-Reloading-of-Command-Aliases.patch => 0113-Allow-Reloading-of-Command-Aliases.patch} (100%)
 rename patches/server/{0113-Add-source-to-PlayerExpChangeEvent.patch => 0114-Add-source-to-PlayerExpChangeEvent.patch} (100%)
 rename patches/server/{0114-Don-t-let-fishinghooks-use-portals.patch => 0115-Don-t-let-fishinghooks-use-portals.patch} (100%)
 rename patches/server/{0115-Add-ProjectileCollideEvent.patch => 0116-Add-ProjectileCollideEvent.patch} (98%)
 rename patches/server/{0116-Prevent-Pathfinding-out-of-World-Border.patch => 0117-Prevent-Pathfinding-out-of-World-Border.patch} (94%)
 rename patches/server/{0117-Optimize-World.isLoaded-BlockPosition-Z.patch => 0118-Optimize-World.isLoaded-BlockPosition-Z.patch} (100%)
 rename patches/server/{0118-Bound-Treasure-Maps-to-World-Border.patch => 0119-Bound-Treasure-Maps-to-World-Border.patch} (100%)
 rename patches/server/{0119-Configurable-Cartographer-Treasure-Maps.patch => 0120-Configurable-Cartographer-Treasure-Maps.patch} (100%)
 rename patches/server/{0120-Optimize-ItemStack.isEmpty.patch => 0121-Optimize-ItemStack.isEmpty.patch} (100%)
 rename patches/server/{0121-Add-API-methods-to-control-if-armour-stands-can-move.patch => 0122-Add-API-methods-to-control-if-armour-stands-can-move.patch} (100%)
 rename patches/server/{0122-String-based-Action-Bar-API.patch => 0123-String-based-Action-Bar-API.patch} (96%)
 rename patches/server/{0123-Properly-fix-item-duplication-bug.patch => 0124-Properly-fix-item-duplication-bug.patch} (94%)
 rename patches/server/{0124-Firework-API-s.patch => 0125-Firework-API-s.patch} (100%)
 rename patches/server/{0125-PlayerTeleportEndGatewayEvent.patch => 0126-PlayerTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0126-Provide-E-TE-Chunk-count-stat-methods.patch => 0127-Provide-E-TE-Chunk-count-stat-methods.patch} (97%)
 rename patches/server/{0127-Enforce-Sync-Player-Saves.patch => 0128-Enforce-Sync-Player-Saves.patch} (92%)
 rename patches/server/{0128-Don-t-allow-entities-to-ride-themselves-572.patch => 0129-Don-t-allow-entities-to-ride-themselves-572.patch} (90%)
 rename patches/server/{0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch => 0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch} (100%)
 rename patches/server/{0130-Cap-Entity-Collisions.patch => 0131-Cap-Entity-Collisions.patch} (96%)
 rename patches/server/{0131-Remove-CraftScheduler-Async-Task-Debugger.patch => 0132-Remove-CraftScheduler-Async-Task-Debugger.patch} (100%)
 rename patches/server/{0132-Do-not-let-armorstands-drown.patch => 0133-Do-not-let-armorstands-drown.patch} (100%)
 rename patches/server/{0133-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch => 0134-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch} (100%)
 rename patches/server/{0134-Properly-handle-async-calls-to-restart-the-server.patch => 0135-Properly-handle-async-calls-to-restart-the-server.patch} (100%)
 rename patches/server/{0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch => 0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch} (97%)
 rename patches/server/{0136-Add-configuration-option-to-prevent-player-names-fro.patch => 0137-Add-configuration-option-to-prevent-player-names-fro.patch} (94%)
 rename patches/server/{0137-Use-TerminalConsoleAppender-for-console-improvements.patch => 0138-Use-TerminalConsoleAppender-for-console-improvements.patch} (99%)
 rename patches/server/{0138-provide-a-configurable-option-to-disable-creeper-lin.patch => 0139-provide-a-configurable-option-to-disable-creeper-lin.patch} (90%)
 rename patches/server/{0139-Item-canEntityPickup.patch => 0140-Item-canEntityPickup.patch} (92%)
 rename patches/server/{0140-PlayerPickupItemEvent-setFlyAtPlayer.patch => 0141-PlayerPickupItemEvent-setFlyAtPlayer.patch} (100%)
 rename patches/server/{0141-PlayerAttemptPickupItemEvent.patch => 0142-PlayerAttemptPickupItemEvent.patch} (100%)
 rename patches/server/{0142-Add-UnknownCommandEvent.patch => 0143-Add-UnknownCommandEvent.patch} (100%)
 rename patches/server/{0143-Basic-PlayerProfile-API.patch => 0144-Basic-PlayerProfile-API.patch} (100%)
 rename patches/server/{0144-Shoulder-Entities-Release-API.patch => 0145-Shoulder-Entities-Release-API.patch} (100%)
 rename patches/server/{0145-Profile-Lookup-Events.patch => 0146-Profile-Lookup-Events.patch} (100%)
 rename patches/server/{0146-Block-player-logins-during-server-shutdown.patch => 0147-Block-player-logins-during-server-shutdown.patch} (100%)
 rename patches/server/{0147-Entity-fromMobSpawner.patch => 0148-Entity-fromMobSpawner.patch} (94%)
 rename patches/server/{0148-Improve-the-Saddle-API-for-Horses.patch => 0149-Improve-the-Saddle-API-for-Horses.patch} (100%)
 rename patches/server/{0149-Implement-ensureServerConversions-API.patch => 0150-Implement-ensureServerConversions-API.patch} (100%)
 rename patches/server/{0150-Implement-getI18NDisplayName.patch => 0151-Implement-getI18NDisplayName.patch} (100%)
 rename patches/server/{0151-ProfileWhitelistVerifyEvent.patch => 0152-ProfileWhitelistVerifyEvent.patch} (97%)
 rename patches/server/{0152-Fix-this-stupid-bullshit.patch => 0153-Fix-this-stupid-bullshit.patch} (100%)
 rename patches/server/{0153-LivingEntity-setKiller.patch => 0154-LivingEntity-setKiller.patch} (100%)
 rename patches/server/{0154-Ocelot-despawns-should-honor-nametags-and-leash.patch => 0155-Ocelot-despawns-should-honor-nametags-and-leash.patch} (100%)
 rename patches/server/{0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch => 0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch} (92%)
 rename patches/server/{0156-Allow-specifying-a-custom-authentication-servers-dow.patch => 0157-Allow-specifying-a-custom-authentication-servers-dow.patch} (96%)
 rename patches/server/{0157-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0158-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 rename patches/server/{0158-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0159-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 rename patches/server/{0159-Add-PlayerJumpEvent.patch => 0160-Add-PlayerJumpEvent.patch} (96%)
 rename patches/server/{0160-handle-PacketPlayInKeepAlive-async.patch => 0161-handle-PacketPlayInKeepAlive-async.patch} (95%)
 rename patches/server/{0161-Expose-client-protocol-version-and-virtual-host.patch => 0162-Expose-client-protocol-version-and-virtual-host.patch} (97%)
 rename patches/server/{0162-revert-serverside-behavior-of-keepalives.patch => 0163-revert-serverside-behavior-of-keepalives.patch} (98%)
 rename patches/server/{0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (100%)
 rename patches/server/{0164-Add-PlayerArmorChangeEvent.patch => 0165-Add-PlayerArmorChangeEvent.patch} (100%)
 rename patches/server/{0165-Prevent-logins-from-being-processed-when-the-player-.patch => 0166-Prevent-logins-from-being-processed-when-the-player-.patch} (100%)
 rename patches/server/{0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch => 0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch} (100%)
 rename patches/server/{0167-use-CB-BlockState-implementations-for-captured-block.patch => 0168-use-CB-BlockState-implementations-for-captured-block.patch} (100%)
 rename patches/server/{0168-API-to-get-a-BlockState-without-a-snapshot.patch => 0169-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename patches/server/{0169-AsyncTabCompleteEvent.patch => 0170-AsyncTabCompleteEvent.patch} (98%)
 rename patches/server/{0170-PlayerPickupExperienceEvent.patch => 0171-PlayerPickupExperienceEvent.patch} (100%)
 rename patches/server/{0171-Ability-to-apply-mending-to-XP-API.patch => 0172-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename patches/server/{0172-PlayerNaturallySpawnCreaturesEvent.patch => 0173-PlayerNaturallySpawnCreaturesEvent.patch} (100%)
 rename patches/server/{0173-PreCreatureSpawnEvent.patch => 0174-PreCreatureSpawnEvent.patch} (100%)
 rename patches/server/{0174-Add-setPlayerProfile-API-for-Skulls.patch => 0175-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename patches/server/{0175-Fill-Profile-Property-Events.patch => 0176-Fill-Profile-Property-Events.patch} (100%)
 rename patches/server/{0176-PlayerAdvancementCriterionGrantEvent.patch => 0177-PlayerAdvancementCriterionGrantEvent.patch} (92%)
 rename patches/server/{0177-Add-ArmorStand-Item-Meta.patch => 0178-Add-ArmorStand-Item-Meta.patch} (100%)
 rename patches/server/{0178-Extend-Player-Interact-cancellation.patch => 0179-Extend-Player-Interact-cancellation.patch} (100%)
 rename patches/server/{0179-Tameable-getOwnerUniqueId-API.patch => 0180-Tameable-getOwnerUniqueId-API.patch} (94%)
 rename patches/server/{0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (100%)
 rename patches/server/{0181-Disable-Explicit-Network-Manager-Flushing.patch => 0182-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename patches/server/{0182-Implement-extended-PaperServerListPingEvent.patch => 0183-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename patches/server/{0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename patches/server/{0184-Player.setPlayerProfile-API.patch => 0185-Player.setPlayerProfile-API.patch} (100%)
 rename patches/server/{0185-getPlayerUniqueId-API.patch => 0186-getPlayerUniqueId-API.patch} (100%)
 rename patches/server/{0186-Improved-Async-Task-Scheduler.patch => 0187-Improved-Async-Task-Scheduler.patch} (100%)
 rename patches/server/{0187-Upstream-config-migrations.patch => 0188-Upstream-config-migrations.patch} (94%)
 rename patches/server/{0188-Make-legacy-ping-handler-more-reliable.patch => 0189-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename patches/server/{0189-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0190-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename patches/server/{0190-Flag-to-disable-the-channel-limit.patch => 0191-Flag-to-disable-the-channel-limit.patch} (100%)
 rename patches/server/{0191-Add-openSign-method-to-HumanEntity.patch => 0192-Add-openSign-method-to-HumanEntity.patch} (100%)
 rename patches/server/{0192-Configurable-sprint-interruption-on-attack.patch => 0193-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename patches/server/{0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (93%)
 rename patches/server/{0194-EndermanEscapeEvent.patch => 0195-EndermanEscapeEvent.patch} (100%)
 rename patches/server/{0195-Enderman.teleportRandomly.patch => 0196-Enderman.teleportRandomly.patch} (100%)
 rename patches/server/{0196-Block-Enderpearl-Travel-Exploit.patch => 0197-Block-Enderpearl-Travel-Exploit.patch} (97%)
 rename patches/server/{0197-Expand-World.spawnParticle-API-and-add-Builder.patch => 0198-Expand-World.spawnParticle-API-and-add-Builder.patch} (95%)
 rename patches/server/{0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename patches/server/{0199-EndermanAttackPlayerEvent.patch => 0200-EndermanAttackPlayerEvent.patch} (100%)
 rename patches/server/{0200-WitchConsumePotionEvent.patch => 0201-WitchConsumePotionEvent.patch} (93%)
 rename patches/server/{0201-WitchThrowPotionEvent.patch => 0202-WitchThrowPotionEvent.patch} (94%)
 rename patches/server/{0202-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename patches/server/{0203-WitchReadyPotionEvent.patch => 0204-WitchReadyPotionEvent.patch} (93%)
 rename patches/server/{0204-ItemStack-getMaxItemUseDuration.patch => 0205-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename patches/server/{0205-Implement-EntityTeleportEndGatewayEvent.patch => 0206-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename patches/server/{0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (89%)
 rename patches/server/{0207-Fix-CraftEntity-hashCode.patch => 0208-Fix-CraftEntity-hashCode.patch} (94%)
 rename patches/server/{0208-Configurable-Alternative-LootPool-Luck-Formula.patch => 0209-Configurable-Alternative-LootPool-Luck-Formula.patch} (97%)
 rename patches/server/{0209-Print-Error-details-when-failing-to-save-player-data.patch => 0210-Print-Error-details-when-failing-to-save-player-data.patch} (90%)
 rename patches/server/{0210-Make-shield-blocking-delay-configurable.patch => 0211-Make-shield-blocking-delay-configurable.patch} (100%)
 rename patches/server/{0211-Improve-EntityShootBowEvent.patch => 0212-Improve-EntityShootBowEvent.patch} (100%)
 rename patches/server/{0212-PlayerReadyArrowEvent.patch => 0213-PlayerReadyArrowEvent.patch} (100%)
 rename patches/server/{0213-Implement-EntityKnockbackByEntityEvent.patch => 0214-Implement-EntityKnockbackByEntityEvent.patch} (98%)
 rename patches/server/{0214-Expand-Explosions-API.patch => 0215-Expand-Explosions-API.patch} (93%)
 rename patches/server/{0215-LivingEntity-Hand-Raised-Item-Use-API.patch => 0216-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename patches/server/{0216-RangedEntity-API.patch => 0217-RangedEntity-API.patch} (100%)
 rename patches/server/{0217-Add-config-to-disable-ender-dragon-legacy-check.patch => 0218-Add-config-to-disable-ender-dragon-legacy-check.patch} (90%)
 rename patches/server/{0218-Implement-World.getEntity-UUID-API.patch => 0219-Implement-World.getEntity-UUID-API.patch} (91%)
 rename patches/server/{0219-InventoryCloseEvent-Reason-API.patch => 0220-InventoryCloseEvent-Reason-API.patch} (99%)
 rename patches/server/{0220-Vex-get-setSummoner-API.patch => 0221-Vex-get-setSummoner-API.patch} (100%)
 rename patches/server/{0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (94%)
 rename patches/server/{0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (92%)
 rename patches/server/{0223-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch => 0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch} (95%)
 rename patches/server/{0224-add-more-information-to-Entity.toString.patch => 0225-add-more-information-to-Entity.toString.patch} (95%)
 rename patches/server/{0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (90%)
 rename patches/server/{0226-EnderDragon-Events.patch => 0227-EnderDragon-Events.patch} (97%)
 rename patches/server/{0227-PlayerElytraBoostEvent.patch => 0228-PlayerElytraBoostEvent.patch} (100%)
 rename patches/server/{0228-PlayerLaunchProjectileEvent.patch => 0229-PlayerLaunchProjectileEvent.patch} (100%)
 rename patches/server/{0229-Improve-BlockPosition-inlining.patch => 0230-Improve-BlockPosition-inlining.patch} (96%)
 rename patches/server/{0230-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (100%)
 rename patches/server/{0231-Vanished-players-don-t-have-rights.patch => 0232-Vanished-players-don-t-have-rights.patch} (100%)
 rename patches/server/{0232-Allow-disabling-armour-stand-ticking.patch => 0233-Allow-disabling-armour-stand-ticking.patch} (98%)
 rename patches/server/{0233-SkeletonHorse-Additions.patch => 0234-SkeletonHorse-Additions.patch} (97%)
 rename patches/server/{0234-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0235-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename patches/server/{0235-Implement-Expanded-ArmorStand-API.patch => 0236-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename patches/server/{0236-AnvilDamageEvent.patch => 0237-AnvilDamageEvent.patch} (100%)
 rename patches/server/{0237-Add-hand-to-bucket-events.patch => 0238-Add-hand-to-bucket-events.patch} (100%)
 rename patches/server/{0238-Add-TNTPrimeEvent.patch => 0239-Add-TNTPrimeEvent.patch} (100%)
 rename patches/server/{0239-Break-up-and-make-tab-spam-limits-configurable.patch => 0240-Break-up-and-make-tab-spam-limits-configurable.patch} (96%)
 rename patches/server/{0240-MC-135506-Experience-should-save-as-Integers.patch => 0241-MC-135506-Experience-should-save-as-Integers.patch} (100%)
 rename patches/server/{0241-Fix-client-rendering-skulls-from-same-user.patch => 0242-Fix-client-rendering-skulls-from-same-user.patch} (100%)
 rename patches/server/{0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (93%)
 rename patches/server/{0243-Add-Early-Warning-Feature-to-WatchDog.patch => 0244-Add-Early-Warning-Feature-to-WatchDog.patch} (99%)
 rename patches/server/{0244-Use-ConcurrentHashMap-in-JsonList.patch => 0245-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename patches/server/{0245-Use-a-Queue-for-Queueing-Commands.patch => 0246-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename patches/server/{0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename patches/server/{0247-Optimize-BlockPosition-helper-methods.patch => 0248-Optimize-BlockPosition-helper-methods.patch} (97%)
 rename patches/server/{0248-Restore-vanilla-default-mob-spawn-range-and-water-an.patch => 0249-Restore-vanilla-default-mob-spawn-range-and-water-an.patch} (89%)
 rename patches/server/{0249-Slime-Pathfinder-Events.patch => 0250-Slime-Pathfinder-Events.patch} (100%)
 rename patches/server/{0250-Configurable-speed-for-water-flowing-over-lava.patch => 0251-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename patches/server/{0251-Optimize-CraftBlockData-Creation.patch => 0252-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0252-Optimize-MappedRegistry.patch => 0253-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0253-Add-PhantomPreSpawnEvent.patch => 0254-Add-PhantomPreSpawnEvent.patch} (98%)
 rename patches/server/{0254-Add-More-Creeper-API.patch => 0255-Add-More-Creeper-API.patch} (95%)
 rename patches/server/{0255-Inventory-removeItemAnySlot.patch => 0256-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (92%)
 rename patches/server/{0257-Asynchronous-chunk-IO-and-loading.patch => 0258-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename patches/server/{0258-Add-ray-tracing-methods-to-LivingEntity.patch => 0259-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/server/{0259-Expose-attack-cooldown-methods-for-Player.patch => 0260-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/server/{0260-Improve-death-events.patch => 0261-Improve-death-events.patch} (100%)
 rename patches/server/{0261-Allow-chests-to-be-placed-with-NBT-data.patch => 0262-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0262-Mob-Pathfinding-API.patch => 0263-Mob-Pathfinding-API.patch} (98%)
 rename patches/server/{0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename patches/server/{0264-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0265-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0266-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0267-Prevent-mob-spawning-from-loading-generating-chunks.patch} (95%)
 rename patches/server/{0267-Implement-furnace-cook-speed-multiplier-API.patch => 0268-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0268-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0269-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename patches/server/{0269-Honor-EntityAgeable.ageLock.patch => 0270-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0270-Configurable-connection-throttle-kick-message.patch => 0271-Configurable-connection-throttle-kick-message.patch} (96%)
 rename patches/server/{0271-Hook-into-CB-plugin-rewrites.patch => 0272-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0272-PreSpawnerSpawnEvent.patch => 0273-PreSpawnerSpawnEvent.patch} (94%)
 rename patches/server/{0273-Add-LivingEntity-getTargetEntity.patch => 0274-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename patches/server/{0274-Add-sun-related-API.patch => 0275-Add-sun-related-API.patch} (93%)
 rename patches/server/{0275-Turtle-API.patch => 0276-Turtle-API.patch} (100%)
 rename patches/server/{0276-Call-player-spectator-target-events-and-improve-impl.patch => 0277-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename patches/server/{0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0278-Add-Velocity-IP-Forwarding-Support.patch => 0279-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename patches/server/{0279-Add-more-Witch-API.patch => 0280-Add-more-Witch-API.patch} (98%)
 rename patches/server/{0280-Check-Drowned-for-Villager-Aggression-Config.patch => 0281-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0281-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0282-Add-option-to-prevent-players-from-moving-into-unloa.patch} (97%)
 rename patches/server/{0282-Reset-players-airTicks-on-respawn.patch => 0283-Reset-players-airTicks-on-respawn.patch} (100%)
 rename patches/server/{0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (94%)
 rename patches/server/{0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename patches/server/{0285-Optimize-World-Time-Updates.patch => 0286-Optimize-World-Time-Updates.patch} (100%)
 rename patches/server/{0286-Restore-custom-InventoryHolder-support.patch => 0287-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0287-Use-Vanilla-Minecart-Speeds.patch => 0288-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0288-Fix-SpongeAbsortEvent-handling.patch => 0289-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0289-Don-t-allow-digging-into-unloaded-chunks.patch => 0290-Don-t-allow-digging-into-unloaded-chunks.patch} (98%)
 rename patches/server/{0290-Make-the-default-permission-message-configurable.patch => 0291-Make-the-default-permission-message-configurable.patch} (97%)
 rename patches/server/{0291-Prevent-rayTrace-from-loading-chunks.patch => 0292-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0292-Handle-Large-Packets-disconnecting-client.patch => 0293-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0293-force-entity-dismount-during-teleportation.patch => 0294-force-entity-dismount-during-teleportation.patch} (98%)
 rename patches/server/{0294-Add-more-Zombie-API.patch => 0295-Add-more-Zombie-API.patch} (97%)
 rename patches/server/{0295-Book-Size-Limits.patch => 0296-Book-Size-Limits.patch} (95%)
 rename patches/server/{0296-Add-PlayerConnectionCloseEvent.patch => 0297-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/server/{0297-Prevent-Enderman-from-loading-chunks.patch => 0298-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename patches/server/{0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename patches/server/{0300-Block-Entity-remove-from-being-called-on-Players.patch => 0301-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename patches/server/{0301-BlockDestroyEvent.patch => 0302-BlockDestroyEvent.patch} (100%)
 rename patches/server/{0302-Async-command-map-building.patch => 0303-Async-command-map-building.patch} (100%)
 rename patches/server/{0303-Implement-Brigadier-Mojang-API.patch => 0304-Implement-Brigadier-Mojang-API.patch} (98%)
 rename patches/server/{0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename patches/server/{0305-Limit-Client-Sign-length-more.patch => 0306-Limit-Client-Sign-length-more.patch} (96%)
 rename patches/server/{0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename patches/server/{0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0308-Handle-Oversized-Tile-Entities-in-chunks.patch => 0309-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (90%)
 rename patches/server/{0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (88%)
 rename patches/server/{0311-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename patches/server/{0312-Entity-getEntitySpawnReason.patch => 0313-Entity-getEntitySpawnReason.patch} (97%)
 rename patches/server/{0313-Update-entity-Metadata-for-all-tracked-players.patch => 0314-Update-entity-Metadata-for-all-tracked-players.patch} (96%)
 rename patches/server/{0314-Fire-event-on-GS4-query.patch => 0315-Fire-event-on-GS4-query.patch} (99%)
 rename patches/server/{0315-Implement-PlayerPostRespawnEvent.patch => 0316-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename patches/server/{0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (94%)
 rename patches/server/{0317-Server-Tick-Events.patch => 0318-Server-Tick-Events.patch} (100%)
 rename patches/server/{0318-PlayerDeathEvent-getItemsToKeep.patch => 0319-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename patches/server/{0319-Optimize-Captured-TileEntity-Lookup.patch => 0320-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename patches/server/{0320-Add-Heightmap-API.patch => 0321-Add-Heightmap-API.patch} (95%)
 rename patches/server/{0321-Mob-Spawner-API-Enhancements.patch => 0322-Mob-Spawner-API-Enhancements.patch} (98%)
 rename patches/server/{0322-Fix-CB-call-to-changed-postToMainThread-method.patch => 0323-Fix-CB-call-to-changed-postToMainThread-method.patch} (91%)
 rename patches/server/{0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (91%)
 rename patches/server/{0324-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename patches/server/{0325-improve-CraftWorld-isChunkLoaded.patch => 0326-improve-CraftWorld-isChunkLoaded.patch} (94%)
 rename patches/server/{0326-Implement-CraftBlockSoundGroup.patch => 0327-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (98%)
 rename patches/server/{0328-ChunkMapDistance-CME.patch => 0329-ChunkMapDistance-CME.patch} (97%)
 rename patches/server/{0329-Chunk-debug-command.patch => 0330-Chunk-debug-command.patch} (100%)
 rename patches/server/{0330-Allow-Saving-of-Oversized-Chunks.patch => 0331-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0331-Expose-the-internal-current-tick.patch => 0332-Expose-the-internal-current-tick.patch} (100%)
 rename patches/server/{0332-Fix-World-isChunkGenerated-calls.patch => 0333-Fix-World-isChunkGenerated-calls.patch} (99%)
 rename patches/server/{0333-Show-blockstate-location-if-we-failed-to-read-it.patch => 0334-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (96%)
 rename patches/server/{0335-Configurable-projectile-relative-velocity.patch => 0336-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0336-offset-item-frame-ticking.patch => 0337-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0337-Fix-MC-158900.patch => 0338-Fix-MC-158900.patch} (94%)
 rename patches/server/{0338-Prevent-consuming-the-wrong-itemstack.patch => 0339-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename patches/server/{0339-Dont-send-unnecessary-sign-update.patch => 0340-Dont-send-unnecessary-sign-update.patch} (92%)
 rename patches/server/{0340-Add-option-to-disable-pillager-patrols.patch => 0341-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0341-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0342-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (92%)
 rename patches/server/{0342-Flat-bedrock-generator-settings.patch => 0343-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0343-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0344-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0344-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0345-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0345-Duplicate-UUID-Resolve-Option.patch => 0346-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename patches/server/{0346-Optimize-Hoppers.patch => 0347-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0347-PlayerDeathEvent-shouldDropExperience.patch => 0348-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename patches/server/{0348-Prevent-bees-loading-chunks-checking-hive-position.patch => 0349-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0349-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0350-Guard-against-serializing-mismatching-chunk-coordina.patch => 0351-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0351-Optimise-IEntityAccess-getPlayerByUUID.patch => 0352-Optimise-IEntityAccess-getPlayerByUUID.patch} (94%)
 rename patches/server/{0352-Fix-items-not-falling-correctly.patch => 0353-Fix-items-not-falling-correctly.patch} (96%)
 rename patches/server/{0353-Lag-compensate-eating.patch => 0354-Lag-compensate-eating.patch} (100%)
 rename patches/server/{0354-Optimize-call-to-getFluid-for-explosions.patch => 0355-Optimize-call-to-getFluid-for-explosions.patch} (91%)
 rename patches/server/{0355-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0356-Add-effect-to-block-break-naturally.patch => 0357-Add-effect-to-block-break-naturally.patch} (100%)
 rename patches/server/{0357-Entity-Activation-Range-2.0.patch => 0358-Entity-Activation-Range-2.0.patch} (99%)
 rename patches/server/{0358-Increase-Light-Queue-Size.patch => 0359-Increase-Light-Queue-Size.patch} (95%)
 rename patches/server/{0359-Fix-Light-Command.patch => 0360-Fix-Light-Command.patch} (100%)
 rename patches/server/{0360-Anti-Xray.patch => 0361-Anti-Xray.patch} (98%)
 rename patches/server/{0361-Implement-alternative-item-despawn-rate.patch => 0362-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0362-Tracking-Range-Improvements.patch => 0363-Tracking-Range-Improvements.patch} (100%)
 rename patches/server/{0363-Fix-items-vanishing-through-end-portal.patch => 0364-Fix-items-vanishing-through-end-portal.patch} (93%)
 rename patches/server/{0364-implement-optional-per-player-mob-spawns.patch => 0365-implement-optional-per-player-mob-spawns.patch} (99%)
 rename patches/server/{0365-Avoid-hopper-searches-if-there-are-no-items.patch => 0366-Avoid-hopper-searches-if-there-are-no-items.patch} (91%)
 rename patches/server/{0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename patches/server/{0368-Add-debug-for-sync-chunk-loads.patch => 0369-Add-debug-for-sync-chunk-loads.patch} (99%)
 rename patches/server/{0369-Allow-overriding-the-java-version-check.patch => 0370-Allow-overriding-the-java-version-check.patch} (89%)
 rename patches/server/{0370-Add-ThrownEggHatchEvent.patch => 0371-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0371-Entity-Jump-API.patch => 0372-Entity-Jump-API.patch} (100%)
 rename patches/server/{0372-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0373-Add-option-to-nerf-pigmen-from-nether-portals.patch} (97%)
 rename patches/server/{0373-Make-the-GUI-graph-fancier.patch => 0374-Make-the-GUI-graph-fancier.patch} (99%)
 rename patches/server/{0374-add-hand-to-BlockMultiPlaceEvent.patch => 0375-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0375-Validate-tripwire-hook-placement-before-update.patch => 0376-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0376-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0377-Configurable-chance-of-villager-zombie-infection.patch => 0378-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0378-Optimise-Chunk-getFluid.patch => 0379-Optimise-Chunk-getFluid.patch} (100%)
 rename patches/server/{0379-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0380-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0380-Add-tick-times-API-and-mspt-command.patch => 0381-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename patches/server/{0381-Expose-MinecraftServer-isRunning.patch => 0382-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/server/{0382-Add-Raw-Byte-ItemStack-Serialization.patch => 0383-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/server/{0383-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0384-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename patches/server/{0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (96%)
 rename patches/server/{0387-Don-t-tick-dead-players.patch => 0388-Don-t-tick-dead-players.patch} (100%)
 rename patches/server/{0388-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0389-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename patches/server/{0389-Optimize-Collision-to-not-load-chunks.patch => 0390-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename patches/server/{0390-Don-t-move-existing-players-to-world-spawn.patch => 0391-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename patches/server/{0391-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0392-Improved-Watchdog-Support.patch => 0393-Improved-Watchdog-Support.patch} (100%)
 rename patches/server/{0393-Optimize-Pathfinding.patch => 0394-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0394-Reduce-Either-Optional-allocation.patch => 0395-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0395-Reduce-memory-footprint-of-NBTTagCompound.patch => 0396-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0396-Prevent-opening-inventories-when-frozen.patch => 0397-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename patches/server/{0397-Optimise-ArraySetSorted-removeIf.patch => 0398-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename patches/server/{0398-Don-t-run-entity-collision-code-if-not-needed.patch => 0399-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0399-Implement-Player-Client-Options-API.patch => 0400-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0400-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0401-Broadcast-join-message-to-console.patch => 0402-Broadcast-join-message-to-console.patch} (100%)
 rename patches/server/{0402-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0403-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename patches/server/{0403-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename patches/server/{0404-Load-Chunks-for-Login-Asynchronously.patch => 0405-Load-Chunks-for-Login-Asynchronously.patch} (100%)
 rename patches/server/{0405-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename patches/server/{0406-Add-PlayerAttackEntityCooldownResetEvent.patch => 0407-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0407-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0408-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0408-Add-phantom-creative-and-insomniac-controls.patch => 0409-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0409-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename patches/server/{0410-Villager-Restocks-API.patch => 0411-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0411-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0412-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename patches/server/{0412-Expose-game-version.patch => 0413-Expose-game-version.patch} (100%)
 rename patches/server/{0413-Optimize-Voxel-Shape-Merging.patch => 0414-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0414-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0415-misc-debugging-dumps.patch => 0416-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0416-Prevent-teleporting-dead-entities.patch => 0417-Prevent-teleporting-dead-entities.patch} (100%)
 rename patches/server/{0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0418-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (99%)
 rename patches/server/{0418-Implement-Mob-Goal-API.patch => 0419-Implement-Mob-Goal-API.patch} (99%)
 rename patches/server/{0419-Add-villager-reputation-API.patch => 0420-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0420-Option-for-maximum-exp-value-when-merging-orbs.patch => 0421-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0421-ExperienceOrbMergeEvent.patch => 0422-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0422-Fix-PotionEffect-ignores-icon-flag.patch => 0423-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0423-Optimize-brigadier-child-sorting-performance.patch => 0424-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0424-Potential-bed-API.patch => 0425-Potential-bed-API.patch} (95%)
 rename patches/server/{0425-Wait-for-Async-Tasks-during-shutdown.patch => 0426-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0427-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename patches/server/{0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0428-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (99%)
 rename patches/server/{0428-Reduce-MutableInt-allocations-from-light-engine.patch => 0429-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0430-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (97%)
 rename patches/server/{0430-Ensure-safe-gateway-teleport.patch => 0431-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0431-Add-option-for-console-having-all-permissions.patch => 0432-Add-option-for-console-having-all-permissions.patch} (97%)
 rename patches/server/{0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch => 0433-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch} (99%)
 rename patches/server/{0433-Use-distance-map-to-optimise-entity-tracker.patch => 0434-Use-distance-map-to-optimise-entity-tracker.patch} (99%)
 rename patches/server/{0434-Optimize-ServerLevels-chunk-level-checking-methods.patch => 0435-Optimize-ServerLevels-chunk-level-checking-methods.patch} (97%)
 rename patches/server/{0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0436-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (98%)
 rename patches/server/{0436-Fix-villager-trading-demand-MC-163962.patch => 0437-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0437-Maps-shouldn-t-load-chunks.patch => 0438-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0438-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0439-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0439-Fix-missing-chunks-due-to-integer-overflow.patch => 0440-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0440-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0441-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0441-Fix-piston-physics-inconsistency-MC-188840.patch => 0442-Fix-piston-physics-inconsistency-MC-188840.patch} (98%)
 rename patches/server/{0442-Fix-sand-duping.patch => 0443-Fix-sand-duping.patch} (100%)
 rename patches/server/{0443-Prevent-position-desync-in-playerconnection-causing-.patch => 0444-Prevent-position-desync-in-playerconnection-causing-.patch} (94%)
 rename patches/server/{0444-Inventory-getHolder-method-without-block-snapshot.patch => 0445-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0445-Expose-Arrow-getItemStack.patch => 0446-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/server/{0446-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0447-Add-and-implement-PlayerRecipeBookClickEvent.patch} (95%)
 rename patches/server/{0447-Hide-sync-chunk-writes-behind-flag.patch => 0448-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0448-Add-permission-for-command-blocks.patch => 0449-Add-permission-for-command-blocks.patch} (98%)
 rename patches/server/{0449-Ensure-Entity-AABB-s-are-never-invalid.patch => 0450-Ensure-Entity-AABB-s-are-never-invalid.patch} (95%)
 rename patches/server/{0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0451-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (98%)
 rename patches/server/{0451-Paper-dumpitem-command.patch => 0452-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0452-Don-t-allow-null-UUID-s-for-chat.patch => 0453-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0453-Improve-Legacy-Component-serialization-size.patch => 0454-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0454-Optimize-Bit-Operations-by-inlining.patch => 0455-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (98%)
 rename patches/server/{0456-incremental-chunk-and-player-saving.patch => 0457-incremental-chunk-and-player-saving.patch} (98%)
 rename patches/server/{0457-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0458-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0458-Support-old-UUID-format-for-NBT.patch => 0459-Support-old-UUID-format-for-NBT.patch} (62%)
 rename patches/server/{0459-Clean-up-duplicated-GameProfile-Properties.patch => 0460-Clean-up-duplicated-GameProfile-Properties.patch} (96%)
 rename patches/server/{0460-Convert-legacy-attributes-in-Item-Meta.patch => 0461-Convert-legacy-attributes-in-Item-Meta.patch} (97%)
 rename patches/server/{0461-Remove-some-streams-from-structures.patch => 0462-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0462-Remove-streams-from-classes-related-villager-gossip.patch => 0463-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0463-Support-components-in-ItemMeta.patch => 0464-Support-components-in-ItemMeta.patch} (97%)
 rename patches/server/{0464-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0465-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0465-Add-entity-liquid-API.patch => 0466-Add-entity-liquid-API.patch} (91%)
 rename patches/server/{0466-Update-itemstack-legacy-name-and-lore.patch => 0467-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0467-Spawn-player-in-correct-world-on-login.patch => 0468-Spawn-player-in-correct-world-on-login.patch} (94%)
 rename patches/server/{0468-Add-PrepareResultEvent.patch => 0469-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0469-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0470-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (100%)
 rename patches/server/{0471-Optimize-NetworkManager-Exception-Handling.patch => 0472-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0472-Optimize-the-advancement-data-player-iteration-to-be.patch => 0473-Optimize-the-advancement-data-player-iteration-to-be.patch} (96%)
 rename patches/server/{0473-Fix-arrows-never-despawning-MC-125757.patch => 0474-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0474-Thread-Safe-Vanilla-Command-permission-checking.patch => 0475-Thread-Safe-Vanilla-Command-permission-checking.patch} (96%)
 rename patches/server/{0475-Move-range-check-for-block-placing-up.patch => 0476-Move-range-check-for-block-placing-up.patch} (96%)
 rename patches/server/{0476-Fix-SPIGOT-5989.patch => 0477-Fix-SPIGOT-5989.patch} (97%)
 rename patches/server/{0477-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0478-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0478-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0479-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0479-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0480-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0480-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0481-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0481-Fix-some-rails-connecting-improperly.patch => 0482-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0482-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0483-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0483-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0484-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0484-Brand-support.patch => 0485-Brand-support.patch} (100%)
 rename patches/server/{0485-Add-setMaxPlayers-API.patch => 0486-Add-setMaxPlayers-API.patch} (94%)
 rename patches/server/{0486-Add-playPickupItemAnimation-to-LivingEntity.patch => 0487-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0487-Don-t-require-FACING-data.patch => 0488-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0489-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (92%)
 rename patches/server/{0489-Add-moon-phase-API.patch => 0490-Add-moon-phase-API.patch} (89%)
 rename patches/server/{0490-Improve-Chunk-Status-Transition-Speed.patch => 0491-Improve-Chunk-Status-Transition-Speed.patch} (97%)
 rename patches/server/{0491-Prevent-headless-pistons-from-being-created.patch => 0492-Prevent-headless-pistons-from-being-created.patch} (94%)
 rename patches/server/{0492-Add-BellRingEvent.patch => 0493-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0493-Add-zombie-targets-turtle-egg-config.patch => 0494-Add-zombie-targets-turtle-egg-config.patch} (90%)
 rename patches/server/{0494-Buffer-joins-to-world.patch => 0495-Buffer-joins-to-world.patch} (96%)
 rename patches/server/{0495-Optimize-redstone-algorithm.patch => 0496-Optimize-redstone-algorithm.patch} (99%)
 rename patches/server/{0496-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0497-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0497-PortalCreateEvent-needs-to-know-its-entity.patch => 0498-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0498-Fix-CraftTeam-null-check.patch => 0499-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0499-Add-more-Evoker-API.patch => 0500-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0500-Add-methods-to-get-translation-keys.patch => 0501-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0501-Create-HoverEvent-from-ItemStack-Entity.patch => 0502-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0502-Cache-block-data-strings.patch => 0503-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0503-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0504-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (94%)
 rename patches/server/{0504-Add-additional-open-container-api-to-HumanEntity.patch => 0505-Add-additional-open-container-api-to-HumanEntity.patch} (97%)
 rename patches/server/{0505-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0506-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (96%)
 rename patches/server/{0506-Extend-block-drop-capture-to-capture-all-items-added.patch => 0507-Extend-block-drop-capture-to-capture-all-items-added.patch} (96%)
 rename patches/server/{0507-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0508-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename patches/server/{0508-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0509-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (94%)
 rename patches/server/{0509-Lazily-track-plugin-scoreboards-by-default.patch => 0510-Lazily-track-plugin-scoreboards-by-default.patch} (98%)
 rename patches/server/{0510-Entity-isTicking.patch => 0511-Entity-isTicking.patch} (90%)
 rename patches/server/{0511-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0512-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0512-Fix-Concurrency-issue-in-WeightedList.patch => 0513-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename patches/server/{0513-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0514-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (91%)
 rename patches/server/{0514-Fix-for-large-move-vectors-crashing-server.patch => 0515-Fix-for-large-move-vectors-crashing-server.patch} (98%)
 rename patches/server/{0515-Optimise-getType-calls.patch => 0516-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0516-Villager-resetOffers.patch => 0517-Villager-resetOffers.patch} (100%)
 rename patches/server/{0517-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0518-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0518-Retain-block-place-order-when-capturing-blockstates.patch => 0519-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0519-Reduce-blockpos-allocation-from-pathfinding.patch => 0520-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0520-Fix-item-locations-dropped-from-campfires.patch => 0521-Fix-item-locations-dropped-from-campfires.patch} (94%)
 rename patches/server/{0521-Player-elytra-boost-API.patch => 0522-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0522-Fixed-TileEntityBell-memory-leak.patch => 0523-Fixed-TileEntityBell-memory-leak.patch} (94%)
 rename patches/server/{0523-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0524-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0524-Add-getOfflinePlayerIfCached-String.patch => 0525-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0525-Add-ignore-discounts-API.patch => 0526-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0526-Toggle-for-removing-existing-dragon.patch => 0527-Toggle-for-removing-existing-dragon.patch} (90%)
 rename patches/server/{0527-Fix-client-lag-on-advancement-loading.patch => 0528-Fix-client-lag-on-advancement-loading.patch} (95%)
 rename patches/server/{0528-Item-no-age-no-player-pickup.patch => 0529-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0529-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0530-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0530-Beacon-API-custom-effect-ranges.patch => 0531-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0531-Add-API-for-quit-reason.patch => 0532-Add-API-for-quit-reason.patch} (96%)
 rename patches/server/{0532-Add-Wandering-Trader-spawn-rate-config-options.patch => 0533-Add-Wandering-Trader-spawn-rate-config-options.patch} (97%)
 rename patches/server/{0533-Significantly-improve-performance-of-the-end-generat.patch => 0534-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0534-Expose-world-spawn-angle.patch => 0535-Expose-world-spawn-angle.patch} (91%)
 rename patches/server/{0535-Add-Destroy-Speed-API.patch => 0536-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0536-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0537-Add-LivingEntity-clearActiveItem.patch => 0538-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0538-Add-PlayerItemCooldownEvent.patch => 0539-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0539-More-lightning-API.patch => 0540-More-lightning-API.patch} (100%)
 rename patches/server/{0540-Climbing-should-not-bypass-cramming-gamerule.patch => 0541-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename patches/server/{0541-Added-missing-default-perms-for-commands.patch => 0542-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0542-Add-PlayerShearBlockEvent.patch => 0543-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0543-Fix-curing-zombie-villager-discount-exploit.patch => 0544-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0544-Limit-recipe-packets.patch => 0545-Limit-recipe-packets.patch} (94%)
 rename patches/server/{0545-Fix-CraftSound-backwards-compatibility.patch => 0546-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0546-MC-4-Fix-item-position-desync.patch => 0547-MC-4-Fix-item-position-desync.patch} (94%)
 rename patches/server/{0547-Player-Chunk-Load-Unload-Events.patch => 0548-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0548-Optimize-Dynamic-get-Missing-Keys.patch => 0549-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0549-Expose-LivingEntity-hurt-direction.patch => 0550-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0550-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0551-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0552-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (99%)
 rename patches/server/{0553-Implement-TargetHitEvent.patch => 0554-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0554-Additional-Block-Material-API-s.patch => 0555-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0555-Fix-harming-potion-dupe.patch => 0556-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0556-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0557-Cache-burn-durations.patch => 0558-Cache-burn-durations.patch} (100%)
 rename patches/server/{0558-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (95%)
 rename patches/server/{0559-Fix-Not-a-string-Map-Conversion-spam.patch => 0560-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0560-Implement-PlayerFlowerPotManipulateEvent.patch => 0561-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0561-Fix-interact-event-not-being-called-in-adventure.patch => 0562-Fix-interact-event-not-being-called-in-adventure.patch} (95%)
 rename patches/server/{0562-Zombie-API-breaking-doors.patch => 0563-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0563-Fix-nerfed-slime-when-splitting.patch => 0564-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0564-Add-EntityLoadCrossbowEvent.patch => 0565-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0565-Guardian-beam-workaround.patch => 0566-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0566-Added-WorldGameRuleChangeEvent.patch => 0567-Added-WorldGameRuleChangeEvent.patch} (98%)
 rename patches/server/{0567-Added-ServerResourcesReloadedEvent.patch => 0568-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0568-Added-world-settings-for-mobs-picking-up-loot.patch => 0569-Added-world-settings-for-mobs-picking-up-loot.patch} (97%)
 rename patches/server/{0569-Implemented-BlockFailedDispenseEvent.patch => 0570-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0570-Added-PlayerLecternPageChangeEvent.patch => 0571-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0571-Added-PlayerLoomPatternSelectEvent.patch => 0572-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0572-Configurable-door-breaking-difficulty.patch => 0573-Configurable-door-breaking-difficulty.patch} (94%)
 rename patches/server/{0573-Empty-commands-shall-not-be-dispatched.patch => 0574-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0574-Implement-API-to-expose-exact-interaction-point.patch => 0575-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0575-Remove-stale-POIs.patch => 0576-Remove-stale-POIs.patch} (92%)
 rename patches/server/{0576-Fix-villager-boat-exploit.patch => 0577-Fix-villager-boat-exploit.patch} (93%)
 rename patches/server/{0577-Add-sendOpLevel-API.patch => 0578-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0578-Add-StructureLocateEvent.patch => 0579-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0579-Collision-option-for-requiring-a-player-participant.patch => 0580-Collision-option-for-requiring-a-player-participant.patch} (97%)
 rename patches/server/{0580-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0581-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (92%)
 rename patches/server/{0581-Return-chat-component-with-empty-text-instead-of-thr.patch => 0582-Return-chat-component-with-empty-text-instead-of-thr.patch} (94%)
 rename patches/server/{0582-Make-schedule-command-per-world.patch => 0583-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0583-Configurable-max-leash-distance.patch => 0584-Configurable-max-leash-distance.patch} (96%)
 rename patches/server/{0584-Implement-BlockPreDispenseEvent.patch => 0585-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0585-added-Wither-API.patch => 0586-added-Wither-API.patch} (100%)
 rename patches/server/{0586-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0587-Add-toggle-for-always-placing-the-dragon-egg.patch => 0588-Add-toggle-for-always-placing-the-dragon-egg.patch} (95%)
 rename patches/server/{0588-Added-PlayerStonecutterRecipeSelectEvent.patch => 0589-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0589-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0590-Reset-shield-blocking-on-dimension-change.patch => 0591-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0591-add-DragonEggFormEvent.patch => 0592-add-DragonEggFormEvent.patch} (95%)
 rename patches/server/{0592-EntityMoveEvent.patch => 0593-EntityMoveEvent.patch} (95%)
 rename patches/server/{0593-added-option-to-disable-pathfinding-updates-on-block.patch => 0594-added-option-to-disable-pathfinding-updates-on-block.patch} (95%)
 rename patches/server/{0594-Inline-shift-direction-fields.patch => 0595-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0595-Allow-adding-items-to-BlockDropItemEvent.patch => 0596-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0596-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0597-living-entity-allow-attribute-registration.patch => 0598-living-entity-allow-attribute-registration.patch} (96%)
 rename patches/server/{0598-fix-dead-slime-setSize-invincibility.patch => 0599-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0599-Merchant-getRecipes-should-return-an-immutable-list.patch => 0600-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0600-Add-support-for-hex-color-codes-in-console.patch => 0601-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0601-Expose-Tracked-Players.patch => 0602-Expose-Tracked-Players.patch} (92%)
 rename patches/server/{0602-Remove-streams-from-SensorNearest.patch => 0603-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0603-Throw-proper-exception-on-empty-JsonList-file.patch => 0604-Throw-proper-exception-on-empty-JsonList-file.patch} (91%)
 rename patches/server/{0604-Improve-ServerGUI.patch => 0605-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0605-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0606-fix-converting-txt-to-json-file.patch => 0607-fix-converting-txt-to-json-file.patch} (97%)
 rename patches/server/{0607-Add-worldborder-events.patch => 0608-Add-worldborder-events.patch} (100%)
 rename patches/server/{0608-added-PlayerNameEntityEvent.patch => 0609-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0609-Prevent-grindstones-from-overstacking-items.patch => 0610-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0610-Add-recipe-to-cook-events.patch => 0611-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0611-Add-Block-isValidTool.patch => 0612-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0612-Allow-using-signs-inside-spawn-protection.patch => 0613-Allow-using-signs-inside-spawn-protection.patch} (96%)
 rename patches/server/{0613-Implement-Keyed-on-World.patch => 0614-Implement-Keyed-on-World.patch} (96%)
 rename patches/server/{0614-Add-fast-alternative-constructor-for-Rotations.patch => 0615-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0615-Item-Rarity-API.patch => 0616-Item-Rarity-API.patch} (96%)
 rename patches/server/{0616-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0617-copy-TESign-isEditable-from-snapshots.patch => 0618-copy-TESign-isEditable-from-snapshots.patch} (89%)
 rename patches/server/{0618-Drop-carried-item-when-player-has-disconnected.patch => 0619-Drop-carried-item-when-player-has-disconnected.patch} (92%)
 rename patches/server/{0619-forced-whitelist-use-configurable-kick-message.patch => 0620-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0620-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (91%)
 rename patches/server/{0621-Entity-load-save-limit-per-chunk.patch => 0622-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0622-fix-cancelling-block-falling-causing-client-desync.patch => 0623-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0623-Expose-protocol-version.patch => 0624-Expose-protocol-version.patch} (91%)
 rename patches/server/{0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (98%)
 rename patches/server/{0625-Enhance-console-tab-completions-for-brigadier-comman.patch => 0626-Enhance-console-tab-completions-for-brigadier-comman.patch} (99%)
 rename patches/server/{0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0627-Add-bypass-host-check.patch => 0628-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0628-Set-area-affect-cloud-rotation.patch => 0629-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0629-add-isDeeplySleeping-to-HumanEntity.patch => 0630-add-isDeeplySleeping-to-HumanEntity.patch} (90%)
 rename patches/server/{0630-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0631-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename patches/server/{0631-add-consumeFuel-to-FurnaceBurnEvent.patch => 0632-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0632-add-get-set-drop-chance-to-EntityEquipment.patch => 0633-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0633-fix-PigZombieAngerEvent-cancellation.patch => 0634-fix-PigZombieAngerEvent-cancellation.patch} (95%)
 rename patches/server/{0634-Fix-checkReach-check-for-Shulker-boxes.patch => 0635-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0635-fix-PlayerItemHeldEvent-firing-twice.patch => 0636-fix-PlayerItemHeldEvent-firing-twice.patch} (93%)
 rename patches/server/{0636-Added-PlayerDeepSleepEvent.patch => 0637-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0637-More-World-API.patch => 0638-More-World-API.patch} (97%)
 rename patches/server/{0638-Added-PlayerBedFailEnterEvent.patch => 0639-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0639-Implement-methods-to-convert-between-Component-and-B.patch => 0640-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (95%)
 rename patches/server/{0641-Introduce-beacon-activation-deactivation-events.patch => 0642-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0642-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0643-add-RespawnFlags-to-PlayerRespawnEvent.patch} (94%)
 rename patches/server/{0643-Add-Channel-initialization-listeners.patch => 0644-Add-Channel-initialization-listeners.patch} (98%)
 rename patches/server/{0644-Send-empty-commands-if-tab-completion-is-disabled.patch => 0645-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0645-Add-more-WanderingTrader-API.patch => 0646-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0646-Add-EntityBlockStorage-clearEntities.patch => 0647-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (96%)
 rename patches/server/{0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0649-Inventory-close.patch => 0650-Inventory-close.patch} (90%)
 rename patches/server/{0650-call-PortalCreateEvent-players-and-end-platform.patch => 0651-call-PortalCreateEvent-players-and-end-platform.patch} (100%)
 rename patches/server/{0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (98%)
 rename patches/server/{0652-Fix-CraftPotionBrewer-cache.patch => 0653-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0653-Add-basic-Datapack-API.patch => 0654-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0654-Add-environment-variable-to-disable-server-gui.patch => 0655-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0655-additions-to-PlayerGameModeChangeEvent.patch => 0656-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0656-ItemStack-repair-check-API.patch => 0657-ItemStack-repair-check-API.patch} (97%)
 rename patches/server/{0657-More-Enchantment-API.patch => 0658-More-Enchantment-API.patch} (100%)
 rename patches/server/{0658-Fix-and-optimise-world-force-upgrading.patch => 0659-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0659-Add-Mob-lookAt-API.patch => 0660-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0660-Add-Unix-domain-socket-support.patch => 0661-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0661-Add-EntityInsideBlockEvent.patch => 0662-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0662-Attributes-API-for-item-defaults.patch => 0663-Attributes-API-for-item-defaults.patch} (94%)
 rename patches/server/{0663-Add-cause-to-Weather-ThunderChangeEvents.patch => 0664-Add-cause-to-Weather-ThunderChangeEvents.patch} (97%)
 rename patches/server/{0664-More-Lidded-Block-API.patch => 0665-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0665-Limit-item-frame-cursors-on-maps.patch => 0666-Limit-item-frame-cursors-on-maps.patch} (95%)
 rename patches/server/{0666-Add-PlayerKickEvent-causes.patch => 0667-Add-PlayerKickEvent-causes.patch} (98%)
 rename patches/server/{0667-Add-PufferFishStateChangeEvent.patch => 0668-Add-PufferFishStateChangeEvent.patch} (97%)
 rename patches/server/{0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (67%)
 rename patches/server/{0670-Add-option-to-fix-items-merging-through-walls.patch => 0671-Add-option-to-fix-items-merging-through-walls.patch} (96%)
 rename patches/server/{0671-Add-BellRevealRaiderEvent.patch => 0672-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0672-Fix-invulnerable-end-crystals.patch => 0673-Fix-invulnerable-end-crystals.patch} (97%)
 rename patches/server/{0673-Add-ElderGuardianAppearanceEvent.patch => 0674-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0674-Fix-dangerous-end-portal-logic.patch => 0675-Fix-dangerous-end-portal-logic.patch} (97%)
 rename patches/server/{0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (96%)
 rename patches/server/{0676-Make-item-validations-configurable.patch => 0677-Make-item-validations-configurable.patch} (96%)
 rename patches/server/{0677-Line-Of-Sight-Changes.patch => 0678-Line-Of-Sight-Changes.patch} (97%)
 rename patches/server/{0678-add-per-world-spawn-limits.patch => 0679-add-per-world-spawn-limits.patch} (97%)
 rename patches/server/{0679-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0680-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0680-Add-more-LimitedRegion-API.patch => 0681-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0681-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0682-Fix-PlayerDropItemEvent-using-wrong-item.patch} (100%)
 rename patches/server/{0682-Missing-Entity-Behavior-API.patch => 0683-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/server/{0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (92%)
 rename patches/server/{0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0685-Use-getChunkIfLoadedImmediately-in-places.patch => 0686-Use-getChunkIfLoadedImmediately-in-places.patch} (95%)
 rename patches/server/{0686-Fix-commands-from-signs-not-firing-command-events.patch => 0687-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0687-Adds-PlayerArmSwingEvent.patch => 0688-Adds-PlayerArmSwingEvent.patch} (92%)
 rename patches/server/{0688-Fixes-kick-event-leave-message-not-being-sent.patch => 0689-Fixes-kick-event-leave-message-not-being-sent.patch} (96%)
 rename patches/server/{0689-Add-config-for-mobs-immune-to-default-effects.patch => 0690-Add-config-for-mobs-immune-to-default-effects.patch} (98%)
 rename patches/server/{0690-Fix-incorrect-message-for-outdated-client.patch => 0691-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0691-Don-t-apply-cramming-damage-to-players.patch => 0692-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0692-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0693-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0693-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0694-Add-a-bunch-of-missing-forceDrop-toggles.patch} (92%)
 rename patches/server/{0694-Stinger-API.patch => 0695-Stinger-API.patch} (100%)
 rename patches/server/{0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0696-Add-System.out-err-catcher.patch => 0697-Add-System.out-err-catcher.patch} (98%)
 rename patches/server/{0697-Fix-test-not-bootstrapping.patch => 0698-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0699-Improve-boat-collision-performance.patch => 0700-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0700-Prevent-AFK-kick-while-watching-end-credits.patch => 0701-Prevent-AFK-kick-while-watching-end-credits.patch} (93%)
 rename patches/server/{0701-Allow-skipping-writing-of-comments-to-server.propert.patch => 0702-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0702-Add-PlayerSetSpawnEvent.patch => 0703-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/server/{0703-Make-hoppers-respect-inventory-max-stack-size.patch => 0704-Make-hoppers-respect-inventory-max-stack-size.patch} (94%)
 rename patches/server/{0704-Optimize-entity-tracker-passenger-checks.patch => 0705-Optimize-entity-tracker-passenger-checks.patch} (90%)
 rename patches/server/{0705-Config-option-for-Piglins-guarding-chests.patch => 0706-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0706-Added-EntityDamageItemEvent.patch => 0707-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0707-Optimize-indirect-passenger-iteration.patch => 0708-Optimize-indirect-passenger-iteration.patch} (95%)
 rename patches/server/{0708-Fix-block-drops-position-losing-precision-millions-o.patch => 0709-Fix-block-drops-position-losing-precision-millions-o.patch} (100%)
 rename patches/server/{0709-Configurable-item-frame-map-cursor-update-interval.patch => 0710-Configurable-item-frame-map-cursor-update-interval.patch} (96%)
 rename patches/server/{0710-Make-EntityUnleashEvent-cancellable.patch => 0711-Make-EntityUnleashEvent-cancellable.patch} (96%)
 rename patches/server/{0711-Clear-bucket-NBT-after-dispense.patch => 0712-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0712-Respect-despawn-rate-in-item-merge-check.patch => 0713-Respect-despawn-rate-in-item-merge-check.patch} (91%)
 rename patches/server/{0713-Change-EnderEye-target-without-changing-other-things.patch => 0714-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0714-Add-BlockBreakBlockEvent.patch => 0715-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0716-More-CommandBlock-API.patch => 0717-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0717-Add-missing-team-sidebar-display-slots.patch => 0718-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0718-Add-back-EntityPortalExitEvent.patch => 0719-Add-back-EntityPortalExitEvent.patch} (97%)
 rename patches/server/{0719-Add-methods-to-find-targets-for-lightning-strikes.patch => 0720-Add-methods-to-find-targets-for-lightning-strikes.patch} (93%)
 rename patches/server/{0720-Get-entity-default-attributes.patch => 0721-Get-entity-default-attributes.patch} (98%)
 rename patches/server/{0721-Left-handed-API.patch => 0722-Left-handed-API.patch} (100%)
 rename patches/server/{0722-Add-advancement-display-API.patch => 0723-Add-advancement-display-API.patch} (100%)
 rename patches/server/{0723-Add-ItemFactory-getMonsterEgg-API.patch => 0724-Add-ItemFactory-getMonsterEgg-API.patch} (93%)
 rename patches/server/{0724-Add-critical-damage-API.patch => 0725-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0725-Fix-issues-with-mob-conversion.patch => 0726-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0726-Add-isCollidable-methods-to-various-places.patch => 0727-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0727-Goat-ram-API.patch => 0728-Goat-ram-API.patch} (100%)
 rename patches/server/{0728-Add-API-for-resetting-a-single-score.patch => 0729-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0729-Add-Raw-Byte-Entity-Serialization.patch => 0730-Add-Raw-Byte-Entity-Serialization.patch} (95%)
 rename patches/server/{0730-Vanilla-command-permission-fixes.patch => 0731-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0731-Make-CallbackExecutor-strict-again.patch => 0732-Make-CallbackExecutor-strict-again.patch} (95%)
 rename patches/server/{0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch => 0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch} (100%)
 rename patches/server/{0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (97%)
 rename patches/server/{0734-Correctly-handle-recursion-for-chunkholder-updates.patch => 0735-Correctly-handle-recursion-for-chunkholder-updates.patch} (100%)
 rename patches/server/{0735-Separate-lookup-locking-from-state-access-in-UserCac.patch => 0736-Separate-lookup-locking-from-state-access-in-UserCac.patch} (98%)
 rename patches/server/{0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch => 0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch} (100%)
 rename patches/server/{0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch => 0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch} (97%)
 rename patches/server/{0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch => 0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch} (100%)
 rename patches/server/{0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch => 0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch} (100%)
 rename patches/server/{0740-Log-when-the-async-catcher-is-tripped.patch => 0741-Log-when-the-async-catcher-is-tripped.patch} (100%)
 rename patches/server/{0741-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0742-Add-paper-mobcaps-and-paper-playermobcaps.patch} (98%)
 rename patches/server/{0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch => 0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch} (100%)
 rename patches/server/{0743-Sanitize-ResourceLocation-error-logging.patch => 0744-Sanitize-ResourceLocation-error-logging.patch} (94%)
 rename patches/server/{0744-Optimise-general-POI-access.patch => 0745-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0745-Allow-controlled-flushing-for-network-manager.patch => 0746-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0746-Add-more-async-catchers.patch => 0747-Add-more-async-catchers.patch} (96%)
 rename patches/server/{0747-Rewrite-entity-bounding-box-lookup-calls.patch => 0748-Rewrite-entity-bounding-box-lookup-calls.patch} (99%)
 rename patches/server/{0748-Optimise-chunk-tick-iteration.patch => 0749-Optimise-chunk-tick-iteration.patch} (98%)
 rename patches/server/{0749-Execute-chunk-tasks-mid-tick.patch => 0750-Execute-chunk-tasks-mid-tick.patch} (96%)
 rename patches/server/{0750-Do-not-copy-visible-chunks.patch => 0751-Do-not-copy-visible-chunks.patch} (98%)
 rename patches/server/{0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0752-Custom-table-implementation-for-blockstate-state-loo.patch => 0753-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0753-Detail-more-information-in-watchdog-dumps.patch => 0754-Detail-more-information-in-watchdog-dumps.patch} (98%)
 rename patches/server/{0754-Manually-inline-methods-in-BlockPosition.patch => 0755-Manually-inline-methods-in-BlockPosition.patch} (92%)
 rename patches/server/{0755-Distance-manager-tick-timings.patch => 0756-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0756-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0757-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (94%)
 rename patches/server/{0758-Add-packet-limiter-config.patch => 0759-Add-packet-limiter-config.patch} (99%)
 rename patches/server/{0759-Lag-compensate-block-breaking.patch => 0760-Lag-compensate-block-breaking.patch} (98%)
 rename patches/server/{0760-Use-correct-LevelStem-registry-when-loading-default-.patch => 0761-Use-correct-LevelStem-registry-when-loading-default-.patch} (93%)
 rename patches/server/{0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0762-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0763-Consolidate-flush-calls-for-entity-tracker-packets.patch} (96%)
 rename patches/server/{0763-Don-t-lookup-fluid-state-when-raytracing.patch => 0764-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0764-Time-scoreboard-search.patch => 0765-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0765-Send-full-pos-packets-for-hard-colliding-entities.patch => 0766-Send-full-pos-packets-for-hard-colliding-entities.patch} (92%)
 rename patches/server/{0766-Do-not-run-raytrace-logic-for-AIR.patch => 0767-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0767-Oprimise-map-impl-for-tracked-players.patch => 0768-Oprimise-map-impl-for-tracked-players.patch} (93%)
 rename patches/server/{0768-Optimise-BlockSoil-nearby-water-lookup.patch => 0769-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch => 0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch} (100%)
 rename patches/server/{0770-Optimise-random-block-ticking.patch => 0771-Optimise-random-block-ticking.patch} (99%)
 rename patches/server/{0771-Optimise-non-flush-packet-sending.patch => 0772-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0772-Optimise-nearby-player-lookups.patch => 0773-Optimise-nearby-player-lookups.patch} (99%)
 rename patches/server/{0773-Optimise-WorldServer-notify.patch => 0774-Optimise-WorldServer-notify.patch} (98%)
 rename patches/server/{0774-Remove-streams-for-villager-AI.patch => 0775-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0775-Rewrite-dataconverter-system.patch => 0776-Rewrite-dataconverter-system.patch} (99%)
 rename patches/server/{0776-Use-Velocity-compression-and-cipher-natives.patch => 0777-Use-Velocity-compression-and-cipher-natives.patch} (99%)
 rename patches/server/{0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (93%)
 rename patches/server/{0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch => 0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch} (97%)
 rename patches/server/{0779-Async-catch-modifications-to-critical-entity-state.patch => 0780-Async-catch-modifications-to-critical-entity-state.patch} (100%)
 rename patches/server/{0780-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0781-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (94%)
 rename patches/server/{0782-Check-requirement-before-suggesting-root-nodes.patch => 0783-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (91%)
 rename patches/server/{0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0785-Ensure-valid-vehicle-status.patch => 0786-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0786-Prevent-softlocked-end-exit-portal-generation.patch => 0787-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0788-Don-t-log-debug-logging-being-disabled.patch => 0789-Don-t-log-debug-logging-being-disabled.patch} (88%)
 rename patches/server/{0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch => 0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch} (100%)
 rename patches/server/{0790-fix-various-menus-with-empty-level-accesses.patch => 0791-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch => 0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch} (95%)
 rename patches/server/{0792-Preserve-overstacked-loot.patch => 0793-Preserve-overstacked-loot.patch} (97%)
 rename patches/server/{0793-Update-head-rotation-in-missing-places.patch => 0794-Update-head-rotation-in-missing-places.patch} (93%)
 rename patches/server/{0794-prevent-unintended-light-block-manipulation.patch => 0795-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch => 0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch} (76%)
 rename patches/server/{0796-Fix-CraftCriteria-defaults-map.patch => 0797-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0797-Fix-upstreams-block-state-factories.patch => 0798-Fix-upstreams-block-state-factories.patch} (99%)
 rename patches/server/{0798-Add-config-option-for-logging-player-ip-addresses.patch => 0799-Add-config-option-for-logging-player-ip-addresses.patch} (97%)
 rename patches/server/{0799-Configurable-feature-seeds.patch => 0800-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0801-Add-root-admin-user-detection.patch => 0802-Add-root-admin-user-detection.patch} (97%)
 rename patches/server/{0802-Always-allow-item-changing-in-Fireball.patch => 0803-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0803-don-t-attempt-to-teleport-dead-entities.patch => 0804-don-t-attempt-to-teleport-dead-entities.patch} (91%)
 rename patches/server/{0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch => 0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch} (100%)
 rename patches/server/{0805-Prevent-excessive-velocity-through-repeated-crits.patch => 0806-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0806-Remove-client-side-code-using-deprecated-for-removal.patch => 0807-Remove-client-side-code-using-deprecated-for-removal.patch} (94%)
 rename patches/server/{0807-Rewrite-the-light-engine.patch => 0808-Rewrite-the-light-engine.patch} (99%)
 rename patches/server/{0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch => 0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch} (100%)
 rename patches/server/{0809-Fix-removing-recipes-from-RecipeIterator.patch => 0810-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0810-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0811-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0811-Hide-unnecessary-itemmeta-from-clients.patch => 0812-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch => 0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch} (98%)
 rename patches/server/{0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0814-Add-PlayerItemFrameChangeEvent.patch => 0815-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0815-Add-player-health-update-API.patch => 0816-Add-player-health-update-API.patch} (100%)
 rename patches/server/{0816-Optimize-HashMapPalette.patch => 0817-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0817-Allow-delegation-to-vanilla-chunk-gen.patch => 0818-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (99%)
 rename patches/server/{0819-Optimise-collision-checking-in-player-move-packet-ha.patch => 0820-Optimise-collision-checking-in-player-move-packet-ha.patch} (99%)
 rename patches/server/{0820-Actually-unload-POI-data.patch => 0821-Actually-unload-POI-data.patch} (99%)
 rename patches/server/{0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0822-Update-Log4j.patch => 0823-Update-Log4j.patch} (92%)
 rename patches/server/{0823-Add-more-Campfire-API.patch => 0824-Add-more-Campfire-API.patch} (98%)
 rename patches/server/{0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (97%)
 rename patches/server/{0825-Fix-tripwire-state-inconsistency.patch => 0826-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0826-Fix-fluid-logging-on-Block-breakNaturally.patch => 0827-Fix-fluid-logging-on-Block-breakNaturally.patch} (100%)
 rename patches/server/{0827-Forward-CraftEntity-in-teleport-command.patch => 0828-Forward-CraftEntity-in-teleport-command.patch} (95%)
 rename patches/server/{0828-Improve-scoreboard-entries.patch => 0829-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0829-Entity-powdered-snow-API.patch => 0830-Entity-powdered-snow-API.patch} (94%)
 rename patches/server/{0830-Add-API-for-item-entity-health.patch => 0831-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0831-Fix-entity-type-tags-suggestions-in-selectors.patch => 0832-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0832-Configurable-max-block-light-for-monster-spawning.patch => 0833-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0834-Load-effect-amplifiers-greater-than-127-correctly.patch => 0835-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0836-Fix-bees-aging-inside-hives.patch => 0837-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0837-Bucketable-API.patch => 0838-Bucketable-API.patch} (100%)
 rename patches/server/{0838-Check-player-world-in-endPortalSoundRadius.patch => 0839-Check-player-world-in-endPortalSoundRadius.patch} (100%)
 rename patches/server/{0839-Validate-usernames.patch => 0840-Validate-usernames.patch} (100%)
 rename patches/server/{0840-Fix-saving-configs-with-more-long-comments.patch => 0841-Fix-saving-configs-with-more-long-comments.patch} (100%)
 rename patches/server/{0841-Make-water-animal-spawn-height-configurable.patch => 0842-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (98%)
 rename patches/server/{0843-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0844-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0844-Add-new-overload-to-PersistentDataContainer-has.patch => 0845-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0845-Multiple-Entries-with-Scoreboards.patch => 0846-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0846-Reset-placed-block-on-exception.patch => 0847-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0847-Add-configurable-height-for-slime-spawn.patch => 0848-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0849-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0849-Fix-xp-reward-for-baby-zombies.patch => 0850-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0850-Kick-on-main-for-illegal-chars.patch => 0851-Kick-on-main-for-illegal-chars.patch} (100%)
 rename patches/server/{0851-Multi-Block-Change-API-Implementation.patch => 0852-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0852-Fix-NotePlayEvent.patch => 0853-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0853-Freeze-Tick-Lock-API.patch => 0854-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0854-Dolphin-API.patch => 0855-Dolphin-API.patch} (100%)
 rename patches/server/{0855-More-PotionEffectType-API.patch => 0856-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0857-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0857-API-for-creating-command-sender-which-forwards-feedb.patch => 0858-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0858-Add-config-for-stronghold-seed.patch => 0859-Add-config-for-stronghold-seed.patch} (100%)
 rename patches/server/{0859-Implement-regenerateChunk.patch => 0860-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0860-Log-exceptions-thrown-during-chat-processing.patch => 0861-Log-exceptions-thrown-during-chat-processing.patch} (100%)
 rename patches/server/{0861-Fix-cancelled-powdered-snow-bucket-placement.patch => 0862-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0863-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0863-Add-GameEvent-tags.patch => 0864-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0864-Replace-player-chunk-loader-system.patch => 0865-Replace-player-chunk-loader-system.patch} (99%)
 rename patches/server/{0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0866-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0866-Replace-ticket-level-propagator.patch => 0867-Replace-ticket-level-propagator.patch} (100%)
 rename patches/server/{0867-Furnace-RecipesUsed-API.patch => 0868-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0868-Configurable-sculk-sensor-listener-range.patch => 0869-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0869-Add-missing-block-data-mins-and-maxes.patch => 0870-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0871-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0871-Put-world-into-worldlist-before-initing-the-world.patch => 0872-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0872-Fix-Entity-Position-Desync.patch => 0873-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0873-Custom-Potion-Mixes.patch => 0874-Custom-Potion-Mixes.patch} (100%)

diff --git a/patches/server/0005-MC-Dev-fixes.patch b/patches/server/0005-MC-Dev-fixes.patch
index 1f95add232..bb449e904e 100644
--- a/patches/server/0005-MC-Dev-fixes.patch
+++ b/patches/server/0005-MC-Dev-fixes.patch
@@ -64,6 +64,36 @@ index 8c37ed1d70c5874bb1bd96fe33b087d4ddc2d68e..ea68b26e506e48d8238b7ee4266e61b2
      private final List<Tag> list;
      private byte type;
  
+diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
+index 32445370db8392c36065fa7a7680cfe9b90653c3..994bfb175446a7d2e697ff8faef36a348ed1accd 100644
+--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
++++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
+@@ -40,14 +40,14 @@ import net.minecraft.world.level.material.FluidState;
+ import org.slf4j.Logger;
+ 
+ public final class NbtUtils {
+-    private static final Comparator<ListTag> YXZ_LISTTAG_INT_COMPARATOR = Comparator.comparingInt((nbt) -> {
++    private static final Comparator<ListTag> YXZ_LISTTAG_INT_COMPARATOR = Comparator.<ListTag>comparingInt((nbt) -> { // Paper - decompile fix
+         return nbt.getInt(1);
+     }).thenComparingInt((nbt) -> {
+         return nbt.getInt(0);
+     }).thenComparingInt((nbt) -> {
+         return nbt.getInt(2);
+     });
+-    private static final Comparator<ListTag> YXZ_LISTTAG_DOUBLE_COMPARATOR = Comparator.comparingDouble((nbt) -> {
++    private static final Comparator<ListTag> YXZ_LISTTAG_DOUBLE_COMPARATOR = Comparator.<ListTag>comparingDouble((nbt) -> { // Paper - decompile fix
+         return nbt.getDouble(1);
+     }).thenComparingDouble((nbt) -> {
+         return nbt.getDouble(0);
+@@ -495,7 +495,7 @@ public final class NbtUtils {
+     }
+ 
+     public static CompoundTag update(DataFixer fixer, DataFixTypes fixTypes, CompoundTag compound, int oldVersion, int targetVersion) {
+-        return fixer.update(fixTypes.getType(), new Dynamic<>(NbtOps.INSTANCE, compound), oldVersion, targetVersion).getValue();
++        return (CompoundTag) fixer.update(fixTypes.getType(), new Dynamic<>(NbtOps.INSTANCE, compound), oldVersion, targetVersion).getValue(); // Paper - decompile fix
+     }
+ 
+     public static Component toPrettyComponent(Tag element) {
 diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java
 index f10ea89e64aac2c11ed442ac7f2ffd15b793ac76..5df72f16e6b954ecee23a6f8daa29de0d3d991fe 100644
 --- a/src/main/java/net/minecraft/network/ConnectionProtocol.java
@@ -204,6 +234,19 @@ index 3d0b05a9ac049cf751dad0b0df46b5152b0cc9a5..3959eeb9090e8e4c999d89ec32fac8c4
              return instance.group(RecordCodecBuilder.point(updateListener), Codec.BOOL.optionalFieldOf("Valid", Boolean.valueOf(false)).forGetter((poiSet) -> {
                  return poiSet.isValid;
              }), PoiRecord.codec(updateListener).listOf().fieldOf("Records").forGetter((poiSet) -> {
+diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+index c5b9c0c650df5f4b7e3d2a431dc900e210104dea..49ca4f6a9e33fdb5295dae2b059d071551353c24 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
++++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+@@ -123,7 +123,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
+ 
+     @Override
+     public Brain<Hoglin> getBrain() {
+-        return super.getBrain();
++        return (Brain<Hoglin>) super.getBrain(); // Paper - decompile fix
+     }
+ 
+     @Override
 diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
 index 92650d816113a0f1c2b589691895ebba3424d661..7ef0075cc16613709e145714204a728d8d8dd82b 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
@@ -218,9 +261,18 @@ index 92650d816113a0f1c2b589691895ebba3424d661..7ef0075cc16613709e145714204a728d
          this.byName = Maps.newHashMap(builder.build()); // CraftBukkit
          RecipeManager.LOGGER.info("Loaded {} recipes", map1.size());
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 57bc78e1a189386443abb02744e88b2fdf803a95..911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8 100644
+index 57bc78e1a189386443abb02744e88b2fdf803a95..ef093604f001d3e899679f6d308780856f076193 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
+@@ -42,7 +42,7 @@ public class PalettedContainer<T> implements PaletteResize<T> {
+     }
+ 
+     public static <T> Codec<PalettedContainer<T>> codec(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy provider, T object) {
+-        return RecordCodecBuilder.create((instance) -> {
++        return RecordCodecBuilder.<DiscData<T>>create((instance) -> { // Paper - decompile fix
+             return instance.group(entryCodec.mapResult(ExtraCodecs.orElsePartial(object)).listOf().fieldOf("palette").forGetter(PalettedContainer.DiscData::paletteEntries), Codec.LONG_STREAM.optionalFieldOf("data").forGetter(PalettedContainer.DiscData::storage)).apply(instance, PalettedContainer.DiscData::new);
+         }).comapFlatMap((serialized) -> {
+             return read(idList, provider, serialized);
 @@ -278,10 +278,6 @@ public class PalettedContainer<T> implements PaletteResize<T> {
      }
  
@@ -243,3 +295,29 @@ index 57bc78e1a189386443abb02744e88b2fdf803a95..911bf2b7bbe627f98d21681b0c6d5b8a
      }
  
      public abstract static class Strategy {
+diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
+index 3864da01056970ae05cc3ca094f923178b4ffc97..e6b9f812e521abd552e0c7dc0429d5a62f2bfc35 100644
+--- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
++++ b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
+@@ -20,7 +20,7 @@ public class EntityLookup<T extends EntityAccess> {
+         for(T entityAccess : this.byId.values()) {
+             U entityAccess2 = (U)((EntityAccess)filter.tryCast(entityAccess));
+             if (entityAccess2 != null) {
+-                action.accept((T)entityAccess2);
++                action.accept(entityAccess2); // Paper - decompile fix
+             }
+         }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/entity/EntitySection.java b/src/main/java/net/minecraft/world/level/entity/EntitySection.java
+index e6b1663d4ccdd3842f711ad7547df8ccf973e4b1..524f3c42964eb83c9109bcc548a1075f1e295411 100644
+--- a/src/main/java/net/minecraft/world/level/entity/EntitySection.java
++++ b/src/main/java/net/minecraft/world/level/entity/EntitySection.java
+@@ -42,7 +42,7 @@ public class EntitySection<T extends EntityAccess> {
+             for(T entityAccess : collection) {
+                 U entityAccess2 = (U)((EntityAccess)type.tryCast(entityAccess));
+                 if (entityAccess2 != null && entityAccess.getBoundingBox().intersects(box)) {
+-                    action.accept((T)entityAccess2);
++                    action.accept(entityAccess2); // Paper - decompile fix
+                 }
+             }
+ 
diff --git a/patches/server/0874-Fix-missing-Level-LevelStem-in-StructureCheck-from-C.patch b/patches/server/0006-CB-fixes.patch
similarity index 89%
rename from patches/server/0874-Fix-missing-Level-LevelStem-in-StructureCheck-from-C.patch
rename to patches/server/0006-CB-fixes.patch
index dd5995cfbb..479ab4e27b 100644
--- a/patches/server/0874-Fix-missing-Level-LevelStem-in-StructureCheck-from-C.patch
+++ b/patches/server/0006-CB-fixes.patch
@@ -1,15 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 25 Feb 2022 07:14:48 -0800
-Subject: [PATCH] Fix missing Level -> LevelStem in StructureCheck from CB
+Subject: [PATCH] CB fixes
 
-Need to use the right for injectDatafixingContext
+* Missing Level -> LevelStem generic in StructureCheck
+  Need to use the right for injectDatafixingContext
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 19e0648c47733dc1973d6ff2ccba2ba6a25f48de..8e87aca16879d7dd1dc0bd17d3215fca40b547cd 100644
+index 1e9805b029abd8a59452b185af2eae8d1c9e7267..4c775aca50d8ff75c2c885bbf9fbbc6c8829d66f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -535,7 +535,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -273,7 +273,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          long l = minecraftserver.getWorldData().worldGenSettings().seed();
  
@@ -19,7 +20,7 @@ index 19e0648c47733dc1973d6ff2ccba2ba6a25f48de..8e87aca16879d7dd1dc0bd17d3215fca
          if (this.dimensionType().createDragonFight()) {
              this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenSettings().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-index ad7177615c7feedc416b543f635c4cd2f88814d0..84f04c91ca9b8dfbb8c2d3685d710cca7171d859 100644
+index 5862fd38fb2a5aeec0a63d001cc043aac62188bb..22e3ac8c5df5592e31ef3f00f102aa3a25e794b4 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
 @@ -45,7 +45,7 @@ public class StructureCheck {
diff --git a/patches/server/0006-MC-Utils.patch b/patches/server/0007-MC-Utils.patch
similarity index 99%
rename from patches/server/0006-MC-Utils.patch
rename to patches/server/0007-MC-Utils.patch
index 04cfaaa996..0127e28975 100644
--- a/patches/server/0006-MC-Utils.patch
+++ b/patches/server/0007-MC-Utils.patch
@@ -5893,7 +5893,7 @@ index 2015e527044db26bed960b2915b5422a7d7ad0e3..94d717f43336ace9375409b48d1e0e42
      @Override
      public ChunkAccess getChunk(int x, int z, ChunkStatus leastStatus, boolean create) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1e9805b029abd8a59452b185af2eae8d1c9e7267..71e01e8f7b1aa5b607ad37297dbc49e9953aa9be 100644
+index 4c775aca50d8ff75c2c885bbf9fbbc6c8829d66f..7564d58b7cbf48c2aaa2e6f823dc88122aecdd6c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -160,6 +160,7 @@ import org.bukkit.event.server.MapInitializeEvent;
diff --git a/patches/server/0007-Not-implemeneted.patch b/patches/server/0008-Not-implemeneted.patch
similarity index 100%
rename from patches/server/0007-Not-implemeneted.patch
rename to patches/server/0008-Not-implemeneted.patch
diff --git a/patches/server/0008-Paper-Metrics.patch b/patches/server/0009-Paper-Metrics.patch
similarity index 99%
rename from patches/server/0008-Paper-Metrics.patch
rename to patches/server/0009-Paper-Metrics.patch
index 234f6cde4c..d14e0f9a3e 100644
--- a/patches/server/0008-Paper-Metrics.patch
+++ b/patches/server/0009-Paper-Metrics.patch
@@ -690,7 +690,7 @@ index 0000000000000000000000000000000000000000..e3b74dbdf8e14219a56fab939f3174e0
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index e4368db074da7b5e48b47d41875c1e63b9745c2a..ed2627f76af277c9be23da3423542d6af0bff872 100644
+index 5c7b2850d311e4d54236ba9acce148bca05672fd..8c1bcf84e9a99af4f12c45c8f14ca1fa6cf3b1f1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -42,6 +42,7 @@ public class PaperConfig {
@@ -714,7 +714,7 @@ index e4368db074da7b5e48b47d41875c1e63b9745c2a..ed2627f76af277c9be23da3423542d6a
  
      static void readConfig(Class<?> clazz, Object instance) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 58c9ab2f6db97bfbf280efc56f9c9be791604a75..f8a9d6a394f796634e4663ef4078a4c98447e13c 100644
+index 43aa6b0129892b8ab8ec25c16a131541c6607487..9d3d65de7cb0be25aa7fc40353390280943b55f4 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -83,6 +83,7 @@ public class SpigotConfig
diff --git a/patches/server/0009-Add-MinecraftKey-Information-to-Objects.patch b/patches/server/0010-Add-MinecraftKey-Information-to-Objects.patch
similarity index 100%
rename from patches/server/0009-Add-MinecraftKey-Information-to-Objects.patch
rename to patches/server/0010-Add-MinecraftKey-Information-to-Objects.patch
diff --git a/patches/server/0010-Timings-v2.patch b/patches/server/0011-Timings-v2.patch
similarity index 99%
rename from patches/server/0010-Timings-v2.patch
rename to patches/server/0011-Timings-v2.patch
index bb4baaa451..6b9fec41f9 100644
--- a/patches/server/0010-Timings-v2.patch
+++ b/patches/server/0011-Timings-v2.patch
@@ -669,7 +669,7 @@ index 0000000000000000000000000000000000000000..0fda52841b5e1643efeda92106124998
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ed2627f76af277c9be23da3423542d6af0bff872..756a2ab6ad416f55fa3864cff9818473840b04fc 100644
+index 8c1bcf84e9a99af4f12c45c8f14ca1fa6cf3b1f1..cc4c008a99bf5a16614d445d2a5e75ce2d5dedb5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,12 +14,15 @@ import java.util.concurrent.TimeUnit;
@@ -1204,7 +1204,7 @@ index 94d717f43336ace9375409b48d1e0e4291072656..3bbee4d08f4125a6499c0a8790c6bda6
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 71e01e8f7b1aa5b607ad37297dbc49e9953aa9be..d491d91e639028fdf9ee75da849d3084b665d93c 100644
+index 7564d58b7cbf48c2aaa2e6f823dc88122aecdd6c..74571a05f8d69e068c615179782def0902b26a09 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1,6 +1,8 @@
diff --git a/patches/server/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0011-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0012-Adventure.patch b/patches/server/0013-Adventure.patch
similarity index 100%
rename from patches/server/0012-Adventure.patch
rename to patches/server/0013-Adventure.patch
diff --git a/patches/server/0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch
similarity index 100%
rename from patches/server/0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch
rename to patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch
diff --git a/patches/server/0014-Configurable-baby-zombie-movement-speed.patch b/patches/server/0015-Configurable-baby-zombie-movement-speed.patch
similarity index 97%
rename from patches/server/0014-Configurable-baby-zombie-movement-speed.patch
rename to patches/server/0015-Configurable-baby-zombie-movement-speed.patch
index 26c1e6b3b2..cbdf1e180c 100644
--- a/patches/server/0014-Configurable-baby-zombie-movement-speed.patch
+++ b/patches/server/0015-Configurable-baby-zombie-movement-speed.patch
@@ -25,7 +25,7 @@ index 791ccdebd5d37afd83eb87671034b3553e305f8f..ec3fb557fa31b153de20c4990066182a
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index a58d2945beb3ed72ea0fb49c0d63c56afdafdcc8..42f3f632caba1897b762a6897923585901a63bd1 100644
+index f83b3d750b97c987748b940b810d5a88ee355049..45cfbf30d27139036dee5379a88ed24a5cee51b4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -76,7 +76,7 @@ import org.bukkit.event.entity.EntityTransformEvent;
diff --git a/patches/server/0015-Configurable-fishing-time-ranges.patch b/patches/server/0016-Configurable-fishing-time-ranges.patch
similarity index 100%
rename from patches/server/0015-Configurable-fishing-time-ranges.patch
rename to patches/server/0016-Configurable-fishing-time-ranges.patch
diff --git a/patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
similarity index 97%
rename from patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
rename to patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
index 6da6ebc0b4..fa851d5d09 100644
--- a/patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
+++ b/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch
@@ -31,7 +31,7 @@ index 04692fe4e7f2107ffc8c48cebdf88e18e58f4ce9..8a4f4582a6bd69016a36d611f9c4ac22
          return this.isInWater() || this.isInRain() || this.isInBubbleColumn();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 711c130a6d725d8a7f2a77e74b51c6123d7856d2..84ac8d7dca08495c2d1be9901c59546245a84c11 100644
+index ee0bf9cd5da91bd5593e4e183084b5db77522cce..c180f80a1504ee10e1115d504dac36f4e62f2fb0 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -105,6 +105,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch
similarity index 97%
rename from patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch
rename to patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch
index a261d98c6b..8e7a6d618b 100644
--- a/patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch
+++ b/patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch
@@ -65,7 +65,7 @@ index 0a6e98ca5534430540044a32c280e5680ac9a28f..6ee62d06cc2b59c06d0f7acfb5938407
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 9cc9c11f2ef5aa386711a0ebc70b6a2d8e5c5b97..d5d79927aeab04d24010b53f9b527fa7b05d8a47 100644
+index c180f80a1504ee10e1115d504dac36f4e62f2fb0..fca40a6ec865589392911beaf07092b7d1c61a47 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -778,14 +778,14 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0018-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch
similarity index 100%
rename from patches/server/0018-Allow-for-toggling-of-spawn-chunks.patch
rename to patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/patches/server/0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch
similarity index 100%
rename from patches/server/0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch
rename to patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
similarity index 100%
rename from patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
rename to patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
diff --git a/patches/server/0021-Implement-Paper-VersionChecker.patch b/patches/server/0022-Implement-Paper-VersionChecker.patch
similarity index 98%
rename from patches/server/0021-Implement-Paper-VersionChecker.patch
rename to patches/server/0022-Implement-Paper-VersionChecker.patch
index a5f7c0e901..4161c24242 100644
--- a/patches/server/0021-Implement-Paper-VersionChecker.patch
+++ b/patches/server/0022-Implement-Paper-VersionChecker.patch
@@ -140,7 +140,7 @@ index 0000000000000000000000000000000000000000..91d7afc710a2d52b4f429e0381cf6417
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index aea6f16d767a7cc7934688b550376338c63fd807..330597270e4f224a9689fd9a3afcedba114abc52 100644
+index 964d15cd3b61a33868e5a9e38d21d97ec144bcad..286615b74c7e4ea3d162502c94884b46550eccee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -412,6 +412,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0022-Add-version-history-to-version-command.patch b/patches/server/0023-Add-version-history-to-version-command.patch
similarity index 100%
rename from patches/server/0022-Add-version-history-to-version-command.patch
rename to patches/server/0023-Add-version-history-to-version-command.patch
diff --git a/patches/server/0023-Player-affects-spawning-API.patch b/patches/server/0024-Player-affects-spawning-API.patch
similarity index 98%
rename from patches/server/0023-Player-affects-spawning-API.patch
rename to patches/server/0024-Player-affects-spawning-API.patch
index 21d0742213..d9ccce3ce5 100644
--- a/patches/server/0023-Player-affects-spawning-API.patch
+++ b/patches/server/0024-Player-affects-spawning-API.patch
@@ -21,7 +21,7 @@ index 5c3b11f738c1ea19981cc878aa6c2323497391a0..b91a61be7c4829fce0ff8da290eab580
      public static Predicate<Entity> withinDistance(double x, double y, double z, double max) {
          double d4 = max * max;
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 9b06b17c36b76447e75d0d790ba3e352442286da..321276281134ef692f9e50d21a84a135e09a0754 100644
+index fca40a6ec865589392911beaf07092b7d1c61a47..eb4b21802eefe91753caf509458fd6d9dd901c25 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -774,7 +774,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0024-Remove-invalid-mob-spawner-tile-entities.patch b/patches/server/0025-Remove-invalid-mob-spawner-tile-entities.patch
similarity index 93%
rename from patches/server/0024-Remove-invalid-mob-spawner-tile-entities.patch
rename to patches/server/0025-Remove-invalid-mob-spawner-tile-entities.patch
index 152ac8f644..017e6dda31 100644
--- a/patches/server/0024-Remove-invalid-mob-spawner-tile-entities.patch
+++ b/patches/server/0025-Remove-invalid-mob-spawner-tile-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove invalid mob spawner tile entities
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 127727c3b4b21c42c64b8616c9fccf7783a89a9c..ba10a0128852d1052db1b0527352019e308d81b2 100644
+index 5496c9ae4af9658164098356532da47351808b51..2ca41f90b6b50c254a6e34da00f287197c81d65e 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -543,6 +543,11 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0025-Further-improve-server-tick-loop.patch b/patches/server/0026-Further-improve-server-tick-loop.patch
similarity index 100%
rename from patches/server/0025-Further-improve-server-tick-loop.patch
rename to patches/server/0026-Further-improve-server-tick-loop.patch
diff --git a/patches/server/0026-Only-refresh-abilities-if-needed.patch b/patches/server/0027-Only-refresh-abilities-if-needed.patch
similarity index 100%
rename from patches/server/0026-Only-refresh-abilities-if-needed.patch
rename to patches/server/0027-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0027-Entity-Origin-API.patch b/patches/server/0028-Entity-Origin-API.patch
similarity index 98%
rename from patches/server/0027-Entity-Origin-API.patch
rename to patches/server/0028-Entity-Origin-API.patch
index 87895e2899..eea14e718a 100644
--- a/patches/server/0027-Entity-Origin-API.patch
+++ b/patches/server/0028-Entity-Origin-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d491d91e639028fdf9ee75da849d3084b665d93c..a377639517c5777e46e9a5cdbdc94b5b6a99eaa4 100644
+index 74571a05f8d69e068c615179782def0902b26a09..54416a9327ecb02627537306678122ae77da1239 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2023,6 +2023,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch b/patches/server/0029-Prevent-tile-entity-and-entity-crashes.patch
similarity index 100%
rename from patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch
rename to patches/server/0029-Prevent-tile-entity-and-entity-crashes.patch
diff --git a/patches/server/0029-Configurable-top-of-nether-void-damage.patch b/patches/server/0030-Configurable-top-of-nether-void-damage.patch
similarity index 100%
rename from patches/server/0029-Configurable-top-of-nether-void-damage.patch
rename to patches/server/0030-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0031-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 92%
rename from patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
rename to patches/server/0031-Check-online-mode-before-converting-and-renaming-pla.patch
index cc4f224bfd..64f713e616 100644
--- a/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch
+++ b/patches/server/0031-Check-online-mode-before-converting-and-renaming-pla.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Check online mode before converting and renaming player data
 
 
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 4dcdfda78966df2596b44f7e2d3b1d61c45f17af..7b367e273c2a6869f8d8929c24ee45efdf6d4b1e 100644
+index 86fb11e9e197357871d603c4f8ce778660d507cf..0132eb685dbcf3d3402096bd34513e91d2b20abd 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 @@ -56,7 +56,7 @@ public class PlayerDataStorage {
diff --git a/patches/server/0031-Always-tick-falling-blocks.patch b/patches/server/0032-Always-tick-falling-blocks.patch
similarity index 100%
rename from patches/server/0031-Always-tick-falling-blocks.patch
rename to patches/server/0032-Always-tick-falling-blocks.patch
diff --git a/patches/server/0032-Configurable-end-credits.patch b/patches/server/0033-Configurable-end-credits.patch
similarity index 94%
rename from patches/server/0032-Configurable-end-credits.patch
rename to patches/server/0033-Configurable-end-credits.patch
index 52ec36b67f..7090170d66 100644
--- a/patches/server/0032-Configurable-end-credits.patch
+++ b/patches/server/0033-Configurable-end-credits.patch
@@ -20,7 +20,7 @@ index 1b090f2e38a8857ef74403e1f3db8c2ba7127297..bc35bdd9cbd544ae2ab27ad042d7d1b3
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a3436596d05547a60c9906c92f709bb56a9175bd..88b6be62678fc09b5a39db28c6d71cc31b16dbcd 100644
+index 592b288c5ded992dc3fdf0db5ed0845884c5be93..fcbd7a78477ed51a91aee626ac62529f106a40cb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -974,6 +974,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0034-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 92%
rename from patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
rename to patches/server/0034-Fix-lag-from-explosions-processing-dead-entities.patch
index 072bdc0b22..1e41454268 100644
--- a/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch
+++ b/patches/server/0034-Fix-lag-from-explosions-processing-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index d2060ba62bebafce409e5ac64868abc5a5f98bcc..047864651dfbf009b66706e5cb0dd3d1749424bc 100644
+index 6929aca0759a090703c1c6ab4daffc069010bfbc..4be483b7a8138514f645909eb3e8ea9975c0f41c 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -208,7 +208,7 @@ public class Explosion {
diff --git a/patches/server/0034-Optimize-explosions.patch b/patches/server/0035-Optimize-explosions.patch
similarity index 100%
rename from patches/server/0034-Optimize-explosions.patch
rename to patches/server/0035-Optimize-explosions.patch
diff --git a/patches/server/0035-Disable-explosion-knockback.patch b/patches/server/0036-Disable-explosion-knockback.patch
similarity index 100%
rename from patches/server/0035-Disable-explosion-knockback.patch
rename to patches/server/0036-Disable-explosion-knockback.patch
diff --git a/patches/server/0036-Disable-thunder.patch b/patches/server/0037-Disable-thunder.patch
similarity index 95%
rename from patches/server/0036-Disable-thunder.patch
rename to patches/server/0037-Disable-thunder.patch
index 92963f611f..59050743e6 100644
--- a/patches/server/0036-Disable-thunder.patch
+++ b/patches/server/0037-Disable-thunder.patch
@@ -19,7 +19,7 @@ index 5cae4a5caf9aba8c0e99f1cb6badc5e8374862c8..1a9b4b08ea906adbfa25c3963a463487
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a377639517c5777e46e9a5cdbdc94b5b6a99eaa4..59dccc9b33452f6692cddf39056b2640529d2d28 100644
+index 54416a9327ecb02627537306678122ae77da1239..b8942266379e5e513b1a814906db3b7f96c4284f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -561,7 +561,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0037-Disable-ice-and-snow.patch b/patches/server/0038-Disable-ice-and-snow.patch
similarity index 94%
rename from patches/server/0037-Disable-ice-and-snow.patch
rename to patches/server/0038-Disable-ice-and-snow.patch
index 47b153a759..5a6d654b24 100644
--- a/patches/server/0037-Disable-ice-and-snow.patch
+++ b/patches/server/0038-Disable-ice-and-snow.patch
@@ -19,7 +19,7 @@ index 1a9b4b08ea906adbfa25c3963a4634871d7ca2f6..ceb1602afb90fc0a23d6cc8d22fc85fa
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 59dccc9b33452f6692cddf39056b2640529d2d28..6c2e53cf3c3fa5bf2df38d4e87e4d0ee52f3c088 100644
+index b8942266379e5e513b1a814906db3b7f96c4284f..5c6ba29dfd786098528d7e118c3059c9d75a9c42 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -585,7 +585,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0038-Configurable-mob-spawner-tick-rate.patch b/patches/server/0039-Configurable-mob-spawner-tick-rate.patch
similarity index 96%
rename from patches/server/0038-Configurable-mob-spawner-tick-rate.patch
rename to patches/server/0039-Configurable-mob-spawner-tick-rate.patch
index 326ab817e1..dfef31d530 100644
--- a/patches/server/0038-Configurable-mob-spawner-tick-rate.patch
+++ b/patches/server/0039-Configurable-mob-spawner-tick-rate.patch
@@ -19,7 +19,7 @@ index ceb1602afb90fc0a23d6cc8d22fc85fab3b8da14..e7b7f0a1a35f782a0da4627b4f02e673
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 08d9980a5b9b26f7dbdfcb6cda7a3995d58bea81..cdf226ee2ba179fde5229e44f22463bcc339601b 100644
+index 31bfc0c491c9a4cc6782b6c284121f96972517ea..6aab3df317a9612da9b83284aa6056f0c7cf436c 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -42,6 +42,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0040-Implement-PlayerLocaleChangeEvent.patch
similarity index 96%
rename from patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
rename to patches/server/0040-Implement-PlayerLocaleChangeEvent.patch
index c94badc2a3..511a5fe002 100644
--- a/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0040-Implement-PlayerLocaleChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 88b6be62678fc09b5a39db28c6d71cc31b16dbcd..352bfe795aea26307de9c998d67a43af3e4845f0 100644
+index fcbd7a78477ed51a91aee626ac62529f106a40cb..e3e9f082102d16a8e16df3b35772430c6d102243 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1727,7 +1727,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch b/patches/server/0041-Per-Player-View-Distance-API-placeholders.patch
similarity index 100%
rename from patches/server/0040-Per-Player-View-Distance-API-placeholders.patch
rename to patches/server/0041-Per-Player-View-Distance-API-placeholders.patch
diff --git a/patches/server/0041-Add-BeaconEffectEvent.patch b/patches/server/0042-Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0041-Add-BeaconEffectEvent.patch
rename to patches/server/0042-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0042-Configurable-container-update-tick-rate.patch b/patches/server/0043-Configurable-container-update-tick-rate.patch
similarity index 100%
rename from patches/server/0042-Configurable-container-update-tick-rate.patch
rename to patches/server/0043-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0043-Use-UserCache-for-player-heads.patch b/patches/server/0044-Use-UserCache-for-player-heads.patch
similarity index 100%
rename from patches/server/0043-Use-UserCache-for-player-heads.patch
rename to patches/server/0044-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0044-Disable-spigot-tick-limiters.patch b/patches/server/0045-Disable-spigot-tick-limiters.patch
similarity index 100%
rename from patches/server/0044-Disable-spigot-tick-limiters.patch
rename to patches/server/0045-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0045-Add-PlayerInitialSpawnEvent.patch b/patches/server/0046-Add-PlayerInitialSpawnEvent.patch
similarity index 95%
rename from patches/server/0045-Add-PlayerInitialSpawnEvent.patch
rename to patches/server/0046-Add-PlayerInitialSpawnEvent.patch
index df343f7d9e..d685e6d5c0 100644
--- a/patches/server/0045-Add-PlayerInitialSpawnEvent.patch
+++ b/patches/server/0046-Add-PlayerInitialSpawnEvent.patch
@@ -9,7 +9,7 @@ This is a duplicate API from spigot, so use our duplicate subclass and
 improve setPosition to use raw
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1cfeaeeddbc97e28f51c79ab3082a5d387daaead..db52eb4df917c9ad3ba807e40f1d44ea9c52aae8 100644
+index bfec1beb0af39e2af6be7c6423bf1eaab32e1062..8e331babd8fdeba77aa3707b7e2e08591fa0d546 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -217,7 +217,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0047-Configurable-Disabling-Cat-Chest-Detection.patch
similarity index 100%
rename from patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch
rename to patches/server/0047-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0047-Ensure-commands-are-not-ran-async.patch b/patches/server/0048-Ensure-commands-are-not-ran-async.patch
similarity index 100%
rename from patches/server/0047-Ensure-commands-are-not-ran-async.patch
rename to patches/server/0048-Ensure-commands-are-not-ran-async.patch
diff --git a/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0049-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 100%
rename from patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to patches/server/0049-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0049-Expose-server-CommandMap.patch b/patches/server/0050-Expose-server-CommandMap.patch
similarity index 100%
rename from patches/server/0049-Expose-server-CommandMap.patch
rename to patches/server/0050-Expose-server-CommandMap.patch
diff --git a/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0051-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 100%
rename from patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to patches/server/0051-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch b/patches/server/0052-Ensure-inv-drag-is-in-bounds.patch
similarity index 92%
rename from patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
rename to patches/server/0052-Ensure-inv-drag-is-in-bounds.patch
index 024166601f..942b4ab775 100644
--- a/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch
+++ b/patches/server/0052-Ensure-inv-drag-is-in-bounds.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index dd3bd4a87e240d09f5c9cda7ec83d19a009042e3..b42ef24e9851ae1bd1313110cfe59ad424d21535 100644
+index 3c00795a4196de1429e7086b0f9cbf9671726b07..52f890fb91041757e6b8cba8831c890cbe9e111d 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -418,7 +418,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0052-Player-Tab-List-and-Title-APIs.patch b/patches/server/0053-Player-Tab-List-and-Title-APIs.patch
similarity index 98%
rename from patches/server/0052-Player-Tab-List-and-Title-APIs.patch
rename to patches/server/0053-Player-Tab-List-and-Title-APIs.patch
index b713f4aaae..b58b05d23e 100644
--- a/patches/server/0052-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/server/0053-Player-Tab-List-and-Title-APIs.patch
@@ -63,7 +63,7 @@ index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a4
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fe27669d525c84d9f8d828dfcde1c35e3ecb7a49..523746b698d38494f0fa76b026d50e3d9d411c54 100644
+index ea80d73cf2f5703579dba6f331d9a29d310570f2..81b5c2c0df4944732c99aaee3b325f6c7052ad99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0053-Add-configurable-portal-search-radius.patch b/patches/server/0054-Add-configurable-portal-search-radius.patch
similarity index 100%
rename from patches/server/0053-Add-configurable-portal-search-radius.patch
rename to patches/server/0054-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0054-Add-velocity-warnings.patch b/patches/server/0055-Add-velocity-warnings.patch
similarity index 100%
rename from patches/server/0054-Add-velocity-warnings.patch
rename to patches/server/0055-Add-velocity-warnings.patch
diff --git a/patches/server/0055-Configurable-inter-world-teleportation-safety.patch b/patches/server/0056-Configurable-inter-world-teleportation-safety.patch
similarity index 100%
rename from patches/server/0055-Configurable-inter-world-teleportation-safety.patch
rename to patches/server/0056-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0056-Add-exception-reporting-event.patch b/patches/server/0057-Add-exception-reporting-event.patch
similarity index 100%
rename from patches/server/0056-Add-exception-reporting-event.patch
rename to patches/server/0057-Add-exception-reporting-event.patch
diff --git a/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/server/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
similarity index 93%
rename from patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
rename to patches/server/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
index 0fbaf13f1e..c569f0e66c 100644
--- a/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/patches/server/0058-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text
 
 
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
-index 1f5050e6c1d932aa196ab9524f7f1f9bd1b45fce..a64780b4b49d01322d8f755ff540a9622c89e983 100644
+index f4f52e43852d2b0b56770c3f747a655a3a6dd683..8b0d452b12d5eca1f92e2cdf014118e215407b31 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundChatPacket.java
 @@ -36,7 +36,14 @@ public class ClientboundChatPacket implements Packet<ClientGamePacketListener> {
diff --git a/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0059-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 100%
rename from patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch
rename to patches/server/0059-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/server/0060-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0060-Chunk-Save-Reattempt.patch b/patches/server/0061-Chunk-Save-Reattempt.patch
similarity index 96%
rename from patches/server/0060-Chunk-Save-Reattempt.patch
rename to patches/server/0061-Chunk-Save-Reattempt.patch
index c611a992c9..82a269b220 100644
--- a/patches/server/0060-Chunk-Save-Reattempt.patch
+++ b/patches/server/0061-Chunk-Save-Reattempt.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index 9f3223947d2fcc1aaf259effe6afce7a47888858..7b69007609ed421ee72ddc3d6f2a7b64888babf1 100644
+index fbf5f01a9a7968194fc85589ca7f9fa328da4881..2d74ab966a1291895b6248a67a31fe4802b3773f 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -274,7 +274,7 @@ public class RegionFile implements AutoCloseable {
diff --git a/patches/server/0061-Complete-resource-pack-API.patch b/patches/server/0062-Complete-resource-pack-API.patch
similarity index 100%
rename from patches/server/0061-Complete-resource-pack-API.patch
rename to patches/server/0062-Complete-resource-pack-API.patch
diff --git a/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0063-Default-loading-permissions.yml-before-plugins.patch
similarity index 96%
rename from patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
rename to patches/server/0063-Default-loading-permissions.yml-before-plugins.patch
index c66666dfb2..c0ef04654f 100644
--- a/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch
+++ b/patches/server/0063-Default-loading-permissions.yml-before-plugins.patch
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 701a2ffd04df48d437b2cb963dd150af99725b6e..817d4572c9991992b720b3ba163188ac0e5b59b7 100644
+index 043fd38598e36bb96e6d3ab1ab0966435c9aa61b..768581056d228303937814af2421ecad732d3132 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -234,4 +234,9 @@ public class PaperConfig {
diff --git a/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0064-Allow-Reloading-of-Custom-Permissions.patch
similarity index 100%
rename from patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch
rename to patches/server/0064-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0064-Remove-Metadata-on-reload.patch b/patches/server/0065-Remove-Metadata-on-reload.patch
similarity index 100%
rename from patches/server/0064-Remove-Metadata-on-reload.patch
rename to patches/server/0065-Remove-Metadata-on-reload.patch
diff --git a/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0066-Handle-Item-Meta-Inconsistencies.patch
similarity index 100%
rename from patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
rename to patches/server/0066-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0067-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 100%
rename from patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to patches/server/0067-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0067-Add-World-Util-Methods.patch b/patches/server/0068-Add-World-Util-Methods.patch
similarity index 96%
rename from patches/server/0067-Add-World-Util-Methods.patch
rename to patches/server/0068-Add-World-Util-Methods.patch
index 8e25454902..01e0d5c51d 100644
--- a/patches/server/0067-Add-World-Util-Methods.patch
+++ b/patches/server/0068-Add-World-Util-Methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6c2e53cf3c3fa5bf2df38d4e87e4d0ee52f3c088..d1b9e82b9c4b90a96d2ae8930b8e33e8d1a55bdb 100644
+index 5c6ba29dfd786098528d7e118c3059c9d75a9c42..0507e0fdbc2aae621a8078a939ad10b5dab33f64 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -209,7 +209,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0068-Custom-replacement-for-eaten-items.patch b/patches/server/0069-Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/server/0068-Custom-replacement-for-eaten-items.patch
rename to patches/server/0069-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0070-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 100%
rename from patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to patches/server/0070-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0070-Use-a-Shared-Random-for-Entities.patch b/patches/server/0071-Use-a-Shared-Random-for-Entities.patch
similarity index 100%
rename from patches/server/0070-Use-a-Shared-Random-for-Entities.patch
rename to patches/server/0071-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0072-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 96%
rename from patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
rename to patches/server/0072-Configurable-spawn-chances-for-skeleton-horses.patch
index 166b4d09e3..6fd7e8e734 100644
--- a/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0072-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -22,7 +22,7 @@ index 71c672eafdce3547eaeb8e31fddcb142ad213094..aa8cd5965632626e4cbd4952acf9b349
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d1b9e82b9c4b90a96d2ae8930b8e33e8d1a55bdb..d9198cf7aff9b1c0f05277fb9f1a3276e2292775 100644
+index 0507e0fdbc2aae621a8078a939ad10b5dab33f64..04816aea9c3a9e999851694fc8485ead586520f8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -565,7 +565,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0073-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 100%
rename from patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0073-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 98%
rename from patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to patches/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index ef34955e43..25ba7d8965 100644
--- a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -18,7 +18,7 @@ index 26646df983507bfb1d75a7a3a9f4c12c7bf9fd49..99478fe8f16783e7d2ae128f32199fa4
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d9198cf7aff9b1c0f05277fb9f1a3276e2292775..ca7c4a297e577bf9f0bf9cfd88a56ad87ac88684 100644
+index 04816aea9c3a9e999851694fc8485ead586520f8..06c182e04e1e046d8e5623d5422a2732cbfec78b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -208,6 +208,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 92%
rename from patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch
index d1ce4c7244..5950957dd2 100644
--- a/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/server/0075-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ca7c4a297e577bf9f0bf9cfd88a56ad87ac88684..22ba7b534c450a4f9e608c331344e948a0fbf1f9 100644
+index 06c182e04e1e046d8e5623d5422a2732cbfec78b..0fa1a31c1595d504ac4d78ab4f5047dc8f1a063a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2033,6 +2033,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0076-Configurable-Chunk-Inhabited-Time.patch
similarity index 96%
rename from patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
rename to patches/server/0076-Configurable-Chunk-Inhabited-Time.patch
index d6631cf697..d50f3875c6 100644
--- a/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch
+++ b/patches/server/0076-Configurable-Chunk-Inhabited-Time.patch
@@ -30,7 +30,7 @@ index aa8cd5965632626e4cbd4952acf9b349f79b2b1c..e7534ed3f995be64c99399ab76e98086
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 327b513c75e75d4b07d3c3b6deda9d1d00b6cd7f..2e04012bdea67baee7c541a9006a99cd4f454e79 100644
+index aff826fb06a16adac8173efcaad0da1724db95c4..3ecb007cf0ae781a2a68ca0a190616daf3e4aa88 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -281,6 +281,13 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0076-EntityPathfindEvent.patch b/patches/server/0077-EntityPathfindEvent.patch
similarity index 98%
rename from patches/server/0076-EntityPathfindEvent.patch
rename to patches/server/0077-EntityPathfindEvent.patch
index 0657e6b613..44aaa32494 100644
--- a/patches/server/0076-EntityPathfindEvent.patch
+++ b/patches/server/0077-EntityPathfindEvent.patch
@@ -32,7 +32,7 @@ index a9fd90d5282bd013e031b9d7481e3f777d6892c6..a6f8ca71ba5d107cfbd24b8e8a225195
  
      private int getSurfaceY() {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index 6b47e7abe63c196ab17c5816fdb4f79a89225178..4335bd9d6413d56326be573f7c07c8cd0503d352 100644
+index 0ed51ff1607277801ddf307984bb3b776ed74816..66a2813b0b4fc321d24dde4d51dbf2dc81e6149d 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 @@ -10,6 +10,7 @@ import net.minecraft.core.BlockPos;
diff --git a/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 95%
rename from patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
rename to patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch
index bf47765c75..3cd51d8e26 100644
--- a/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/patches/server/0078-Sanitise-RegionFileCache-and-make-configurable.patch
@@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 817d4572c9991992b720b3ba163188ac0e5b59b7..01da2246c70237676597b3e70e3e169ab1132071 100644
+index 768581056d228303937814af2421ecad732d3132..2c43db4094f0a5a450eadcf342c8e5107ff053da 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -239,4 +239,9 @@ public class PaperConfig {
diff --git a/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0079-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch
rename to patches/server/0079-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0080-Add-PlayerUseUnknownEntityEvent.patch
similarity index 97%
rename from patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
rename to patches/server/0080-Add-PlayerUseUnknownEntityEvent.patch
index 31423cadc5..da2c587acd 100644
--- a/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0080-Add-PlayerUseUnknownEntityEvent.patch
@@ -20,7 +20,7 @@ index 8834ed411a7db86b4d2b88183a1315317107d719..c45b5ab6776f3ac79f856c3a6467c510
      static final ServerboundInteractPacket.Action ATTACK_ACTION = new ServerboundInteractPacket.Action() {
          @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8125b2d736594018e89bb3be32262f5e1e8791d5..024f6b5bf84a4e55f6237107ae8f8958caa9ef72 100644
+index 0429a019d8f25dc9df6c3a9d7e28eea739431a71..8e976184215b2db7684bb0488e4a8124b5dedde0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2219,8 +2219,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0081-Configurable-Grass-Spread-Tick-Rate.patch
similarity index 100%
rename from patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch
rename to patches/server/0081-Configurable-Grass-Spread-Tick-Rate.patch
diff --git a/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 100%
rename from patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to patches/server/0082-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
diff --git a/patches/server/0082-Optimize-DataBits.patch b/patches/server/0083-Optimize-DataBits.patch
similarity index 100%
rename from patches/server/0082-Optimize-DataBits.patch
rename to patches/server/0083-Optimize-DataBits.patch
diff --git a/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to patches/server/0084-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0084-Workaround-for-setting-passengers-on-players.patch b/patches/server/0085-Workaround-for-setting-passengers-on-players.patch
similarity index 100%
rename from patches/server/0084-Workaround-for-setting-passengers-on-players.patch
rename to patches/server/0085-Workaround-for-setting-passengers-on-players.patch
diff --git a/patches/server/0085-Configurable-Player-Collision.patch b/patches/server/0086-Configurable-Player-Collision.patch
similarity index 98%
rename from patches/server/0085-Configurable-Player-Collision.patch
rename to patches/server/0086-Configurable-Player-Collision.patch
index 430487b50f..d21c24db19 100644
--- a/patches/server/0085-Configurable-Player-Collision.patch
+++ b/patches/server/0086-Configurable-Player-Collision.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 01da2246c70237676597b3e70e3e169ab1132071..c8242aa5b4a896111b23de60fa120ec6be06d0ca 100644
+index 2c43db4094f0a5a450eadcf342c8e5107ff053da..13debcbff95b26f17677db876a23cff33825c881 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -244,4 +244,9 @@ public class PaperConfig {
diff --git a/patches/server/0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/server/0086-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/server/0087-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0087-Configurable-RCON-IP-address.patch b/patches/server/0088-Configurable-RCON-IP-address.patch
similarity index 100%
rename from patches/server/0087-Configurable-RCON-IP-address.patch
rename to patches/server/0088-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/server/0088-EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/server/0089-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0089-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from patches/server/0089-Add-ability-to-configure-frosted_ice-properties.patch
rename to patches/server/0090-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0090-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0091-remove-null-possibility-for-getServer-singleton.patch
similarity index 100%
rename from patches/server/0090-remove-null-possibility-for-getServer-singleton.patch
rename to patches/server/0091-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 98%
rename from patches/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 2efbd75ff6..a79e71b55b 100644
--- a/patches/server/0091-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0092-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 22ba7b534c450a4f9e608c331344e948a0fbf1f9..8672a2d9a62f091cae06073d57428766efc643bd 100644
+index 0fa1a31c1595d504ac4d78ab4f5047dc8f1a063a..c0ec21a8110ed54489361cfae1e1112fe448150a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2053,6 +2053,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch
similarity index 99%
rename from patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch
rename to patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch
index 53c04628e4..897d43d9c2 100644
--- a/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/patches/server/0093-LootTable-API-Replenishable-Lootables-Feature.patch
@@ -515,7 +515,7 @@ index 0000000000000000000000000000000000000000..3377b86c337d0234bbb9b0349e4034a7
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f12e282dc4683d0430b9dba552757c4da5dee988..6f33e481e70a7b34a25d1413079288ca59b058c1 100644
+index 8e746391d6e3393a19e0f0cb3b28b6722df55510..6436ab09944ba1bec7f9ae011078898ac4d55f9e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -170,6 +170,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 89%
rename from patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
index 624ef0f40d..dceeebf8fc 100644
--- a/patches/server/0093-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/patches/server/0094-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c8242aa5b4a896111b23de60fa120ec6be06d0ca..c6ca15a5cc53995ca0ada9c9ac9dc1d084963eb5 100644
+index 13debcbff95b26f17677db876a23cff33825c881..a037c09a7616874d26b2a8eda9ebc795b8266431 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -249,4 +249,9 @@ public class PaperConfig {
@@ -19,7 +19,7 @@ index c8242aa5b4a896111b23de60fa120ec6be06d0ca..c6ca15a5cc53995ca0ada9c9ac9dc1d0
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
-index 819cd341c4e352a75c38a0ed48097170ddd53082..79683676311d0e13383887db5cb8638f13a0af94 100644
+index b837b6616a2384b253cca8ed62c9488b639f6298..0efb63d1a4cefede25712daf9cea0f5c3256980f 100644
 --- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 +++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 @@ -136,6 +136,7 @@ public class ScoreboardSaveData extends SavedData {
diff --git a/patches/server/0094-System-property-for-disabling-watchdoge.patch b/patches/server/0095-System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from patches/server/0094-System-property-for-disabling-watchdoge.patch
rename to patches/server/0095-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0095-Optimize-UserCache-Thread-Safe.patch b/patches/server/0096-Optimize-UserCache-Thread-Safe.patch
similarity index 100%
rename from patches/server/0095-Optimize-UserCache-Thread-Safe.patch
rename to patches/server/0096-Optimize-UserCache-Thread-Safe.patch
diff --git a/patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch
similarity index 97%
rename from patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch
rename to patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch
index a2f12a8015..64982119f2 100644
--- a/patches/server/0096-Optional-TNT-doesn-t-move-in-water.patch
+++ b/patches/server/0097-Optional-TNT-doesn-t-move-in-water.patch
@@ -24,7 +24,7 @@ index 7661e41950c38bce94a2c7de4269ba6ebb2f6c52..d7734fbc6b684b14bc32c94e65947fb4
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 28210d31d10de624aba1aeb30b99f3f576d5c4e6..3d27cbf5e9105def2f38525a85da5acf8ebf8fe9 100644
+index c9cc096183753d61d9f53ceca05af07c04bbff3b..861f3790179e18f6192ac8b2fb5d2ecbc54484ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -67,7 +67,7 @@ public class ServerEntity {
diff --git a/patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 100%
rename from patches/server/0097-Faster-redstone-torch-rapid-clock-removal.patch
rename to patches/server/0098-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0098-Add-server-name-parameter.patch b/patches/server/0099-Add-server-name-parameter.patch
similarity index 90%
rename from patches/server/0098-Add-server-name-parameter.patch
rename to patches/server/0099-Add-server-name-parameter.patch
index 041f0bc305..b7f8d47734 100644
--- a/patches/server/0098-Add-server-name-parameter.patch
+++ b/patches/server/0099-Add-server-name-parameter.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index e6362865d1e7beac23e520ebd2deb8a356428045..60ccdf33a014f3488353045e30526bc3f16e93c5 100644
+index 1ea304aaf85ada7737f62248f7b8cd44c800505e..ff36d930a5fade32942a11f378d1c187f8f9f01a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -149,6 +149,14 @@ public class Main {
diff --git a/patches/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/server/0100-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
similarity index 100%
rename from patches/server/0099-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
rename to patches/server/0100-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
diff --git a/patches/server/0100-Fix-Old-Sign-Conversion.patch b/patches/server/0101-Fix-Old-Sign-Conversion.patch
similarity index 100%
rename from patches/server/0100-Fix-Old-Sign-Conversion.patch
rename to patches/server/0101-Fix-Old-Sign-Conversion.patch
diff --git a/patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 96%
rename from patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
rename to patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch
index b1b718f6ff..56a2d048af 100644
--- a/patches/server/0101-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 4a392a95b6fc3cb4d4186bdc0632d10d1a90b9b1..526e07d8ea21af42c271bee4da5bccd766227006 100644
+index 522aa6a0b4b365a78cf3fce2604d71fb88d30388..e174d9803e557470068f7893260d55a042888517 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -61,6 +61,15 @@ public class ServerConnectionListener {
diff --git a/patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 92%
rename from patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
index f50b799b0c..fc115189d5 100644
--- a/patches/server/0102-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
 
 
 diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-index e8515f4ed1f29ba926bc4ab6d918722aee450ac2..6914ab77fc868844c391ac41ba2d344a26012208 100644
+index 981845707f47a674a912bf84509397a42b973e74..920a1ded577aa1c265137dd72a6f3d13a431d5c8 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
 @@ -101,7 +101,7 @@ public class GameProfileCache {
diff --git a/patches/server/0103-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0104-Add-setting-for-proxy-online-mode-status.patch
similarity index 97%
rename from patches/server/0103-Add-setting-for-proxy-online-mode-status.patch
rename to patches/server/0104-Add-setting-for-proxy-online-mode-status.patch
index c84f4c5ce2..1216d49789 100644
--- a/patches/server/0103-Add-setting-for-proxy-online-mode-status.patch
+++ b/patches/server/0104-Add-setting-for-proxy-online-mode-status.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add setting for proxy online mode status
 TODO: Add isProxyOnlineMode check to Metrics
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c6ca15a5cc53995ca0ada9c9ac9dc1d084963eb5..728835cddd413d778e9628360989724f65335b46 100644
+index a037c09a7616874d26b2a8eda9ebc795b8266431..2ec11634242ada8cbcf3bc2a15a56e59d219039a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -23,6 +23,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
diff --git a/patches/server/0104-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0105-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/0104-Optimise-BlockState-s-hashCode-equals.patch
rename to patches/server/0105-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0105-Configurable-packet-in-spam-threshold.patch b/patches/server/0106-Configurable-packet-in-spam-threshold.patch
similarity index 92%
rename from patches/server/0105-Configurable-packet-in-spam-threshold.patch
rename to patches/server/0106-Configurable-packet-in-spam-threshold.patch
index 1be2ad9b6a..3c2a821fff 100644
--- a/patches/server/0105-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0106-Configurable-packet-in-spam-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 728835cddd413d778e9628360989724f65335b46..6c13fe725ca2b2a6f0f375b80f6c2cb643b9913d 100644
+index 2ec11634242ada8cbcf3bc2a15a56e59d219039a..06894c03b1d584c533355b3c4174b7fb05d67bc2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -264,4 +264,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 728835cddd413d778e9628360989724f65335b46..6c13fe725ca2b2a6f0f375b80f6c2cb6
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 024f6b5bf84a4e55f6237107ae8f8958caa9ef72..6547de3f54ac69af84430d0277f156adacdaa3e7 100644
+index 8e976184215b2db7684bb0488e4a8124b5dedde0..350a8194ef52242be6a70a16d2692e17216178fb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1502,13 +1502,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0106-Configurable-flying-kick-messages.patch b/patches/server/0107-Configurable-flying-kick-messages.patch
similarity index 93%
rename from patches/server/0106-Configurable-flying-kick-messages.patch
rename to patches/server/0107-Configurable-flying-kick-messages.patch
index fa67571d72..668ae68266 100644
--- a/patches/server/0106-Configurable-flying-kick-messages.patch
+++ b/patches/server/0107-Configurable-flying-kick-messages.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6c13fe725ca2b2a6f0f375b80f6c2cb643b9913d..5e23ff0c5e44427a996281ae42fc12c28649e158 100644
+index 06894c03b1d584c533355b3c4174b7fb05d67bc2..7612ee9bb6877dea0ff83d03f393180048ff960c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -273,4 +273,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 6c13fe725ca2b2a6f0f375b80f6c2cb643b9913d..5e23ff0c5e44427a996281ae42fc12c2
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6547de3f54ac69af84430d0277f156adacdaa3e7..df5282a1bb7d685f0f322f5976d8cf7d31abed49 100644
+index 350a8194ef52242be6a70a16d2692e17216178fb..47d8ae1eb7edea51a81ddfaef3cd1c4b06ad12a3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -300,7 +300,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/patches/server/0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
similarity index 100%
rename from patches/server/0107-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
rename to patches/server/0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
diff --git a/patches/server/0108-Option-to-remove-corrupt-tile-entities.patch b/patches/server/0109-Option-to-remove-corrupt-tile-entities.patch
similarity index 95%
rename from patches/server/0108-Option-to-remove-corrupt-tile-entities.patch
rename to patches/server/0109-Option-to-remove-corrupt-tile-entities.patch
index 8c6b0cb363..f250660200 100644
--- a/patches/server/0108-Option-to-remove-corrupt-tile-entities.patch
+++ b/patches/server/0109-Option-to-remove-corrupt-tile-entities.patch
@@ -19,7 +19,7 @@ index d7734fbc6b684b14bc32c94e65947fb41aae126a..80345730b8ccc11d3d0833485d25b03f
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 614e3255394a0988bcb19afaf066b1c2322ca1f0..6611affe664150139780ac596eab698c8843490c 100644
+index 3ecb007cf0ae781a2a68ca0a190616daf3e4aa88..e9436ab14bac2b5267239bcb27ad450d93c680e4 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -259,7 +259,7 @@ public class LevelChunk extends ChunkAccess {
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0110-Add-EntityZapEvent.patch
similarity index 100%
rename from patches/server/0109-Add-EntityZapEvent.patch
rename to patches/server/0110-Add-EntityZapEvent.patch
diff --git a/patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/server/0111-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
similarity index 100%
rename from patches/server/0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
rename to patches/server/0111-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
diff --git a/patches/server/0111-Cache-user-authenticator-threads.patch b/patches/server/0112-Cache-user-authenticator-threads.patch
similarity index 100%
rename from patches/server/0111-Cache-user-authenticator-threads.patch
rename to patches/server/0112-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from patches/server/0112-Allow-Reloading-of-Command-Aliases.patch
rename to patches/server/0113-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0114-Don-t-let-fishinghooks-use-portals.patch b/patches/server/0115-Don-t-let-fishinghooks-use-portals.patch
similarity index 100%
rename from patches/server/0114-Don-t-let-fishinghooks-use-portals.patch
rename to patches/server/0115-Don-t-let-fishinghooks-use-portals.patch
diff --git a/patches/server/0115-Add-ProjectileCollideEvent.patch b/patches/server/0116-Add-ProjectileCollideEvent.patch
similarity index 98%
rename from patches/server/0115-Add-ProjectileCollideEvent.patch
rename to patches/server/0116-Add-ProjectileCollideEvent.patch
index c000fcc907..4aba55165d 100644
--- a/patches/server/0115-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0116-Add-ProjectileCollideEvent.patch
@@ -27,7 +27,7 @@ index 68b15e3061e1e8637a34ee5e0f0953dd23645f49..91505b592e95240e0dc71a17906ab48f
                      this.preOnHit((HitResult) object); // CraftBukkit - projectile hit event
                      this.hasImpulse = true;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-index fc37e18f02b27f76244da3363e6c31d000b8e2e6..3370f4d331637bf13c7912218041f23872971e25 100644
+index 02b0622d23521090a0725e2b24cc1231e416ba0c..3de3258418f638a1b523c6a9178bb3ef1aaf2915 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 @@ -11,6 +11,7 @@ import net.minecraft.world.entity.Entity;
diff --git a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0117-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 94%
rename from patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/server/0117-Prevent-Pathfinding-out-of-World-Border.patch
index a1262e3eaa..df13150cc1 100644
--- a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/patches/server/0117-Prevent-Pathfinding-out-of-World-Border.patch
@@ -13,7 +13,7 @@ by adding code to all overrides in:
 to return BLOCKED if it is outside the world border.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
-index 4335bd9d6413d56326be573f7c07c8cd0503d352..9fba89aa8b1c257cdc3a63a5bd137320d66a37ec 100644
+index 66a2813b0b4fc321d24dde4d51dbf2dc81e6149d..7991baa181d60ac037fd859278d00274ddb42be8 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
 @@ -155,7 +155,7 @@ public abstract class PathNavigation {
diff --git a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0118-Optimize-World.isLoaded-BlockPosition-Z.patch
similarity index 100%
rename from patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch
rename to patches/server/0118-Optimize-World.isLoaded-BlockPosition-Z.patch
diff --git a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0119-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch
rename to patches/server/0119-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0120-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch
rename to patches/server/0120-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0120-Optimize-ItemStack.isEmpty.patch b/patches/server/0121-Optimize-ItemStack.isEmpty.patch
similarity index 100%
rename from patches/server/0120-Optimize-ItemStack.isEmpty.patch
rename to patches/server/0121-Optimize-ItemStack.isEmpty.patch
diff --git a/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0122-Add-API-methods-to-control-if-armour-stands-can-move.patch
similarity index 100%
rename from patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch
rename to patches/server/0122-Add-API-methods-to-control-if-armour-stands-can-move.patch
diff --git a/patches/server/0122-String-based-Action-Bar-API.patch b/patches/server/0123-String-based-Action-Bar-API.patch
similarity index 96%
rename from patches/server/0122-String-based-Action-Bar-API.patch
rename to patches/server/0123-String-based-Action-Bar-API.patch
index 24b7df5ba8..0a5ec8d756 100644
--- a/patches/server/0122-String-based-Action-Bar-API.patch
+++ b/patches/server/0123-String-based-Action-Bar-API.patch
@@ -26,7 +26,7 @@ index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e168bc5a3a3dcab404023ebe16ea90e380d6b38c..e7798e4fbfd0b9e882356e6df30ada0e1b174c56 100644
+index 796060044c0b8e479e93a35de886b31aab24e1b4..f1c8202428cd8b13c9f7a17365c701ac0e6c7ccf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -267,6 +267,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0123-Properly-fix-item-duplication-bug.patch b/patches/server/0124-Properly-fix-item-duplication-bug.patch
similarity index 94%
rename from patches/server/0123-Properly-fix-item-duplication-bug.patch
rename to patches/server/0124-Properly-fix-item-duplication-bug.patch
index c4ab6603a8..14109ddfd2 100644
--- a/patches/server/0123-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0124-Properly-fix-item-duplication-bug.patch
@@ -19,7 +19,7 @@ index fa3344c71a9715ad465f39be92cb724368ae2b03..2fbe90ba893393e04b72b9feeff5f6be
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index df5282a1bb7d685f0f322f5976d8cf7d31abed49..0b15188c1357926f72265411eb776726a5aa21f6 100644
+index 47d8ae1eb7edea51a81ddfaef3cd1c4b06ad12a3..6995539a536f0019839a177ffb6e633c8013a8fb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2845,7 +2845,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0124-Firework-API-s.patch b/patches/server/0125-Firework-API-s.patch
similarity index 100%
rename from patches/server/0124-Firework-API-s.patch
rename to patches/server/0125-Firework-API-s.patch
diff --git a/patches/server/0125-PlayerTeleportEndGatewayEvent.patch b/patches/server/0126-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0125-PlayerTeleportEndGatewayEvent.patch
rename to patches/server/0126-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 97%
rename from patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
index 5cd92db02e..676ea3eba3 100644
--- a/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -20,7 +20,7 @@ index 567cc347af00eed98fdf8832ef6c9468332b94e4..d22b7edc9ddea765c11e82346afd3942
      private boolean tickingBlockEntities;
      public final Thread thread;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 48812a4fe0c12689dd9d7829019cdf70e0bda65b..e90773c4824edf29a553827dd986209b2dd3f985 100644
+index 4c2aad1db5a4f82e5fa5c187cb58e8c675b4d697..7d65bed4a6571594b5d47e4debd01813a272814e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -144,6 +144,57 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0127-Enforce-Sync-Player-Saves.patch b/patches/server/0128-Enforce-Sync-Player-Saves.patch
similarity index 92%
rename from patches/server/0127-Enforce-Sync-Player-Saves.patch
rename to patches/server/0128-Enforce-Sync-Player-Saves.patch
index 7fdf166b85..99d1138169 100644
--- a/patches/server/0127-Enforce-Sync-Player-Saves.patch
+++ b/patches/server/0128-Enforce-Sync-Player-Saves.patch
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e4ebac252ac25bd51acfc6a0e9513c96ef4cfd95..79290edb6014027e1ceb34f21ee9f1220fe74784 100644
+index 5a7ca495a78f33e5449d47ce71dbf9b11678551f..288a046b8335a611e0c7a155a6d0565e6f7c272a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1036,11 +1036,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0129-Don-t-allow-entities-to-ride-themselves-572.patch
similarity index 90%
rename from patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
rename to patches/server/0129-Don-t-allow-entities-to-ride-themselves-572.patch
index 038c5c2f94..fc09d5c627 100644
--- a/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/patches/server/0129-Don-t-allow-entities-to-ride-themselves-572.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6f33e481e70a7b34a25d1413079288ca59b058c1..5a98227902dfd87cda7c046f6fde0aeb4462353f 100644
+index 6436ab09944ba1bec7f9ae011078898ac4d55f9e..d6501d075b090abb8166dfda10c80d63b67d8e42 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2260,6 +2260,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0130-Cap-Entity-Collisions.patch b/patches/server/0131-Cap-Entity-Collisions.patch
similarity index 96%
rename from patches/server/0130-Cap-Entity-Collisions.patch
rename to patches/server/0131-Cap-Entity-Collisions.patch
index 916e6315f0..0a0dccc30b 100644
--- a/patches/server/0130-Cap-Entity-Collisions.patch
+++ b/patches/server/0131-Cap-Entity-Collisions.patch
@@ -27,7 +27,7 @@ index f383f30b9dd1a7c6cf69d342f99118beec70b206..47b717e8741bb2b8f3aa776dcdc73a3e
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5a98227902dfd87cda7c046f6fde0aeb4462353f..9bf0d7dca8abee27ca5757bc3e56c723d910623b 100644
+index d6501d075b090abb8166dfda10c80d63b67d8e42..357f10f8daa93e0222ced3e9b9c5930ad0a5658c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0132-Do-not-let-armorstands-drown.patch b/patches/server/0133-Do-not-let-armorstands-drown.patch
similarity index 100%
rename from patches/server/0132-Do-not-let-armorstands-drown.patch
rename to patches/server/0133-Do-not-let-armorstands-drown.patch
diff --git a/patches/server/0133-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/server/0134-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
similarity index 100%
rename from patches/server/0133-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
rename to patches/server/0134-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
diff --git a/patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0135-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0135-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 97%
rename from patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index 19ee876167..5d03b7cafd 100644
--- a/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0136-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -26,7 +26,7 @@ index 47b717e8741bb2b8f3aa776dcdc73a3e7dbb5960..9dad1efab44b8a23f274aa89c85944d9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0b15188c1357926f72265411eb776726a5aa21f6..00ab2135a53aecfe327d4fe95073db89936038a8 100644
+index 6995539a536f0019839a177ffb6e633c8013a8fb..da776d740ca0e684a08d7df58e50f862eb031ee7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2069,6 +2069,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 94%
rename from patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch
index 00da544c8d..8d9c35a5e0 100644
--- a/patches/server/0136-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5e23ff0c5e44427a996281ae42fc12c28649e158..7a69f9d9bb9c05474d8fbab22d626529a41a66a1 100644
+index 7612ee9bb6877dea0ff83d03f393180048ff960c..352cec8559923189dcea5c97066ef2f90cc4023b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -280,4 +280,9 @@ public class PaperConfig {
diff --git a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch
similarity index 99%
rename from patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
rename to patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch
index cd5ce96e3c..fd6fc933a9 100644
--- a/patches/server/0137-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0138-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c1f97f5bb806e3c92a2b4633142d3214e11f7074..03e00ea0e09e1b368d5803e094366fe7c38c6270 100644
+index 9d0639f65cf4e7bd8febbab69a01fe71c0e8d67e..e7eca424ffa81f60a08a2ab655e085bd3e49983c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,7 +12,17 @@ repositories {
diff --git a/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 90%
rename from patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch
index d7ff436899..2a9095c87f 100644
--- a/patches/server/0138-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/patches/server/0139-provide-a-configurable-option-to-disable-creeper-lin.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 506539188aa1a2c7aa21b8ba3e0769a09d6ad134..9884d11cef96630dbb1f2b82bc02bcb5cebcd91b 100644
+index 9dad1efab44b8a23f274aa89c85944d98e9a6c51..99d09ff7e9eea776f8c78eda3e89a9613a722172 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -382,4 +382,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 506539188aa1a2c7aa21b8ba3e0769a09d6ad134..9884d11cef96630dbb1f2b82bc02bcb5
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 4a7e25481a382bc06ff022a17a590e08eac398d6..638b80006138ca7be44abfa69f31eccb2035ffac 100644
+index 7a5eea3a2eaff5e08589fc240307da2beb44c307..e74bd467f6b2fe26d7798abbe089a6311c42be64 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -281,7 +281,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0139-Item-canEntityPickup.patch b/patches/server/0140-Item-canEntityPickup.patch
similarity index 92%
rename from patches/server/0139-Item-canEntityPickup.patch
rename to patches/server/0140-Item-canEntityPickup.patch
index e93bdc0b90..8256bd986b 100644
--- a/patches/server/0139-Item-canEntityPickup.patch
+++ b/patches/server/0140-Item-canEntityPickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index a2310dc7b045d4e4c3924d656a4dcf0a1d66c095..3eda6821d12bf616037f6c00815602428afbcdaf 100644
+index eb4b21802eefe91753caf509458fd6d9dd901c25..c98b28c563faf68e9bc3176f51ed7f50aa9bd6a4 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -622,6 +622,11 @@ public abstract class Mob extends LivingEntity {
@@ -21,7 +21,7 @@ index a2310dc7b045d4e4c3924d656a4dcf0a1d66c095..3eda6821d12bf616037f6c0081560242
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 8d3242a1436b0622d0aebb0a61a447ddf5819273..6df6204c9d4099afeb8ff07dd747f756d8e380d6 100644
+index 1f9e1a7284a02ba7486cf9d1b1498a7799b8d3da..e5c97ffc4ceafcda2939d28fdc7cd729cf902db4 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -52,6 +52,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/0140-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0141-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0141-PlayerAttemptPickupItemEvent.patch b/patches/server/0142-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/0141-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0142-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0142-Add-UnknownCommandEvent.patch b/patches/server/0143-Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/server/0142-Add-UnknownCommandEvent.patch
rename to patches/server/0143-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0143-Basic-PlayerProfile-API.patch b/patches/server/0144-Basic-PlayerProfile-API.patch
similarity index 100%
rename from patches/server/0143-Basic-PlayerProfile-API.patch
rename to patches/server/0144-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0144-Shoulder-Entities-Release-API.patch b/patches/server/0145-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/server/0144-Shoulder-Entities-Release-API.patch
rename to patches/server/0145-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0145-Profile-Lookup-Events.patch b/patches/server/0146-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0145-Profile-Lookup-Events.patch
rename to patches/server/0146-Profile-Lookup-Events.patch
diff --git a/patches/server/0146-Block-player-logins-during-server-shutdown.patch b/patches/server/0147-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from patches/server/0146-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0147-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0147-Entity-fromMobSpawner.patch b/patches/server/0148-Entity-fromMobSpawner.patch
similarity index 94%
rename from patches/server/0147-Entity-fromMobSpawner.patch
rename to patches/server/0148-Entity-fromMobSpawner.patch
index e2fce80f26..012ca3be7c 100644
--- a/patches/server/0147-Entity-fromMobSpawner.patch
+++ b/patches/server/0148-Entity-fromMobSpawner.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9bf0d7dca8abee27ca5757bc3e56c723d910623b..4473197fdcad7e6026797c6f494c4e2a90c2fb36 100644
+index 357f10f8daa93e0222ced3e9b9c5930ad0a5658c..d9e2cf70c4fcbf2d02a8bba00be28528df76b645 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -318,6 +318,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -49,7 +49,7 @@ index 6aab3df317a9612da9b83284aa6056f0c7cf436c..38abf49a86b0d33c6069c6a2b95edeb6
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
                              Entity vehicle = entity.getVehicle();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 4ebd7609ec2bf62586feef4da7605dbb89569567..2fe32de341258c31682ed7f55adf0c6be1328713 100644
+index 1e0b8314ef388763aa43055909e48778f0d421a3..5cc9370d31434f28730a44263e013e474413d534 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1200,5 +1200,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0149-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0149-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0149-Implement-ensureServerConversions-API.patch b/patches/server/0150-Implement-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0149-Implement-ensureServerConversions-API.patch
rename to patches/server/0150-Implement-ensureServerConversions-API.patch
diff --git a/patches/server/0150-Implement-getI18NDisplayName.patch b/patches/server/0151-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0150-Implement-getI18NDisplayName.patch
rename to patches/server/0151-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0151-ProfileWhitelistVerifyEvent.patch b/patches/server/0152-ProfileWhitelistVerifyEvent.patch
similarity index 97%
rename from patches/server/0151-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0152-ProfileWhitelistVerifyEvent.patch
index b84cd77bca..02967097cc 100644
--- a/patches/server/0151-ProfileWhitelistVerifyEvent.patch
+++ b/patches/server/0152-ProfileWhitelistVerifyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 093b510293fdad471fd3dc9727b50699ae9bac8f..6466a0b03a0e398fdf580d97cdfdf1e612f2ade3 100644
+index 03fc0bca0c1a11db43d315236ca05dfea137ddb3..a1ca0c0c08f6793ce3440733f802a40f99890d85 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -615,9 +615,9 @@ public abstract class PlayerList {
diff --git a/patches/server/0152-Fix-this-stupid-bullshit.patch b/patches/server/0153-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from patches/server/0152-Fix-this-stupid-bullshit.patch
rename to patches/server/0153-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0153-LivingEntity-setKiller.patch b/patches/server/0154-LivingEntity-setKiller.patch
similarity index 100%
rename from patches/server/0153-LivingEntity-setKiller.patch
rename to patches/server/0154-LivingEntity-setKiller.patch
diff --git a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0155-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 92%
rename from patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
index e3e77a0454..9b68ceeb8c 100644
--- a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/patches/server/0156-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 1c5865ee2a9f3b142d92d63c19ffd785ffcf1235..9c27f69f5b8e95ee56428a597e67dc4e8beb6d29 100644
+index 38abf49a86b0d33c6069c6a2b95edeb6c7019eb4..5bf68b03ddfc7c9554c467e2c0588084a796f6fa 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -158,6 +158,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 96%
rename from patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch
index bc877ef713..1f8cc40cfa 100644
--- a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/patches/server/0157-Allow-specifying-a-custom-authentication-servers-dow.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7a69f9d9bb9c05474d8fbab22d626529a41a66a1..f4735cc330822183e098a67f2c0f00f21db9e137 100644
+index 352cec8559923189dcea5c97066ef2f90cc4023b..71288ac78dc0adb4fdb692d3f69debbff84ffa74 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 97%
rename from patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to patches/server/0158-Handle-plugin-prefixes-using-Log4J-configuration.patch
index 49291a0748..61939161b7 100644
--- a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/patches/server/0158-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 03e00ea0e09e1b368d5803e094366fe7c38c6270..31c19767848a3f7c1ef2c95d40d395950dff6fd5 100644
+index e7eca424ffa81f60a08a2ab655e085bd3e49983c..541357dff44a3ce86b6adf807c0e43df11b012ef 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -21,7 +21,7 @@ dependencies {
diff --git a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to patches/server/0159-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/patches/server/0159-Add-PlayerJumpEvent.patch b/patches/server/0160-Add-PlayerJumpEvent.patch
similarity index 96%
rename from patches/server/0159-Add-PlayerJumpEvent.patch
rename to patches/server/0160-Add-PlayerJumpEvent.patch
index 663d4b1380..f0cf6a0226 100644
--- a/patches/server/0159-Add-PlayerJumpEvent.patch
+++ b/patches/server/0160-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 00ab2135a53aecfe327d4fe95073db89936038a8..fb95c76877437710a5a89e8dfcbaa5cea27bda76 100644
+index da776d740ca0e684a08d7df58e50f862eb031ee7..e0e00be58d4cb36b1cde2aa329fc10a0adc91b27 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1185,7 +1185,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch
similarity index 95%
rename from patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
rename to patches/server/0161-handle-PacketPlayInKeepAlive-async.patch
index f76e611e05..3c93d62b38 100644
--- a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
+++ b/patches/server/0161-handle-PacketPlayInKeepAlive-async.patch
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fb95c76877437710a5a89e8dfcbaa5cea27bda76..4a4a478e8964a9cec8bc61e2435333415b449f8c 100644
+index e0e00be58d4cb36b1cde2aa329fc10a0adc91b27..f75027fc9f6457fbf46c97a381729ff043a1b413 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2804,14 +2804,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch
similarity index 97%
rename from patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch
index 6131023aab..1040586e1a 100644
--- a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch
+++ b/patches/server/0162-Expose-client-protocol-version-and-virtual-host.patch
@@ -90,7 +90,7 @@ index 27d304316bec097fea4b950cb4e0ac80cb219f70..85fea9b0bf84a8b40098f35eac503070
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e7798e4fbfd0b9e882356e6df30ada0e1b174c56..5cd36bb3b83cd553bc16f5f24f7ece07d5003ff9 100644
+index f1c8202428cd8b13c9f7a17365c701ac0e6c7ccf..8d439a7e901eb18e6e9b606ad71d9fd487743217 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -211,6 +211,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch b/patches/server/0163-revert-serverside-behavior-of-keepalives.patch
similarity index 98%
rename from patches/server/0162-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0163-revert-serverside-behavior-of-keepalives.patch
index 924168458a..fa656de035 100644
--- a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0163-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 4a4a478e8964a9cec8bc61e2435333415b449f8c..e6cbeccfc1a471783c1b60bcb49df934b82fd36e 100644
+index f75027fc9f6457fbf46c97a381729ff043a1b413..44e4cd2a3039be132ca5f03759801456b3290f72 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -221,9 +221,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0164-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0164-Add-PlayerArmorChangeEvent.patch b/patches/server/0165-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from patches/server/0164-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0165-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0166-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
similarity index 100%
rename from patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch
rename to patches/server/0167-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0168-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0169-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0169-AsyncTabCompleteEvent.patch b/patches/server/0170-AsyncTabCompleteEvent.patch
similarity index 98%
rename from patches/server/0169-AsyncTabCompleteEvent.patch
rename to patches/server/0170-AsyncTabCompleteEvent.patch
index 931c03d7e3..e380d580e6 100644
--- a/patches/server/0169-AsyncTabCompleteEvent.patch
+++ b/patches/server/0170-AsyncTabCompleteEvent.patch
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e6cbeccfc1a471783c1b60bcb49df934b82fd36e..fe414f1f84407574f6cae4f83c9e30caa7b16e33 100644
+index 44e4cd2a3039be132ca5f03759801456b3290f72..4c89828089ddb8fbee78643df7d3b82d1a68f8f9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -707,10 +707,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0170-PlayerPickupExperienceEvent.patch b/patches/server/0171-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0170-PlayerPickupExperienceEvent.patch
rename to patches/server/0171-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0172-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/server/0171-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0172-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0173-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/server/0174-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0173-PreCreatureSpawnEvent.patch
rename to patches/server/0174-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0174-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0174-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0175-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0175-Fill-Profile-Property-Events.patch b/patches/server/0176-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0175-Fill-Profile-Property-Events.patch
rename to patches/server/0176-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
similarity index 92%
rename from patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
index 2db6d486c2..24c1ee0c73 100644
--- a/patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch
+++ b/patches/server/0177-PlayerAdvancementCriterionGrantEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index f26bdd3d6eb0ae38c1d7b50f29942fcf2207e3a1..3d82f984648605d58fae3c57f145d0da8a2ae225 100644
+index e5ffc18cbd107b9fd20a9781f6f1979e9598378f..ecd62d2625bc5def3ac68f642f2c6f156060f129 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
 @@ -277,6 +277,12 @@ public class PlayerAdvancements {
diff --git a/patches/server/0177-Add-ArmorStand-Item-Meta.patch b/patches/server/0178-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0177-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0178-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0178-Extend-Player-Interact-cancellation.patch b/patches/server/0179-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0178-Extend-Player-Interact-cancellation.patch
rename to patches/server/0179-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0179-Tameable-getOwnerUniqueId-API.patch b/patches/server/0180-Tameable-getOwnerUniqueId-API.patch
similarity index 94%
rename from patches/server/0179-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0180-Tameable-getOwnerUniqueId-API.patch
index 842a58904b..7fca628e8a 100644
--- a/patches/server/0179-Tameable-getOwnerUniqueId-API.patch
+++ b/patches/server/0180-Tameable-getOwnerUniqueId-API.patch
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 6151df2086d92fd5f428e2efe0df8d1c154ff891..32c7dc33ac0a41902bc841692a8b64b18e4355b6 100644
+index a5202ee012034678efbbd5ca1eccf2fd72a315bd..254d4f2e45d7c8f572a4368eccd84560d4d0d836 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -89,6 +89,10 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
diff --git a/patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to patches/server/0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0182-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0182-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/0182-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0183-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to patches/server/0184-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/patches/server/0184-Player.setPlayerProfile-API.patch b/patches/server/0185-Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/server/0184-Player.setPlayerProfile-API.patch
rename to patches/server/0185-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0185-getPlayerUniqueId-API.patch b/patches/server/0186-getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/server/0185-getPlayerUniqueId-API.patch
rename to patches/server/0186-getPlayerUniqueId-API.patch
diff --git a/patches/server/0186-Improved-Async-Task-Scheduler.patch b/patches/server/0187-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0186-Improved-Async-Task-Scheduler.patch
rename to patches/server/0187-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0187-Upstream-config-migrations.patch b/patches/server/0188-Upstream-config-migrations.patch
similarity index 94%
rename from patches/server/0187-Upstream-config-migrations.patch
rename to patches/server/0188-Upstream-config-migrations.patch
index 2a716b1a99..3862808878 100644
--- a/patches/server/0187-Upstream-config-migrations.patch
+++ b/patches/server/0188-Upstream-config-migrations.patch
@@ -7,7 +7,7 @@ This patch contains config migrations for when upstream adds options
 which Paper already had.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f4735cc330822183e098a67f2c0f00f21db9e137..806b612d3c9ca1dd76be88170b3268ca45acef63 100644
+index 71288ac78dc0adb4fdb692d3f69debbff84ffa74..61d6c4ed39fb7d3ebdeafd8f84fa2f40f3714201 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -291,4 +291,23 @@ public class PaperConfig {
diff --git a/patches/server/0188-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0188-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0189-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0189-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0189-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0190-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0190-Flag-to-disable-the-channel-limit.patch b/patches/server/0191-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from patches/server/0190-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0191-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0191-Add-openSign-method-to-HumanEntity.patch b/patches/server/0192-Add-openSign-method-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0191-Add-openSign-method-to-HumanEntity.patch
rename to patches/server/0192-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0192-Configurable-sprint-interruption-on-attack.patch b/patches/server/0193-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0192-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0193-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 93%
rename from patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 7b727ce6f2..3ae32a1206 100644
--- a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fe414f1f84407574f6cae4f83c9e30caa7b16e33..9854706d1645a5c04e7ba636cf6f139b1ac4c453 100644
+index 4c89828089ddb8fbee78643df7d3b82d1a68f8f9..a0d7f02bf8765733521fa144c80cf48c6593f91c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2810,9 +2810,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0194-EndermanEscapeEvent.patch b/patches/server/0195-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0194-EndermanEscapeEvent.patch
rename to patches/server/0195-EndermanEscapeEvent.patch
diff --git a/patches/server/0195-Enderman.teleportRandomly.patch b/patches/server/0196-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0195-Enderman.teleportRandomly.patch
rename to patches/server/0196-Enderman.teleportRandomly.patch
diff --git a/patches/server/0196-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
similarity index 97%
rename from patches/server/0196-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0197-Block-Enderpearl-Travel-Exploit.patch
index fdee8c7467..44f44d156a 100644
--- a/patches/server/0196-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0197-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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 861f9d6a42dbcc5a96c24b29b4bb80a450a69665..d74c86f401c0161ac139f0dfd789d03bc616fe3b 100644
+index a9706dcb41a05fa69b5f7fa939d9fe02f6bfacd8..8fc56818a2ba1aed73b8dda4da04ecac748c6ae6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -398,4 +398,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0197-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 95%
rename from patches/server/0197-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
index 780f0a1b93..e3f03cae84 100644
--- a/patches/server/0197-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0198-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8672a2d9a62f091cae06073d57428766efc643bd..c38f6d789eea3bde1a71b14c3d070b000a9a297e 100644
+index c0ec21a8110ed54489361cfae1e1112fe448150a..7c64fbdaa8724fafd0bba6fcab581760ec0e0b0d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1386,12 +1386,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -34,7 +34,7 @@ index 8672a2d9a62f091cae06073d57428766efc643bd..c38f6d789eea3bde1a71b14c3d070b00
  
              if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e90773c4824edf29a553827dd986209b2dd3f985..681b91f047566c7b2220a2f30e11a55b7338dffe 100644
+index 7d65bed4a6571594b5d47e4debd01813a272814e..bd1157ee7e721876824f66cc72dc90c3e49871ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1812,11 +1812,17 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from patches/server/0198-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to patches/server/0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/patches/server/0199-EndermanAttackPlayerEvent.patch b/patches/server/0200-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0199-EndermanAttackPlayerEvent.patch
rename to patches/server/0200-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0200-WitchConsumePotionEvent.patch b/patches/server/0201-WitchConsumePotionEvent.patch
similarity index 93%
rename from patches/server/0200-WitchConsumePotionEvent.patch
rename to patches/server/0201-WitchConsumePotionEvent.patch
index ce2524108d..f054a8dd3c 100644
--- a/patches/server/0200-WitchConsumePotionEvent.patch
+++ b/patches/server/0201-WitchConsumePotionEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 2ea39decbd22c57952cded4c368ab475e6a37230..cf6f38b8d76e319c299bbcc960b860eb404a13ab 100644
+index 1b9d1262f60224819dcd77acf09798bfc1895369..312726d7d9030146b0db432493b2efbd5e42847a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -123,7 +123,11 @@ public class Witch extends Raider implements RangedAttackMob {
diff --git a/patches/server/0201-WitchThrowPotionEvent.patch b/patches/server/0202-WitchThrowPotionEvent.patch
similarity index 94%
rename from patches/server/0201-WitchThrowPotionEvent.patch
rename to patches/server/0202-WitchThrowPotionEvent.patch
index e856c38cf5..86ba404bc1 100644
--- a/patches/server/0201-WitchThrowPotionEvent.patch
+++ b/patches/server/0202-WitchThrowPotionEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index cf6f38b8d76e319c299bbcc960b860eb404a13ab..bab4988c3170429f5b050d0c7aa96a70002680c5 100644
+index 312726d7d9030146b0db432493b2efbd5e42847a..5a3bc20015ec188debd0703654b734baf20aa52a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -235,9 +235,16 @@ public class Witch extends Raider implements RangedAttackMob {
diff --git a/patches/server/0202-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from patches/server/0202-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to patches/server/0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/patches/server/0203-WitchReadyPotionEvent.patch b/patches/server/0204-WitchReadyPotionEvent.patch
similarity index 93%
rename from patches/server/0203-WitchReadyPotionEvent.patch
rename to patches/server/0204-WitchReadyPotionEvent.patch
index 3ca0af95ee..99ac9dce10 100644
--- a/patches/server/0203-WitchReadyPotionEvent.patch
+++ b/patches/server/0204-WitchReadyPotionEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index bab4988c3170429f5b050d0c7aa96a70002680c5..75c863c2cf365c321e401e05f564518be3a7b949 100644
+index 5a3bc20015ec188debd0703654b734baf20aa52a..1ee8fec8f9f581fa68497ebf4f90aad9d425ec71 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -156,7 +156,11 @@ public class Witch extends Raider implements RangedAttackMob {
diff --git a/patches/server/0204-ItemStack-getMaxItemUseDuration.patch b/patches/server/0205-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0204-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0205-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0205-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0205-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0206-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 89%
rename from patches/server/0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index b254cbac71..462155cf04 100644
--- a/patches/server/0206-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0207-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 638b80006138ca7be44abfa69f31eccb2035ffac..bf7ddca34c8d9834a5b923fab30a605afa5f337a 100644
+index e74bd467f6b2fe26d7798abbe089a6311c42be64..951654626a9eaa8d8cc4044f98b0931097e848e0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -272,6 +272,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0207-Fix-CraftEntity-hashCode.patch b/patches/server/0208-Fix-CraftEntity-hashCode.patch
similarity index 94%
rename from patches/server/0207-Fix-CraftEntity-hashCode.patch
rename to patches/server/0208-Fix-CraftEntity-hashCode.patch
index 85567a1480..ae135df932 100644
--- a/patches/server/0207-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0208-Fix-CraftEntity-hashCode.patch
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 2fe32de341258c31682ed7f55adf0c6be1328713..e496a346b12497e5e0834e0bc523c2221b45cab7 100644
+index 5cc9370d31434f28730a44263e013e474413d534..20c753f5819652430e4fe7b9e3fd4a4b16fc3647 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -795,14 +795,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0208-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 97%
rename from patches/server/0208-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
index add9499f1f..ec29fc37b1 100644
--- a/patches/server/0208-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/server/0209-Configurable-Alternative-LootPool-Luck-Formula.patch
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 806b612d3c9ca1dd76be88170b3268ca45acef63..915e2c5b0ffbd0d459a203e1bfb131be4c5476d4 100644
+index 61d6c4ed39fb7d3ebdeafd8f84fa2f40f3714201..e933d54c309da046554029d1f232daa31659e537 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -310,4 +310,12 @@ public class PaperConfig {
diff --git a/patches/server/0209-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 90%
rename from patches/server/0209-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
index eed7562471..1fa6aa9aac 100644
--- a/patches/server/0209-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/server/0210-Print-Error-details-when-failing-to-save-player-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Print Error details when failing to save player data
 
 
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 7b367e273c2a6869f8d8929c24ee45efdf6d4b1e..6727468946ea5f60bd80549f827a7c2b9a42b98b 100644
+index 0132eb685dbcf3d3402096bd34513e91d2b20abd..d785efd61caa2237e05d9ce3dbf84d86076ff047 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 @@ -43,7 +43,7 @@ public class PlayerDataStorage {
diff --git a/patches/server/0210-Make-shield-blocking-delay-configurable.patch b/patches/server/0211-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/server/0210-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0211-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0211-Improve-EntityShootBowEvent.patch b/patches/server/0212-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0211-Improve-EntityShootBowEvent.patch
rename to patches/server/0212-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0212-PlayerReadyArrowEvent.patch b/patches/server/0213-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0212-PlayerReadyArrowEvent.patch
rename to patches/server/0213-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
similarity index 98%
rename from patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch
rename to patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
index 4d962853a5..fb2d62ff7e 100644
--- a/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/server/0214-Implement-EntityKnockbackByEntityEvent.patch
@@ -56,7 +56,7 @@ index 04ba5e773e2e1ecd54023370e986c4c85e54cde5..7436cf1b9cce14494bd514cb7f4ed035
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index dddbc0497c9c6547c025162b0e6fcd865bff464c..d8af0c5977964b8953550120b69ed50198abf114 100644
+index c98b28c563faf68e9bc3176f51ed7f50aa9bd6a4..0dd63184ffc9a4f25261344600336679c902e2ec 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1554,7 +1554,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0214-Expand-Explosions-API.patch b/patches/server/0215-Expand-Explosions-API.patch
similarity index 93%
rename from patches/server/0214-Expand-Explosions-API.patch
rename to patches/server/0215-Expand-Explosions-API.patch
index 8b1566f618..ad6eb3d960 100644
--- a/patches/server/0214-Expand-Explosions-API.patch
+++ b/patches/server/0215-Expand-Explosions-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 681b91f047566c7b2220a2f30e11a55b7338dffe..2ccf2315478f6809d4eddffc481c72c3dc618b4d 100644
+index bd1157ee7e721876824f66cc72dc90c3e49871ce..7c11de1cf5c1df6b1658147fe25eb67802c3899f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -700,6 +700,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0215-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0215-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0216-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0216-RangedEntity-API.patch b/patches/server/0217-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0216-RangedEntity-API.patch
rename to patches/server/0217-RangedEntity-API.patch
diff --git a/patches/server/0217-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 90%
rename from patches/server/0217-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
index ddbcd4e087..7f54e199ca 100644
--- a/patches/server/0217-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0218-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 97ad6c164281df845b3789e68287157c2a3d8ee8..825f8de6f5a6f6221724ba35dde265aadb15e4e8 100644
+index 1e9ffb5bc5c9d74c07be14435eb29ef998943814..e203647884c20a8512a0aebdbad3488939226a8c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -409,4 +409,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 97ad6c164281df845b3789e68287157c2a3d8ee8..825f8de6f5a6f6221724ba35dde265aa
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 2b7ffbc125d01db093a31ed6147fc1d736a01e80..9a6b2c75b8622b0f9eda85011ef6f2f1dca574c9 100644
+index 794a26485850626964a6ce968577348b60fe0042..f713a1fefb0d8505672d653cf67ead13e321144f 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -88,6 +88,10 @@ public class EndDragonFight {
diff --git a/patches/server/0218-Implement-World.getEntity-UUID-API.patch b/patches/server/0219-Implement-World.getEntity-UUID-API.patch
similarity index 91%
rename from patches/server/0218-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0219-Implement-World.getEntity-UUID-API.patch
index d5832ace14..23976b68fb 100644
--- a/patches/server/0218-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0219-Implement-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2ccf2315478f6809d4eddffc481c72c3dc618b4d..15455d7be314d32cbda7adede326b33d3306c349 100644
+index 7c11de1cf5c1df6b1658147fe25eb67802c3899f..a50f95940f1992ef6512a79d17b10cf51013f7f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1034,6 +1034,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0219-InventoryCloseEvent-Reason-API.patch b/patches/server/0220-InventoryCloseEvent-Reason-API.patch
similarity index 99%
rename from patches/server/0219-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0220-InventoryCloseEvent-Reason-API.patch
index bc01c3f96d..07e4f74d4e 100644
--- a/patches/server/0219-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0220-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c38f6d789eea3bde1a71b14c3d070b000a9a297e..b2a4fd52eeead4dd2e20cfab47acc9d3fcabab98 100644
+index 7c64fbdaa8724fafd0bba6fcab581760ec0e0b0d..d4a09cbaac906c766c55577551e539c9840d8d03 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1133,7 +1133,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0220-Vex-get-setSummoner-API.patch b/patches/server/0221-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0220-Vex-get-setSummoner-API.patch
rename to patches/server/0221-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 94%
rename from patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index cc6541e4cb..d75952d217 100644
--- a/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0222-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1be8c731ab7019a2f93d0b32facbe05fb23371d2..27526c1c1b21369fe8ca0f1541a15562555922b5 100644
+index b280cb3250928367efa02cd1d9ce1607e6fb547d..dced761b1f74de28a784dfcffed1bbc002e5a586 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2234,6 +2234,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 92%
rename from patches/server/0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index c8fc08e944..c0afe840a5 100644
--- a/patches/server/0222-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/patches/server/0223-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index db42d22f58df5daefc41720206405dda4f7ad633..2716fb59e83e2e2bca845bd1b58c5aefb7aa89a0 100644
+index 943c2bd2a0836eda5b4da382c459ade6cbe40fea..b374d50678e92fabbf1d640729a8a276fc791c62 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -222,6 +222,10 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0223-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 95%
rename from patches/server/0223-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0224-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
index 9ae2453670..7c24570379 100644
--- a/patches/server/0223-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
+++ b/patches/server/0224-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 8cec9cdfc2708153e8d37a7d52a15fd47dc21dcd..125630037713c4790636ffd11b14b2c1d83a085a 100644
+index 541357dff44a3ce86b6adf807c0e43df11b012ef..80c533bc8966e4f9d7b19ef98faf04146d14be7d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -28,6 +28,7 @@ dependencies {
diff --git a/patches/server/0224-add-more-information-to-Entity.toString.patch b/patches/server/0225-add-more-information-to-Entity.toString.patch
similarity index 95%
rename from patches/server/0224-add-more-information-to-Entity.toString.patch
rename to patches/server/0225-add-more-information-to-Entity.toString.patch
index 4da95a5c33..fba5a02350 100644
--- a/patches/server/0224-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0225-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4473197fdcad7e6026797c6f494c4e2a90c2fb36..9041feeeb0e2d43abebaa136dc739b3525f48e16 100644
+index d9e2cf70c4fcbf2d02a8bba00be28528df76b645..919b66c88f21606348b20f02cc420d0ff1fa0f8b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2844,7 +2844,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 90%
rename from patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index a5fa4a3d84..b9bd199304 100644
--- a/patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/patches/server/0226-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 330597270e4f224a9689fd9a3afcedba114abc52..99322a92b16010ed2ed2505067096e6baef2f616 100644
+index 286615b74c7e4ea3d162502c94884b46550eccee..7739b98398ee08b10c545cee6f9bd2c698a38fe2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -417,6 +417,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0226-EnderDragon-Events.patch b/patches/server/0227-EnderDragon-Events.patch
similarity index 97%
rename from patches/server/0226-EnderDragon-Events.patch
rename to patches/server/0227-EnderDragon-Events.patch
index a5f0467043..6368f8e07f 100644
--- a/patches/server/0226-EnderDragon-Events.patch
+++ b/patches/server/0227-EnderDragon-Events.patch
@@ -23,7 +23,7 @@ index 68e27569f44efd7fa234c19c7fd51da709a06a43..f18830d9d0f821e5603992846c335bba
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
-index f4a219f8e9f0fe698185e8ba9a4489c681d82c9e..075c27924a137adbb110f5751569c3ebd89e3fc0 100644
+index 62b4b9a63452e8af7425c4d8ea4b4bada441c563..c2a14305cb737fbc6447c555d8a15e2d3977e3fa 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
 @@ -74,7 +74,9 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
diff --git a/patches/server/0227-PlayerElytraBoostEvent.patch b/patches/server/0228-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0227-PlayerElytraBoostEvent.patch
rename to patches/server/0228-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0228-PlayerLaunchProjectileEvent.patch b/patches/server/0229-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0228-PlayerLaunchProjectileEvent.patch
rename to patches/server/0229-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0229-Improve-BlockPosition-inlining.patch b/patches/server/0230-Improve-BlockPosition-inlining.patch
similarity index 96%
rename from patches/server/0229-Improve-BlockPosition-inlining.patch
rename to patches/server/0230-Improve-BlockPosition-inlining.patch
index fec6db62f8..c8ba260207 100644
--- a/patches/server/0229-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0230-Improve-BlockPosition-inlining.patch
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index 749660a685a6a1e425681c64bbbfef32958a0808..ca9355da97b8569c9168487263977f75e60ab997 100644
+index 9f32861d791f7e4cb39d2ad01f48e1916fc2b4b1..73b3c5f5c037fbe3f588f8f4b0113bef283632a4 100644
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
 @@ -50,7 +50,7 @@ public class Vec3i implements Comparable<Vec3i> {
diff --git a/patches/server/0230-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/0230-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0231-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0231-Vanished-players-don-t-have-rights.patch b/patches/server/0232-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/0231-Vanished-players-don-t-have-rights.patch
rename to patches/server/0232-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0232-Allow-disabling-armour-stand-ticking.patch b/patches/server/0233-Allow-disabling-armour-stand-ticking.patch
similarity index 98%
rename from patches/server/0232-Allow-disabling-armour-stand-ticking.patch
rename to patches/server/0233-Allow-disabling-armour-stand-ticking.patch
index d309b4a128..4b9030fdc9 100644
--- a/patches/server/0232-Allow-disabling-armour-stand-ticking.patch
+++ b/patches/server/0233-Allow-disabling-armour-stand-ticking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 391a4cd47438cf8fd72b43f6cb0b4e278fa844ad..719b87705577132389f262a1557e5e84d37374d0 100644
+index 5993ea31ebdf1b37f85cee27f11234b7981f77fe..831e874f01d8edcff12a094dbf918d2533939c60 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -419,4 +419,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0233-SkeletonHorse-Additions.patch b/patches/server/0234-SkeletonHorse-Additions.patch
similarity index 97%
rename from patches/server/0233-SkeletonHorse-Additions.patch
rename to patches/server/0234-SkeletonHorse-Additions.patch
index 72eefb7d71..3fa78942e4 100644
--- a/patches/server/0233-SkeletonHorse-Additions.patch
+++ b/patches/server/0234-SkeletonHorse-Additions.patch
@@ -32,7 +32,7 @@ index cad754d6b75c3c16db4fd847fdf6cb8c0ec82dde..5c70fdefeb940837950e8a9692b1ac3a
  
          this.horse.setTrap(false);
 diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java
-index 0dc46471f7247e5d36c3896a0c87473072362fe6..bc3bfe8d3c2f87e2e9f167b9ff34d9ca8a696391 100644
+index 41d20c16ea165cf166c6f3b228bc8261b0ee0d9c..99f69f11e86fdee801504303fe025797f7959db8 100644
 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java
 +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java
 @@ -89,6 +89,28 @@ public interface EntityGetter {
diff --git a/patches/server/0234-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0235-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0234-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0235-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0235-Implement-Expanded-ArmorStand-API.patch b/patches/server/0236-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0235-Implement-Expanded-ArmorStand-API.patch
rename to patches/server/0236-Implement-Expanded-ArmorStand-API.patch
diff --git a/patches/server/0236-AnvilDamageEvent.patch b/patches/server/0237-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0236-AnvilDamageEvent.patch
rename to patches/server/0237-AnvilDamageEvent.patch
diff --git a/patches/server/0237-Add-hand-to-bucket-events.patch b/patches/server/0238-Add-hand-to-bucket-events.patch
similarity index 100%
rename from patches/server/0237-Add-hand-to-bucket-events.patch
rename to patches/server/0238-Add-hand-to-bucket-events.patch
diff --git a/patches/server/0238-Add-TNTPrimeEvent.patch b/patches/server/0239-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0238-Add-TNTPrimeEvent.patch
rename to patches/server/0239-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 96%
rename from patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch
index 3383fa2c3d..38514face6 100644
--- a/patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0240-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 915e2c5b0ffbd0d459a203e1bfb131be4c5476d4..00dd9dab2b19f3e49f3b41c20eb96a84bfae1769 100644
+index e933d54c309da046554029d1f232daa31659e537..9dba4eb0e9c4e4d974edaeaf41c370d3996dd94e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -318,4 +318,18 @@ public class PaperConfig {
@@ -45,7 +45,7 @@ index 915e2c5b0ffbd0d459a203e1bfb131be4c5476d4..00dd9dab2b19f3e49f3b41c20eb96a84
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 27526c1c1b21369fe8ca0f1541a15562555922b5..62fda1dd8d560a8e16118e9d1b044ef59c0e5b02 100644
+index dced761b1f74de28a784dfcffed1bbc002e5a586..8a1da2b1e667420df97e432b5a5fd9563cadda91 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -227,6 +227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0240-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0241-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from patches/server/0240-MC-135506-Experience-should-save-as-Integers.patch
rename to patches/server/0241-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/patches/server/0241-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0242-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from patches/server/0241-Fix-client-rendering-skulls-from-same-user.patch
rename to patches/server/0242-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/patches/server/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 93%
rename from patches/server/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 5a242f6a81..156e358d93 100644
--- a/patches/server/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -29,7 +29,7 @@ index 610a1ce766d826f3fdca595dd4135f96ef9280d8..b64f42b9ca1da5b6d5c290c157e51079
  
      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 b2a4fd52eeead4dd2e20cfab47acc9d3fcabab98..7e2e7ce7ba9b23c813e1a4197ac06d0fe703c22b 100644
+index d4a09cbaac906c766c55577551e539c9840d8d03..abff89e99d9f62a82c65a397016ab956f9ef42aa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -209,6 +209,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -97,18 +97,9 @@ index 67566e5f95f7452d31bea485bdb91a4e1a32e5d5..dc2235824853a0d7ccbff51dd26a71e9
      public boolean preventPoiUpdated = false; // CraftBukkit - SPIGOT-5710
      public boolean captureBlockStates = false;
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
-index 3864da01056970ae05cc3ca094f923178b4ffc97..f4731d69946871768ecf16149a47d2ef1cb3e910 100644
+index e6b9f812e521abd552e0c7dc0429d5a62f2bfc35..f4731d69946871768ecf16149a47d2ef1cb3e910 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
 +++ b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java
-@@ -20,7 +20,7 @@ public class EntityLookup<T extends EntityAccess> {
-         for(T entityAccess : this.byId.values()) {
-             U entityAccess2 = (U)((EntityAccess)filter.tryCast(entityAccess));
-             if (entityAccess2 != null) {
--                action.accept((T)entityAccess2);
-+                action.accept(entityAccess2); // Paper - decompile fix
-             }
-         }
- 
 @@ -34,6 +34,26 @@ public class EntityLookup<T extends EntityAccess> {
          UUID uUID = entity.getUUID();
          if (this.byUuid.containsKey(uUID)) {
diff --git a/patches/server/0243-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 99%
rename from patches/server/0243-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch
index e980e9bfb7..909ac54753 100644
--- a/patches/server/0243-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0244-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 00dd9dab2b19f3e49f3b41c20eb96a84bfae1769..d9114c5fa141c37270398100db6bb2a8a8e4ed1e 100644
+index 9dba4eb0e9c4e4d974edaeaf41c370d3996dd94e..62671d6c04f973594a6ca95446774c4b5a78a575 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/server/0247-Optimize-BlockPosition-helper-methods.patch b/patches/server/0248-Optimize-BlockPosition-helper-methods.patch
similarity index 97%
rename from patches/server/0247-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0248-Optimize-BlockPosition-helper-methods.patch
index a366ff68c2..b69dfaf75d 100644
--- a/patches/server/0247-Optimize-BlockPosition-helper-methods.patch
+++ b/patches/server/0248-Optimize-BlockPosition-helper-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 5f23b9ab6540530acac623d2cd8e9ec5d0064f39..d38049bed6f3dc3198e687686ef4d8938c7a6b59 100644
+index 85bdeafd92aff5d694c4b5dff0b5796f3467a886..0e39b49f603bea0f731652bac71067237b3869b4 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -130,67 +130,84 @@ public class BlockPos extends Vec3i {
diff --git a/patches/server/0248-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0249-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 89%
rename from patches/server/0248-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0249-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
index 6cd1a6bdce..891e5bf4db 100644
--- a/patches/server/0248-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
+++ b/patches/server/0249-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 1d802f0e81b3880e9bb7799ecd46826f4bdcee03..7acf96f2fbf807d4621ad3cfc9d9312adb255287 100644
+index feef74e3a6d50344245c4a61ece5b2194af1072f..c55321ec37b500199eda375cabca21e666612b9c 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/0249-Slime-Pathfinder-Events.patch b/patches/server/0250-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0249-Slime-Pathfinder-Events.patch
rename to patches/server/0250-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0251-Optimize-CraftBlockData-Creation.patch b/patches/server/0252-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0251-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0252-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0252-Optimize-MappedRegistry.patch b/patches/server/0253-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0252-Optimize-MappedRegistry.patch
rename to patches/server/0253-Optimize-MappedRegistry.patch
diff --git a/patches/server/0253-Add-PhantomPreSpawnEvent.patch b/patches/server/0254-Add-PhantomPreSpawnEvent.patch
similarity index 98%
rename from patches/server/0253-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0254-Add-PhantomPreSpawnEvent.patch
index 5e8116b48b..e3026cd52d 100644
--- a/patches/server/0253-Add-PhantomPreSpawnEvent.patch
+++ b/patches/server/0254-Add-PhantomPreSpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index b2b929a70253f3dfc41b11fb6e7d87f547d30dd8..e032d3e854bd60c37a5e6328389de3361108d9b2 100644
+index c436476b3ec442b40a7ff122e6d3947a47ae163b..84400bb44d5deb7c79295a83c4c3c6aac88f3175 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -171,6 +171,11 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/server/0254-Add-More-Creeper-API.patch b/patches/server/0255-Add-More-Creeper-API.patch
similarity index 95%
rename from patches/server/0254-Add-More-Creeper-API.patch
rename to patches/server/0255-Add-More-Creeper-API.patch
index d45c1b86d4..b92aff3e3f 100644
--- a/patches/server/0254-Add-More-Creeper-API.patch
+++ b/patches/server/0255-Add-More-Creeper-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index bf7ddca34c8d9834a5b923fab30a605afa5f337a..c2dbe53f504327f153efe195c74ad28c1b89791f 100644
+index 951654626a9eaa8d8cc4044f98b0931097e848e0..f9193f8cd3b0d0e689a523c7142a897c342c2931 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -309,7 +309,18 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0255-Inventory-removeItemAnySlot.patch b/patches/server/0256-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0255-Inventory-removeItemAnySlot.patch
rename to patches/server/0256-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 92%
rename from patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 7abfc4852d..592f2eccb1 100644
--- a/patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 15455d7be314d32cbda7adede326b33d3306c349..65b7a4dc767a3fd5c4d0c00f4a4aaa8e04d13f13 100644
+index a50f95940f1992ef6512a79d17b10cf51013f7f0..16926ecc4a67951d58c1794a64a408dbd9943a30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -381,7 +381,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0257-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from patches/server/0257-Asynchronous-chunk-IO-and-loading.patch
rename to patches/server/0258-Asynchronous-chunk-IO-and-loading.patch
index 956b289d8e..6387ea3458 100644
--- a/patches/server/0257-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch
@@ -2786,7 +2786,7 @@ index efb735f2cf0d232db83ade7332250e455c276bea..b6737c0b74e821c948919ca4184dfe02
          } 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 7e2e7ce7ba9b23c813e1a4197ac06d0fe703c22b..83fac40b413e8f1ae4bda1e1c87b07c51af832ef 100644
+index abff89e99d9f62a82c65a397016ab956f9ef42aa..d997ab37e49b43f692b30536ffb4d2563eab30f1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -310,6 +310,78 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -3586,7 +3586,7 @@ index 4160a35ecfa1c28b88d6ebbfd14a0be1933e3b6d..3e08ff74979c78b27537403bbcaf1345
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 65b7a4dc767a3fd5c4d0c00f4a4aaa8e04d13f13..5dea397fc7f11db39385c1711364a31144979f5c 100644
+index 16926ecc4a67951d58c1794a64a408dbd9943a30..440a3cb699939b0b1224a4668f0e221f9c7f3159 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1875,6 +1875,34 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0260-Improve-death-events.patch b/patches/server/0261-Improve-death-events.patch
similarity index 100%
rename from patches/server/0260-Improve-death-events.patch
rename to patches/server/0261-Improve-death-events.patch
diff --git a/patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0262-Mob-Pathfinding-API.patch b/patches/server/0263-Mob-Pathfinding-API.patch
similarity index 98%
rename from patches/server/0262-Mob-Pathfinding-API.patch
rename to patches/server/0263-Mob-Pathfinding-API.patch
index d39edfd5b8..99a04d0b70 100644
--- a/patches/server/0262-Mob-Pathfinding-API.patch
+++ b/patches/server/0263-Mob-Pathfinding-API.patch
@@ -151,7 +151,7 @@ index 0000000000000000000000000000000000000000..8c9f0c6c38627beded373ca29f1989ae
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/pathfinder/Path.java b/src/main/java/net/minecraft/world/level/pathfinder/Path.java
-index 5f59b2bd26571d16e04f2b6a5ded8f8fb7c4e31e..bdc221f5b1eccff017c5eace11f4ea2540329f1d 100644
+index 4ad2ac8d1e9111933fa58c47442fa1f5e8173fd3..2a335f277bd0e4b8ad0f60d8226eb8aaa80a871f 100644
 --- a/src/main/java/net/minecraft/world/level/pathfinder/Path.java
 +++ b/src/main/java/net/minecraft/world/level/pathfinder/Path.java
 @@ -21,6 +21,7 @@ public class Path {
diff --git a/patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 95%
rename from patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch
index e7256d6918..c42a3625c4 100644
--- a/patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch
+++ b/patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 18166f773301bb4eeef9e6892fac85dd58dfd28c..cc3312af20b74a3cbec667ecb50d3cac30b455fa 100644
+index 12cd430e7041fab5c3d8a0aa1fe8b28866067088..41f13b52fdaba3c07aeafa17628861dcd7786556 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -169,9 +169,9 @@ public final class NaturalSpawner {
diff --git a/patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0269-Honor-EntityAgeable.ageLock.patch b/patches/server/0270-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0269-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0270-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0270-Configurable-connection-throttle-kick-message.patch b/patches/server/0271-Configurable-connection-throttle-kick-message.patch
similarity index 96%
rename from patches/server/0270-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0271-Configurable-connection-throttle-kick-message.patch
index 335161867f..3d7e5a655a 100644
--- a/patches/server/0270-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0271-Configurable-connection-throttle-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7cec7a377d64dd00ea6fb8f82af489d4bf3bf572..9aa28bb2968522ef1b9375bcc872e6d8dfb01764 100644
+index 7682300eec0d097798c1bd68de519513c438fd17..83875260a131102612e700e7d620cc79a7452c5b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -294,6 +294,11 @@ public class PaperConfig {
diff --git a/patches/server/0271-Hook-into-CB-plugin-rewrites.patch b/patches/server/0272-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0271-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0272-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0272-PreSpawnerSpawnEvent.patch b/patches/server/0273-PreSpawnerSpawnEvent.patch
similarity index 94%
rename from patches/server/0272-PreSpawnerSpawnEvent.patch
rename to patches/server/0273-PreSpawnerSpawnEvent.patch
index 3bf17abefb..0e9cb1f017 100644
--- a/patches/server/0272-PreSpawnerSpawnEvent.patch
+++ b/patches/server/0273-PreSpawnerSpawnEvent.patch
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 33e7a9eb613a4984ebcb5f3cde5a1fa584f1695e..f08c5ae9d41ec9efb627665f5de4dd6165fd0092 100644
+index 18b1b7c05665ee1fb06670ceded719b19f3a4ee3..1c76a59eb25148bf2523e9d68cc165b6cd3e1d23 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -128,11 +128,11 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0273-Add-LivingEntity-getTargetEntity.patch b/patches/server/0274-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/0273-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0274-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0274-Add-sun-related-API.patch b/patches/server/0275-Add-sun-related-API.patch
similarity index 93%
rename from patches/server/0274-Add-sun-related-API.patch
rename to patches/server/0275-Add-sun-related-API.patch
index b20576ceab..dbba5a6c4f 100644
--- a/patches/server/0274-Add-sun-related-API.patch
+++ b/patches/server/0275-Add-sun-related-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5dea397fc7f11db39385c1711364a31144979f5c..6b54afecfe45fd078a709fc87ab101a4aee4f7f7 100644
+index 440a3cb699939b0b1224a4668f0e221f9c7f3159..5dcb92e37e5f419104bd416eb7b53128c1bfed9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -676,6 +676,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0275-Turtle-API.patch b/patches/server/0276-Turtle-API.patch
similarity index 100%
rename from patches/server/0275-Turtle-API.patch
rename to patches/server/0276-Turtle-API.patch
diff --git a/patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0277-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0278-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
index 513b5f8a79..0d34c16c30 100644
--- a/patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0279-Add-Velocity-IP-Forwarding-Support.patch
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 9aa28bb2968522ef1b9375bcc872e6d8dfb01764..edf0a82ba7e16b86100aa1920fa41508be2ab1e8 100644
+index 83875260a131102612e700e7d620cc79a7452c5b..c63b7b01094abaf41bc58c123d6ddeb68bc32195 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -9,6 +9,7 @@ import java.io.IOException;
diff --git a/patches/server/0279-Add-more-Witch-API.patch b/patches/server/0280-Add-more-Witch-API.patch
similarity index 98%
rename from patches/server/0279-Add-more-Witch-API.patch
rename to patches/server/0280-Add-more-Witch-API.patch
index 5a1bc8178c..7d2cd72ae6 100644
--- a/patches/server/0279-Add-more-Witch-API.patch
+++ b/patches/server/0280-Add-more-Witch-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Witch API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 75c863c2cf365c321e401e05f564518be3a7b949..43e4562dcb0de8db42ff556134f649b5e0aa4284 100644
+index 1ee8fec8f9f581fa68497ebf4f90aad9d425ec71..f9eb4a3a37454de78c65f895a82e67a854b6909b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -1,5 +1,8 @@
diff --git a/patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0281-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 97%
rename from patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
index f0c000f5f6..7961dbbeb0 100644
--- a/patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0282-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -20,7 +20,7 @@ index e57ab8a3e6efd78e12385042b7d91dcd27fef11d..eb44aef0aecf65f5c1b19f42bf85a3a2
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d0adb066fcea5636c88be838fb5eff79306c5f4a..b7923ee97eea5c2e285080afba0bd1e93ace41b5 100644
+index f1d2c9274f4968adab689a08c86bea7a16b76b39..189e05daf63060c8f0c1ca56bc23a0c4c8fa0b7a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -534,6 +534,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0282-Reset-players-airTicks-on-respawn.patch b/patches/server/0283-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0282-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0283-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 94%
rename from patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 01be147e24..c4f99ad87b 100644
--- a/patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/patches/server/0284-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after
 the current one finished, resulting in 100ms lost per profile lookup
 
 diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
-index a3ab666b5fa89aad7ee167d9aeff2f62019a4a78..8e182fdd69dba6e1c52e2f6a893534d77fb3bfaa 100644
+index cc38e909d1fa83206fa09666599d853a6e89ef36..c48a40155108b6bae18073638a0ba12649344261 100644
 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
 @@ -43,6 +43,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository {
diff --git a/patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0285-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0285-Optimize-World-Time-Updates.patch b/patches/server/0286-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0285-Optimize-World-Time-Updates.patch
rename to patches/server/0286-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0286-Restore-custom-InventoryHolder-support.patch b/patches/server/0287-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0286-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0287-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0287-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0288-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0287-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0288-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0288-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0289-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0288-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0289-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 98%
rename from patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
index 4de27b3be9..391c841f2a 100644
--- a/patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0290-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index 91d6885da13138e1def16e1876910ef893ce244d..eb58536e37af9da5e3ae7e43f874a1ef
  
                  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 b7923ee97eea5c2e285080afba0bd1e93ace41b5..bfdf4072d27b022377beafae877f2d553acae9d3 100644
+index 189e05daf63060c8f0c1ca56bc23a0c4c8fa0b7a..7241418074dbd8e0e81e2b679bd317d98fea2e27 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1563,7 +1563,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0290-Make-the-default-permission-message-configurable.patch b/patches/server/0291-Make-the-default-permission-message-configurable.patch
similarity index 97%
rename from patches/server/0290-Make-the-default-permission-message-configurable.patch
rename to patches/server/0291-Make-the-default-permission-message-configurable.patch
index e28db7fdb0..12e5ad2e42 100644
--- a/patches/server/0290-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0291-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 1fa190e098079522e0fe3593fa261c1b7ad4e24b..1eb45df9dca5d0c31ac46709e706136a
      }
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index edf0a82ba7e16b86100aa1920fa41508be2ab1e8..c48b175d5511b733bcff9a93a874f5ffc0174691 100644
+index c63b7b01094abaf41bc58c123d6ddeb68bc32195..0b0cdbea6693c18519212604a391e8100afbcc70 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -20,6 +20,7 @@ import java.util.regex.Pattern;
diff --git a/patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0292-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0292-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0293-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0292-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0293-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0293-force-entity-dismount-during-teleportation.patch b/patches/server/0294-force-entity-dismount-during-teleportation.patch
similarity index 98%
rename from patches/server/0293-force-entity-dismount-during-teleportation.patch
rename to patches/server/0294-force-entity-dismount-during-teleportation.patch
index 9c5889a6ae..860e145bcd 100644
--- a/patches/server/0293-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0294-force-entity-dismount-during-teleportation.patch
@@ -41,7 +41,7 @@ index 28a5255626b1a4ed893ac66850ed42adbf573a1c..119a32c11aff63a764eadeca59d5f50f
  
          if (entity1 != entity && this.connection != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c819bd3db7dfab1181288683f2a47bb71a52953d..1f1442e62c089ef9a922bbee91fc841771e7777f 100644
+index ad2341ce26f976b4c45d91e8040bea5aef130f02..f1489819f53b096c81ef8d06d4e40e3661e6fe52 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2256,11 +2256,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0294-Add-more-Zombie-API.patch b/patches/server/0295-Add-more-Zombie-API.patch
similarity index 97%
rename from patches/server/0294-Add-more-Zombie-API.patch
rename to patches/server/0295-Add-more-Zombie-API.patch
index 8829377ba1..27a69eb714 100644
--- a/patches/server/0294-Add-more-Zombie-API.patch
+++ b/patches/server/0295-Add-more-Zombie-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 42f3f632caba1897b762a6897923585901a63bd1..8c7c621f09e8669a6874a2ce101972cb1c03f8ae 100644
+index 45cfbf30d27139036dee5379a88ed24a5cee51b4..65a85eba15c42d55f52a01d2484e02ba6ba36b35 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -93,6 +93,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0295-Book-Size-Limits.patch b/patches/server/0296-Book-Size-Limits.patch
similarity index 95%
rename from patches/server/0295-Book-Size-Limits.patch
rename to patches/server/0296-Book-Size-Limits.patch
index bfc0c1610f..8e324dfaa7 100644
--- a/patches/server/0295-Book-Size-Limits.patch
+++ b/patches/server/0296-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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c48b175d5511b733bcff9a93a874f5ffc0174691..e683e5bf47abe7bd3d2f7e9811a377549308ded4 100644
+index 0b0cdbea6693c18519212604a391e8100afbcc70..a3c3656ba4e8bb85bfb3186d6284f02f09975b13 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -369,6 +369,13 @@ public class PaperConfig {
@@ -24,7 +24,7 @@ index c48b175d5511b733bcff9a93a874f5ffc0174691..e683e5bf47abe7bd3d2f7e9811a37754
      private static void asyncChunks() {
          ConfigurationSection section;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bfdf4072d27b022377beafae877f2d553acae9d3..52de402481607a0f35e43028003593499821ffb7 100644
+index 7241418074dbd8e0e81e2b679bd317d98fea2e27..d8135a0e644b67ed47972eb3bda517323561a93d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1012,6 +1012,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0296-Add-PlayerConnectionCloseEvent.patch b/patches/server/0297-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0296-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0297-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0297-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0298-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0297-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0298-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0299-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0300-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0300-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0301-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0300-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0301-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0301-BlockDestroyEvent.patch b/patches/server/0302-BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/0301-BlockDestroyEvent.patch
rename to patches/server/0302-BlockDestroyEvent.patch
diff --git a/patches/server/0302-Async-command-map-building.patch b/patches/server/0303-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0302-Async-command-map-building.patch
rename to patches/server/0303-Async-command-map-building.patch
diff --git a/patches/server/0303-Implement-Brigadier-Mojang-API.patch b/patches/server/0304-Implement-Brigadier-Mojang-API.patch
similarity index 98%
rename from patches/server/0303-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0304-Implement-Brigadier-Mojang-API.patch
index e675f15171..6ed7005ef5 100644
--- a/patches/server/0303-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0304-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 0c560f91986d5352f1ec42ccb48853366a981fbe..e8badd402381eaae1eafbd751bd2dfecc0427922 100644
+index 80c533bc8966e4f9d7b19ef98faf04146d14be7d..d84e04f2cf8870611d36834c5ea77a82e42df6d5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,7 @@ repositories {
@@ -81,7 +81,7 @@ index f3bbe012541a71ab75c1863990d0c056c62d8c6e..4bc28b66788d06d1446284f5adef6a44
          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 52de402481607a0f35e43028003593499821ffb7..fdf45cb0132bc588b9bb3ac8d9f89c0d1082b0e7 100644
+index d8135a0e644b67ed47972eb3bda517323561a93d..43bd11679d881b1039db4ed57e70d1ae4d49a107 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -753,8 +753,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0305-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0305-Limit-Client-Sign-length-more.patch b/patches/server/0306-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from patches/server/0305-Limit-Client-Sign-length-more.patch
rename to patches/server/0306-Limit-Client-Sign-length-more.patch
index 6f7d06e2d5..9a8c695108 100644
--- a/patches/server/0305-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0306-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 fdf45cb0132bc588b9bb3ac8d9f89c0d1082b0e7..3ec98749f23e56d52e246d2c94006c5ed4ddf303 100644
+index 43bd11679d881b1039db4ed57e70d1ae4d49a107..d1c5e6672068b83a22602fecd891d62c15edd55d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0307-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0308-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0308-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0309-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0308-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0309-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 90%
rename from patches/server/0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch
index 493063668c..cc6da2d01b 100644
--- a/patches/server/0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch
+++ b/patches/server/0310-Set-Zombie-last-tick-at-start-of-drowning-process.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process
 Fixes GH-1887
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 8c7c621f09e8669a6874a2ce101972cb1c03f8ae..a54af7c5b970102e8ff7f46bf4dd34b19faf3b8a 100644
+index 65a85eba15c42d55f52a01d2484e02ba6ba36b35..996613d75f66d97c3bd5241ca1c1346b92ec06dd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -222,6 +222,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 88%
rename from patches/server/0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 2657eddbbc..5fc785eca6 100644
--- a/patches/server/0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0311-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 73dd4776fee3429c42b279ab92050a4b872f64b5..25da9e3252154415303db662286e89e3aa7cfcd8 100644
+index e889c7f626316ea68e9231d903bd97095f07e9e9..b494d7fc864a2fa734c73c2c4d433e288bccfb26 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1123,6 +1123,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0311-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from patches/server/0311-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to patches/server/0312-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0312-Entity-getEntitySpawnReason.patch b/patches/server/0313-Entity-getEntitySpawnReason.patch
similarity index 97%
rename from patches/server/0312-Entity-getEntitySpawnReason.patch
rename to patches/server/0313-Entity-getEntitySpawnReason.patch
index 7386fa6dd0..67405e4977 100644
--- a/patches/server/0312-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0313-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 83fac40b413e8f1ae4bda1e1c87b07c51af832ef..49d6941b95dd5d7030f38915e31144d03e807909 100644
+index d997ab37e49b43f692b30536ffb4d2563eab30f1..ebaa49c99eb797dfefe401731884f70a841904ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1188,6 +1188,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -35,7 +35,7 @@ index b494d7fc864a2fa734c73c2c4d433e288bccfb26..840bfcea9347b50b422eb7a325a1be43
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c15c86a0cbb08a0770b88a2f5e2c656a6b79157f..7396e86b750e326653b82ca28ae3bffee3f99344 100644
+index f1489819f53b096c81ef8d06d4e40e3661e6fe52..232ae73392ef1bf27f0ae2721b36069326174717 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -70,6 +70,8 @@ import net.minecraft.world.InteractionHand;
diff --git a/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 96%
rename from patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch
index d7b4690b18..4c83a4f456 100644
--- a/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0314-Update-entity-Metadata-for-all-tracked-players.patch
@@ -22,7 +22,7 @@ index 861f3790179e18f6192ac8b2fb5d2ecbc54484ad..5e3f489964489e0facc93a823a1cb84b
          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 3ec98749f23e56d52e246d2c94006c5ed4ddf303..30807f1ca5fe70c874420f63adea4cc37e4e3e67 100644
+index d1c5e6672068b83a22602fecd891d62c15edd55d..4fcfe654f8199ead2d2309d37f6b5866ba540e45 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2305,7 +2305,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0314-Fire-event-on-GS4-query.patch b/patches/server/0315-Fire-event-on-GS4-query.patch
similarity index 99%
rename from patches/server/0314-Fire-event-on-GS4-query.patch
rename to patches/server/0315-Fire-event-on-GS4-query.patch
index 5b78abf70c..4196ec4456 100644
--- a/patches/server/0314-Fire-event-on-GS4-query.patch
+++ b/patches/server/0315-Fire-event-on-GS4-query.patch
@@ -26,7 +26,7 @@ index 51cb2644aa516a59e19fecb308d519dbc7e5fb11..e548aa0ca4e1e94ab628614b44fc1156
          this.dataOutputStream.write(value);
      }
 diff --git a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
-index 02bb0b2df37ead741adfef38d7479ba6f691dc2d..25ae440839f1d286550a77d0a4c61e1dc02b369d 100644
+index fc368dee97eb989a30d6d6115771971d1d733b34..000918fe0cc3fde07145e027b25f148afcb0de62 100644
 --- a/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
 +++ b/src/main/java/net/minecraft/server/rcon/thread/QueryThreadGs4.java
 @@ -105,13 +105,32 @@ public class QueryThreadGs4 extends GenericThread {
diff --git a/patches/server/0315-Implement-PlayerPostRespawnEvent.patch b/patches/server/0316-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from patches/server/0315-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0316-Implement-PlayerPostRespawnEvent.patch
index 607833e55c..8765dc67f9 100644
--- a/patches/server/0315-Implement-PlayerPostRespawnEvent.patch
+++ b/patches/server/0316-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index eea7a625fb00af13944b21e1af4bf1804c5ce6d9..1b53a2c29734a955b290d196799109047de5b45c 100644
+index 840bfcea9347b50b422eb7a325a1be438da45015..5623398d3c6fc804a078c10af4bdc24cb63d6ef6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -722,9 +722,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 94%
rename from patches/server/0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index ba034d6b24..309d46c6a4 100644
--- a/patches/server/0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0317-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index fcbefb814edfc27c5eaa0f943976de238808cc36..1da634eacccff884d50b7f1298bc8e44b0b8b6f2 100644
+index b374d50678e92fabbf1d640729a8a276fc791c62..b72bb3b78a3b19edb67e74bdc03a46060a1f6af3 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -106,6 +106,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0317-Server-Tick-Events.patch b/patches/server/0318-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0317-Server-Tick-Events.patch
rename to patches/server/0318-Server-Tick-Events.patch
diff --git a/patches/server/0318-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0319-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0318-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0319-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0319-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/0319-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0320-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0320-Add-Heightmap-API.patch b/patches/server/0321-Add-Heightmap-API.patch
similarity index 95%
rename from patches/server/0320-Add-Heightmap-API.patch
rename to patches/server/0321-Add-Heightmap-API.patch
index a678b0be71..6ab1bbb77e 100644
--- a/patches/server/0320-Add-Heightmap-API.patch
+++ b/patches/server/0321-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6b54afecfe45fd078a709fc87ab101a4aee4f7f7..b5a83801675eb5e8edf4c5ef8171075010ea2850 100644
+index 5dcb92e37e5f419104bd416eb7b53128c1bfed9f..bfdd37da36117274f2a15c7380d863c3235e696c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -215,6 +215,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0321-Mob-Spawner-API-Enhancements.patch b/patches/server/0322-Mob-Spawner-API-Enhancements.patch
similarity index 98%
rename from patches/server/0321-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0322-Mob-Spawner-API-Enhancements.patch
index 133e40d274..267037a711 100644
--- a/patches/server/0321-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0322-Mob-Spawner-API-Enhancements.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Mob Spawner API Enhancements
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 30930a24c197c45f2ed86eaf7a150252005e7a37..c0f33a6cb4812e13204552c125df06210adc7196 100644
+index fafbc8601ba3378b86c660f947e23ec293dd7e7e..70e1f9bd9e4711aaf45ff8b7214726de646997ab 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -230,7 +230,13 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0323-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0323-Fix-CB-call-to-changed-postToMainThread-method.patch
index 7cb3a7e5f5..0a939fe4d5 100644
--- a/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0323-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 30807f1ca5fe70c874420f63adea4cc37e4e3e67..c49dfd213d3b1a2862707f2866179f34334b9eaa 100644
+index 4fcfe654f8199ead2d2309d37f6b5866ba540e45..070451db9f8dff9bb73ec8d71a1e97e9bdcc9f4c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -438,7 +438,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 91%
rename from patches/server/0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 866e6f9b91..de77003ffb 100644
--- a/patches/server/0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0324-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)
 This also fixes the adding sound playing when the item frame direction is changed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
-index 82ad5f56e2a16eb9650d4aceccb40ad84cc40418..30159f4f387b61b50589fad61f91c9e5a4adaf12 100644
+index f2339fc092a5ef12da701de820ff3c315bd0a4b0..d02f507ac58bae5d4f669dae52cc01c35651cee5 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
 @@ -307,7 +307,7 @@ public class ItemFrame extends HangingEntity {
diff --git a/patches/server/0324-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from patches/server/0324-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/server/0325-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/0325-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0326-improve-CraftWorld-isChunkLoaded.patch
similarity index 94%
rename from patches/server/0325-improve-CraftWorld-isChunkLoaded.patch
rename to patches/server/0326-improve-CraftWorld-isChunkLoaded.patch
index 96e0dd4acf..9845a27315 100644
--- a/patches/server/0325-improve-CraftWorld-isChunkLoaded.patch
+++ b/patches/server/0326-improve-CraftWorld-isChunkLoaded.patch
@@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b5a83801675eb5e8edf4c5ef8171075010ea2850..d1a49917484dddfb2920aed8421650e9872f0cd3 100644
+index bfdd37da36117274f2a15c7380d863c3235e696c..be2790a12ec37267418b77569ceb7dec54d7c282 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -286,13 +286,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0326-Implement-CraftBlockSoundGroup.patch b/patches/server/0327-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0326-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0327-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 98%
rename from patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 63f13fe85d..803d275f5e 100644
--- a/patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0328-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -85,7 +85,7 @@ index b24064e5f5029b0c42ea0083533eb581cad01528..e60e4f3693314adb7763c440036f0c80
          // 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 49d6941b95dd5d7030f38915e31144d03e807909..9722603f06bd386a114052652afddfe40e7ef757 100644
+index ebaa49c99eb797dfefe401731884f70a841904ad..704d5fd4038cd6913e0804b66da920cd661e93ee 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;
@@ -221,7 +221,7 @@ index 1fdb4242784e55d5bb6102deb150a57a156aacd3..419e1c4db73631de3d65d8a0e7d5eb08
          this.maxCount = i * i;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d1a49917484dddfb2920aed8421650e9872f0cd3..3ffefd881c2ec03debd2e69e8e82badfdfe66778 100644
+index be2790a12ec37267418b77569ceb7dec54d7c282..b3bdfe375a42c5b4bb7b2a3c79678ca57419d179 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1349,15 +1349,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0328-ChunkMapDistance-CME.patch b/patches/server/0329-ChunkMapDistance-CME.patch
similarity index 97%
rename from patches/server/0328-ChunkMapDistance-CME.patch
rename to patches/server/0329-ChunkMapDistance-CME.patch
index c0ab400e26..6043b5d3d0 100644
--- a/patches/server/0328-ChunkMapDistance-CME.patch
+++ b/patches/server/0329-ChunkMapDistance-CME.patch
@@ -17,7 +17,7 @@ index d930162608e1b765ef222eb0fe61d010c6fa97f1..674a6492e2eb10cfd29989643eedcea0
  
      public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) {
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index 2012831c4e9573118209672c8a0170573566b491..a028de3cec90a097d6f10c49be2c6a7cb0b19318 100644
+index ab785bfc29c0b120b7c6fed2d15460c86e020291..1e066a35b53b1f71a0e6376a22d51fc4c0a412dc 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -52,7 +52,16 @@ public abstract class DistanceManager {
diff --git a/patches/server/0329-Chunk-debug-command.patch b/patches/server/0330-Chunk-debug-command.patch
similarity index 100%
rename from patches/server/0329-Chunk-debug-command.patch
rename to patches/server/0330-Chunk-debug-command.patch
diff --git a/patches/server/0330-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0331-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0330-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0331-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0331-Expose-the-internal-current-tick.patch b/patches/server/0332-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0331-Expose-the-internal-current-tick.patch
rename to patches/server/0332-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0332-Fix-World-isChunkGenerated-calls.patch b/patches/server/0333-Fix-World-isChunkGenerated-calls.patch
similarity index 99%
rename from patches/server/0332-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0333-Fix-World-isChunkGenerated-calls.patch
index 71bc0e1f6a..3d88741861 100644
--- a/patches/server/0332-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0333-Fix-World-isChunkGenerated-calls.patch
@@ -188,7 +188,7 @@ index a1bfcdd713c47d8613eb4af7625a64d51161690b..4bc33c31d497aa7d69226ab870fd7890
              } 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 3ffefd881c2ec03debd2e69e8e82badfdfe66778..a4b9e20b2656647afacefc2c4b7962f78d882114 100644
+index b3bdfe375a42c5b4bb7b2a3c79678ca57419d179..2993fdcc7670d47466893d7ee4d0c3916859d37f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -20,6 +20,7 @@ import java.util.Objects;
diff --git a/patches/server/0333-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0333-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0334-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 96%
rename from patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index d2ece57ce0..c9a9791996 100644
--- a/patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0335-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
@@ -37,7 +37,7 @@ index 5589ee42959e3665dd5df9049fe108b6f6629608..e5365453655c0f394dea3d3b388afc24
  }
 +
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index cc3312af20b74a3cbec667ecb50d3cac30b455fa..be1068c305ef0c968caa2ee9412ed7ad1b1946f1 100644
+index 41f13b52fdaba3c07aeafa17628861dcd7786556..474dc6302d2b0f8c629b2e1f6de9d4ba6faf398b 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -87,6 +87,13 @@ public final class NaturalSpawner {
diff --git a/patches/server/0335-Configurable-projectile-relative-velocity.patch b/patches/server/0336-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0335-Configurable-projectile-relative-velocity.patch
rename to patches/server/0336-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0336-offset-item-frame-ticking.patch b/patches/server/0337-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0336-offset-item-frame-ticking.patch
rename to patches/server/0337-offset-item-frame-ticking.patch
diff --git a/patches/server/0337-Fix-MC-158900.patch b/patches/server/0338-Fix-MC-158900.patch
similarity index 94%
rename from patches/server/0337-Fix-MC-158900.patch
rename to patches/server/0338-Fix-MC-158900.patch
index 8b69e5c5a8..0a3f421920 100644
--- a/patches/server/0337-Fix-MC-158900.patch
+++ b/patches/server/0338-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1b53a2c29734a955b290d196799109047de5b45c..81aee8c195307fd3cd4a89c29ebb7ebc25436c83 100644
+index 5623398d3c6fc804a078c10af4bdc24cb63d6ef6..3c176d48e6b1a8e165b5860cd443b36c65397ce9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -606,8 +606,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0338-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0339-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0338-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0339-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0339-Dont-send-unnecessary-sign-update.patch b/patches/server/0340-Dont-send-unnecessary-sign-update.patch
similarity index 92%
rename from patches/server/0339-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0340-Dont-send-unnecessary-sign-update.patch
index ae5cd2aefb..2d33438703 100644
--- a/patches/server/0339-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0340-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 c49dfd213d3b1a2862707f2866179f34334b9eaa..319a2c29a960f24e82da9131e128d3d1d36a37db 100644
+index 070451db9f8dff9bb73ec8d71a1e97e9bdcc9f4c..0de98ce5db144d0b5cde34f62991c46b7aedad8b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2884,6 +2884,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0340-Add-option-to-disable-pillager-patrols.patch b/patches/server/0341-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0340-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0341-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0341-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0342-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 92%
rename from patches/server/0341-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/server/0342-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index 406550da84..f93696310b 100644
--- a/patches/server/0341-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0342-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 319a2c29a960f24e82da9131e128d3d1d36a37db..c6328204024ffffd2cd0fe1a4ee921d846143987 100644
+index 0de98ce5db144d0b5cde34f62991c46b7aedad8b..f961a0f5b571d86c8d2b57f489b421fbfb01ca3d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1753,6 +1753,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0342-Flat-bedrock-generator-settings.patch b/patches/server/0343-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0342-Flat-bedrock-generator-settings.patch
rename to patches/server/0343-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0343-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0344-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0343-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0344-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0344-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0345-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0344-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0345-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0345-Duplicate-UUID-Resolve-Option.patch b/patches/server/0346-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0345-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0346-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0346-Optimize-Hoppers.patch b/patches/server/0347-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0346-Optimize-Hoppers.patch
rename to patches/server/0347-Optimize-Hoppers.patch
diff --git a/patches/server/0347-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0348-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0347-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0348-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0348-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0349-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0348-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0349-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0349-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0349-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0350-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0350-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0351-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0351-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch
index b229ce21e3..8ab8ea58fd 100644
--- a/patches/server/0351-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/patches/server/0352-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 9722603f06bd386a114052652afddfe40e7ef757..9d5fec4f5786557718d2759f2116af46b99d9a36 100644
+index 704d5fd4038cd6913e0804b66da920cd661e93ee..2de2e890cbf74ba98ce0ae9d1ad1a8195eccf71f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -385,6 +385,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0352-Fix-items-not-falling-correctly.patch b/patches/server/0353-Fix-items-not-falling-correctly.patch
similarity index 96%
rename from patches/server/0352-Fix-items-not-falling-correctly.patch
rename to patches/server/0353-Fix-items-not-falling-correctly.patch
index 3ca3dee44a..c9c3bef8b4 100644
--- a/patches/server/0352-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0353-Fix-items-not-falling-correctly.patch
@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking Spigot's entity
 activation range check from an item's move method.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 1da634eacccff884d50b7f1298bc8e44b0b8b6f2..b73198444747e6f8865ad9694c0b11ee95746dae 100644
+index b72bb3b78a3b19edb67e74bdc03a46060a1f6af3..87c92e73d23a1ebb0646ba0293e1c0d51bb0e059 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -134,7 +134,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0353-Lag-compensate-eating.patch b/patches/server/0354-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0353-Lag-compensate-eating.patch
rename to patches/server/0354-Lag-compensate-eating.patch
diff --git a/patches/server/0354-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch
similarity index 91%
rename from patches/server/0354-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch
index 9811aa4dd0..6dc5f5aa31 100644
--- a/patches/server/0354-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize call to getFluid for explosions
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 09f17a7f4f78b09a44a6486923060623478a2b5e..e2bc9e91f03997884af381b3261b102a6e0bc5cb 100644
+index afac23f1741baaf2a4ee2729f25a0ddf5f2b9d7d..fc1b86828c8a38950f7a26735d8f5d125ee3e914 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -174,7 +174,7 @@ public class Explosion {
diff --git a/patches/server/0355-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0355-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0356-Add-effect-to-block-break-naturally.patch b/patches/server/0357-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0356-Add-effect-to-block-break-naturally.patch
rename to patches/server/0357-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0357-Entity-Activation-Range-2.0.patch b/patches/server/0358-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0357-Entity-Activation-Range-2.0.patch
rename to patches/server/0358-Entity-Activation-Range-2.0.patch
index 25395c03cd..1438a9e4e0 100644
--- a/patches/server/0357-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0358-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 9d5fec4f5786557718d2759f2116af46b99d9a36..a8d4a104d8f431c1e2b2f98bfac8217211d9e4a9 100644
+index 2de2e890cbf74ba98ce0ae9d1ad1a8195eccf71f..2a040e2fc7684ed180efa81037a1c8cb34201518 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;
@@ -108,7 +108,7 @@ index 9d5fec4f5786557718d2759f2116af46b99d9a36..a8d4a104d8f431c1e2b2f98bfac82172
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a896b0b671d0c57de49c8f5e937e6218cbdc7a1e..3ad6488119a5fa5928219960fb37272f1bf7f73a 100644
+index 232ae73392ef1bf27f0ae2721b36069326174717..76525b5cee6a6d404ffa877875f08cb0c350510b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -322,6 +322,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -144,7 +144,7 @@ index a896b0b671d0c57de49c8f5e937e6218cbdc7a1e..3ad6488119a5fa5928219960fb37272f
              movement = this.maybeBackOffFromEdge(movement, movementType);
              Vec3 vec3d1 = this.collide(movement);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b234473dcac22dcb121a3b3d9f75053b42f357c4..2df50b4fc01dec77e41f96711c493aedceaae863 100644
+index bcf7c431f90a917d56933370e9f479f25f009dcb..7b671d833cf717c16761b878d45cf04b79c7dbd1 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -206,6 +206,19 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0358-Increase-Light-Queue-Size.patch b/patches/server/0359-Increase-Light-Queue-Size.patch
similarity index 95%
rename from patches/server/0358-Increase-Light-Queue-Size.patch
rename to patches/server/0359-Increase-Light-Queue-Size.patch
index 05e946da7f..d8dbdbbc62 100644
--- a/patches/server/0358-Increase-Light-Queue-Size.patch
+++ b/patches/server/0359-Increase-Light-Queue-Size.patch
@@ -29,7 +29,7 @@ index 98adf2fd1c2e9fe75456266ea1d7604fe64109b1..d9c59ea6faa7155d415c89228c22da33
  }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f71a1401d229b32557f0444ce45cfa47ffa2fde4..b3d3e023d10fe6bb964fe7a3d1cbb96d6a406283 100644
+index 20bbe968b03b32a6124dbf9df1fbf9da71cd668f..49f86ccc3e0d5ba7d42e353a963ab0d4a18e251f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -813,7 +813,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0359-Fix-Light-Command.patch b/patches/server/0360-Fix-Light-Command.patch
similarity index 100%
rename from patches/server/0359-Fix-Light-Command.patch
rename to patches/server/0360-Fix-Light-Command.patch
diff --git a/patches/server/0360-Anti-Xray.patch b/patches/server/0361-Anti-Xray.patch
similarity index 98%
rename from patches/server/0360-Anti-Xray.patch
rename to patches/server/0361-Anti-Xray.patch
index 02b626f023..5082695a81 100644
--- a/patches/server/0360-Anti-Xray.patch
+++ b/patches/server/0361-Anti-Xray.patch
@@ -1180,7 +1180,7 @@ index 655a2f2fd64cc3ce1c972f3b05df8136f31a603a..ab976352bb0b7a7aa9ffaf1f8bffeadb
          List<Entity> list = Lists.newArrayList();
          List<Entity> list1 = Lists.newArrayList();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a8d4a104d8f431c1e2b2f98bfac8217211d9e4a9..01d7948d195afcee9dc2542993f3379858ee0210 100644
+index 2a040e2fc7684ed180efa81037a1c8cb34201518..cadefabbbecdba5e6002c94c2df34dd0b7b76991 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -395,7 +395,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1316,14 +1316,14 @@ index c696358102086257033b55adbef84b1a259cb46e..67b06640358e04752bf149e9380f5f83
  
      public int getSerializedSize() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8..5bae276dd55d080cbf8fca53c99c9c3636d8f33f 100644
+index ef093604f001d3e899679f6d308780856f076193..45a969f97b26e328e34f3d576557999c32b954a2 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -29,6 +29,7 @@ public class PalettedContainer<T> implements PaletteResize<T> {
          return 0;
      };
      public final IdMap<T> registry;
-+    private final T[] presetValues; // Paper - Anti-Xray - Add preset values
++    private final T @org.jetbrains.annotations.Nullable [] presetValues; // Paper - Anti-Xray - Add preset values
      private volatile PalettedContainer.Data<T> data;
      private final PalettedContainer.Strategy strategy;
      private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer");
@@ -1335,7 +1335,7 @@ index 911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8..5bae276dd55d080cbf8fca53c99c9c36
 +    // Paper start - Anti-Xray - Add preset values
 +    @Deprecated public static <T> Codec<PalettedContainer<T>> codec(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy provider, T object) { return PalettedContainer.codec(idList, entryCodec, provider, object, null); } // Notice for updates: Please make sure this function isn't used anywhere
 +    public static <T> Codec<PalettedContainer<T>> codec(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy provider, T object, T @org.jetbrains.annotations.Nullable [] presetValues) {
-         return RecordCodecBuilder.create((instance) -> {
+         return RecordCodecBuilder.<DiscData<T>>create((instance) -> { // Paper - decompile fix
              return instance.group(entryCodec.mapResult(ExtraCodecs.orElsePartial(object)).listOf().fieldOf("palette").forGetter(PalettedContainer.DiscData::paletteEntries), Codec.LONG_STREAM.optionalFieldOf("data").forGetter(PalettedContainer.DiscData::storage)).apply(instance, PalettedContainer.DiscData::new);
          }).comapFlatMap((serialized) -> {
 -            return read(idList, provider, serialized);
@@ -1349,7 +1349,7 @@ index 911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8..5bae276dd55d080cbf8fca53c99c9c36
 -    public PalettedContainer(IdMap<T> idList, PalettedContainer.Strategy paletteProvider, PalettedContainer.Configuration<T> dataProvider, BitStorage storage, List<T> paletteEntries) {
 +    // Paper start - Anti-Xray - Add preset values
 +    @Deprecated public PalettedContainer(IdMap<T> idList, PalettedContainer.Strategy paletteProvider, PalettedContainer.Configuration<T> dataProvider, BitStorage storage, List<T> paletteEntries) { this(idList, paletteProvider, dataProvider, storage, paletteEntries, null, null); } // Notice for updates: Please make sure this constructor isn't used anywhere
-+    public PalettedContainer(IdMap<T> idList, PalettedContainer.Strategy paletteProvider, PalettedContainer.Configuration<T> dataProvider, BitStorage storage, List<T> paletteEntries, T defaultValue, T[] presetValues) {
++    public PalettedContainer(IdMap<T> idList, PalettedContainer.Strategy paletteProvider, PalettedContainer.Configuration<T> dataProvider, BitStorage storage, List<T> paletteEntries, T defaultValue, T @org.jetbrains.annotations.Nullable [] presetValues) {
 +        this.presetValues = presetValues;
          this.registry = idList;
          this.strategy = paletteProvider;
@@ -1381,7 +1381,7 @@ index 911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8..5bae276dd55d080cbf8fca53c99c9c36
  
 -    private PalettedContainer(IdMap<T> idList, PalettedContainer.Strategy paletteProvider, PalettedContainer.Data<T> data) {
 +    // Paper start - Anti-Xray - Add preset values
-+    private PalettedContainer(IdMap<T> idList, PalettedContainer.Strategy paletteProvider, PalettedContainer.Data<T> data, T[] presetValues) {
++    private PalettedContainer(IdMap<T> idList, PalettedContainer.Strategy paletteProvider, PalettedContainer.Data<T> data, T @org.jetbrains.annotations.Nullable [] presetValues) {
 +        this.presetValues = presetValues;
 +        // Paper end
          this.registry = idList;
@@ -1447,7 +1447,7 @@ index 911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8..5bae276dd55d080cbf8fca53c99c9c36
 -    public void write(FriendlyByteBuf buf) {
 +    // Paper start - Anti-Xray - Add chunk packet info
 +    @Deprecated public void write(FriendlyByteBuf buf) { this.write(buf, null, 0); } // Notice for updates: Please make sure this method isn't used anywhere
-+    public void write(FriendlyByteBuf buf, com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) {
++    public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) {
          this.acquire();
  
          try {
@@ -1467,7 +1467,7 @@ index 911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8..5bae276dd55d080cbf8fca53c99c9c36
      }
  
 -    private static <T> DataResult<PalettedContainer<T>> read(IdMap<T> idList, PalettedContainer.Strategy provider, PalettedContainer.DiscData<T> serialized) {
-+    private static <T> DataResult<PalettedContainer<T>> read(IdMap<T> idList, PalettedContainer.Strategy provider, PalettedContainer.DiscData<T> serialized, T defaultValue, T[] presetValues) { // Paper - Anti-Xray - Add preset values
++    private static <T> DataResult<PalettedContainer<T>> read(IdMap<T> idList, PalettedContainer.Strategy provider, PalettedContainer.DiscData<T> serialized, T defaultValue, T @org.jetbrains.annotations.Nullable [] presetValues) { // Paper - Anti-Xray - Add preset values
          List<T> list = serialized.paletteEntries();
          int i = provider.size();
          int j = provider.calculateBitsForSerialization(idList, list.size());
@@ -1495,7 +1495,7 @@ index 911bf2b7bbe627f98d21681b0c6d5b8a5170c8a8..5bae276dd55d080cbf8fca53c99c9c36
  
 -        public void write(FriendlyByteBuf buf) {
 +        // Paper start - Anti-Xray - Add chunk packet info
-+        public void write(FriendlyByteBuf buf, com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) {
++        public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) {
              buf.writeByte(this.storage.getBits());
              this.palette.write(buf);
 +
diff --git a/patches/server/0361-Implement-alternative-item-despawn-rate.patch b/patches/server/0362-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0361-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0362-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0362-Tracking-Range-Improvements.patch b/patches/server/0363-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0362-Tracking-Range-Improvements.patch
rename to patches/server/0363-Tracking-Range-Improvements.patch
diff --git a/patches/server/0363-Fix-items-vanishing-through-end-portal.patch b/patches/server/0364-Fix-items-vanishing-through-end-portal.patch
similarity index 93%
rename from patches/server/0363-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0364-Fix-items-vanishing-through-end-portal.patch
index d7a5200b16..0fd06fdeb9 100644
--- a/patches/server/0363-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0364-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3ad6488119a5fa5928219960fb37272f1bf7f73a..fb442956b525bc7a65fb89f2d2ec99bf8a29de5c 100644
+index 76525b5cee6a6d404ffa877875f08cb0c350510b..57d8fa214b842f6d03ed4c0709b7ec859914cc60 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3051,6 +3051,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0364-implement-optional-per-player-mob-spawns.patch b/patches/server/0365-implement-optional-per-player-mob-spawns.patch
similarity index 99%
rename from patches/server/0364-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0365-implement-optional-per-player-mob-spawns.patch
index 686a36f2a0..fdc9be4172 100644
--- a/patches/server/0364-implement-optional-per-player-mob-spawns.patch
+++ b/patches/server/0365-implement-optional-per-player-mob-spawns.patch
@@ -353,7 +353,7 @@ index 6dae228c0d0460d74ed49aee5a38dfd7b145d891..c7114fc8045feab770dde30669d27113
          double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8);
          double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8);
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index a028de3cec90a097d6f10c49be2c6a7cb0b19318..92bd7382f0e1e19c245587ff32dff3dd87a401a3 100644
+index 1e066a35b53b1f71a0e6376a22d51fc4c0a412dc..6228f2f67541da62b0ae093de987662db9643740 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -326,6 +326,12 @@ public abstract class DistanceManager {
diff --git a/patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0366-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 91%
rename from patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch
rename to patches/server/0366-Avoid-hopper-searches-if-there-are-no-items.patch
index 19a1fa0156..c5138af81d 100644
--- a/patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/patches/server/0366-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -27,7 +27,7 @@ index bfbd1922d77602628e57326b3251459f45b1aed9..334fd625829c8e5e9c434b184f6d0084
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntitySection.java b/src/main/java/net/minecraft/world/level/entity/EntitySection.java
-index e6b1663d4ccdd3842f711ad7547df8ccf973e4b1..28f5c01497e0cbad50016f72585f8384496de0fa 100644
+index 524f3c42964eb83c9109bcc548a1075f1e295411..e9aee7d11798c3bd990466f101e9e342686de11c 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntitySection.java
 +++ b/src/main/java/net/minecraft/world/level/entity/EntitySection.java
 @@ -13,6 +13,10 @@ public class EntitySection<T extends EntityAccess> {
@@ -66,15 +66,6 @@ index e6b1663d4ccdd3842f711ad7547df8ccf973e4b1..28f5c01497e0cbad50016f72585f8384
          return this.storage.remove(entity);
      }
  
-@@ -42,7 +60,7 @@ public class EntitySection<T extends EntityAccess> {
-             for(T entityAccess : collection) {
-                 U entityAccess2 = (U)((EntityAccess)type.tryCast(entityAccess));
-                 if (entityAccess2 != null && entityAccess.getBoundingBox().intersects(box)) {
--                    action.accept((T)entityAccess2);
-+                    action.accept(entityAccess2); // Paper - decompile fixes
-                 }
-             }
- 
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java b/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java
 index 13df7889b2b5249fb81c54fadf55315a4c515116..74210dc2eef63da7360b1f833bb59b278419fb2b 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntitySectionStorage.java
diff --git a/patches/server/0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0367-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0368-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0368-Add-debug-for-sync-chunk-loads.patch b/patches/server/0369-Add-debug-for-sync-chunk-loads.patch
similarity index 99%
rename from patches/server/0368-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0369-Add-debug-for-sync-chunk-loads.patch
index 55c22e669b..328659c043 100644
--- a/patches/server/0368-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0369-Add-debug-for-sync-chunk-loads.patch
@@ -317,7 +317,7 @@ index e05f3c197c072860a3242ccfb41ba68609be748d..cf56b2ed508352205ef6ec71519b0626
              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 01d7948d195afcee9dc2542993f3379858ee0210..8932b7fb1a1c9f24f917711af69c6f8cbfca93a4 100644
+index cadefabbbecdba5e6002c94c2df34dd0b7b76991..2119a0cb18edffb88150451446f488b763db977c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -383,6 +383,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0369-Allow-overriding-the-java-version-check.patch b/patches/server/0370-Allow-overriding-the-java-version-check.patch
similarity index 89%
rename from patches/server/0369-Allow-overriding-the-java-version-check.patch
rename to patches/server/0370-Allow-overriding-the-java-version-check.patch
index bf02cce178..063aa0723b 100644
--- a/patches/server/0369-Allow-overriding-the-java-version-check.patch
+++ b/patches/server/0370-Allow-overriding-the-java-version-check.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check
 -DPaper.IgnoreJavaVersion=true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index a87a6583a1bd31a276a79c2cfb3c3ca4e749c3dc..e3b2b61e5f030080e481dc00d1086f723b8b97ee 100644
+index 08f4ba483a6c61365310de6561b314e428a6b978..b07323de3587464b54c25fd9e079b3b50ed323da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -191,7 +191,7 @@ public class Main {
diff --git a/patches/server/0370-Add-ThrownEggHatchEvent.patch b/patches/server/0371-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0370-Add-ThrownEggHatchEvent.patch
rename to patches/server/0371-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0371-Entity-Jump-API.patch b/patches/server/0372-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0371-Entity-Jump-API.patch
rename to patches/server/0372-Entity-Jump-API.patch
diff --git a/patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 97%
rename from patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch
index d6ab8551d9..8fa4357f98 100644
--- a/patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0373-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -21,7 +21,7 @@ index 6b0391743cd9e249c66796e7fe7a4da8c6b81b2e..5ba23152d2c7e45a824d49246706aa98
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fb442956b525bc7a65fb89f2d2ec99bf8a29de5c..b254affe962442c9363e41787454697c509c1cab 100644
+index 57d8fa214b842f6d03ed4c0709b7ec859914cc60..2983a5dfc781f40f345a8ca88c83c6af44ea2c7c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -324,6 +324,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0373-Make-the-GUI-graph-fancier.patch b/patches/server/0374-Make-the-GUI-graph-fancier.patch
similarity index 99%
rename from patches/server/0373-Make-the-GUI-graph-fancier.patch
rename to patches/server/0374-Make-the-GUI-graph-fancier.patch
index f6061a031e..b97ce20f84 100644
--- a/patches/server/0373-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0374-Make-the-GUI-graph-fancier.patch
@@ -384,7 +384,7 @@ index 0000000000000000000000000000000000000000..c3e54da4ab6440811aab2f9dd1e21880
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index f2d47ea5490c03184e4854e3df1b66760855754e..e5f071c6449dc12cfed939b6b8a21a20cd7c38f7 100644
+index 75083eeb9b413e6dd5375007360dce6857a08fff..66464c10a6b33414c6d1b67b926a66c343d5f887 100644
 --- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 +++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 @@ -95,7 +95,7 @@ public class MinecraftServerGui extends JComponent {
diff --git a/patches/server/0374-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0375-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0374-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0375-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0375-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0376-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0375-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0376-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0376-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0376-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0377-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0377-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0378-Optimise-Chunk-getFluid.patch b/patches/server/0379-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0378-Optimise-Chunk-getFluid.patch
rename to patches/server/0379-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0379-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0380-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0379-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0380-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0380-Add-tick-times-API-and-mspt-command.patch b/patches/server/0381-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0380-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0381-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0381-Expose-MinecraftServer-isRunning.patch b/patches/server/0382-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0381-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0382-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0382-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0383-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0382-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0383-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0383-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0383-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0384-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0385-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 96%
rename from patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 373714aa6f..e74cc3c4e0 100644
--- a/patches/server/0386-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -26,7 +26,7 @@ index c7114fc8045feab770dde30669d2711313bff189..04596feb8667e3abbfa1c7343b46caca
              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 8932b7fb1a1c9f24f917711af69c6f8cbfca93a4..9f1b38c40da90f4224810356b8ee78418b58cb5d 100644
+index 2119a0cb18edffb88150451446f488b763db977c..01fca7eb1b12948d475f794e5a319ada72f0eb38 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2200,7 +2200,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0387-Don-t-tick-dead-players.patch b/patches/server/0388-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0387-Don-t-tick-dead-players.patch
rename to patches/server/0388-Don-t-tick-dead-players.patch
diff --git a/patches/server/0388-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0388-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0389-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0389-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0390-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0391-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0391-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0392-Improved-Watchdog-Support.patch b/patches/server/0393-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/0392-Improved-Watchdog-Support.patch
rename to patches/server/0393-Improved-Watchdog-Support.patch
diff --git a/patches/server/0393-Optimize-Pathfinding.patch b/patches/server/0394-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0393-Optimize-Pathfinding.patch
rename to patches/server/0394-Optimize-Pathfinding.patch
diff --git a/patches/server/0394-Reduce-Either-Optional-allocation.patch b/patches/server/0395-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0394-Reduce-Either-Optional-allocation.patch
rename to patches/server/0395-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0395-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0395-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0396-Prevent-opening-inventories-when-frozen.patch b/patches/server/0397-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0396-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0397-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0397-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0398-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0397-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0398-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0398-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0398-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0399-Implement-Player-Client-Options-API.patch b/patches/server/0400-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0399-Implement-Player-Client-Options-API.patch
rename to patches/server/0400-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0400-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0400-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0401-Broadcast-join-message-to-console.patch b/patches/server/0402-Broadcast-join-message-to-console.patch
similarity index 100%
rename from patches/server/0401-Broadcast-join-message-to-console.patch
rename to patches/server/0402-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0402-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from patches/server/0402-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/patches/server/0403-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0403-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0404-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from patches/server/0404-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/patches/server/0405-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0405-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0406-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0406-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0407-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0407-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0408-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0408-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0409-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0409-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0410-Villager-Restocks-API.patch b/patches/server/0411-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0410-Villager-Restocks-API.patch
rename to patches/server/0411-Villager-Restocks-API.patch
diff --git a/patches/server/0411-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0411-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0412-Expose-game-version.patch b/patches/server/0413-Expose-game-version.patch
similarity index 100%
rename from patches/server/0412-Expose-game-version.patch
rename to patches/server/0413-Expose-game-version.patch
diff --git a/patches/server/0413-Optimize-Voxel-Shape-Merging.patch b/patches/server/0414-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0413-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0414-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0414-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0414-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0415-misc-debugging-dumps.patch b/patches/server/0416-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0415-misc-debugging-dumps.patch
rename to patches/server/0416-misc-debugging-dumps.patch
diff --git a/patches/server/0416-Prevent-teleporting-dead-entities.patch b/patches/server/0417-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0416-Prevent-teleporting-dead-entities.patch
rename to patches/server/0417-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0418-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 99%
rename from patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0418-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index fe731e5eb9..aec478d621 100644
--- a/patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0418-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e8badd402381eaae1eafbd751bd2dfecc0427922..962c4eca17efca49f7c738287c90093e340779b4 100644
+index d84e04f2cf8870611d36834c5ea77a82e42df6d5..ce5d9bb9bc4dc724af7dac263c61bbb64bf81be3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -1,4 +1,6 @@
@@ -92,7 +92,7 @@ index e8badd402381eaae1eafbd751bd2dfecc0427922..962c4eca17efca49f7c738287c90093e
      exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class")
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c20fe23174d8a12bfc5acb4b0e947c6fca5ab897..6ee4d5377d3963c67c6da4e5b164e49949768f03 100644
+index 6cfaef1886b517c56ed9a96347be6e51efa84d9f..5fe5732bd6753e8ca37d8c3f7f24c6620b91d4e3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -430,4 +430,9 @@ public class PaperConfig {
diff --git a/patches/server/0418-Implement-Mob-Goal-API.patch b/patches/server/0419-Implement-Mob-Goal-API.patch
similarity index 99%
rename from patches/server/0418-Implement-Mob-Goal-API.patch
rename to patches/server/0419-Implement-Mob-Goal-API.patch
index f4c7f1f6f7..ab1e0c915d 100644
--- a/patches/server/0418-Implement-Mob-Goal-API.patch
+++ b/patches/server/0419-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 962c4eca17efca49f7c738287c90093e340779b4..cc75f70b5ab381c0c7012c2d6e5c40d7e4a06c7b 100644
+index ce5d9bb9bc4dc724af7dac263c61bbb64bf81be3..5ec76300234f29d9a153eb60cd60dccb849e5dc9 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -45,6 +45,7 @@ dependencies {
diff --git a/patches/server/0419-Add-villager-reputation-API.patch b/patches/server/0420-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0419-Add-villager-reputation-API.patch
rename to patches/server/0420-Add-villager-reputation-API.patch
diff --git a/patches/server/0420-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0421-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0420-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0421-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0421-ExperienceOrbMergeEvent.patch b/patches/server/0422-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0421-ExperienceOrbMergeEvent.patch
rename to patches/server/0422-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0422-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0423-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0422-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0423-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0423-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0424-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0423-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0424-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0424-Potential-bed-API.patch b/patches/server/0425-Potential-bed-API.patch
similarity index 95%
rename from patches/server/0424-Potential-bed-API.patch
rename to patches/server/0425-Potential-bed-API.patch
index dba834abeb..45ebcdd575 100644
--- a/patches/server/0424-Potential-bed-API.patch
+++ b/patches/server/0425-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 5d14403e1826ab2be43c0436b1fc2f1877072e6f..319aa663bd0250c6371c06501fc7986e80fcec6b 100644
+index 709bab9ac4eb453caeb0f565b6a0d6d097e2d1e0..f1c3afb478f2ffabb883ab86e132ff43c7c2d821 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/0425-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0426-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0425-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0426-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0427-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0427-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0428-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from patches/server/0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0428-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 1425b2155e..7cfba9fc64 100644
--- a/patches/server/0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0428-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let
 them destroy the worlds End Portals and get on top of the nether easy.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6ee4d5377d3963c67c6da4e5b164e49949768f03..e849c9c9fccf928399478dc3727eba55ae5b40d4 100644
+index 5fe5732bd6753e8ca37d8c3f7f24c6620b91d4e3..92f64c3d0fabd913f9640635f74396757263fac5 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -435,4 +435,15 @@ public class PaperConfig {
diff --git a/patches/server/0428-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0429-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0428-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0429-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0430-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from patches/server/0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0430-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index df965d6a00..57001dea7b 100644
--- a/patches/server/0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0430-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce allocation of Vec3D by entity tracker
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 79403282d297c2cfd20df964f65df62ec35bb45f..662954f44da3829e7d828f2290a4934188985a84 100644
+index 94a5fa9cac20597181f435998413b1981d8ef289..d410298aa665084d5a066410679e69a6777bd637 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1901,9 +1901,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0430-Ensure-safe-gateway-teleport.patch b/patches/server/0431-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0430-Ensure-safe-gateway-teleport.patch
rename to patches/server/0431-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0431-Add-option-for-console-having-all-permissions.patch b/patches/server/0432-Add-option-for-console-having-all-permissions.patch
similarity index 97%
rename from patches/server/0431-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0432-Add-option-for-console-having-all-permissions.patch
index 1acff6917f..40511a4409 100644
--- a/patches/server/0431-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0432-Add-option-for-console-having-all-permissions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index e849c9c9fccf928399478dc3727eba55ae5b40d4..edfa4a27a18b5c9df75f3952c51acdde1faa6dde 100644
+index 92f64c3d0fabd913f9640635f74396757263fac5..dcc2b48f7784473c3c62fe062b66891e835694c4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -446,4 +446,9 @@ public class PaperConfig {
diff --git a/patches/server/0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0433-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 99%
rename from patches/server/0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0433-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 8c52a596d0..f98354fda3 100644
--- a/patches/server/0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0433-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -42,7 +42,7 @@ index 674a6492e2eb10cfd29989643eedcea08b2d5218..dff475b327d6edaa4dcb9bc09029237f
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 662954f44da3829e7d828f2290a4934188985a84..980afbd2b9bc232becd6001e6b1da0aae0abedec 100644
+index d410298aa665084d5a066410679e69a6777bd637..fcdf19b6c0b88ef9a4b84575b461d60ff5d3879a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -181,11 +181,23 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -224,7 +224,7 @@ index 662954f44da3829e7d828f2290a4934188985a84..980afbd2b9bc232becd6001e6b1da0aa
  
      public List<ServerPlayer> getPlayersCloseForSpawning(ChunkPos pos) {
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index cca9efd1b7aabc4b8010cf4b8b942c66adb7eee1..a3bdace1ce3252e8c09b642ee8963bfb4b39222c 100644
+index 4a9d0fca55b71f817defcb4286154c0a47bede03..62118348d6fb00f063507debb488e1ff431d139c 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -49,7 +49,7 @@ public abstract class DistanceManager {
diff --git a/patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch
index 024652b79b..a6fe98e1ee 100644
--- a/patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 980afbd2b9bc232becd6001e6b1da0aae0abedec..b2072b4eb3369f73bd68d3836447ecda802d7007 100644
+index fcdf19b6c0b88ef9a4b84575b461d60ff5d3879a..f6864aba42bab1e23450f8f600c5c1f1ce4d4846 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -70,6 +70,7 @@ import net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
@@ -280,7 +280,7 @@ index 980afbd2b9bc232becd6001e6b1da0aae0abedec..b2072b4eb3369f73bd68d3836447ecda
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0dc85e33e9748a87e2dfbbbfb1861bdf636dab33..7ac9ca00521a9a265d4d188c3bef5c89736d8852 100644
+index 53c8583b8438571dd6fcec26c79a6594a4a6f786..a99d0dfeece57204e94b349b385e315a83869bca 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -54,6 +54,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0434-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0435-Optimize-ServerLevels-chunk-level-checking-methods.patch
similarity index 97%
rename from patches/server/0434-Optimize-ServerLevels-chunk-level-checking-methods.patch
rename to patches/server/0435-Optimize-ServerLevels-chunk-level-checking-methods.patch
index bbbf4318c6..e10d972ecc 100644
--- a/patches/server/0434-Optimize-ServerLevels-chunk-level-checking-methods.patch
+++ b/patches/server/0435-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 9f1b38c40da90f4224810356b8ee78418b58cb5d..ddf4f4081374910df6c8ad7b92c479066434276f 100644
+index 01fca7eb1b12948d475f794e5a319ada72f0eb38..2fed7a347844a24a1095a654f27c1494a53eef51 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2165,19 +2165,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0436-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 98%
rename from patches/server/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0436-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index fe8bf40a11..a6227e1804 100644
--- a/patches/server/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/patches/server/0436-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -35,7 +35,7 @@ index bc880a78381b9c30e4ec92bdf17c9eca1ded41f2..eae27a641ee69f3383f1200f8c8ab8dd
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
-index a3bdace1ce3252e8c09b642ee8963bfb4b39222c..d6bb8610de3c2e468c964f131564e54b392534f1 100644
+index 62118348d6fb00f063507debb488e1ff431d139c..211566dada0f820af331695b4c62035b89f25a53 100644
 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java
 +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
 @@ -212,6 +212,27 @@ public abstract class DistanceManager {
diff --git a/patches/server/0436-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0437-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0436-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0437-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0437-Maps-shouldn-t-load-chunks.patch b/patches/server/0438-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0437-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0438-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0438-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0439-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0438-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0439-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0439-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0440-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0439-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0440-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0440-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0441-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0440-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0441-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0441-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0442-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 98%
rename from patches/server/0441-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0442-Fix-piston-physics-inconsistency-MC-188840.patch
index b3550476a2..bdc9e032a2 100644
--- a/patches/server/0441-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0442-Fix-piston-physics-inconsistency-MC-188840.patch
@@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840
 This patch also fixes rail duping and carpet duping.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index edfa4a27a18b5c9df75f3952c51acdde1faa6dde..a545a882335094daa787ec5c7005939080195263 100644
+index dcc2b48f7784473c3c62fe062b66891e835694c4..df1337c89c943a80a31d127c844f061c1e56eb91 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -451,4 +451,12 @@ public class PaperConfig {
diff --git a/patches/server/0442-Fix-sand-duping.patch b/patches/server/0443-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0442-Fix-sand-duping.patch
rename to patches/server/0443-Fix-sand-duping.patch
diff --git a/patches/server/0443-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0444-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from patches/server/0443-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0444-Prevent-position-desync-in-playerconnection-causing-.patch
index 9ced2d10a0..e5cf4e564f 100644
--- a/patches/server/0443-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0444-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 81a1af417ea394a63d4d86b19fadbafce8963aac..901101fe571aa6723081d975ada15c54e543180e 100644
+index 7c7cd7e9ee014f5b822a94d394ab1978dcff7beb..24c605ab53c45daa8f6e2b4e8004e056b38d75a5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1338,6 +1338,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0444-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0445-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0444-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0445-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0445-Expose-Arrow-getItemStack.patch b/patches/server/0446-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0445-Expose-Arrow-getItemStack.patch
rename to patches/server/0446-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0446-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0447-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 95%
rename from patches/server/0446-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0447-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 5639a182f3..a2b186db62 100644
--- a/patches/server/0446-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0447-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 901101fe571aa6723081d975ada15c54e543180e..b6517796367e2424063d429fed6ceeb9078ea2e0 100644
+index 24c605ab53c45daa8f6e2b4e8004e056b38d75a5..2d02799d99e0eea9327820fe8a014910c346ec21 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2801,9 +2801,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0447-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0448-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0447-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0448-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0448-Add-permission-for-command-blocks.patch b/patches/server/0449-Add-permission-for-command-blocks.patch
similarity index 98%
rename from patches/server/0448-Add-permission-for-command-blocks.patch
rename to patches/server/0449-Add-permission-for-command-blocks.patch
index 97b9091484..02e3126cfe 100644
--- a/patches/server/0448-Add-permission-for-command-blocks.patch
+++ b/patches/server/0449-Add-permission-for-command-blocks.patch
@@ -18,7 +18,7 @@ index d4f57fde2f02071dfde08cb2a5c8359984056aef..176e5bbac94cf39805dcacfcae3a3daa
                  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 b6517796367e2424063d429fed6ceeb9078ea2e0..e32011d5a0b9b2873adb99805fc3ab29e478679d 100644
+index 2d02799d99e0eea9327820fe8a014910c346ec21..770f11ad28f17427306e79509ecd192555854f1e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -792,7 +792,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0449-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0450-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 95%
rename from patches/server/0449-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0450-Ensure-Entity-AABB-s-are-never-invalid.patch
index 426a703d22..b2040a5e81 100644
--- a/patches/server/0449-Ensure-Entity-AABB-s-are-never-invalid.patch
+++ b/patches/server/0450-Ensure-Entity-AABB-s-are-never-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7ac9ca00521a9a265d4d188c3bef5c89736d8852..e2c3c733f6ee7c4f35ad7ee351d5ea1eb00fc251 100644
+index a99d0dfeece57204e94b349b385e315a83869bca..e2585356cb8e9d556901a87df4a0b33bf4a5dcf4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -599,8 +599,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0451-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 98%
rename from patches/server/0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0451-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 2769a06ced..bd5e6fa749 100644
--- a/patches/server/0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0451-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -89,7 +89,7 @@ index a7a3c17cf97486f9f1af0cdc00686c22b37449b6..5a4eeb46543d9458e309e2d4cc56086b
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e32011d5a0b9b2873adb99805fc3ab29e478679d..c55d5c2f27babd8733a83fdd89b97d11c91de1cf 100644
+index 770f11ad28f17427306e79509ecd192555854f1e..e3cc64933133d086bb14b6a941f6dd30d31d970c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3059,7 +3059,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0451-Paper-dumpitem-command.patch b/patches/server/0452-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0451-Paper-dumpitem-command.patch
rename to patches/server/0452-Paper-dumpitem-command.patch
diff --git a/patches/server/0452-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0453-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0452-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0453-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0453-Improve-Legacy-Component-serialization-size.patch b/patches/server/0454-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0453-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0454-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0455-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0454-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0455-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index b38afa2618..4025eb4510 100644
--- a/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -44,7 +44,7 @@ index 3f613f1f5942452daa60e919abb80397e8357e63..829f97c44a68acf7ed59c6790461bcb1
          this.printSaveWarning = false;
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a4b9e20b2656647afacefc2c4b7962f78d882114..7bb753f498b10be32726771250dca7e15338d8d1 100644
+index 2993fdcc7670d47466893d7ee4d0c3916859d37f..a5c335715a25dc154682e38a49ff308f30b41216 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -275,8 +275,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0456-incremental-chunk-and-player-saving.patch b/patches/server/0457-incremental-chunk-and-player-saving.patch
similarity index 98%
rename from patches/server/0456-incremental-chunk-and-player-saving.patch
rename to patches/server/0457-incremental-chunk-and-player-saving.patch
index d93c50da63..86497575c4 100644
--- a/patches/server/0456-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0457-incremental-chunk-and-player-saving.patch
@@ -165,7 +165,7 @@ index dff475b327d6edaa4dcb9bc09029237f8f659846..05d2790b80a6d2e1dc6b8d2375f783be
          for (int i = 0; i < this.futures.length(); ++i) {
              CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> completablefuture = (CompletableFuture) this.futures.get(i);
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b2072b4eb3369f73bd68d3836447ecda802d7007..36181d03c44f2ee4a129129b6fe253f25748af2d 100644
+index f6864aba42bab1e23450f8f600c5c1f1ce4d4846..b1093b728f09a8b1235d27563004de3ff0fbe911 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -104,6 +104,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
@@ -301,7 +301,7 @@ index 1d5587bb9cf785de4b6d59234eb700c2e1a8a7dd..9fdd2a39e3590b3098fa31b9b0e00811
      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 ddf4f4081374910df6c8ad7b92c479066434276f..e4422ec63abf90e78a7ff6b12cb613234960e59a 100644
+index 2fed7a347844a24a1095a654f27c1494a53eef51..2182d17d463cea2ff999c5bc61eb31f4317362d8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1061,6 +1061,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -355,7 +355,7 @@ index 5a4eeb46543d9458e309e2d4cc56086b5cf528c6..d11b5c9e64b6695a44cc2db588bed2e8
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      public ServerGamePacketListenerImpl connection;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a36d582b8fdd99eba423fbeb8f46f0dd226d3523..d70680d5422434b4a0e962a30cc1324f323c272e 100644
+index e9470af5a168f54c78383553ca634e77ae2a4cf5..f19c9489d0b982a28e2ee8fac6940ecc11fac6af 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -560,6 +560,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0457-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0458-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0457-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0458-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0458-Support-old-UUID-format-for-NBT.patch b/patches/server/0459-Support-old-UUID-format-for-NBT.patch
similarity index 62%
rename from patches/server/0458-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0459-Support-old-UUID-format-for-NBT.patch
index 174483efe9..acb06f11bc 100644
--- a/patches/server/0458-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0459-Support-old-UUID-format-for-NBT.patch
@@ -46,26 +46,9 @@ index be2bd47a509a03e78c380cf749cd476f332ab03d..210f81e380cb38c2d5d69849e593d2fd
          return tag != null && tag.getType() == IntArrayTag.TYPE && ((IntArrayTag)tag).getAsIntArray().length == 4;
      }
 diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index 32445370db8392c36065fa7a7680cfe9b90653c3..7b48db30a155006a74688809155d779b88e48092 100644
+index 994bfb175446a7d2e697ff8faef36a348ed1accd..7b48db30a155006a74688809155d779b88e48092 100644
 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java
 +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
-@@ -40,14 +40,14 @@ import net.minecraft.world.level.material.FluidState;
- import org.slf4j.Logger;
- 
- public final class NbtUtils {
--    private static final Comparator<ListTag> YXZ_LISTTAG_INT_COMPARATOR = Comparator.comparingInt((nbt) -> {
-+    private static final Comparator<ListTag> YXZ_LISTTAG_INT_COMPARATOR = Comparator.<ListTag>comparingInt((nbt) -> { // Paper - decompile fix
-         return nbt.getInt(1);
-     }).thenComparingInt((nbt) -> {
-         return nbt.getInt(0);
-     }).thenComparingInt((nbt) -> {
-         return nbt.getInt(2);
-     });
--    private static final Comparator<ListTag> YXZ_LISTTAG_DOUBLE_COMPARATOR = Comparator.comparingDouble((nbt) -> {
-+    private static final Comparator<ListTag> YXZ_LISTTAG_DOUBLE_COMPARATOR = Comparator.<ListTag>comparingDouble((nbt) -> { // Paper - decompile fix
-         return nbt.getDouble(1);
-     }).thenComparingDouble((nbt) -> {
-         return nbt.getDouble(0);
 @@ -75,6 +75,11 @@ public final class NbtUtils {
          if (compound.contains("Name", 8)) {
              string = compound.getString("Name");
@@ -78,12 +61,3 @@ index 32445370db8392c36065fa7a7680cfe9b90653c3..7b48db30a155006a74688809155d779b
  
          if (compound.hasUUID("Id")) {
              uUID = compound.getUUID("Id");
-@@ -495,7 +500,7 @@ public final class NbtUtils {
-     }
- 
-     public static CompoundTag update(DataFixer fixer, DataFixTypes fixTypes, CompoundTag compound, int oldVersion, int targetVersion) {
--        return fixer.update(fixTypes.getType(), new Dynamic<>(NbtOps.INSTANCE, compound), oldVersion, targetVersion).getValue();
-+        return (CompoundTag) fixer.update(fixTypes.getType(), new Dynamic<>(NbtOps.INSTANCE, compound), oldVersion, targetVersion).getValue(); // Paper - decompile fix
-     }
- 
-     public static Component toPrettyComponent(Tag element) {
diff --git a/patches/server/0459-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0460-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 96%
rename from patches/server/0459-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0460-Clean-up-duplicated-GameProfile-Properties.patch
index d9c0d0a1c7..6a8048ec43 100644
--- a/patches/server/0459-Clean-up-duplicated-GameProfile-Properties.patch
+++ b/patches/server/0460-Clean-up-duplicated-GameProfile-Properties.patch
@@ -9,7 +9,7 @@ growing to large sizes and preventing login.
 This now automatically cleans up the extra properties.
 
 diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index b77b806b28dfada3e84e25d868aa8a8f8556f5af..97c5e6c70cd9f96bc229557a425fbffbf489910e 100644
+index 7b48db30a155006a74688809155d779b88e48092..9865f9352ecac8175070187c2f67fedddb588864 100644
 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java
 +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
 @@ -93,7 +93,8 @@ public final class NbtUtils {
diff --git a/patches/server/0460-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0461-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 97%
rename from patches/server/0460-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0461-Convert-legacy-attributes-in-Item-Meta.patch
index f98b66147d..d1830740b8 100644
--- a/patches/server/0460-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0461-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,7 +30,7 @@ index 0520c45197629cbdc2777d9ae11eef572e793160..46c313d581b9af6aa0a48f97ae3cc800
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 59bb47ab215e83ca5446621cae1e3fa4a02f7d6f..0f24f26644250905fe47c64bb203f234267b474f 100644
+index 4b48f4e1b2d69a18be0e9d83d52bc4f58b1f5bd9..058a7ccd1680e68db55350a72510da4aaff8d60b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -480,7 +480,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0461-Remove-some-streams-from-structures.patch b/patches/server/0462-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0461-Remove-some-streams-from-structures.patch
rename to patches/server/0462-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0462-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0463-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0462-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0463-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0463-Support-components-in-ItemMeta.patch b/patches/server/0464-Support-components-in-ItemMeta.patch
similarity index 97%
rename from patches/server/0463-Support-components-in-ItemMeta.patch
rename to patches/server/0464-Support-components-in-ItemMeta.patch
index ad452ddc2a..f8e10e62b2 100644
--- a/patches/server/0463-Support-components-in-ItemMeta.patch
+++ b/patches/server/0464-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 0f24f26644250905fe47c64bb203f234267b474f..4506438ac75ca3724d096a454e07fb7e950228f6 100644
+index 058a7ccd1680e68db55350a72510da4aaff8d60b..9486dc1c1ec5d997d53277ede2f85e9df153939e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -874,11 +874,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0464-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0465-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0464-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0465-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0465-Add-entity-liquid-API.patch b/patches/server/0466-Add-entity-liquid-API.patch
similarity index 91%
rename from patches/server/0465-Add-entity-liquid-API.patch
rename to patches/server/0466-Add-entity-liquid-API.patch
index d450f7b31e..4482f88f22 100644
--- a/patches/server/0465-Add-entity-liquid-API.patch
+++ b/patches/server/0466-Add-entity-liquid-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e2c3c733f6ee7c4f35ad7ee351d5ea1eb00fc251..a702a53f588ddd9f748f55973cd3782734aafc51 100644
+index e2585356cb8e9d556901a87df4a0b33bf4a5dcf4..eac485db587eba68ab0d05ac5bfd07fb20c0e766 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1372,7 +1372,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -17,7 +17,7 @@ index e2c3c733f6ee7c4f35ad7ee351d5ea1eb00fc251..a702a53f588ddd9f748f55973cd37827
          return this.isInWater() || this.isInRain() || this.isInBubbleColumn();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index c066be9b92d73de66ee3f1ef6aa8910de4589210..1fb0d345b0b22d40d9313f35c792c646533da008 100644
+index b732d9de71e5799969852a22f22e860637f7d64e..1f2503748e0534d48db558d09997683d563b649c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1243,5 +1243,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0466-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0467-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0466-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0467-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0467-Spawn-player-in-correct-world-on-login.patch b/patches/server/0468-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from patches/server/0467-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0468-Spawn-player-in-correct-world-on-login.patch
index e93a78eec4..a12daa7fac 100644
--- a/patches/server/0467-Spawn-player-in-correct-world-on-login.patch
+++ b/patches/server/0468-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d70680d5422434b4a0e962a30cc1324f323c272e..c154f5e7708dbb19cf1b1a546bb209d386ef52d4 100644
+index f19c9489d0b982a28e2ee8fac6940ecc11fac6af..aa9d32a4c86aade43f91c78ae1179119d12e9a88 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -196,7 +196,18 @@ public abstract class PlayerList {
diff --git a/patches/server/0468-Add-PrepareResultEvent.patch b/patches/server/0469-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0468-Add-PrepareResultEvent.patch
rename to patches/server/0469-Add-PrepareResultEvent.patch
diff --git a/patches/server/0469-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0470-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0469-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0470-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/patches/server/0471-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0472-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0471-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0472-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0472-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0473-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 96%
rename from patches/server/0472-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0473-Optimize-the-advancement-data-player-iteration-to-be.patch
index f60ffe8b92..bcabd99f92 100644
--- a/patches/server/0472-Optimize-the-advancement-data-player-iteration-to-be.patch
+++ b/patches/server/0473-Optimize-the-advancement-data-player-iteration-to-be.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize the advancement data player iteration to be O(N)
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 3d82f984648605d58fae3c57f145d0da8a2ae225..bd858a9da2f2442be85f36bb2de0dac46d0c68d7 100644
+index ecd62d2625bc5def3ac68f642f2c6f156060f129..f8f0be77126d2f3a1c53f7405ce4de4f0dca42be 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
 @@ -437,6 +437,16 @@ public class PlayerAdvancements {
diff --git a/patches/server/0473-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0474-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0473-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0474-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0474-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0475-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 96%
rename from patches/server/0474-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0475-Thread-Safe-Vanilla-Command-permission-checking.patch
index 834506f5be..7145af352d 100644
--- a/patches/server/0474-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0475-Thread-Safe-Vanilla-Command-permission-checking.patch
@@ -26,7 +26,7 @@ index 2b87c6eb28d4db634dd6d8ee42ff3aa78ed7cb68..f64aa22ed6fcb4af67317b99f459ee52
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index 530a09fa3c9155459c6a4519e3412408ae658145..cb0045fc4ddd738c45dee89d57b213a633b9a136 100644
+index 31aaad639b6c285226ca7aca1bd2285cfe0d9117..db26d834d9a59c4fd60f99077f0118c08293678f 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -56,7 +56,7 @@ public class CommandSourceStack implements SharedSuggestionProvider, com.destroy
diff --git a/patches/server/0475-Move-range-check-for-block-placing-up.patch b/patches/server/0476-Move-range-check-for-block-placing-up.patch
similarity index 96%
rename from patches/server/0475-Move-range-check-for-block-placing-up.patch
rename to patches/server/0476-Move-range-check-for-block-placing-up.patch
index f673fb2fed..cce90f624f 100644
--- a/patches/server/0475-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0476-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 c55d5c2f27babd8733a83fdd89b97d11c91de1cf..67ac85c5d9222f6ccbf5fed0f06c7b62e16c5e7b 100644
+index e3cc64933133d086bb14b6a941f6dd30d31d970c..baa80ce55e815b179fcf55b3cda3f59d3efe1354 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1682,6 +1682,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0476-Fix-SPIGOT-5989.patch b/patches/server/0477-Fix-SPIGOT-5989.patch
similarity index 97%
rename from patches/server/0476-Fix-SPIGOT-5989.patch
rename to patches/server/0477-Fix-SPIGOT-5989.patch
index 98c7bbe05b..7b8d5b1276 100644
--- a/patches/server/0476-Fix-SPIGOT-5989.patch
+++ b/patches/server/0477-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 78270cdd1e8f371f951d317f6cf438069e81c958..8c35ca1f6507092da1bd25ce4fe2e100f3233a1a 100644
+index d5e5e0a80c1a3dd5823e9975062856b6d0ef3ae1..d5768986b1666691bbcefac158cea120eaf9cac5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -79,6 +79,7 @@ import net.minecraft.world.level.GameRules;
diff --git a/patches/server/0477-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0478-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0477-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0478-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0478-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0479-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0478-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0479-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0479-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0480-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0479-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0480-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0480-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0481-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0480-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0481-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0481-Fix-some-rails-connecting-improperly.patch b/patches/server/0482-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0481-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0482-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0482-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0483-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0482-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0483-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0483-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0484-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0483-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0484-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0484-Brand-support.patch b/patches/server/0485-Brand-support.patch
similarity index 100%
rename from patches/server/0484-Brand-support.patch
rename to patches/server/0485-Brand-support.patch
diff --git a/patches/server/0485-Add-setMaxPlayers-API.patch b/patches/server/0486-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0485-Add-setMaxPlayers-API.patch
rename to patches/server/0486-Add-setMaxPlayers-API.patch
index ba2b6710fb..b49c1c0270 100644
--- a/patches/server/0485-Add-setMaxPlayers-API.patch
+++ b/patches/server/0486-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8c35ca1f6507092da1bd25ce4fe2e100f3233a1a..1dcdc093e7e304ca2479b268bd4e8a07b8c5735a 100644
+index d5768986b1666691bbcefac158cea120eaf9cac5..e5dc73d7cfd2ec868b18c5d34010d79d273465e1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -144,7 +144,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0486-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0487-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0486-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0487-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0487-Don-t-require-FACING-data.patch b/patches/server/0488-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0487-Don-t-require-FACING-data.patch
rename to patches/server/0488-Don-t-require-FACING-data.patch
diff --git a/patches/server/0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0489-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 92%
rename from patches/server/0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0489-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index e7d888ee24..4a7aa73b9c 100644
--- a/patches/server/0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0489-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 e4422ec63abf90e78a7ff6b12cb613234960e59a..116c9f57b91aad9928ef0834e9b46546553595b4 100644
+index 2182d17d463cea2ff999c5bc61eb31f4317362d8..f8a892110339ef63b5bdc31b64c4a40833685526 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1751,6 +1751,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -17,7 +17,7 @@ index e4422ec63abf90e78a7ff6b12cb613234960e59a..116c9f57b91aad9928ef0834e9b46546
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6bd208485b8d7d4fb2eb80811304dfa626c95dfe..0f53de1e9fb15f4f63106f38aef6c398bdb87d78 100644
+index 84607e4d2b22bc0c5df762fddb556eab7c06de23..0d194f538e388560fbf946c581a5f5aea6550df7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -256,11 +256,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0489-Add-moon-phase-API.patch b/patches/server/0490-Add-moon-phase-API.patch
similarity index 89%
rename from patches/server/0489-Add-moon-phase-API.patch
rename to patches/server/0490-Add-moon-phase-API.patch
index 1fce895616..35bfa2ea8c 100644
--- a/patches/server/0489-Add-moon-phase-API.patch
+++ b/patches/server/0490-Add-moon-phase-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0f53de1e9fb15f4f63106f38aef6c398bdb87d78..e8dd6a2de3a09e6144d42d16071de186a2b32817 100644
+index 0d194f538e388560fbf946c581a5f5aea6550df7..3f0a35ccb0763b34f735a76b230e30e7840684d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -194,6 +194,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0490-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0491-Improve-Chunk-Status-Transition-Speed.patch
similarity index 97%
rename from patches/server/0490-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0491-Improve-Chunk-Status-Transition-Speed.patch
index 14f78ac175..85e8a85a9e 100644
--- a/patches/server/0490-Improve-Chunk-Status-Transition-Speed.patch
+++ b/patches/server/0491-Improve-Chunk-Status-Transition-Speed.patch
@@ -54,7 +54,7 @@ index 6ba7e2713452c4c6f48a1a825ef27b500140aa16..cd4328bd606d778ebb45f36af8cf23d8
      public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) {
          this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size());
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 679306d4b4607954fe1d68c9bede6e37b408d399..f79509a529d4e682b5e370ddd99539afd1934f73 100644
+index 549facfa3e154fa1b1d3eeb4b6127d3bb75b5f8b..efe1d149eb0c6661b67d51375a264fb2b4aaad80 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -691,7 +691,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0491-Prevent-headless-pistons-from-being-created.patch b/patches/server/0492-Prevent-headless-pistons-from-being-created.patch
similarity index 94%
rename from patches/server/0491-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0492-Prevent-headless-pistons-from-being-created.patch
index e77c51a78e..e8b6baa19f 100644
--- a/patches/server/0491-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0492-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 933d3ace21f5a313f1d5e4dfd86777f6fa235f3f..1fd89294fabcd2a390ba7f1502acbfeb9a2343d6 100644
+index cb967380155d34ff511346d54b61e1c2109780f3..3029cd3138f9ae806666c741ce8a11de963f4aef 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -469,4 +469,10 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 933d3ace21f5a313f1d5e4dfd86777f6fa235f3f..1fd89294fabcd2a390ba7f1502acbfeb
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 8325ccbcae2a5ed55f436163bb8136cc03db9df0..97f99a06b8954b08af9f4156abe8abdad359349a 100644
+index 0d6f33319521101bd10352d597b5e3e063ec443f..29f6c10e2c2626a9726d295acf12efea2b463cd3 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -35,6 +35,8 @@ import net.minecraft.world.level.block.BaseFireBlock;
diff --git a/patches/server/0492-Add-BellRingEvent.patch b/patches/server/0493-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0492-Add-BellRingEvent.patch
rename to patches/server/0493-Add-BellRingEvent.patch
diff --git a/patches/server/0493-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0494-Add-zombie-targets-turtle-egg-config.patch
similarity index 90%
rename from patches/server/0493-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0494-Add-zombie-targets-turtle-egg-config.patch
index 0c0a662b76..c15fe21872 100644
--- a/patches/server/0493-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0494-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8b4b521a84c8623665d21d0340bca7665953d20b..786253c675bff5aee5c5d79db897a282e6fb4b65 100644
+index 12a6f12ffa8a45b054b01a7edc73ca8a5bcb59b5..367b1e401f858dd34bfed94c0b55fc0f169f506c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -58,6 +58,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 8b4b521a84c8623665d21d0340bca7665953d20b..786253c675bff5aee5c5d79db897a282
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index de140adee6679e27598ecd7fe292cd657c7af303..252a079d4867a5ce7fb6a982cf668d2348f7292f 100644
+index 0ca58915b6b2eaf6a9765ba75d3e0773690ea040..7f779d724f8682cdfb777375f7e0af48f53708d3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -106,7 +106,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0494-Buffer-joins-to-world.patch b/patches/server/0495-Buffer-joins-to-world.patch
similarity index 96%
rename from patches/server/0494-Buffer-joins-to-world.patch
rename to patches/server/0495-Buffer-joins-to-world.patch
index 36aff9e064..a9c394af70 100644
--- a/patches/server/0494-Buffer-joins-to-world.patch
+++ b/patches/server/0495-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1fd89294fabcd2a390ba7f1502acbfeb9a2343d6..8111e5e1752d93f94b773e35f7ff3857144def63 100644
+index 3029cd3138f9ae806666c741ce8a11de963f4aef..b3f872e4920babfe521effb233b13f8e9c85bef1 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
diff --git a/patches/server/0495-Optimize-redstone-algorithm.patch b/patches/server/0496-Optimize-redstone-algorithm.patch
similarity index 99%
rename from patches/server/0495-Optimize-redstone-algorithm.patch
rename to patches/server/0496-Optimize-redstone-algorithm.patch
index 909e595c8d..6c810d8a29 100644
--- a/patches/server/0495-Optimize-redstone-algorithm.patch
+++ b/patches/server/0496-Optimize-redstone-algorithm.patch
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 786253c675bff5aee5c5d79db897a282e6fb4b65..21adf6cb4cef00bc5f16a6e065a43c7894e24ba9 100644
+index 367b1e401f858dd34bfed94c0b55fc0f169f506c..4bd324e2f4675612501e4eb82ec43bffa28495dd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -63,6 +63,16 @@ public class PaperWorldConfig {
diff --git a/patches/server/0496-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0497-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0496-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0497-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0497-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0498-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0497-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0498-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0498-Fix-CraftTeam-null-check.patch b/patches/server/0499-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0498-Fix-CraftTeam-null-check.patch
rename to patches/server/0499-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0499-Add-more-Evoker-API.patch b/patches/server/0500-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0499-Add-more-Evoker-API.patch
rename to patches/server/0500-Add-more-Evoker-API.patch
diff --git a/patches/server/0500-Add-methods-to-get-translation-keys.patch b/patches/server/0501-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0500-Add-methods-to-get-translation-keys.patch
rename to patches/server/0501-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0501-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0502-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0501-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0502-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0502-Cache-block-data-strings.patch b/patches/server/0503-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0502-Cache-block-data-strings.patch
rename to patches/server/0503-Cache-block-data-strings.patch
diff --git a/patches/server/0503-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0504-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 94%
rename from patches/server/0503-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0504-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index c7d783a52e..2624dd65c2 100644
--- a/patches/server/0503-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0504-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0b715660d17751d4bc6c8d23dc288ca246608ec..758c10215a14f51c95657fe9b392e3f1ed37ec3c 100644
+index 4b6f6bf8c79f2d496218ab02833c25242beb1067..b7f876a00abdedcf6822b7dae61144e7fd94fdb3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -685,7 +685,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -31,7 +31,7 @@ index b0b715660d17751d4bc6c8d23dc288ca246608ec..758c10215a14f51c95657fe9b392e3f1
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e18b2855791002a20f5afaa87cbfb36023ba4b7f..b3d636566d818aa3113501bf1620af29c62602fd 100644
+index 2df33172415c8da39b9f299027cd86d2ce7c6890..bd285a7d84c934ec094099810eac1f03c09118e3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -154,6 +154,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -69,7 +69,7 @@ index 70e1f9bd9e4711aaf45ff8b7214726de646997ab..4bfebbb2e87464cd47a38a5da6275b2c
                          if (entity instanceof Mob) {
                              Mob entityinsentient = (Mob) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1fb0d345b0b22d40d9313f35c792c646533da008..27c48e853ee93ab8eeb27560666fafc1057585be 100644
+index 1f2503748e0534d48db558d09997683d563b649c..8ec7cd4ea41c28c1f730df649b7cf73d57d60b55 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -579,7 +579,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0504-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0505-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 97%
rename from patches/server/0504-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0505-Add-additional-open-container-api-to-HumanEntity.patch
index 673327c917..188d4ee3d8 100644
--- a/patches/server/0504-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0505-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 319aa663bd0250c6371c06501fc7986e80fcec6b..e4759fe6779b2c174388c1b5f56ce13c51d653b6 100644
+index f1c3afb478f2ffabb883ab86e132ff43c7c2d821..cdd2e391d18179d85a8658d09a02de6637a86a5c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -458,6 +458,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0505-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0506-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 96%
rename from patches/server/0505-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0506-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index a02addc375..9787a24022 100644
--- a/patches/server/0505-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0506-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
@@ -30,7 +30,7 @@ This patch will significantly reduce CPU use on startup, reduce memory usage,
 and improve server startup time.
 
 diff --git a/src/main/java/com/mojang/datafixers/DataFixerBuilder.java b/src/main/java/com/mojang/datafixers/DataFixerBuilder.java
-index edb77982d273e9492ab1a669ca1ad89da2ec3c3e..abc265b00044b14abb55c2628d454ee01fef467b 100644
+index e7e410585760c6f0cb4b6cf81fcc97333fc8ab10..503828188b25ce41b86a868853d6969b84764a84 100644
 --- a/src/main/java/com/mojang/datafixers/DataFixerBuilder.java
 +++ b/src/main/java/com/mojang/datafixers/DataFixerBuilder.java
 @@ -26,8 +26,10 @@ public class DataFixerBuilder {
diff --git a/patches/server/0506-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0507-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 96%
rename from patches/server/0506-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0507-Extend-block-drop-capture-to-capture-all-items-added.patch
index 77ad943789..26250fd153 100644
--- a/patches/server/0506-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0507-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 116c9f57b91aad9928ef0834e9b46546553595b4..7f20b6806a28a8ff064aa1b539e82977e1ab0395 100644
+index f8a892110339ef63b5bdc31b64c4a40833685526..6e3eb9624d6febc995cf428d9d0136718e6b7f4a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1263,6 +1263,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0507-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0508-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0507-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0508-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0508-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0509-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 94%
rename from patches/server/0508-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0509-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 80eeafad73..efba304224 100644
--- a/patches/server/0508-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0509-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b3d636566d818aa3113501bf1620af29c62602fd..dd22f619ace097c5d6ee63ef869d564df0569b5e 100644
+index bd285a7d84c934ec094099810eac1f03c09118e3..35825b598778e6b8aef613263abab1a8d4ab4af3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4013,4 +4013,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0509-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0510-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 98%
rename from patches/server/0509-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0510-Lazily-track-plugin-scoreboards-by-default.patch
index 26354870bb..8c331cf394 100644
--- a/patches/server/0509-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0510-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,7 +14,7 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 8111e5e1752d93f94b773e35f7ff3857144def63..ec42fb00b6f4a691fa710c68131f80b242e3e6e8 100644
+index b3f872e4920babfe521effb233b13f8e9c85bef1..7a99db37a91edd12ef4a5d8cad690f6e62d31ba0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -96,6 +96,11 @@ public class PaperConfig {
diff --git a/patches/server/0510-Entity-isTicking.patch b/patches/server/0511-Entity-isTicking.patch
similarity index 90%
rename from patches/server/0510-Entity-isTicking.patch
rename to patches/server/0511-Entity-isTicking.patch
index 209855c20f..2b9164a120 100644
--- a/patches/server/0510-Entity-isTicking.patch
+++ b/patches/server/0511-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dd22f619ace097c5d6ee63ef869d564df0569b5e..51711841c072e0ac59922a45271298d2930e3581 100644
+index 35825b598778e6b8aef613263abab1a8d4ab4af3..c4f528fac063b2f8a4955d00e4220fcbd0867a61 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -56,6 +56,7 @@ import net.minecraft.resources.ResourceKey;
@@ -27,7 +27,7 @@ index dd22f619ace097c5d6ee63ef869d564df0569b5e..51711841c072e0ac59922a45271298d2
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 27c48e853ee93ab8eeb27560666fafc1057585be..ff890a42f1d67e197f4aac5d76a18527bae5b79d 100644
+index 8ec7cd4ea41c28c1f730df649b7cf73d57d60b55..c63301472922dceb2873553bb4b0c350b37a23c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1267,5 +1267,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0511-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0512-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0511-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0512-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0512-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0513-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0512-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0513-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0513-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0514-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 91%
rename from patches/server/0513-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0514-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 0e429e17b8..380db649b6 100644
--- a/patches/server/0513-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0514-Reset-Ender-Crystals-on-Dragon-Spawn.patch
@@ -11,7 +11,7 @@ This ensures the crystals/pillars are in expected state when the dragon spawns.
 See #3522
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 9a6b2c75b8622b0f9eda85011ef6f2f1dca574c9..01fb5d0c18d50e298a891a42428c5c87d6820194 100644
+index f713a1fefb0d8505672d653cf67ead13e321144f..b1a0654ba01c265385db877d528c1aa2103b2eb0 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -408,6 +408,7 @@ public class EndDragonFight {
diff --git a/patches/server/0514-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0515-Fix-for-large-move-vectors-crashing-server.patch
similarity index 98%
rename from patches/server/0514-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0515-Fix-for-large-move-vectors-crashing-server.patch
index d7d6ec0879..ce662351de 100644
--- a/patches/server/0514-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0515-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 758c10215a14f51c95657fe9b392e3f1ed37ec3c..ed205249d7d2c2eb63fc6dab113a2b63ef1f36cb 100644
+index b7f876a00abdedcf6822b7dae61144e7fd94fdb3..def6838c09a859e5b3297b8251432f921720235e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -508,20 +508,31 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0515-Optimise-getType-calls.patch b/patches/server/0516-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0515-Optimise-getType-calls.patch
rename to patches/server/0516-Optimise-getType-calls.patch
diff --git a/patches/server/0516-Villager-resetOffers.patch b/patches/server/0517-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0516-Villager-resetOffers.patch
rename to patches/server/0517-Villager-resetOffers.patch
diff --git a/patches/server/0517-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0518-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0517-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0518-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0518-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0519-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0518-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0519-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0519-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0520-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0519-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0520-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0520-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0521-Fix-item-locations-dropped-from-campfires.patch
similarity index 94%
rename from patches/server/0520-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0521-Fix-item-locations-dropped-from-campfires.patch
index 49b095cf5a..14795b0485 100644
--- a/patches/server/0520-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0521-Fix-item-locations-dropped-from-campfires.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix item locations dropped from campfires
 Fixes #4259 by not flooring the blockposition among other weirdness
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-index 05cae0e74c64f5ab659dbfae4e40f1c8d9f15ed7..dd272fe24d330c04f2f3f44db9357b3d35034c4e 100644
+index a365b60830c0e541b9a62fe2db06b8889c803fad..02cdd957e7f79f6c00ee015a0d382def8aa2aead 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 @@ -70,7 +70,11 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
diff --git a/patches/server/0521-Player-elytra-boost-API.patch b/patches/server/0522-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0521-Player-elytra-boost-API.patch
rename to patches/server/0522-Player-elytra-boost-API.patch
diff --git a/patches/server/0522-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0523-Fixed-TileEntityBell-memory-leak.patch
similarity index 94%
rename from patches/server/0522-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0523-Fixed-TileEntityBell-memory-leak.patch
index 8f350486f1..09d0b77f4a 100644
--- a/patches/server/0522-Fixed-TileEntityBell-memory-leak.patch
+++ b/patches/server/0523-Fixed-TileEntityBell-memory-leak.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fixed TileEntityBell memory leak
 TileEntityBell has a list of entities (entitiesAtRing) that was not being cleared at the right time, causing leaks whenever a bell would be rung near a crowd of entities.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
-index 205db12aa5a8161b07efe7f12da79e9d7bff5cd6..b06e911acb825883c93da73358fa81653e8a0d4a 100644
+index 4353ad2f67556feaa0fdd34e8e907b17ab697565..feaad48e9bbc1e658324ef9e1e7e73aca0b3bf48 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
 @@ -61,6 +61,11 @@ public class BellBlockEntity extends BlockEntity {
diff --git a/patches/server/0523-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0524-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0523-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0524-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0524-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0525-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0524-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0525-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0525-Add-ignore-discounts-API.patch b/patches/server/0526-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0525-Add-ignore-discounts-API.patch
rename to patches/server/0526-Add-ignore-discounts-API.patch
diff --git a/patches/server/0526-Toggle-for-removing-existing-dragon.patch b/patches/server/0527-Toggle-for-removing-existing-dragon.patch
similarity index 90%
rename from patches/server/0526-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0527-Toggle-for-removing-existing-dragon.patch
index 81a8b06509..5839a45267 100644
--- a/patches/server/0526-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0527-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 21adf6cb4cef00bc5f16a6e065a43c7894e24ba9..2953c4d8bdfc0a7e7570c8994fd1c6ced6eaf654 100644
+index 4bd324e2f4675612501e4eb82ec43bffa28495dd..61ffa935098b461962bf0fee8b2422a07b3e17a2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -73,6 +73,14 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index 21adf6cb4cef00bc5f16a6e065a43c7894e24ba9..2953c4d8bdfc0a7e7570c8994fd1c6ce
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 01fb5d0c18d50e298a891a42428c5c87d6820194..ddfaaac55646527ccd5bb4f5b4d35aa3ddaf34f4 100644
+index b1a0654ba01c265385db877d528c1aa2103b2eb0..f59de70c4854b10ac39874838db33cdf784a45a1 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -216,7 +216,7 @@ public class EndDragonFight {
diff --git a/patches/server/0527-Fix-client-lag-on-advancement-loading.patch b/patches/server/0528-Fix-client-lag-on-advancement-loading.patch
similarity index 95%
rename from patches/server/0527-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0528-Fix-client-lag-on-advancement-loading.patch
index d4944d32cb..876c53aa02 100644
--- a/patches/server/0527-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0528-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index eaeeff92c0ff0cee9f4efaba536b750020670293..f84322256c19a5619fc5cd2efa3f64580d299bbf 100644
+index d379b14dfe18650b8c7077a3018238565853d17e..8e9b35d3012ab0bafe5e2194d8723d892402de39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -337,7 +337,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0528-Item-no-age-no-player-pickup.patch b/patches/server/0529-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0528-Item-no-age-no-player-pickup.patch
rename to patches/server/0529-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0529-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0530-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0529-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0530-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0530-Beacon-API-custom-effect-ranges.patch b/patches/server/0531-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0530-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0531-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0531-Add-API-for-quit-reason.patch b/patches/server/0532-Add-API-for-quit-reason.patch
similarity index 96%
rename from patches/server/0531-Add-API-for-quit-reason.patch
rename to patches/server/0532-Add-API-for-quit-reason.patch
index b6c8adfa00..1cdbb8d028 100644
--- a/patches/server/0531-Add-API-for-quit-reason.patch
+++ b/patches/server/0532-Add-API-for-quit-reason.patch
@@ -37,7 +37,7 @@ index 1136a3e406b3683ba7498a7903ed32e7053ffd1d..8874f9a3d64b706fdc857c805fe27931
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ed205249d7d2c2eb63fc6dab113a2b63ef1f36cb..85b7a53d43b0ea86ea211a6476edda3f95644e63 100644
+index def6838c09a859e5b3297b8251432f921720235e..8095858836774dd2b34c0361408a4adfec3c3bc6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -441,6 +441,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -49,7 +49,7 @@ index ed205249d7d2c2eb63fc6dab113a2b63ef1f36cb..85b7a53d43b0ea86ea211a6476edda3f
              this.connection.disconnect(ichatbasecomponent);
          });
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1dcdc093e7e304ca2479b268bd4e8a07b8c5735a..96d481a113551fe77fb8d3c78633ad89434125e6 100644
+index e5dc73d7cfd2ec868b18c5d34010d79d273465e1..0b4d5ab836e861ea87bb72185a513bdf341d5921 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -600,7 +600,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0532-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 97%
rename from patches/server/0532-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch
index 0051d0ab5c..24ed760819 100644
--- a/patches/server/0532-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch
@@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h
 values used in other places.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2953c4d8bdfc0a7e7570c8994fd1c6ced6eaf654..f56992472665b59e3ae22fab74d994686dc767f4 100644
+index 61ffa935098b461962bf0fee8b2422a07b3e17a2..f46d0d22b99582070747e2fde3c6328b0ab6d707 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -81,6 +81,19 @@ public class PaperWorldConfig {
@@ -35,7 +35,7 @@ index 2953c4d8bdfc0a7e7570c8994fd1c6ced6eaf654..f56992472665b59e3ae22fab74d99468
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index 80a895bad59538acbc88b9cb3392cbc95092a1fe..487dfa0dd39b99994a82ff3858903c28d7676c0d 100644
+index 7215501f554f88c49fa35a063743caa8af46369c..0eddd793fa590a68bd094d417ffb90941532522c 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 @@ -43,43 +43,53 @@ public class WanderingTraderSpawner implements CustomSpawner {
diff --git a/patches/server/0533-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0534-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0533-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0534-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0534-Expose-world-spawn-angle.patch b/patches/server/0535-Expose-world-spawn-angle.patch
similarity index 91%
rename from patches/server/0534-Expose-world-spawn-angle.patch
rename to patches/server/0535-Expose-world-spawn-angle.patch
index f3d1afa4dd..691463a16a 100644
--- a/patches/server/0534-Expose-world-spawn-angle.patch
+++ b/patches/server/0535-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 96d481a113551fe77fb8d3c78633ad89434125e6..1e131bf7f56f0c69e0edaa80c39b014ee8f265a4 100644
+index 0b4d5ab836e861ea87bb72185a513bdf341d5921..30f0b20924d6b778e49761a72b50263c96311bee 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -878,7 +878,7 @@ public abstract class PlayerList {
@@ -18,7 +18,7 @@ index 96d481a113551fe77fb8d3c78633ad89434125e6..1e131bf7f56f0c69e0edaa80c39b014e
  
              Player respawnPlayer = entityplayer1.getBukkitEntity();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e8dd6a2de3a09e6144d42d16071de186a2b32817..180b4b1659c35324089c6606fcdad8824e3b8b3e 100644
+index 3f0a35ccb0763b34f735a76b230e30e7840684d1..2c93624bda6919ce0a291d8855cb6e176b010e0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -247,7 +247,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0535-Add-Destroy-Speed-API.patch b/patches/server/0536-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0535-Add-Destroy-Speed-API.patch
rename to patches/server/0536-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0536-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0536-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0537-Add-LivingEntity-clearActiveItem.patch b/patches/server/0538-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0537-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0538-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0538-Add-PlayerItemCooldownEvent.patch b/patches/server/0539-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0538-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0539-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0539-More-lightning-API.patch b/patches/server/0540-More-lightning-API.patch
similarity index 100%
rename from patches/server/0539-More-lightning-API.patch
rename to patches/server/0540-More-lightning-API.patch
diff --git a/patches/server/0540-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0540-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch
index 2589f75924..4e99201db9 100644
--- a/patches/server/0540-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -21,7 +21,7 @@ index f46d0d22b99582070747e2fde3c6328b0ab6d707..b9164fb28a49ccc3113f7010786960ec
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 51711841c072e0ac59922a45271298d2930e3581..d030dc5faa84a0848d2b704a9dcf489fbecb0a70 100644
+index c4f528fac063b2f8a4955d00e4220fcbd0867a61..1e3436849760430b0db303e716f50555046d6f3e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1748,6 +1748,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0541-Added-missing-default-perms-for-commands.patch b/patches/server/0542-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0541-Added-missing-default-perms-for-commands.patch
rename to patches/server/0542-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0542-Add-PlayerShearBlockEvent.patch b/patches/server/0543-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0542-Add-PlayerShearBlockEvent.patch
rename to patches/server/0543-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0543-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0543-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0544-Limit-recipe-packets.patch b/patches/server/0545-Limit-recipe-packets.patch
similarity index 94%
rename from patches/server/0544-Limit-recipe-packets.patch
rename to patches/server/0545-Limit-recipe-packets.patch
index 3d81489c18..0830063b0d 100644
--- a/patches/server/0544-Limit-recipe-packets.patch
+++ b/patches/server/0545-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index ec42fb00b6f4a691fa710c68131f80b242e3e6e8..d5ae781d65016e0382cb3497cb8cac201680bc8c 100644
+index 7a99db37a91edd12ef4a5d8cad690f6e62d31ba0..4c2d11d04b63d0e5e2eeb3743a1f79fea301c5aa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -366,6 +366,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index ec42fb00b6f4a691fa710c68131f80b242e3e6e8..d5ae781d65016e0382cb3497cb8cac20
      public static boolean velocityOnlineMode;
      public static byte[] velocitySecretKey;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 85b7a53d43b0ea86ea211a6476edda3f95644e63..ade4e224020950337bfe1427efc25222a46297f0 100644
+index 8095858836774dd2b34c0361408a4adfec3c3bc6..9dd934166b96b9379f549d52386fc83894079212 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -230,6 +230,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0545-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0546-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0545-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0546-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0546-MC-4-Fix-item-position-desync.patch b/patches/server/0547-MC-4-Fix-item-position-desync.patch
similarity index 94%
rename from patches/server/0546-MC-4-Fix-item-position-desync.patch
rename to patches/server/0547-MC-4-Fix-item-position-desync.patch
index 8e303b4a3a..9dd6c9cfdb 100644
--- a/patches/server/0546-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0547-MC-4-Fix-item-position-desync.patch
@@ -9,7 +9,7 @@ loss, which forces the server to lose the same precision as the client
 keeping them in sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d5ae781d65016e0382cb3497cb8cac201680bc8c..266e52e1bf4d03ce7ad9dd329a18577b887cc767 100644
+index 4c2d11d04b63d0e5e2eeb3743a1f79fea301c5aa..c75005b934271e4b8864d949052d56465571f011 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -101,6 +101,11 @@ public class PaperConfig {
@@ -43,7 +43,7 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9
  
      public Vec3 updateEntityPosition(Vec3 orig) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d030dc5faa84a0848d2b704a9dcf489fbecb0a70..615934ced9c383c6ee37c9cb5cf07e92185662e3 100644
+index 1e3436849760430b0db303e716f50555046d6f3e..86a9cbc0768575138c09217cd300c2d9d08540fc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3828,6 +3828,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0547-Player-Chunk-Load-Unload-Events.patch b/patches/server/0548-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0547-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0548-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0548-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0549-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0548-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0549-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0549-Expose-LivingEntity-hurt-direction.patch b/patches/server/0550-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0549-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0550-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0550-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0550-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0551-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0551-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0552-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 99%
rename from patches/server/0552-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 3d353e6e7f..c7309cc0c3 100644
--- a/patches/server/0552-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
@@ -37,7 +37,7 @@ index 742ffe531bb8f3a9ca34dea99b044123d90cfff9..bd283f71cb05ffbe1fed39afb41ae54d
              CriteriaTriggers.TRADE.trigger((ServerPlayer) this.tradingPlayer, this, offer.getResult());
          }
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index b42ef24e9851ae1bd1313110cfe59ad424d21535..a0bfce13f024f993534d8f72a24f1a09b586464e 100644
+index 52f890fb91041757e6b8cba8831c890cbe9e111d..cd4070d30e18d14701385328f03734e731c3c2d3 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -753,6 +753,14 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0553-Implement-TargetHitEvent.patch b/patches/server/0554-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0553-Implement-TargetHitEvent.patch
rename to patches/server/0554-Implement-TargetHitEvent.patch
diff --git a/patches/server/0554-Additional-Block-Material-API-s.patch b/patches/server/0555-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0554-Additional-Block-Material-API-s.patch
rename to patches/server/0555-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0555-Fix-harming-potion-dupe.patch b/patches/server/0556-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0555-Fix-harming-potion-dupe.patch
rename to patches/server/0556-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0556-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0556-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0557-Cache-burn-durations.patch b/patches/server/0558-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0557-Cache-burn-durations.patch
rename to patches/server/0558-Cache-burn-durations.patch
diff --git a/patches/server/0558-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 95%
rename from patches/server/0558-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 9d5b1cb668..54f580f087 100644
--- a/patches/server/0558-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0dafb6b4837f9b68249e64a9f0b7f8f727d58327..8df810594156944a2cb149af35863caf10edbb83 100644
+index 17e4ee9224a79eded353a7098f277d502269ad38..f61e0c14db835a6b79f7c4b1f68a1005d5b3e913 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -104,6 +104,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0559-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0560-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0559-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0560-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0560-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0561-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0560-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0561-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0561-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0562-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 95%
rename from patches/server/0561-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0562-Fix-interact-event-not-being-called-in-adventure.patch
index c56c2554d8..49080fbb8e 100644
--- a/patches/server/0561-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0562-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 ade4e224020950337bfe1427efc25222a46297f0..5fd41a511709e5299a6d62521a46409fdb717664 100644
+index 9dd934166b96b9379f549d52386fc83894079212..1bd25f0d74ab3a018b56df7a517e661b9af32341 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1760,7 +1760,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0562-Zombie-API-breaking-doors.patch b/patches/server/0563-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0562-Zombie-API-breaking-doors.patch
rename to patches/server/0563-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0563-Fix-nerfed-slime-when-splitting.patch b/patches/server/0564-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0563-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0564-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0564-Add-EntityLoadCrossbowEvent.patch b/patches/server/0565-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0564-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0565-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0565-Guardian-beam-workaround.patch b/patches/server/0566-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0565-Guardian-beam-workaround.patch
rename to patches/server/0566-Guardian-beam-workaround.patch
diff --git a/patches/server/0566-Added-WorldGameRuleChangeEvent.patch b/patches/server/0567-Added-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from patches/server/0566-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0567-Added-WorldGameRuleChangeEvent.patch
index 21b356a056..aa2a6cc9f1 100644
--- a/patches/server/0566-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0567-Added-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 74e10d581f8c1b0b026d8f940194971efbdef434..798afc145c54306fcf0838d8daef2bdf
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 180b4b1659c35324089c6606fcdad8824e3b8b3e..f701061688d9058ec89dcf5c8ae337c17ff0d7eb 100644
+index 2c93624bda6919ce0a291d8855cb6e176b010e0c..5cc1de91e2ccc0d3f0d6ab9adcf39f2f72bdeb9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1797,8 +1797,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0567-Added-ServerResourcesReloadedEvent.patch b/patches/server/0568-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0567-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0568-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0568-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0569-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 97%
rename from patches/server/0568-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0569-Added-world-settings-for-mobs-picking-up-loot.patch
index f41cca0551..d6e6b4f242 100644
--- a/patches/server/0568-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0569-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -37,7 +37,7 @@ index 609380af4de4118a543b6ec94feb176e6f6870ed..ecf12ed5014202181e78af051e4a9ca8
              LocalDate localdate = LocalDate.now();
              int i = localdate.get(ChronoField.DAY_OF_MONTH);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 252a079d4867a5ce7fb6a982cf668d2348f7292f..64222cced10e87438ee3ada26aead0284649be78 100644
+index 7f779d724f8682cdfb777375f7e0af48f53708d3..dffb315cf21472f306bcc1d9fdcfba441a87b18f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -498,7 +498,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0569-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0570-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0569-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0570-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0570-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0571-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0570-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0571-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0571-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0572-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0571-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0572-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0572-Configurable-door-breaking-difficulty.patch b/patches/server/0573-Configurable-door-breaking-difficulty.patch
similarity index 94%
rename from patches/server/0572-Configurable-door-breaking-difficulty.patch
rename to patches/server/0573-Configurable-door-breaking-difficulty.patch
index b2d66405fc..e754c90c3f 100644
--- a/patches/server/0572-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0573-Configurable-door-breaking-difficulty.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable door breaking difficulty
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 63d0971379f96e000ab9e7939f626c216cb6d12c..95952806a544d38952b82f7078a46a5eeb622cd8 100644
+index ab52e655d16dc565cfb890ec8fdb07ce7f68e4cf..797275dd2dc0f7c2ef24311ebdd9659e8b2fdf2f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -109,6 +109,25 @@ public class PaperWorldConfig {
@@ -48,7 +48,7 @@ index 920c2101ebbdc07c7fd15903a3d641aa55f8336d..b3a00bff85ade49b476c883350ff3563
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 64222cced10e87438ee3ada26aead0284649be78..e72e9b748b3f3e34baddf01366c703efba50c67c 100644
+index dffb315cf21472f306bcc1d9fdcfba441a87b18f..da378373db05f7cf5e655bc76cb58945347d1f32 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -97,7 +97,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0573-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0574-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0573-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0574-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0574-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0575-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0574-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0575-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0575-Remove-stale-POIs.patch b/patches/server/0576-Remove-stale-POIs.patch
similarity index 92%
rename from patches/server/0575-Remove-stale-POIs.patch
rename to patches/server/0576-Remove-stale-POIs.patch
index 87d0c12886..59efbc0b2b 100644
--- a/patches/server/0575-Remove-stale-POIs.patch
+++ b/patches/server/0576-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 7f20b6806a28a8ff064aa1b539e82977e1ab0395..47dbdbf8c879fb50818ab9316c715fdcec96d581 100644
+index 6e3eb9624d6febc995cf428d9d0136718e6b7f4a..4797737c8085012bb898da0313a9ef9bf44e723d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1831,6 +1831,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0576-Fix-villager-boat-exploit.patch b/patches/server/0577-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0576-Fix-villager-boat-exploit.patch
rename to patches/server/0577-Fix-villager-boat-exploit.patch
index 9fef6d153b..832ad8704c 100644
--- a/patches/server/0576-Fix-villager-boat-exploit.patch
+++ b/patches/server/0577-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8ce5f463f16857b5862b6e0a77c63d8118b34d67..f4e74b0bc3d192d7f7c2bc1dbfef92a28863a57c 100644
+index 30f0b20924d6b778e49761a72b50263c96311bee..f0e2f637d443db71bd9df26cebb0f02c3e1ae85f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -625,6 +625,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0577-Add-sendOpLevel-API.patch b/patches/server/0578-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0577-Add-sendOpLevel-API.patch
rename to patches/server/0578-Add-sendOpLevel-API.patch
diff --git a/patches/server/0578-Add-StructureLocateEvent.patch b/patches/server/0579-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0578-Add-StructureLocateEvent.patch
rename to patches/server/0579-Add-StructureLocateEvent.patch
diff --git a/patches/server/0579-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0580-Collision-option-for-requiring-a-player-participant.patch
similarity index 97%
rename from patches/server/0579-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0580-Collision-option-for-requiring-a-player-participant.patch
index b0e2dbaaf0..2453830557 100644
--- a/patches/server/0579-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0580-Collision-option-for-requiring-a-player-participant.patch
@@ -28,7 +28,7 @@ index 797275dd2dc0f7c2ef24311ebdd9659e8b2fdf2f..55c997bc5fb41e16d965c6017128c903
      public int wanderingTraderSpawnDayTicks = 24000;
      public int wanderingTraderSpawnChanceFailureIncrement = 25;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 615934ced9c383c6ee37c9cb5cf07e92185662e3..6e14c3616164ff735841d03174161b6802c6aa8a 100644
+index 86a9cbc0768575138c09217cd300c2d9d08540fc..b28591ec812aead480fc55c50bce4bd3cbbb2409 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1631,6 +1631,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0580-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0581-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 92%
rename from patches/server/0580-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0581-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
index f6d7cce33f..b74ce3c39c 100644
--- a/patches/server/0580-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
+++ b/patches/server/0581-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
@@ -7,7 +7,7 @@ The duplicate ProjectileHitEvent in EntityFireball was removed. The
 event was always called before the duplicate call.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
-index 3370f4d331637bf13c7912218041f23872971e25..0dc335b3003ae3cf11828cc849763e271a3b365b 100644
+index 3de3258418f638a1b523c6a9178bb3ef1aaf2915..fa4e930388baa2ee0a752873b2ec1a67cc020de6 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java
 @@ -97,7 +97,7 @@ public abstract class AbstractHurtingProjectile extends Projectile {
diff --git a/patches/server/0581-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0582-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 94%
rename from patches/server/0581-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0582-Return-chat-component-with-empty-text-instead-of-thr.patch
index 1b7dfd0303..a9e7d4baac 100644
--- a/patches/server/0581-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0582-Return-chat-component-with-empty-text-instead-of-thr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index a0bfce13f024f993534d8f72a24f1a09b586464e..f45943ce80e78fe189fa2fffa27586b0a5a30c3d 100644
+index cd4070d30e18d14701385328f03734e731c3c2d3..a0e5e2daff21564a85c46ad469b79139cc26c1fd 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -22,6 +22,7 @@ import net.minecraft.ReportedException;
diff --git a/patches/server/0582-Make-schedule-command-per-world.patch b/patches/server/0583-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0582-Make-schedule-command-per-world.patch
rename to patches/server/0583-Make-schedule-command-per-world.patch
diff --git a/patches/server/0583-Configurable-max-leash-distance.patch b/patches/server/0584-Configurable-max-leash-distance.patch
similarity index 96%
rename from patches/server/0583-Configurable-max-leash-distance.patch
rename to patches/server/0584-Configurable-max-leash-distance.patch
index 334d10649f..39f8d7dd66 100644
--- a/patches/server/0583-Configurable-max-leash-distance.patch
+++ b/patches/server/0584-Configurable-max-leash-distance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max leash distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 19ae4ae82be4a5a387b0f6e1b18e36b24d0cbbdb..671ca20b02097332ef98d2be2e7aaafeadaf2a2c 100644
+index 55c997bc5fb41e16d965c6017128c90321d8457a..7b771d8467027b9ec898efe96b423a98556e54c3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -301,6 +301,12 @@ public class PaperWorldConfig {
diff --git a/patches/server/0584-Implement-BlockPreDispenseEvent.patch b/patches/server/0585-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0584-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0585-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0585-added-Wither-API.patch b/patches/server/0586-added-Wither-API.patch
similarity index 100%
rename from patches/server/0585-added-Wither-API.patch
rename to patches/server/0586-added-Wither-API.patch
diff --git a/patches/server/0586-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0586-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0587-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 95%
rename from patches/server/0587-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch
index 9bc589fe50..544c347429 100644
--- a/patches/server/0587-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -21,7 +21,7 @@ index 7b771d8467027b9ec898efe96b423a98556e54c3..e6b8f71c81daf1e886a9d46a2bed18d4
      public boolean phantomOnlyAttackInsomniacs = true;
      private void phantomSettings() {
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index ddfaaac55646527ccd5bb4f5b4d35aa3ddaf34f4..619ce8161deab5b93e2a3c4e652b3249f499fd3b 100644
+index f59de70c4854b10ac39874838db33cdf784a45a1..088ad331ec088478d85aedd8d4c32eab55e18dc5 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -367,7 +367,7 @@ public class EndDragonFight {
diff --git a/patches/server/0588-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0588-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0589-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0589-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0590-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0591-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0590-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0591-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0591-add-DragonEggFormEvent.patch b/patches/server/0592-add-DragonEggFormEvent.patch
similarity index 95%
rename from patches/server/0591-add-DragonEggFormEvent.patch
rename to patches/server/0592-add-DragonEggFormEvent.patch
index 7f32c9846d..ab3f7fd05b 100644
--- a/patches/server/0591-add-DragonEggFormEvent.patch
+++ b/patches/server/0592-add-DragonEggFormEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add DragonEggFormEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 619ce8161deab5b93e2a3c4e652b3249f499fd3b..467e2af08698ca40fbbe1fa7b0bafb9561f4fa65 100644
+index 088ad331ec088478d85aedd8d4c32eab55e18dc5..7dbe0bc8082c8e7741f40bbd69bc7d7407945754 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -367,9 +367,23 @@ public class EndDragonFight {
diff --git a/patches/server/0592-EntityMoveEvent.patch b/patches/server/0593-EntityMoveEvent.patch
similarity index 95%
rename from patches/server/0592-EntityMoveEvent.patch
rename to patches/server/0593-EntityMoveEvent.patch
index 885079f8c7..0ceba87d24 100644
--- a/patches/server/0592-EntityMoveEvent.patch
+++ b/patches/server/0593-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 16ab255e5aba0d0975cf77ae70dca74cba767ad6..3e8b73dccfb9ffdd0bc013edb2d05e3cae934fb7 100644
+index 0f03525066b818a81583618e9a80f245032493b7..9912b4e10abb5c41f2b92d992a6fe00ee5545740 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1541,6 +1541,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,7 +17,7 @@ index 16ab255e5aba0d0975cf77ae70dca74cba767ad6..3e8b73dccfb9ffdd0bc013edb2d05e3c
  
              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 47dbdbf8c879fb50818ab9316c715fdcec96d581..b7156e36d7d7907cf0390dcf3312b9754a4782ae 100644
+index 4797737c8085012bb898da0313a9ef9bf44e723d..3b5eceaf3a40fee6430864e849d403f5e3c5f9b4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -209,6 +209,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0593-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 95%
rename from patches/server/0593-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch
index 3a7562ecf7..a03f8b0be8 100644
--- a/patches/server/0593-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -21,7 +21,7 @@ index e6b8f71c81daf1e886a9d46a2bed18d4d414e18d..59675e523625b95169236bd0ead063cf
      public boolean phantomOnlyAttackInsomniacs = true;
      private void phantomSettings() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b7156e36d7d7907cf0390dcf3312b9754a4782ae..33e2da5fb3cf6dd21e3df601bb9ee9a4991102e4 100644
+index 3b5eceaf3a40fee6430864e849d403f5e3c5f9b4..1b678f60ae054f6d9c97ba17f5ffe258d65cccb1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1403,6 +1403,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0594-Inline-shift-direction-fields.patch b/patches/server/0595-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0594-Inline-shift-direction-fields.patch
rename to patches/server/0595-Inline-shift-direction-fields.patch
diff --git a/patches/server/0595-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0595-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0596-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0596-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0597-living-entity-allow-attribute-registration.patch b/patches/server/0598-living-entity-allow-attribute-registration.patch
similarity index 96%
rename from patches/server/0597-living-entity-allow-attribute-registration.patch
rename to patches/server/0598-living-entity-allow-attribute-registration.patch
index 4bc58ce5e3..88cf7f15c6 100644
--- a/patches/server/0597-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0598-living-entity-allow-attribute-registration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] living entity allow attribute registration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index cb9ed449ed96474d2115a3023ff0b7b298548071..9cbfda029782385d1a7987f5be46d450bd8a758e 100644
+index 4d2c02a1e1b4a8fad12894a7439ec7e53a67d97a..c770ee21b7b699522941f6a1584d532001c04082 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 @@ -132,4 +132,12 @@ public class AttributeMap {
diff --git a/patches/server/0598-fix-dead-slime-setSize-invincibility.patch b/patches/server/0599-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0598-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0599-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0599-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0599-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0600-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0601-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0600-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0601-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0601-Expose-Tracked-Players.patch b/patches/server/0602-Expose-Tracked-Players.patch
similarity index 92%
rename from patches/server/0601-Expose-Tracked-Players.patch
rename to patches/server/0602-Expose-Tracked-Players.patch
index d1e0be907a..ec9396cdd0 100644
--- a/patches/server/0601-Expose-Tracked-Players.patch
+++ b/patches/server/0602-Expose-Tracked-Players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ff890a42f1d67e197f4aac5d76a18527bae5b79d..49738cdb2f712d9ce76d3fff92b79e829bfa2370 100644
+index c63301472922dceb2873553bb4b0c350b37a23c3..23f3acdc37968ec76ffb57e022755c97ff02ff67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1271,5 +1271,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0602-Remove-streams-from-SensorNearest.patch b/patches/server/0603-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0602-Remove-streams-from-SensorNearest.patch
rename to patches/server/0603-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0603-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 91%
rename from patches/server/0603-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch
index 97b26758f7..e013e32526 100644
--- a/patches/server/0603-Throw-proper-exception-on-empty-JsonList-file.patch
+++ b/patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Throw proper exception on empty JsonList file
 
 
 diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
-index fb5d34913fb7db7d75d974118eb77c3d9833d742..8982562721c3a5a5a3305e90bd8b5bc21585a425 100644
+index 91899909abd83611ac63633fef701be542cf64bf..4fd709a550bf8da1e996894a1ca6b91206c31e9e 100644
 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java
 +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
 @@ -187,6 +187,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
diff --git a/patches/server/0604-Improve-ServerGUI.patch b/patches/server/0605-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0604-Improve-ServerGUI.patch
rename to patches/server/0605-Improve-ServerGUI.patch
diff --git a/patches/server/0605-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0605-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0606-fix-converting-txt-to-json-file.patch b/patches/server/0607-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from patches/server/0606-fix-converting-txt-to-json-file.patch
rename to patches/server/0607-fix-converting-txt-to-json-file.patch
index e43fa63a74..eb9cd86dd7 100644
--- a/patches/server/0606-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0607-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index 8eca8825008713467a20f84d71ed0f32d5a40e47..e842e96fe566e89b37e38429c718318a
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 056cfea2595540110ccbf0f10b9349fca4929f41..87af28ec546a7b0bb5f23ec36d0820aa4e0c1557 100644
+index 64b8d76642e8bbcdc685ea30d95a83adffca1bbc..7157bd4e36b0e367af37749b80968caf2bac0437 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -174,6 +174,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0607-Add-worldborder-events.patch b/patches/server/0608-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0607-Add-worldborder-events.patch
rename to patches/server/0608-Add-worldborder-events.patch
diff --git a/patches/server/0608-added-PlayerNameEntityEvent.patch b/patches/server/0609-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0608-added-PlayerNameEntityEvent.patch
rename to patches/server/0609-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0609-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0610-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0609-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0610-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0610-Add-recipe-to-cook-events.patch b/patches/server/0611-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0610-Add-recipe-to-cook-events.patch
rename to patches/server/0611-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0611-Add-Block-isValidTool.patch b/patches/server/0612-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0611-Add-Block-isValidTool.patch
rename to patches/server/0612-Add-Block-isValidTool.patch
diff --git a/patches/server/0612-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
similarity index 96%
rename from patches/server/0612-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
index 6342316711..2134c6d27d 100644
--- a/patches/server/0612-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
@@ -19,7 +19,7 @@ index 59675e523625b95169236bd0ead063cf0d87847e..bdd531806a4f006085be113c34b5780c
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5fd41a511709e5299a6d62521a46409fdb717664..69810e000f886ad105f587cfda8cb991730553b2 100644
+index 1bd25f0d74ab3a018b56df7a517e661b9af32341..ecd5068a8bfc8d0d4339cf7d6b8da8f81371bbfc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1752,7 +1752,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0613-Implement-Keyed-on-World.patch b/patches/server/0614-Implement-Keyed-on-World.patch
similarity index 96%
rename from patches/server/0613-Implement-Keyed-on-World.patch
rename to patches/server/0614-Implement-Keyed-on-World.patch
index fac235d7a2..6c9519f39b 100644
--- a/patches/server/0613-Implement-Keyed-on-World.patch
+++ b/patches/server/0614-Implement-Keyed-on-World.patch
@@ -34,7 +34,7 @@ index 6124142faeeb792c0f7f6c167f8da47af446cba9..153c2551544dffe36e836fa62f275216
          // Check if a World already exists with the UID.
          if (this.getWorld(world.getUID()) != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f701061688d9058ec89dcf5c8ae337c17ff0d7eb..5f77172bcd7c250d33a9ecbd40dbf70f370dcc9e 100644
+index 5cc1de91e2ccc0d3f0d6ab9adcf39f2f72bdeb9d..65b15946fbac36c4b767127aa1fa8ef59c0aefc0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2020,6 +2020,11 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0614-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0614-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0615-Item-Rarity-API.patch b/patches/server/0616-Item-Rarity-API.patch
similarity index 96%
rename from patches/server/0615-Item-Rarity-API.patch
rename to patches/server/0616-Item-Rarity-API.patch
index 46c0a4f795..5facdccf60 100644
--- a/patches/server/0615-Item-Rarity-API.patch
+++ b/patches/server/0616-Item-Rarity-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item Rarity API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index f84322256c19a5619fc5cd2efa3f64580d299bbf..14267529e5db9e8f77beffabd07e3f6c876239c9 100644
+index 8e9b35d3012ab0bafe5e2194d8723d892402de39..b719718f826fb6827ed586b8171a8775c3120803 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -503,6 +503,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0616-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0616-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0617-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0618-copy-TESign-isEditable-from-snapshots.patch
similarity index 89%
rename from patches/server/0617-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0618-copy-TESign-isEditable-from-snapshots.patch
index c62a00d76e..0cfc8f03a3 100644
--- a/patches/server/0617-copy-TESign-isEditable-from-snapshots.patch
+++ b/patches/server/0618-copy-TESign-isEditable-from-snapshots.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] copy TESign#isEditable from snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index de3a0a272e9cb0182e08d5401e7e8a6be4434219..c0d205c279e2fb5c73af00fbde876c65b5131aae 100644
+index bfa2345642142ea45460552fce97d5b411a5e48e..59f03dce529f54d9c447ed2bda40da4b8ec8c4a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -116,6 +116,7 @@ public class CraftSign extends CraftBlockEntityState<SignBlockEntity> implements
diff --git a/patches/server/0618-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch
similarity index 92%
rename from patches/server/0618-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch
index c52dc7d1fa..26cffa4d21 100644
--- a/patches/server/0618-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 774db05fa19b1fc1d13481010e3135eba9593a3b..d591492c50ba8c4158199d4ff848ab5072c5d86d 100644
+index 7157bd4e36b0e367af37749b80968caf2bac0437..2c011416ee3b1c57a1ee95ba0a120c784b8f87b2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -618,6 +618,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0619-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0620-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0619-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0620-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0620-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0620-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index a625705cdf..a80d297e37 100644
--- a/patches/server/0620-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0621-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 69810e000f886ad105f587cfda8cb991730553b2..25c78a8c32210cdb670be9efb0a52727b6a86985 100644
+index ecd5068a8bfc8d0d4339cf7d6b8da8f81371bbfc..bfe47c83a94a3f8024cfdefaecdb149a2a3a2346 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1187,7 +1187,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0621-Entity-load-save-limit-per-chunk.patch b/patches/server/0622-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0621-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0622-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0622-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0623-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0622-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0623-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0623-Expose-protocol-version.patch b/patches/server/0624-Expose-protocol-version.patch
similarity index 91%
rename from patches/server/0623-Expose-protocol-version.patch
rename to patches/server/0624-Expose-protocol-version.patch
index 33d28e0ebc..0bb6bf0dc5 100644
--- a/patches/server/0623-Expose-protocol-version.patch
+++ b/patches/server/0624-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 14267529e5db9e8f77beffabd07e3f6c876239c9..7af823c7d3192f7fbd9be5ee32c91e5b4ba9e2ee 100644
+index b719718f826fb6827ed586b8171a8775c3120803..f330a0b109a4a82b4f97b9321841bbe60f0c8202 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -517,6 +517,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 98%
rename from patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 51fbaae524..1935ce4852 100644
--- a/patches/server/0624-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0625-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 25c78a8c32210cdb670be9efb0a52727b6a86985..269b0910f8e39511dbb0f29404f79ad96ce511ae 100644
+index bfe47c83a94a3f8024cfdefaecdb149a2a3a2346..8c202a0ecbff003a4cb6cd1cbc3cf9ba77e37128 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -767,12 +767,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 99%
rename from patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch
index ee304b6776..0fe6d987f6 100644
--- a/patches/server/0625-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 266e52e1bf4d03ce7ad9dd329a18577b887cc767..6ebc539a5cf795fdde38a199fbce7fed39a07e0c 100644
+index c75005b934271e4b8864d949052d56465571f011..4a7e4c2038dd4a7496ed4084a19f31a611ee319a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -106,6 +106,13 @@ public class PaperConfig {
diff --git a/patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0626-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0627-Add-bypass-host-check.patch b/patches/server/0628-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0627-Add-bypass-host-check.patch
rename to patches/server/0628-Add-bypass-host-check.patch
diff --git a/patches/server/0628-Set-area-affect-cloud-rotation.patch b/patches/server/0629-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0628-Set-area-affect-cloud-rotation.patch
rename to patches/server/0629-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 90%
rename from patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch
index f54e630675..8c7bfe4fbb 100644
--- a/patches/server/0629-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0630-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 e4759fe6779b2c174388c1b5f56ce13c51d653b6..b39117c4505926da0be9c8248964a233393e8e2d 100644
+index cdd2e391d18179d85a8658d09a02de6637a86a5c..e7108dd70f1eb91f38e04ad71e595bc679560f75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -121,6 +121,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0630-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0631-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0632-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch
similarity index 95%
rename from patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch
index b0a3c9d25d..9b69dc24f2 100644
--- a/patches/server/0633-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PigZombieAngerEvent cancellation
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index aa81dba877e6611b23ec514ee1bcf9ac29c94515..c1e0cf7d86d7b45cc4ca342d80f0dc3fe43b0bfd 100644
+index 31595c3a225c14f7cab4ab1b50c9905f8dae09a3..6fe49abb9d9a273787828e72061e16a7b053e50a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -52,6 +52,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
diff --git a/patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0634-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch
index e8a861e589..7a332176ff 100644
--- a/patches/server/0635-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0636-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 269b0910f8e39511dbb0f29404f79ad96ce511ae..89d1e34e0c2be7328ffe7635b64d1a8f2256bafe 100644
+index 8c202a0ecbff003a4cb6cd1cbc3cf9ba77e37128..f9b817f2ec0f1c390393c4795c28de193636ca68 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1959,6 +1959,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0636-Added-PlayerDeepSleepEvent.patch b/patches/server/0637-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0636-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0637-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0637-More-World-API.patch b/patches/server/0638-More-World-API.patch
similarity index 97%
rename from patches/server/0637-More-World-API.patch
rename to patches/server/0638-More-World-API.patch
index 26e43326d5..3fac16090a 100644
--- a/patches/server/0637-More-World-API.patch
+++ b/patches/server/0638-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 5f77172bcd7c250d33a9ecbd40dbf70f370dcc9e..addc12d30bf58459b7d54bdc8ad97eff231c6419 100644
+index 65b15946fbac36c4b767127aa1fa8ef59c0aefc0..e57f5dfb86e4692455f8876f2183f6f520bc4b5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1966,6 +1966,65 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0638-Added-PlayerBedFailEnterEvent.patch b/patches/server/0639-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0638-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0639-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0639-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 95%
rename from patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index d02d309395..576aa63f5a 100644
--- a/patches/server/0640-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d591492c50ba8c4158199d4ff848ab5072c5d86d..b5c9c959de02430aee46bb8a1e55cef8fc6f69bd 100644
+index 2c011416ee3b1c57a1ee95ba0a120c784b8f87b2..1f1d5a1fe4fc567a383e60bd9b0dc69d8da673cb 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -851,6 +851,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0641-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0642-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0641-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0642-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 94%
rename from patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 5e9f9d090c..5fff43eeb8 100644
--- a/patches/server/0642-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0643-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 89d1e34e0c2be7328ffe7635b64d1a8f2256bafe..1083e5c23065f9bf5e2edd1e16fd80366ab931f8 100644
+index f9b817f2ec0f1c390393c4795c28de193636ca68..6764cfef07169db97662177837aa7815f7346a5d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2497,7 +2497,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -18,7 +18,7 @@ index 89d1e34e0c2be7328ffe7635b64d1a8f2256bafe..1083e5c23065f9bf5e2edd1e16fd8036
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 976f55eeb9fb0bc6cafdc9e39f347e6ba8d9e1ac..6419a548fe9a552bef69a68bfd0c45460f31be77 100644
+index 1f1d5a1fe4fc567a383e60bd9b0dc69d8da673cb..5d7d1372e012ce609073eecea83232b085c6c404 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -810,6 +810,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0643-Add-Channel-initialization-listeners.patch b/patches/server/0644-Add-Channel-initialization-listeners.patch
similarity index 98%
rename from patches/server/0643-Add-Channel-initialization-listeners.patch
rename to patches/server/0644-Add-Channel-initialization-listeners.patch
index 1fd905fdd3..1f7fe2772b 100644
--- a/patches/server/0643-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0644-Add-Channel-initialization-listeners.patch
@@ -106,7 +106,7 @@ index 0000000000000000000000000000000000000000..30e62719e0a83525daa33cf41cb61df3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 7fe08a998b4067f9f67c7e7a2244c1de0b194093..3d78b1f06839fa6534c84979a32bb80ec5de6d84 100644
+index 888e863b6d605bf587d0c071795a43d2157afa4d..c36089ead51d2e7dc3369d5f9a1869f58ff5391c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -112,6 +112,7 @@ public class ServerConnectionListener {
diff --git a/patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0644-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0645-Add-more-WanderingTrader-API.patch b/patches/server/0646-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0645-Add-more-WanderingTrader-API.patch
rename to patches/server/0646-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0646-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0647-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0646-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0647-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 96%
rename from patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index d62b24cd3e..b53cff9d00 100644
--- a/patches/server/0647-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Adventure message to PlayerAdvancementDoneEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 3ff6995d34914720d353fdbe1aa981bfab9f6040..f7959fe8d5247504dd79a18010470d98781c7cfe 100644
+index 8096f01fa7f1ed73e4812912fc9b21bafdd212c8..b16287a47870978706734b928b87f2357e91e3a1 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
 @@ -290,10 +290,18 @@ public class PlayerAdvancements {
diff --git a/patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0648-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0649-Inventory-close.patch b/patches/server/0650-Inventory-close.patch
similarity index 90%
rename from patches/server/0649-Inventory-close.patch
rename to patches/server/0650-Inventory-close.patch
index e21cf25bc1..e7f478324a 100644
--- a/patches/server/0649-Inventory-close.patch
+++ b/patches/server/0650-Inventory-close.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Inventory#close
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 7d8f29335d4c5188527cad66be39cedb34c26f50..396a4ae3d5a829eda78ef98561333aea300aa722 100644
+index b17dab9e5c06d8789553b104602d7da35d926dd1..30ac442049088200e9ab77a561c59cbc58aaa28f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -448,6 +448,14 @@ public class CraftInventory implements Inventory {
diff --git a/patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0650-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 98%
rename from patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index db9414e188..9fc439f344 100644
--- a/patches/server/0651-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
@@ -48,7 +48,7 @@ index ecf12ed5014202181e78af051e4a9ca88a275794..e23fe546291e670f89447398507d08a0
      @Override
      public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 573107f1281e68c7ba00d4dea8fac02f2d18504d..5c35b73c13c3826be9705e05154076810a78d147 100644
+index ca9324381a60fc3072719c39918a1c16ac88799b..b55640ed068becd40cbb7d7507b4e67ae9ee792a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -144,7 +144,7 @@ public class Phantom extends FlyingMob implements Enemy {
diff --git a/patches/server/0652-Fix-CraftPotionBrewer-cache.patch b/patches/server/0653-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0652-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0653-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0653-Add-basic-Datapack-API.patch b/patches/server/0654-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0653-Add-basic-Datapack-API.patch
rename to patches/server/0654-Add-basic-Datapack-API.patch
diff --git a/patches/server/0654-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0655-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0654-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0655-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0655-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0656-ItemStack-repair-check-API.patch b/patches/server/0657-ItemStack-repair-check-API.patch
similarity index 97%
rename from patches/server/0656-ItemStack-repair-check-API.patch
rename to patches/server/0657-ItemStack-repair-check-API.patch
index 8337bee581..4a91ed49f7 100644
--- a/patches/server/0656-ItemStack-repair-check-API.patch
+++ b/patches/server/0657-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 7af823c7d3192f7fbd9be5ee32c91e5b4ba9e2ee..43cd04e8d7299d961108e9a51a012a2021b20ee7 100644
+index f330a0b109a4a82b4f97b9321841bbe60f0c8202..a4cdebfddb8b3eb71a1ab20f5f503ebfe576b778 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -518,6 +518,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0657-More-Enchantment-API.patch b/patches/server/0658-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0657-More-Enchantment-API.patch
rename to patches/server/0658-More-Enchantment-API.patch
diff --git a/patches/server/0658-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0659-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0658-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0659-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0659-Add-Mob-lookAt-API.patch b/patches/server/0660-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0659-Add-Mob-lookAt-API.patch
rename to patches/server/0660-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0660-Add-Unix-domain-socket-support.patch b/patches/server/0661-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0660-Add-Unix-domain-socket-support.patch
rename to patches/server/0661-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0661-Add-EntityInsideBlockEvent.patch b/patches/server/0662-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0661-Add-EntityInsideBlockEvent.patch
rename to patches/server/0662-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0662-Attributes-API-for-item-defaults.patch b/patches/server/0663-Attributes-API-for-item-defaults.patch
similarity index 94%
rename from patches/server/0662-Attributes-API-for-item-defaults.patch
rename to patches/server/0663-Attributes-API-for-item-defaults.patch
index 5150fbd9ac..2915d2428f 100644
--- a/patches/server/0662-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0663-Attributes-API-for-item-defaults.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 43cd04e8d7299d961108e9a51a012a2021b20ee7..e714b42cf97b1a9ec5a8e68678541ea734bc78fe 100644
+index a4cdebfddb8b3eb71a1ab20f5f503ebfe576b778..3441344d11756411acd9e4d6fdc8463fd1c5e6dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -526,6 +526,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0664-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 97%
rename from patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0664-Add-cause-to-Weather-ThunderChangeEvents.patch
index 3e4a652650..74ac72ae3b 100644
--- a/patches/server/0663-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0664-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 33e2da5fb3cf6dd21e3df601bb9ee9a4991102e4..3fac2eba419cfa41c80ea461964ec8963bcd91ab 100644
+index 1b678f60ae054f6d9c97ba17f5ffe258d65cccb1..3864f6756f07c96607b277e250d906223cf178f6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -474,8 +474,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -95,7 +95,7 @@ index 1bd338c7860adf3b846cd6caa33312b3269ac3ef..95635cc7367b757d149bb2c81326a041
              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 fc7f17f05ef5457cce545424b19537c9d3e9bf01..bbc0f333b59743973652ec4bf13936821a7e596a 100644
+index e57f5dfb86e4692455f8876f2183f6f520bc4b5e..06b3377cbe2808187d9f4af1253be9e787ec7f2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1182,7 +1182,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0664-More-Lidded-Block-API.patch b/patches/server/0665-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0664-More-Lidded-Block-API.patch
rename to patches/server/0665-More-Lidded-Block-API.patch
diff --git a/patches/server/0665-Limit-item-frame-cursors-on-maps.patch b/patches/server/0666-Limit-item-frame-cursors-on-maps.patch
similarity index 95%
rename from patches/server/0665-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0666-Limit-item-frame-cursors-on-maps.patch
index 6dfd4f011c..dfc4282000 100644
--- a/patches/server/0665-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0666-Limit-item-frame-cursors-on-maps.patch
@@ -19,7 +19,7 @@ index 502d7cbff05c9fd6ef64d6e6483b7c7d5cebfb22..eff5a39968c8a4ff49ca9a7de5e2bf2a
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 77fde68dae2e64ef54b1cee7ab8b33f4609b3675..77209dfe179f97a5be89bdf812622773b90e6214 100644
+index 4acbcafc158cf11af51d9518ba5b83aaa75f52a1..6a78374b6ab3198571df7e17023d371667ebb24b 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -295,8 +295,12 @@ public class MapItemSavedData extends SavedData {
diff --git a/patches/server/0666-Add-PlayerKickEvent-causes.patch b/patches/server/0667-Add-PlayerKickEvent-causes.patch
similarity index 98%
rename from patches/server/0666-Add-PlayerKickEvent-causes.patch
rename to patches/server/0667-Add-PlayerKickEvent-causes.patch
index edad0a5ea0..ed375924a0 100644
--- a/patches/server/0666-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0667-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4def5f9189cffd11ce23fc974fbf1102f9c1d57c..5ad26bbe780009d4e52b226ac824898d697c629b 100644
+index e91c9caff8d789031f93fb5b3bd17599eb0b5c33..fd65fd87ae40cdc12ae351d3fd7e4305826b5d93 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2122,7 +2122,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -57,7 +57,7 @@ index 708ac03d5a849bf09c49547306e4a8c5a5ef8d91..5a8df368a4a25839cd4ac9be6972da2e
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 43f2fc30b4a7d5b05d3c9399eda1d3fc69469e8f..ebd6d424bd5ccd1a3f3cb6f3964176e5935fe590 100644
+index 1dce75b762c2b9134819bcd66d14fc07826dc48f..feb3fafd3e958ae86aa95c68b5118aebd6bf45e4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -318,7 +318,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -318,7 +318,7 @@ index 43f2fc30b4a7d5b05d3c9399eda1d3fc69469e8f..ebd6d424bd5ccd1a3f3cb6f3964176e5
          }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6419a548fe9a552bef69a68bfd0c45460f31be77..87ff48190bfc9687b95db7634c0e48f0ccb56577 100644
+index 5d7d1372e012ce609073eecea83232b085c6c404..ee139c746328fcff67b1ee75629dbee0dd547fed 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -719,7 +719,7 @@ public abstract class PlayerList {
@@ -342,7 +342,7 @@ index 6419a548fe9a552bef69a68bfd0c45460f31be77..87ff48190bfc9687b95db7634c0e48f0
          // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b542df24792f3fecb7b017db46555d38cacce15d..9dbcd27b5e4a53fdbd73b1558b6e984ffe43bb63 100644
+index 1acc475774dd50fbfbf68fff4675b9e1e31bbf2a..61c1fdbdd3de1862238bc8e78dff90e5faf7786c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -509,16 +509,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0667-Add-PufferFishStateChangeEvent.patch b/patches/server/0668-Add-PufferFishStateChangeEvent.patch
similarity index 97%
rename from patches/server/0667-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0668-Add-PufferFishStateChangeEvent.patch
index 14a8a30708..e15126884a 100644
--- a/patches/server/0667-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0668-Add-PufferFishStateChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PufferFishStateChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-index 76fc6bdc67a1bd4d0f9f654b9b912f6bc59ac1da..f576e602f2fce87cdebc194b474dced64952178b 100644
+index 9169e0c76b1801aad760691a6090199fdb7f6585..ce02552c1b3c62cf9f48425838a129a3ec40a049 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 @@ -95,25 +95,39 @@ public class Pufferfish extends AbstractFish {
diff --git a/patches/server/0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0668-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 67%
rename from patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
index 4691f7dea9..670063cc65 100644
--- a/patches/server/0669-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
+++ b/patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
@@ -13,10 +13,10 @@ contention situations.
 And this is extremely a low contention situation.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 5bae276dd55d080cbf8fca53c99c9c3636d8f33f..c225ef6eb1b094f605548d3f72165a6ebc156157 100644
+index 45a969f97b26e328e34f3d576557999c32b954a2..83dc9550f4ed2a138d4ece2765273e555cda994a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-@@ -35,17 +35,17 @@ public class PalettedContainer<T> implements PaletteResize<T> {
+@@ -35,11 +35,11 @@ public class PalettedContainer<T> implements PaletteResize<T> {
      private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer");
  
      public void acquire() {
@@ -30,13 +30,6 @@ index 5bae276dd55d080cbf8fca53c99c9c3636d8f33f..c225ef6eb1b094f605548d3f72165a6e
      }
  
      // Paper start - Anti-Xray - Add preset values
-     @Deprecated public static <T> Codec<PalettedContainer<T>> codec(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy provider, T object) { return PalettedContainer.codec(idList, entryCodec, provider, object, null); } // Notice for updates: Please make sure this function isn't used anywhere
-     public static <T> Codec<PalettedContainer<T>> codec(IdMap<T> idList, Codec<T> entryCodec, PalettedContainer.Strategy provider, T object, T @org.jetbrains.annotations.Nullable [] presetValues) {
--        return RecordCodecBuilder.create((instance) -> {
-+        return RecordCodecBuilder.<DiscData<T>>create((instance) -> { // Paper - decompile fixes
-             return instance.group(entryCodec.mapResult(ExtraCodecs.orElsePartial(object)).listOf().fieldOf("palette").forGetter(PalettedContainer.DiscData::paletteEntries), Codec.LONG_STREAM.optionalFieldOf("data").forGetter(PalettedContainer.DiscData::storage)).apply(instance, PalettedContainer.DiscData::new);
-         }).comapFlatMap((serialized) -> {
-             return read(idList, provider, serialized, object, presetValues);
 @@ -143,7 +143,7 @@ public class PalettedContainer<T> implements PaletteResize<T> {
      }
      // Paper end
@@ -68,8 +61,8 @@ index 5bae276dd55d080cbf8fca53c99c9c3636d8f33f..c225ef6eb1b094f605548d3f72165a6e
  
      // Paper start - Anti-Xray - Add chunk packet info
      @Deprecated public void write(FriendlyByteBuf buf) { this.write(buf, null, 0); } // Notice for updates: Please make sure this method isn't used anywhere
--    public void write(FriendlyByteBuf buf, com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) {
-+    public synchronized void write(FriendlyByteBuf buf, com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) { // Paper - synchronize
+-    public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) {
++    public synchronized void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo<T> chunkPacketInfo, int bottomBlockY) { // Paper - synchronize
          this.acquire();
  
          try {
@@ -77,8 +70,8 @@ index 5bae276dd55d080cbf8fca53c99c9c3636d8f33f..c225ef6eb1b094f605548d3f72165a6e
  
      }
  
--    private static <T> DataResult<PalettedContainer<T>> read(IdMap<T> idList, PalettedContainer.Strategy provider, PalettedContainer.DiscData<T> serialized, T defaultValue, T[] presetValues) { // Paper - Anti-Xray - Add preset values
-+    private synchronized static <T> DataResult<PalettedContainer<T>> read(IdMap<T> idList, PalettedContainer.Strategy provider, PalettedContainer.DiscData<T> serialized, T defaultValue, T[] presetValues) { // Paper - Anti-Xray - Add preset values // Paper - synchronize
+-    private static <T> DataResult<PalettedContainer<T>> read(IdMap<T> idList, PalettedContainer.Strategy provider, PalettedContainer.DiscData<T> serialized, T defaultValue, T @org.jetbrains.annotations.Nullable [] presetValues) { // Paper - Anti-Xray - Add preset values
++    private synchronized static <T> DataResult<PalettedContainer<T>> read(IdMap<T> idList, PalettedContainer.Strategy provider, PalettedContainer.DiscData<T> serialized, T defaultValue, T @org.jetbrains.annotations.Nullable [] presetValues) { // Paper - Anti-Xray - Add preset values // Paper - synchronize
          List<T> list = serialized.paletteEntries();
          int i = provider.size();
          int j = provider.calculateBitsForSerialization(idList, list.size());
diff --git a/patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch
similarity index 96%
rename from patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch
index e403b5a886..362a1b16f3 100644
--- a/patches/server/0670-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch
@@ -19,7 +19,7 @@ index eff5a39968c8a4ff49ca9a7de5e2bf2a20ea7fd8..0059c837ab3b1223c56aa9fbc96dd2ae
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 995172d8f271520ffa09e919f2a4890a4a1ccd89..0a1ef65c7199939035f2d548525b72bd0e40704d 100644
+index 7b2ac6920d5f0a8dc7cbb552a0e45e2fe471190e..47b946f7b761a318780b7c1973d0450faf7e8b62 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -240,6 +240,14 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0671-Add-BellRevealRaiderEvent.patch b/patches/server/0672-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0671-Add-BellRevealRaiderEvent.patch
rename to patches/server/0672-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0672-Fix-invulnerable-end-crystals.patch b/patches/server/0673-Fix-invulnerable-end-crystals.patch
similarity index 97%
rename from patches/server/0672-Fix-invulnerable-end-crystals.patch
rename to patches/server/0673-Fix-invulnerable-end-crystals.patch
index 21834fcd66..69911150b1 100644
--- a/patches/server/0672-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0673-Fix-invulnerable-end-crystals.patch
@@ -66,7 +66,7 @@ index 78b0456a3f9e3f66d467386c3e5f68d07adf1977..d8c4f36ae0e65c6d0398fac80c93b786
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
-index 1e53d4bef86349eaa1356444a80ae92d4311ccce..c03bf5bdb67b00c75f9fcfead882c4d944282244 100644
+index 4d24566f6297813e040333fdfd1e3e2aae6a4004..c7e9bed9cfb22b4ada906540434f9c0eff1d53ab 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
 @@ -99,6 +99,7 @@ public class SpikeFeature extends Feature<SpikeConfiguration> {
diff --git a/patches/server/0673-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0674-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0673-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0674-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0674-Fix-dangerous-end-portal-logic.patch b/patches/server/0675-Fix-dangerous-end-portal-logic.patch
similarity index 97%
rename from patches/server/0674-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0675-Fix-dangerous-end-portal-logic.patch
index c4e3dbc526..1be4e84ec5 100644
--- a/patches/server/0674-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0675-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6e14c3616164ff735841d03174161b6802c6aa8a..7cd731c123e01a71ae9c98c1d6d4ec87d5852849 100644
+index b28591ec812aead480fc55c50bce4bd3cbbb2409..62f1c3f197804bb4867ea0aea614038d9c96c283 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -397,6 +397,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 96%
rename from patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 143d33b783..c3c7f53663 100644
--- a/patches/server/0675-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
 Uses an EnumMap as well as a Set paired List for O(1) contains calls.
 
 diff --git a/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java b/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java
-index c8857376cdeecea8fa53ca5fe3bb1f32d51d9a8e..46d0003a9c912af522575b7d0c9665e8ce36cf25 100644
+index 18a0822798205f9d687b0b98e3db37041a31c63f..c38b4deafd2e43f2021d28388228cd53b230e61b 100644
 --- a/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java
 +++ b/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java
 @@ -60,11 +60,43 @@ public class MobSpawnSettings {
diff --git a/patches/server/0676-Make-item-validations-configurable.patch b/patches/server/0677-Make-item-validations-configurable.patch
similarity index 96%
rename from patches/server/0676-Make-item-validations-configurable.patch
rename to patches/server/0677-Make-item-validations-configurable.patch
index 4c135437dc..1bff191b03 100644
--- a/patches/server/0676-Make-item-validations-configurable.patch
+++ b/patches/server/0677-Make-item-validations-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6ebc539a5cf795fdde38a199fbce7fed39a07e0c..06a479af429a92e441eb9e58f36760d0ff75fe7e 100644
+index 4a7e4c2038dd4a7496ed4084a19f31a611ee319a..b33ece9a98f94d0c09b837bc95dbfab82ff6cabe 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -504,4 +504,19 @@ public class PaperConfig {
@@ -56,7 +56,7 @@ index 0f753f4868141ecc383877ea3a666a383f2e3339..ebb643fc0477409d1efb4e9af5967504
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 4506438ac75ca3724d096a454e07fb7e950228f6..086dde0e023f032cd5635dd227a79f6bc1ab39f9 100644
+index 9486dc1c1ec5d997d53277ede2f85e9df153939e..9ce647730d9f7aa121e13f2ba00037fc18625efd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -357,18 +357,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0677-Line-Of-Sight-Changes.patch b/patches/server/0678-Line-Of-Sight-Changes.patch
similarity index 97%
rename from patches/server/0677-Line-Of-Sight-Changes.patch
rename to patches/server/0678-Line-Of-Sight-Changes.patch
index 7284a4c466..28e1141d0b 100644
--- a/patches/server/0677-Line-Of-Sight-Changes.patch
+++ b/patches/server/0678-Line-Of-Sight-Changes.patch
@@ -19,7 +19,7 @@ index fd2d5e274a3bf889b954bed17d286d1157cd208e..709ca3f249a5c4d3a405e94ca353864d
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bbc0f333b59743973652ec4bf13936821a7e596a..a986f6470a6112ddd6b6d81f99479e7bc9d6ff91 100644
+index 06b3377cbe2808187d9f4af1253be9e787ec7f2f..e2f88425ea748384af18b126c6478a58a3eba176 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -199,6 +199,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0678-add-per-world-spawn-limits.patch b/patches/server/0679-add-per-world-spawn-limits.patch
similarity index 97%
rename from patches/server/0678-add-per-world-spawn-limits.patch
rename to patches/server/0679-add-per-world-spawn-limits.patch
index dc5081368c..68527d5cff 100644
--- a/patches/server/0678-add-per-world-spawn-limits.patch
+++ b/patches/server/0679-add-per-world-spawn-limits.patch
@@ -44,7 +44,7 @@ index d980e31884ea70493628e4934e19fa68314ba8e2..54a1fb5b6d1dee73761851c55c6bdc1c
      private void lightQueueSize() {
          lightQueueSize = getInt("light-queue-size", lightQueueSize);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a986f6470a6112ddd6b6d81f99479e7bc9d6ff91..29c2abd452364f34671e761f69b1c67aa1e9cf34 100644
+index e2f88425ea748384af18b126c6478a58a3eba176..1d0eb961e3abc980845ff3ecc8a790a98c55e49c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -221,6 +221,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0679-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0680-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0679-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0680-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0680-Add-more-LimitedRegion-API.patch b/patches/server/0681-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0680-Add-more-LimitedRegion-API.patch
rename to patches/server/0681-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0681-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0681-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0682-Missing-Entity-Behavior-API.patch b/patches/server/0683-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0682-Missing-Entity-Behavior-API.patch
rename to patches/server/0683-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 395831754d..61eab94f77 100644
--- a/patches/server/0683-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0684-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 ebd6d424bd5ccd1a3f3cb6f3964176e5935fe590..c52b292f4fe13a3fa586caa6452016bf0937ddf4 100644
+index feb3fafd3e958ae86aa95c68b5118aebd6bf45e4..12fa5b4a5d9997c442dbc17e77a5fb320f9f2ed1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1109,7 +1109,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0684-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 95%
rename from patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch
index 4b994b8d6b..99213d6d81 100644
--- a/patches/server/0685-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0686-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 3fac2eba419cfa41c80ea461964ec8963bcd91ab..3f912338b9fc5ec85a9d6748df6dbe490d08dbcf 100644
+index 3864f6756f07c96607b277e250d906223cf178f6..6a526474ca4683b8df3d4a61950e661963cbc737 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -215,7 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index 3fac2eba419cfa41c80ea461964ec8963bcd91ab..3f912338b9fc5ec85a9d6748df6dbe49
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c52b292f4fe13a3fa586caa6452016bf0937ddf4..7b94ef26b03b6e19956e9d5a6a72ce2678001069 100644
+index 12fa5b4a5d9997c442dbc17e77a5fb320f9f2ed1..4cfc463818964acbd695e6cb4767883835b90eab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1320,7 +1320,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0686-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0687-Adds-PlayerArmSwingEvent.patch b/patches/server/0688-Adds-PlayerArmSwingEvent.patch
similarity index 92%
rename from patches/server/0687-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0688-Adds-PlayerArmSwingEvent.patch
index 0402650e9d..0ac17873c1 100644
--- a/patches/server/0687-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0688-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 7b94ef26b03b6e19956e9d5a6a72ce2678001069..6cfb8618b3d17b8b0c63ac743629de797ff4c144 100644
+index 4cfc463818964acbd695e6cb4767883835b90eab..a11647ab2b75870c6d7366260865c261e5cfd52d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2257,7 +2257,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 96%
rename from patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch
index febc1ca1a3..316e9e0de5 100644
--- a/patches/server/0688-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6cfb8618b3d17b8b0c63ac743629de797ff4c144..9f681ddb310600790a124da061e1a082fc41d526 100644
+index a11647ab2b75870c6d7366260865c261e5cfd52d..aaa1466c420e346d20aace4115f2d83cb9fb2d0b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -455,7 +455,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -39,7 +39,7 @@ index 6cfb8618b3d17b8b0c63ac743629de797ff4c144..9f681ddb310600790a124da061e1a082
              this.server.getPlayerList().broadcastMessage(PaperAdventure.asVanilla(quitMessage), ChatType.SYSTEM, Util.NIL_UUID);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 87ff48190bfc9687b95db7634c0e48f0ccb56577..ebd416bbaea3fe10aa6812599624cebf7a2bd901 100644
+index ee139c746328fcff67b1ee75629dbee0dd547fed..88820ba073e89638304b26e52a39a426f76fb2e9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -591,6 +591,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 98%
rename from patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch
index 1ce7549cb6..1119d3551b 100644
--- a/patches/server/0689-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch
@@ -31,7 +31,7 @@ index 047d2b47b5af22087359e76362d84dc69ae26707..36730b851203602a49d5a76b25a9e3a1
      private void nerfNetherPortalPigmen() {
          nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1c7888d997111ef3cfa0cd59704b2ba7070fad8a..fadf212cef6aa6ea28af397a5e2fac9241b07af9 100644
+index 709ca3f249a5c4d3a405e94ca353864df349ffcd..1f35368f9f44c578be76d66a85da937f497df655 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1130,7 +1130,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0690-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0691-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0690-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0691-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0692-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0691-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0692-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 92%
rename from patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch
index e81626d650..8e69a76f25 100644
--- a/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch
@@ -19,7 +19,7 @@ index e47f3092b6bd6b86b577de705db1a575d0952348..490212cfe4e5cea7219eaf4304e14bfa
  
              }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 29372c8a0c54e4bae518e09846f0e9caba263896..f9be50049325a1139d67ccf590caeeceadb2fd23 100644
+index 306aa8c36be92d66ebcc6b7e0dbb9dee6ec41a9b..8db4fc59b99694d2b15af188fc1c39ccf0090a8d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -522,7 +522,9 @@ public class Panda extends Animal {
@@ -33,7 +33,7 @@ index 29372c8a0c54e4bae518e09846f0e9caba263896..f9be50049325a1139d67ccf590caeece
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index f7c23377e41870c558a49a08552d109b7b9cbc33..8a2c2b4bd603aae37055abd058feb7ee759078ce 100644
+index de4e35305f08cc92876f51edadbe69a620a8166e..f65d32245556e2acab927a29626749edea980f0a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -305,7 +305,9 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
diff --git a/patches/server/0694-Stinger-API.patch b/patches/server/0695-Stinger-API.patch
similarity index 100%
rename from patches/server/0694-Stinger-API.patch
rename to patches/server/0695-Stinger-API.patch
diff --git a/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0696-Add-System.out-err-catcher.patch b/patches/server/0697-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0696-Add-System.out-err-catcher.patch
rename to patches/server/0697-Add-System.out-err-catcher.patch
index c6fb8f742b..704b758183 100644
--- a/patches/server/0696-Add-System.out-err-catcher.patch
+++ b/patches/server/0697-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 e2662b3500bbc9aeb4b8eaf0adc04f7951af72df..da5549f62c08ca4b2e6942269be1c0970a85ae8c 100644
+index 2256a680d4f53d143e4ebfd82221074a84a86fdc..1b2aec9215d82a8ad60439a8ac38651319c0bdef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -282,6 +282,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0697-Fix-test-not-bootstrapping.patch b/patches/server/0698-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0697-Fix-test-not-bootstrapping.patch
rename to patches/server/0698-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0699-Improve-boat-collision-performance.patch b/patches/server/0700-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0699-Improve-boat-collision-performance.patch
rename to patches/server/0700-Improve-boat-collision-performance.patch
diff --git a/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch
index 50ea94b19c..44c6dff957 100644
--- a/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0701-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 44a8fba1461b455b085bd66d6562190f13097c2c..be57a11febb169051af99711b7b1704dddc77898 100644
+index aaa1466c420e346d20aace4115f2d83cb9fb2d0b..e1f530d8b9faf7258a4d4c6dee689548b43b31a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -387,7 +387,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0702-Add-PlayerSetSpawnEvent.patch b/patches/server/0703-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0702-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0703-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 94%
rename from patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch
index fe1da128ae..ea86736121 100644
--- a/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0704-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 31c128eab2a2cb7436e5c1777e9b19affa448ba3..a19642740f42ee8c683ed7a86f6edd2bc887b6dd 100644
+index ae680111d01470881e5dc4914cc7e8e82a463aaa..d241b25acc223982109495542fd17e0fbdf53437 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
 @@ -587,17 +587,19 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
diff --git a/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0705-Optimize-entity-tracker-passenger-checks.patch
similarity index 90%
rename from patches/server/0704-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0705-Optimize-entity-tracker-passenger-checks.patch
index ce8a02f22d..cf8b4494f3 100644
--- a/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0705-Optimize-entity-tracker-passenger-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize entity tracker passenger checks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index f6b6ac1ab31c364646151866c54c9e46dee12516..75d0c2532c26eab044256cf6373ba7909dfe6395 100644
+index 1a4350b40d15edba998e3dee5f16cde4e9f50759..5128efe19f57278ebc8540f3a614cebc27dbd3b0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -73,7 +73,7 @@ public class ServerEntity {
diff --git a/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0706-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0705-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0706-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0706-Added-EntityDamageItemEvent.patch b/patches/server/0707-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0706-Added-EntityDamageItemEvent.patch
rename to patches/server/0707-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0707-Optimize-indirect-passenger-iteration.patch b/patches/server/0708-Optimize-indirect-passenger-iteration.patch
similarity index 95%
rename from patches/server/0707-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0708-Optimize-indirect-passenger-iteration.patch
index 864b1e2a73..3f6f8f2a1f 100644
--- a/patches/server/0707-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0708-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7cd731c123e01a71ae9c98c1d6d4ec87d5852849..260ce781fe0bc8d4c9cbf80bb8c8ca4762402273 100644
+index 62f1c3f197804bb4867ea0aea614038d9c96c283..4da2419e1aafee5f730b0793dc79e44531610e07 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3534,26 +3534,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 96%
rename from patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch
index 4d8e7828f0..8378741c11 100644
--- a/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch
@@ -21,7 +21,7 @@ index b33a8e15153375316b9c8e856c14669667599225..848169bdab0a20e41cfb917cd6ec1abc
      private void fixItemsMergingThroughWalls() {
          fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 75d0c2532c26eab044256cf6373ba7909dfe6395..94704a258ce7183aeb0ccec0b9106e40efd08821 100644
+index 5128efe19f57278ebc8540f3a614cebc27dbd3b0..ea9cd490fc3bfcf6a2900a702615e6626f0ed98b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -98,7 +98,7 @@ public class ServerEntity {
diff --git a/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch
similarity index 96%
rename from patches/server/0710-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0711-Make-EntityUnleashEvent-cancellable.patch
index 50b5b02668..2d8246afff 100644
--- a/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make EntityUnleashEvent cancellable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 6f47a27e9e48a4e49d5827ca3a3a2613680639aa..818436a1f35d3c59d9776d4edff675e6896c302f 100644
+index ca9d4c5741c76457fbb7d238a9df1ad5268bbb6b..829f5a82467e7106efddf9e367cd402bc0b36c5f 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1469,7 +1469,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0711-Clear-bucket-NBT-after-dispense.patch b/patches/server/0712-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0711-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0712-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch
similarity index 91%
rename from patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch
rename to patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch
index 80ac80b533..8967390e3e 100644
--- a/patches/server/0712-Respect-despawn-rate-in-item-merge-check.patch
+++ b/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Respect despawn rate in item merge check
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index f63502307fce7d3721b368d81af5a121b7dd9744..f09db211f6f789ced85f7bf716428cd04bb41378 100644
+index 47b946f7b761a318780b7c1973d0450faf7e8b62..f7d29950644a5cf12da0d31246d9f5fcbcc201bb 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -261,7 +261,7 @@ public class ItemEntity extends Entity {
diff --git a/patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0713-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0714-Add-BlockBreakBlockEvent.patch b/patches/server/0715-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0714-Add-BlockBreakBlockEvent.patch
rename to patches/server/0715-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0715-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0716-More-CommandBlock-API.patch b/patches/server/0717-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0716-More-CommandBlock-API.patch
rename to patches/server/0717-More-CommandBlock-API.patch
diff --git a/patches/server/0717-Add-missing-team-sidebar-display-slots.patch b/patches/server/0718-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0717-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0718-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0718-Add-back-EntityPortalExitEvent.patch b/patches/server/0719-Add-back-EntityPortalExitEvent.patch
similarity index 97%
rename from patches/server/0718-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0719-Add-back-EntityPortalExitEvent.patch
index c9bdb45f72..a44e713ebd 100644
--- a/patches/server/0718-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0719-Add-back-EntityPortalExitEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 260ce781fe0bc8d4c9cbf80bb8c8ca4762402273..4a10dbd66013858f8b7e519888c839804ea545d9 100644
+index 4da2419e1aafee5f730b0793dc79e44531610e07..f9c11fcb180fda63f2ae4edb8d952106bfe80294 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3039,6 +3039,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 93%
rename from patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch
index d9d2a6b332..742d7716ff 100644
--- a/patches/server/0719-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0720-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 3f912338b9fc5ec85a9d6748df6dbe490d08dbcf..de293811673a247219c799d247e1ca94a7c934f5 100644
+index 6a526474ca4683b8df3d4a61950e661963cbc737..7eeb80e708da11cc0ec41e4eeee53fb370ac17b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -754,6 +754,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -29,7 +29,7 @@ index 3f912338b9fc5ec85a9d6748df6dbe490d08dbcf..de293811673a247219c799d247e1ca94
                      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 29c2abd452364f34671e761f69b1c67aa1e9cf34..18cbb6052de6c79095f34ebdb1feb13c4e95afe8 100644
+index 1d0eb961e3abc980845ff3ecc8a790a98c55e49c..aa82956d3ea5eb83a348b62c08a9bc8f33a554fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0720-Get-entity-default-attributes.patch b/patches/server/0721-Get-entity-default-attributes.patch
similarity index 98%
rename from patches/server/0720-Get-entity-default-attributes.patch
rename to patches/server/0721-Get-entity-default-attributes.patch
index 0a2928c80d..cd8586d90e 100644
--- a/patches/server/0720-Get-entity-default-attributes.patch
+++ b/patches/server/0721-Get-entity-default-attributes.patch
@@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..4ecba0b02c2813a890aecc5586987879
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index e714b42cf97b1a9ec5a8e68678541ea734bc78fe..965d15f4596b8ebf07d89829088b94146cb6a302 100644
+index 3441344d11756411acd9e4d6fdc8463fd1c5e6dd..11a269b7384432d919fcd14cec3cf1d94c5d7fa2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -543,6 +543,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0721-Left-handed-API.patch b/patches/server/0722-Left-handed-API.patch
similarity index 100%
rename from patches/server/0721-Left-handed-API.patch
rename to patches/server/0722-Left-handed-API.patch
diff --git a/patches/server/0722-Add-advancement-display-API.patch b/patches/server/0723-Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/0722-Add-advancement-display-API.patch
rename to patches/server/0723-Add-advancement-display-API.patch
diff --git a/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 93%
rename from patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch
index a7a82e297a..f22d19fef2 100644
--- a/patches/server/0723-Add-ItemFactory-getMonsterEgg-API.patch
+++ b/patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ItemFactory#getMonsterEgg API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index fcbd28fdeab4815c005c7dca547aee246f52fd26..1c0ecd8bb3156a8e1718e84455dd9af667adaf7a 100644
+index def8caa7e991cc5f6e8aefcf9e9e3b18149bfdfa..446dfea89b4fbab55d1379315247172b6cc4730c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -410,5 +410,17 @@ public final class CraftItemFactory implements ItemFactory {
diff --git a/patches/server/0724-Add-critical-damage-API.patch b/patches/server/0725-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0724-Add-critical-damage-API.patch
rename to patches/server/0725-Add-critical-damage-API.patch
diff --git a/patches/server/0725-Fix-issues-with-mob-conversion.patch b/patches/server/0726-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0725-Fix-issues-with-mob-conversion.patch
rename to patches/server/0726-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0726-Add-isCollidable-methods-to-various-places.patch b/patches/server/0727-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0726-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0727-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0727-Goat-ram-API.patch b/patches/server/0728-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0727-Goat-ram-API.patch
rename to patches/server/0728-Goat-ram-API.patch
diff --git a/patches/server/0728-Add-API-for-resetting-a-single-score.patch b/patches/server/0729-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0728-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0729-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch
similarity index 95%
rename from patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch
index b3e64a8f4f..0a3c4951b9 100644
--- a/patches/server/0729-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4a10dbd66013858f8b7e519888c839804ea545d9..1db65d69cb3b81d2e4eee016b9a8735fe45bdc50 100644
+index f9c11fcb180fda63f2ae4edb8d952106bfe80294..614ce90b4a1a6e6385d1bfc4d1df0563ecc33b98 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1837,6 +1837,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -25,7 +25,7 @@ index 4a10dbd66013858f8b7e519888c839804ea545d9..1db65d69cb3b81d2e4eee016b9a8735f
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 49738cdb2f712d9ce76d3fff92b79e829bfa2370..788148145eddc90eac35881bc847e958b6a47ebe 100644
+index 23f3acdc37968ec76ffb57e022755c97ff02ff67..9e5f338d0bb64ac47a99cd08a2ab083d2f5caf6c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1284,5 +1284,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0730-Vanilla-command-permission-fixes.patch b/patches/server/0731-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0730-Vanilla-command-permission-fixes.patch
rename to patches/server/0731-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0731-Make-CallbackExecutor-strict-again.patch b/patches/server/0732-Make-CallbackExecutor-strict-again.patch
similarity index 95%
rename from patches/server/0731-Make-CallbackExecutor-strict-again.patch
rename to patches/server/0732-Make-CallbackExecutor-strict-again.patch
index b744e81473..479a8f98f9 100644
--- a/patches/server/0731-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0732-Make-CallbackExecutor-strict-again.patch
@@ -10,7 +10,7 @@ schedules. Effectively, use the callback executor as a tool of
 finding issues rather than hiding these issues.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f79509a529d4e682b5e370ddd99539afd1934f73..c72f9ba68194f0ed9ecd40c15e32274cc3bec777 100644
+index efe1d149eb0c6661b67d51375a264fb2b4aaad80..5261c7a44200e2cc191b67900c7771ca31fb33df 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -164,17 +164,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 100%
rename from patches/server/0732-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index c132c79132..b4e5807041 100644
--- a/patches/server/0733-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0734-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 de293811673a247219c799d247e1ca94a7c934f5..0e23cac2140c7edaba2ce13d4bb05e304826e75c 100644
+index 7eeb80e708da11cc0ec41e4eeee53fb370ac17b1..02b6cdc6b0b90fba7523f5eafb1b5641d6eceb66 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1309,9 +1309,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch
similarity index 100%
rename from patches/server/0734-Correctly-handle-recursion-for-chunkholder-updates.patch
rename to patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch
similarity index 98%
rename from patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch
rename to patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch
index 20298aa1a6..86c0e502fd 100644
--- a/patches/server/0735-Separate-lookup-locking-from-state-access-in-UserCac.patch
+++ b/patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Separate lookup locking from state access in UserCache
 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 3789441e2df9410aa1c6efe59054aaba2c738633..a157f71cf55b9e97fac56c7c55b552da86000fd5 100644
+index 95974d78196397136179f8d6acf1597c557e5a23..6349b33939909435120fdef5e506480108cfbfc1 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/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch
similarity index 100%
rename from patches/server/0736-Fix-chunks-refusing-to-unload-at-low-TPS.patch
rename to patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
similarity index 97%
rename from patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
rename to patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index bd4c418337..1bbeb83fd9 100644
--- a/patches/server/0737-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
@@ -8,7 +8,7 @@ Sync loading the chunk at this stage would cause it to load
 older data, as well as screwing our region state.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index be3f39ec1dff1a9756a34182fe4a2e546e85226c..0fa24e3207b25232a639ef4c88dff2c1908a2740 100644
+index 16350310a235c321e48c29fbace2969b43778bf5..0326d187ac19b5c8577e377d9ad92f1839112fc7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -313,6 +313,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch
similarity index 100%
rename from patches/server/0738-Do-not-allow-ticket-level-changes-when-updating-chun.patch
rename to patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/0739-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0741-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0740-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0741-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 98%
rename from patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch
index b62bab9ac4..906528460b 100644
--- a/patches/server/0741-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -293,7 +293,7 @@ index 1622450b53e0f0f48c3ca107e4d705b4ad29dadf..f6a225eed29eed364b7e2ea6bc85d55d
      public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) {
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index da5549f62c08ca4b2e6942269be1c0970a85ae8c..c1b79f21bff6f9f83f06c338a67f9a942f75da68 100644
+index 1b2aec9215d82a8ad60439a8ac38651319c0bdef..492f398a1c2dbe7b821dd40be1c1c6952f056c3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2137,6 +2137,11 @@ public final class CraftServer implements Server {
@@ -309,7 +309,7 @@ index da5549f62c08ca4b2e6942269be1c0970a85ae8c..c1b79f21bff6f9f83f06c338a67f9a94
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 18cbb6052de6c79095f34ebdb1feb13c4e95afe8..b3f447e77619a7a0954a7709f36ad22678fce5f4 100644
+index aa82956d3ea5eb83a348b62c08a9bc8f33a554fc..2b8352e74f46e397a6f5b27c300153fde7c56af7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1717,9 +1717,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
similarity index 100%
rename from patches/server/0742-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
rename to patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
diff --git a/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0744-Sanitize-ResourceLocation-error-logging.patch
similarity index 94%
rename from patches/server/0743-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0744-Sanitize-ResourceLocation-error-logging.patch
index 68b489be16..ff7e0b7826 100644
--- a/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0744-Sanitize-ResourceLocation-error-logging.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Sanitize ResourceLocation error logging
 
 
 diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java
-index bf78cfc3b577e256ae68f219224447531619abd6..6e5d13e63c97cb95b93af1d997dc0eb53f966566 100644
+index 30e5d27080b3246b87f90f838fb0305e7bb0d9d7..7c8f56557e0e6c3a142cd27af50d017df0fbe8f0 100644
 --- a/src/main/java/net/minecraft/resources/ResourceLocation.java
 +++ b/src/main/java/net/minecraft/resources/ResourceLocation.java
 @@ -32,9 +32,9 @@ public class ResourceLocation implements Comparable<ResourceLocation> {
diff --git a/patches/server/0744-Optimise-general-POI-access.patch b/patches/server/0745-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0744-Optimise-general-POI-access.patch
rename to patches/server/0745-Optimise-general-POI-access.patch
diff --git a/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0746-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0745-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0746-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0746-Add-more-async-catchers.patch b/patches/server/0747-Add-more-async-catchers.patch
similarity index 96%
rename from patches/server/0746-Add-more-async-catchers.patch
rename to patches/server/0747-Add-more-async-catchers.patch
index 9eca07f148..f0813b3370 100644
--- a/patches/server/0746-Add-more-async-catchers.patch
+++ b/patches/server/0747-Add-more-async-catchers.patch
@@ -31,7 +31,7 @@ index f01182a0ac8a14bcd5b1deb778306e7bf1bf70ed..b27c8db914cca3ff0ea8a24acddb9cb9
              throw new UnsupportedOperationException("Only one concurrent iteration supported");
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
-index ccafd28e3dc9a03f310eb5bdde85fcb277ef5116..aa3217425a64fdd691f255dcc5529a29b8c2c86b 100644
+index 2110cb437807f99994838b57653caefe2f01a9c5..35e3926a878dd87f05bb41e9e52b4e04e30752eb 100644
 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java
 @@ -166,6 +166,7 @@ public class PersistentEntitySectionManager<T extends EntityAccess> implements A
diff --git a/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch
similarity index 99%
rename from patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch
rename to patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch
index c7080fe862..0a840e45df 100644
--- a/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch
@@ -914,7 +914,7 @@ index 0000000000000000000000000000000000000000..3ba094e640d7fe7803e2bbdab8ff3beb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0e23cac2140c7edaba2ce13d4bb05e304826e75c..69dc366684db5229a882c18075465abc389cc8fa 100644
+index 02b6cdc6b0b90fba7523f5eafb1b5641d6eceb66..eace9e9c97fff7d02326805ce77cc75a650f9b6d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -431,7 +431,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -953,7 +953,7 @@ index 8fdda1e5805534d08c0a06b15e89d85b3d9c21e9..a24f605bd033f249a374e83ba0948801
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1db65d69cb3b81d2e4eee016b9a8735fe45bdc50..af19659eb52abd900a67b1b354bac958f0d37a70 100644
+index 614ce90b4a1a6e6385d1bfc4d1df0563ecc33b98..78478f6e8bd07c2b4e11b627819a664e706efb8b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -428,6 +428,56 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -1229,7 +1229,7 @@ index 35e3926a878dd87f05bb41e9e52b4e04e30752eb..5029ab81e3d7943a001b6367083eb511
              Visibility visibility = PersistentEntitySectionManager.getEffectiveStatus(this.entity, this.currentSection.getStatus());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index ecab8b4d6850cf182c28869ecbdbc92d45fbe637..58a99a6867642c74cba7db1edff87a071065f28d 100644
+index f8f44cb6e823a0150f3abdab133f8ae247c9b89c..0085a4dd0f0def1ba71342e20aecdd46a3761b02 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -133,9 +133,7 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0748-Optimise-chunk-tick-iteration.patch b/patches/server/0749-Optimise-chunk-tick-iteration.patch
similarity index 98%
rename from patches/server/0748-Optimise-chunk-tick-iteration.patch
rename to patches/server/0749-Optimise-chunk-tick-iteration.patch
index 5884894655..4dbe3f42f1 100644
--- a/patches/server/0748-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0749-Optimise-chunk-tick-iteration.patch
@@ -70,7 +70,7 @@ index fbfbe9adeca7364e6346c887616890bf968f38a1..bd43fbc8a93afa7604aa467392520ed7
              int i = 0;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 77f17937e90c9b12839f0e64131aa24b5df25dae..6a9f9d93be96bd27be5ac3a7d2e142fda2f45efa 100644
+index 0326d187ac19b5c8577e377d9ad92f1839112fc7..93170820a091062bc8a41c6af7f470889e0b57d8 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -159,6 +159,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -82,7 +82,7 @@ index 77f17937e90c9b12839f0e64131aa24b5df25dae..6a9f9d93be96bd27be5ac3a7d2e142fd
      // CraftBukkit start - recursion-safe executor for Chunk loadCallback() and unloadCallback()
      public final CallbackExecutor callbackExecutor = new CallbackExecutor();
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 7771fd7c7918aa4852371dc88d46163c168f020e..e5d8e00199a7aecc67565d01f4d7dc46cf5ea1d7 100644
+index adab778c11ef11cb57418675a98129afb01ec06e..d5eb5a365c8e8cdcd8e9cf54918cc2fb383c6625 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -46,6 +46,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
diff --git a/patches/server/0749-Execute-chunk-tasks-mid-tick.patch b/patches/server/0750-Execute-chunk-tasks-mid-tick.patch
similarity index 96%
rename from patches/server/0749-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0750-Execute-chunk-tasks-mid-tick.patch
index 5f82611d28..577f243d3b 100644
--- a/patches/server/0749-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0750-Execute-chunk-tasks-mid-tick.patch
@@ -19,7 +19,7 @@ index b27021a42cbed3f0648a8d0903d00d03922ae221..eada966d7f108a6081be7a848f5c1dfc
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5ad26bbe780009d4e52b226ac824898d697c629b..0a421d3beaa956bc24ef9cf3d47ae4e3e6fb9e10 100644
+index fd65fd87ae40cdc12ae351d3fd7e4305826b5d93..e7c0f933a141aa2c846bb2fc07f161f9ef6c091d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1348,6 +1348,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -106,7 +106,7 @@ index 5ad26bbe780009d4e52b226ac824898d697c629b..0a421d3beaa956bc24ef9cf3d47ae4e3
 +    // Paper end - execute chunk tasks mid tick
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index e5d8e00199a7aecc67565d01f4d7dc46cf5ea1d7..be59f4ec068947fbb78ae8b140527bb417395860 100644
+index d5eb5a365c8e8cdcd8e9cf54918cc2fb383c6625..b73f49b9bf49dc2a08aa8ffece675df41c077412 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -1019,6 +1019,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -126,7 +126,7 @@ index e5d8e00199a7aecc67565d01f4d7dc46cf5ea1d7..be59f4ec068947fbb78ae8b140527bb4
                  }
                  // Paper start - optimise chunk tick iteration
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 69dc366684db5229a882c18075465abc389cc8fa..8a68dd633bf67b934f52b2ba286b9d2a05acd369 100644
+index eace9e9c97fff7d02326805ce77cc75a650f9b6d..381a4283715290162f445265e61294256e6b3075 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -202,7 +202,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0750-Do-not-copy-visible-chunks.patch b/patches/server/0751-Do-not-copy-visible-chunks.patch
similarity index 98%
rename from patches/server/0750-Do-not-copy-visible-chunks.patch
rename to patches/server/0751-Do-not-copy-visible-chunks.patch
index 8bb08bcd39..c8837f5533 100644
--- a/patches/server/0750-Do-not-copy-visible-chunks.patch
+++ b/patches/server/0751-Do-not-copy-visible-chunks.patch
@@ -35,7 +35,7 @@ index b3516862d796c2d9fcc1c67a6073445403d73088..b61abf227a04b4565c2525e5f469db30
              List<ChunkHolder> allChunks = new ArrayList<>(visibleChunks.values());
              List<ServerPlayer> players = world.players;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 245ce32ee7b35a07c47c31772208eccf35c85a33..6f2f3f036b983a34a50b43522c30b3ba0ef555d2 100644
+index 93170820a091062bc8a41c6af7f470889e0b57d8..1f6fdb65e28af63860700c5571cb77a0c05b692a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -123,9 +123,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -187,7 +187,7 @@ index 245ce32ee7b35a07c47c31772208eccf35c85a33..6f2f3f036b983a34a50b43522c30b3ba
          while (objectbidirectionaliterator.hasNext()) {
              Entry<ChunkHolder> entry = (Entry) objectbidirectionaliterator.next();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 225cdb651775bcc601982ba33b1f5d01aefd9e2a..2420bc805923094d4d7422e69c20ed5de23777de 100644
+index 2b8352e74f46e397a6f5b27c300153fde7c56af7..a8c3c76ec3aed40655a0c5335407cb20ecfbc63d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -160,7 +160,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0751-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0752-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch
similarity index 98%
rename from patches/server/0753-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0754-Detail-more-information-in-watchdog-dumps.patch
index beff46dc9f..7d2d44d42b 100644
--- a/patches/server/0753-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch
@@ -77,7 +77,7 @@ index 97b05b7145c6a3a379de31b8988c909da9b21139..f7bb26e8b7a74a9ae5b469351b2fccc6
              });
              throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8a68dd633bf67b934f52b2ba286b9d2a05acd369..2a215b9b35978caa61e687c3915df7d5edfae97a 100644
+index 381a4283715290162f445265e61294256e6b3075..9fa7a01db61ba91b79eda4f7e4fd4f0001712808 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -981,7 +981,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -123,7 +123,7 @@ index 8a68dd633bf67b934f52b2ba286b9d2a05acd369..2a215b9b35978caa61e687c3915df7d5
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index af19659eb52abd900a67b1b354bac958f0d37a70..320128ff98867993aa7785cc77b769bdce451795 100644
+index 78478f6e8bd07c2b4e11b627819a664e706efb8b..1f9f1ff4ccc3f45008df45274b8a154f0f802688 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -908,7 +908,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0755-Manually-inline-methods-in-BlockPosition.patch
similarity index 92%
rename from patches/server/0754-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0755-Manually-inline-methods-in-BlockPosition.patch
index 9d7f17f71a..6668339cba 100644
--- a/patches/server/0754-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0755-Manually-inline-methods-in-BlockPosition.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Manually inline methods in BlockPosition
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 0dcf75c5c792650d7a5b9354222df16bcd1cfbd2..14610e6144ec144ebbec6fb0945c67bb0ea86795 100644
+index 028edb36f995316a9348133db1ed1d4cdda21aed..8c79f66abd42e9c9875e8877c6dd82b5e3cfa184 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -484,9 +484,9 @@ public class BlockPos extends Vec3i {
@@ -45,7 +45,7 @@ index 0dcf75c5c792650d7a5b9354222df16bcd1cfbd2..14610e6144ec144ebbec6fb0945c67bb
          }
          // Paper end
 diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index e7ee1fa6fe070cd307fdeb2c77c927506014da72..1c3583e97b13b6978535fae401778fa45808a32e 100644
+index 73b3c5f5c037fbe3f588f8f4b0113bef283632a4..c06c7da7de84bc764ea7b9612b3dc2303b49b22e 100644
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
 @@ -19,9 +19,9 @@ public class Vec3i implements Comparable<Vec3i> {
diff --git a/patches/server/0755-Distance-manager-tick-timings.patch b/patches/server/0756-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0755-Distance-manager-tick-timings.patch
rename to patches/server/0756-Distance-manager-tick-timings.patch
diff --git a/patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0756-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 94%
rename from patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 661b165d8e..c3f6182749 100644
--- a/patches/server/0757-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced
 here.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d17c2bcc1537f2a7eb575984b06c5da1bb511e6b..89c9deb19a6ad80e8e70246b7728c2c583c545b6 100644
+index 06035b728a66a63582c34c85096bada1588bfaa6..843c36a8272ea5affe0a4f3baa9e15823ad74059 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -353,6 +353,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0758-Add-packet-limiter-config.patch b/patches/server/0759-Add-packet-limiter-config.patch
similarity index 99%
rename from patches/server/0758-Add-packet-limiter-config.patch
rename to patches/server/0759-Add-packet-limiter-config.patch
index 8703e85abb..4647b9c71b 100644
--- a/patches/server/0758-Add-packet-limiter-config.patch
+++ b/patches/server/0759-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 06a479af429a92e441eb9e58f36760d0ff75fe7e..eeae1a043ef185f206e923a5799e173cf3cf485d 100644
+index b33ece9a98f94d0c09b837bc95dbfab82ff6cabe..52dcb9d05dd6ca449850b6ad3c50d8f4192f13bb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -519,4 +519,102 @@ public class PaperConfig {
diff --git a/patches/server/0759-Lag-compensate-block-breaking.patch b/patches/server/0760-Lag-compensate-block-breaking.patch
similarity index 98%
rename from patches/server/0759-Lag-compensate-block-breaking.patch
rename to patches/server/0760-Lag-compensate-block-breaking.patch
index 835f0807cf..ca2395eead 100644
--- a/patches/server/0759-Lag-compensate-block-breaking.patch
+++ b/patches/server/0760-Lag-compensate-block-breaking.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Lag compensate block breaking
 Use time instead of ticks if ticks fall behind
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index eeae1a043ef185f206e923a5799e173cf3cf485d..b591b47fc663289682c35f480f851b7eceb979dd 100644
+index 52dcb9d05dd6ca449850b6ad3c50d8f4192f13bb..4444356a6bd44afdbe67593136c18b803a0ddd66 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -617,4 +617,10 @@ public class PaperConfig {
diff --git a/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 93%
rename from patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch
index aa16023c87..6003909071 100644
--- a/patches/server/0760-Use-correct-LevelStem-registry-when-loading-default-.patch
+++ b/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use correct LevelStem registry when loading default
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eb9a3fecb7c1526d0c5f6194c78ff3a740c94c7e..cdbee0c0d0f6154dc6396be87eeea1db67ad5dbf 100644
+index e7c0f933a141aa2c846bb2fc07f161f9ef6c091d..d86e74c9363d10428d611cb232243a872abd9d5f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -565,7 +565,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0761-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 96%
rename from patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch
index cc16a5e2ba..4669941fb1 100644
--- a/patches/server/0762-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch
@@ -22,7 +22,7 @@ With this change I could get all 200 on at 0ms ping.
 So in general this patch should reduce Netty I/O thread load.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 469bc5f71a72217514c0496977de33e2fa4d391e..ef5321f230f66383e3760bf97e7eca1be3a5b02e 100644
+index 5271cc135e636961fc1248f6b98bb122ab3391e6..cd6eb305f4d36be923f6c5f0dd85e449d0f94c8f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -1077,7 +1077,24 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0763-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0764-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0763-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0764-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0764-Time-scoreboard-search.patch b/patches/server/0765-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0764-Time-scoreboard-search.patch
rename to patches/server/0765-Time-scoreboard-search.patch
diff --git a/patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 92%
rename from patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch
index b834b4491c..87d034b685 100644
--- a/patches/server/0765-Send-full-pos-packets-for-hard-colliding-entities.patch
+++ b/patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch
@@ -9,7 +9,7 @@ Configurable under
 `send-full-pos-for-hard-colliding-entities`
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index b591b47fc663289682c35f480f851b7eceb979dd..31e057e16c04f6cb6a4fa42e6ac9e81198e24d79 100644
+index 4444356a6bd44afdbe67593136c18b803a0ddd66..8c2065a906d9ad8bd0b480a675b76b38680088e0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -623,4 +623,10 @@ public class PaperConfig {
@@ -24,7 +24,7 @@ index b591b47fc663289682c35f480f851b7eceb979dd..31e057e16c04f6cb6a4fa42e6ac9e811
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 94704a258ce7183aeb0ccec0b9106e40efd08821..703ac671b19636859648f16a5431b2700791e7d5 100644
+index ea9cd490fc3bfcf6a2900a702615e6626f0ed98b..9760ff4b6ca0e555f01151968cbfe0cdb8960e35 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -172,7 +172,7 @@ public class ServerEntity {
diff --git a/patches/server/0766-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0767-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0766-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0767-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0767-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0768-Oprimise-map-impl-for-tracked-players.patch
similarity index 93%
rename from patches/server/0767-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0768-Oprimise-map-impl-for-tracked-players.patch
index 84ace1e487..bd0b6903b2 100644
--- a/patches/server/0767-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0768-Oprimise-map-impl-for-tracked-players.patch
@@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have
 better lookups than HashMap.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 09e2d5bd3ab14a2c43547313394bf1167168d6cc..99a42f57d7cbab085dd9ac053b7b1cae7db3fd6c 100644
+index 1f6fdb65e28af63860700c5571cb77a0c05b692a..17b02c7ca671577f27b86cac0533cc2261f16e44 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -110,6 +110,7 @@ import org.apache.commons.lang3.mutable.MutableObject;
diff --git a/patches/server/0768-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0769-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0768-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0769-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch
similarity index 100%
rename from patches/server/0769-Allow-removal-addition-of-entities-to-entity-ticklis.patch
rename to patches/server/0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0770-Optimise-random-block-ticking.patch b/patches/server/0771-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0770-Optimise-random-block-ticking.patch
rename to patches/server/0771-Optimise-random-block-ticking.patch
index 7e265be8e8..1d0d60fbe6 100644
--- a/patches/server/0770-Optimise-random-block-ticking.patch
+++ b/patches/server/0771-Optimise-random-block-ticking.patch
@@ -71,7 +71,7 @@ index 0000000000000000000000000000000000000000..e8b4053babe46999980b926431254050
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2a215b9b35978caa61e687c3915df7d5edfae97a..f0ab54b45a5e1fb6ee49fea757cb908088873d80 100644
+index 9fa7a01db61ba91b79eda4f7e4fd4f0001712808..6dee3e414e378538e6b5ef93dc1414e0128cffbb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -645,6 +645,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -410,7 +410,7 @@ index cdd17e501c678a4f4bebbaaccdaec1682351e2f2..6afad987f6dd1fd7243dfa6c50549c2a
  
      public PalettedContainer<BlockState> getStates() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index c225ef6eb1b094f605548d3f72165a6ebc156157..9b84407b2d56186c1c9614371ea38297c9b893f4 100644
+index 83dc9550f4ed2a138d4ece2765273e555cda994a..65afcb24f6274d30ebf8598ffce291537128858a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -355,6 +355,14 @@ public class PalettedContainer<T> implements PaletteResize<T> {
diff --git a/patches/server/0771-Optimise-non-flush-packet-sending.patch b/patches/server/0772-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0771-Optimise-non-flush-packet-sending.patch
rename to patches/server/0772-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0772-Optimise-nearby-player-lookups.patch b/patches/server/0773-Optimise-nearby-player-lookups.patch
similarity index 99%
rename from patches/server/0772-Optimise-nearby-player-lookups.patch
rename to patches/server/0773-Optimise-nearby-player-lookups.patch
index 774bfe3e37..d5bebad96c 100644
--- a/patches/server/0772-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0773-Optimise-nearby-player-lookups.patch
@@ -39,7 +39,7 @@ index bd43fbc8a93afa7604aa467392520ed7b30a1d83..1a7fc533afced7235162f81b2de8148c
      // Paper end - optimise anyPlayerCloseEnoughForSpawning
      long lastAutoSaveTime; // Paper - incremental autosave
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 99a42f57d7cbab085dd9ac053b7b1cae7db3fd6c..405a6bdffbdf7af3837d68fe98cae62cc576b85e 100644
+index 17b02c7ca671577f27b86cac0533cc2261f16e44..6c7a9ad153eb5c08852602ca73a630aa61a58e0c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -164,6 +164,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -105,7 +105,7 @@ index 99a42f57d7cbab085dd9ac053b7b1cae7db3fd6c..405a6bdffbdf7af3837d68fe98cae62c
  
      protected ChunkGenerator generator() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f0ab54b45a5e1fb6ee49fea757cb908088873d80..a186109d12e6c68244683feb26d90f0734ee5b31 100644
+index 6dee3e414e378538e6b5ef93dc1414e0128cffbb..ea665ae89b0963e5605ff0bc87f906fdddeb2c9a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -400,6 +400,83 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0773-Optimise-WorldServer-notify.patch b/patches/server/0774-Optimise-WorldServer-notify.patch
similarity index 98%
rename from patches/server/0773-Optimise-WorldServer-notify.patch
rename to patches/server/0774-Optimise-WorldServer-notify.patch
index ab15ed05d8..54f133235c 100644
--- a/patches/server/0773-Optimise-WorldServer-notify.patch
+++ b/patches/server/0774-Optimise-WorldServer-notify.patch
@@ -8,7 +8,7 @@ Instead, only iterate over navigators in the current region that are
 eligible for repathing.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 405a6bdffbdf7af3837d68fe98cae62cc576b85e..2556647c724fdca7c81c5edb4ae19bdec92181de 100644
+index 6c7a9ad153eb5c08852602ca73a630aa61a58e0c..5ba598c136bca2be1badd41e9cfba39ee5f02994 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -301,15 +301,81 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -110,7 +110,7 @@ index 405a6bdffbdf7af3837d68fe98cae62cc576b85e..2556647c724fdca7c81c5edb4ae19bde
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a186109d12e6c68244683feb26d90f0734ee5b31..459cf01bcd1cbf7c315e2d9cb03e7dc4102588b9 100644
+index ea665ae89b0963e5605ff0bc87f906fdddeb2c9a..ae1de6544f488ff14202fd9df6267b2c98b81111 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1096,6 +1096,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0774-Remove-streams-for-villager-AI.patch b/patches/server/0775-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0774-Remove-streams-for-villager-AI.patch
rename to patches/server/0775-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0775-Rewrite-dataconverter-system.patch b/patches/server/0776-Rewrite-dataconverter-system.patch
similarity index 99%
rename from patches/server/0775-Rewrite-dataconverter-system.patch
rename to patches/server/0776-Rewrite-dataconverter-system.patch
index fc85db48ad..72192de57f 100644
--- a/patches/server/0775-Rewrite-dataconverter-system.patch
+++ b/patches/server/0776-Rewrite-dataconverter-system.patch
@@ -22097,7 +22097,7 @@ index c4bb280aef31c14e71337db0d6dbc5f06d9b9730..3cfc57b49fb3d85c4b9039907fc22bad
  
              for(int l = this.levelHeightAccessor.getMinSection(); l < this.levelHeightAccessor.getMaxSection(); ++l) {
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
-index 5862fd38fb2a5aeec0a63d001cc043aac62188bb..ad7177615c7feedc416b543f635c4cd2f88814d0 100644
+index 22e3ac8c5df5592e31ef3f00f102aa3a25e794b4..84f04c91ca9b8dfbb8c2d3685d710cca7171d859 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java
 @@ -116,7 +116,7 @@ public class StructureCheck {
diff --git a/patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch
similarity index 99%
rename from patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch
index f8e84e030b..2ec02bf6a3 100644
--- a/patches/server/0776-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index cc75f70b5ab381c0c7012c2d6e5c40d7e4a06c7b..eb6c5e292f748aad797a8b9d6a51b5b50e6e1f53 100644
+index 5ec76300234f29d9a153eb60cd60dccb849e5dc9..faf2b9524687b556af71b6d1cabf4a611e940df2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -44,6 +44,11 @@ dependencies {
diff --git a/patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 93%
rename from patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
index b94bc8f207..5103d7a24c 100644
--- a/patches/server/0777-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
+++ b/patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce worldgen thread worker count for low core count CPUs
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 0a92ef3a1470b1944d0d912f9c2d9641d5464c98..ad49b5a0b3d7fb104eda273368e5ad1e2b1453dc 100644
+index bbe69b5b2b1b7ccd3358325c9a65e7e197dfa7f2..d5a4e7d0ba2aff89e9aec64c8545c105926dcab4 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -131,7 +131,19 @@ public class Util {
diff --git a/patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
similarity index 97%
rename from patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
rename to patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index 47b15feb11..5c0a433617 100644
--- a/patches/server/0778-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
@@ -16,7 +16,7 @@ of a chance that we're about to eat a dirtload of chunk load callbacks, thus
 making this issue much more of an issue
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 58a99a6867642c74cba7db1edff87a071065f28d..5931e6a7bf57274c187db62de0482193557d572f 100644
+index 0085a4dd0f0def1ba71342e20aecdd46a3761b02..0cf67d55ab30ab145ffb2ff562c26c47c2e2879e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -129,46 +129,6 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0779-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0780-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0779-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0780-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0780-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0781-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0780-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0781-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 94%
rename from patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 6351272172..8dfad9ab0f 100644
--- a/patches/server/0781-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 459cf01bcd1cbf7c315e2d9cb03e7dc4102588b9..4df54aa0828e79960469576cf1adaf002f32d8d3 100644
+index ae1de6544f488ff14202fd9df6267b2c98b81111..41972a8db871b5a4a74e7735a2883d3d8e24c0ee 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2482,6 +2482,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0782-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0783-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0782-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0783-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 91%
rename from patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 7150f1af40..5f48d6b3b1 100644
--- a/patches/server/0783-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 33e824ca56f3aa9f080d6c5ebec9613107e7aa37..fd858a8c1fd280ec7769e224c7191ca85731f8a7 100644
+index e1f530d8b9faf7258a4d4c6dee689548b43b31a2..50311a996960b6907ae9d538d68ca327c2a0206e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -767,6 +767,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0784-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0785-Ensure-valid-vehicle-status.patch b/patches/server/0786-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0785-Ensure-valid-vehicle-status.patch
rename to patches/server/0786-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0787-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0787-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0787-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0788-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0789-Don-t-log-debug-logging-being-disabled.patch
similarity index 88%
rename from patches/server/0788-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0789-Don-t-log-debug-logging-being-disabled.patch
index 52bf120706..5bec880eb8 100644
--- a/patches/server/0788-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0789-Don-t-log-debug-logging-being-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't log debug logging being disabled
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 5097623eee5c1c9412f0c4a14f70b93e21ea295e..3b9dfaf9e6a63220754738dc966ee72cb91f80a4 100644
+index 6f7b34f03e0d151e4da652b9ad73e0d7930fe5d3..d509187ca63963fdd7f1a44d89d2aa1a1b1ce3bd 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -382,7 +382,7 @@ public class SpigotConfig
diff --git a/patches/server/0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
similarity index 100%
rename from patches/server/0789-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
rename to patches/server/0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0790-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0791-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0790-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0791-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
similarity index 95%
rename from patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
rename to patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
index d7efb28ea5..4269df0d81 100644
--- a/patches/server/0791-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
+++ b/patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
@@ -12,7 +12,7 @@ time to save, as flush saving performs a full flush at
 the end anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 2556647c724fdca7c81c5edb4ae19bdec92181de..5a4431adefa6d0baef1d46b97a2ee7d5d6a56ec9 100644
+index 5ba598c136bca2be1badd41e9cfba39ee5f02994..7f73703cf9dc4ecdd049d6c72c0ecbdcca95a784 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -928,6 +928,16 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0792-Preserve-overstacked-loot.patch b/patches/server/0793-Preserve-overstacked-loot.patch
similarity index 97%
rename from patches/server/0792-Preserve-overstacked-loot.patch
rename to patches/server/0793-Preserve-overstacked-loot.patch
index c0cdd696b4..2d41e5c253 100644
--- a/patches/server/0792-Preserve-overstacked-loot.patch
+++ b/patches/server/0793-Preserve-overstacked-loot.patch
@@ -26,7 +26,7 @@ index 848169bdab0a20e41cfb917cd6ec1abc771c1a7d..e5eeab49d167a9a151301ca910e14215
      private com.google.common.collect.Table<String, String, Integer> behaviorTickRates;
      private void tickRates() {
 diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
-index 276c444a0fddb6962818635d5fc7721a56b30784..4f240fc74fb9551d752855dcdf2a376ff30f536b 100644
+index e3897785b055a859bccf6d67eb1a5157f5b54348..ca5d0bb8a8666285075e23f58b7d34ea34f3d94c 100644
 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
 +++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
 @@ -54,9 +54,17 @@ public class LootTable {
diff --git a/patches/server/0793-Update-head-rotation-in-missing-places.patch b/patches/server/0794-Update-head-rotation-in-missing-places.patch
similarity index 93%
rename from patches/server/0793-Update-head-rotation-in-missing-places.patch
rename to patches/server/0794-Update-head-rotation-in-missing-places.patch
index 1b09737747..2dd4efaae9 100644
--- a/patches/server/0793-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0794-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 320128ff98867993aa7785cc77b769bdce451795..44d5a86dbe71d3e460947217916daa648f45217f 100644
+index 1f9f1ff4ccc3f45008df45274b8a154f0f802688..0f3a4d929fd78d3a63427dc01576cefacc24dbe0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1665,6 +1665,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0794-prevent-unintended-light-block-manipulation.patch b/patches/server/0795-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0794-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0795-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
similarity index 76%
rename from patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
rename to patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 533d2ba2ed..89603862f0 100644
--- a/patches/server/0795-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
@@ -5,18 +5,9 @@ Subject: [PATCH] Dont count named piglins and hoglins towards mob cap
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index c5b9c0c650df5f4b7e3d2a431dc900e210104dea..373ec915412899e4893aa182abd6fb63f3dff0aa 100644
+index 49ca4f6a9e33fdb5295dae2b059d071551353c24..373ec915412899e4893aa182abd6fb63f3dff0aa 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -123,7 +123,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
- 
-     @Override
-     public Brain<Hoglin> getBrain() {
--        return super.getBrain();
-+        return (Brain<Hoglin>) super.getBrain(); // Paper - decompile fix
-     }
- 
-     @Override
 @@ -181,7 +181,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
  
      @Override
diff --git a/patches/server/0796-Fix-CraftCriteria-defaults-map.patch b/patches/server/0797-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0796-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0797-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0797-Fix-upstreams-block-state-factories.patch b/patches/server/0798-Fix-upstreams-block-state-factories.patch
similarity index 99%
rename from patches/server/0797-Fix-upstreams-block-state-factories.patch
rename to patches/server/0798-Fix-upstreams-block-state-factories.patch
index e3d49748cd..4a88c25608 100644
--- a/patches/server/0797-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0798-Fix-upstreams-block-state-factories.patch
@@ -10,7 +10,7 @@ tile entity type to determine the block state factory and falls back on
 the material type of the block at that location.
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-index 0e37da7227eaba0d089e5bd136eca088ab2b5eb3..5601d0c2fe635a2a4f073c333531e1a8adf1833c 100644
+index e838abb6d258a1ab47e95572cf4c30c6ca6144b4..905ec2917fe1e5ef08b8a930afb0c0d8432fa444 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 @@ -270,7 +270,7 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject {
diff --git a/patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 97%
rename from patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch
index 401620d8e1..cc81a11fff 100644
--- a/patches/server/0798-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for logging player ip addresses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 31e057e16c04f6cb6a4fa42e6ac9e81198e24d79..609f7ff543353ede53dc46dafc5a2fd0b0622cd8 100644
+index 8c2065a906d9ad8bd0b480a675b76b38680088e0..3916d3e7773f4a3b6d5c5347d6a12a707bffcdad 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
@@ -81,7 +81,7 @@ index 4cd92875d60c2f1dcce67ac99e9ba257a10f87b1..f5c1dff1d571e89f960f11400edbcbbe
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0c2d1a8feb15bc2bc6ce2674b24222d5c501cd18..d9cd0bb20be6eca5db889f1350b829c0309e021f 100644
+index 81957d99205fcee40752914180f9f4a1158a613f..03d4d4d95e0cf617726a39ebd7191cd2d10ffdb7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -238,7 +238,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0799-Configurable-feature-seeds.patch b/patches/server/0800-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0799-Configurable-feature-seeds.patch
rename to patches/server/0800-Configurable-feature-seeds.patch
diff --git a/patches/server/0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0800-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0801-Add-root-admin-user-detection.patch b/patches/server/0802-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0801-Add-root-admin-user-detection.patch
rename to patches/server/0802-Add-root-admin-user-detection.patch
index b985f2b5b8..86c355de50 100644
--- a/patches/server/0801-Add-root-admin-user-detection.patch
+++ b/patches/server/0802-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 12020ec70e47499962ad19d03c89da8e2891536e..5c06cbc8680a06cc30a79c7115bb01c89d7a9cfa 100644
+index 939745227346e6d23e50f942eb48ab97c4ab6190..e28e09aae1d95d9bed50a137e999e6d457e62478 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -191,6 +191,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0802-Always-allow-item-changing-in-Fireball.patch b/patches/server/0803-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0802-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0803-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch
similarity index 91%
rename from patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch
index 57489841d5..0d78c1bee5 100644
--- a/patches/server/0803-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 44d5a86dbe71d3e460947217916daa648f45217f..f1c1f58ebb0398df9da9474778d1ad321d9e9433 100644
+index 0f3a4d929fd78d3a63427dc01576cefacc24dbe0..b736af871fefc05437d77c57375fbc57dca130f5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -716,7 +716,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
similarity index 100%
rename from patches/server/0804-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
rename to patches/server/0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/patches/server/0805-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0806-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0805-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0806-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 94%
rename from patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch
index e024a62da1..a11975f1ad 100644
--- a/patches/server/0806-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Remove client-side code using deprecated for removal
 Fixes warnings on build
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index ad49b5a0b3d7fb104eda273368e5ad1e2b1453dc..6d62358239b3e2ba653e439cea918dcbc9059775 100644
+index d5a4e7d0ba2aff89e9aec64c8545c105926dcab4..e0a77a776533e48a3f8e2165eb77d4765213b79e 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -23,7 +23,6 @@ import java.net.URL;
diff --git a/patches/server/0807-Rewrite-the-light-engine.patch b/patches/server/0808-Rewrite-the-light-engine.patch
similarity index 99%
rename from patches/server/0807-Rewrite-the-light-engine.patch
rename to patches/server/0808-Rewrite-the-light-engine.patch
index 159272cec4..b1b7d36c2f 100644
--- a/patches/server/0807-Rewrite-the-light-engine.patch
+++ b/patches/server/0808-Rewrite-the-light-engine.patch
@@ -5002,7 +5002,7 @@ index b6f8600838f243f72c1f0a9a2425837338df8bf6..a141071966428315484480831a58f02a
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 9b84407b2d56186c1c9614371ea38297c9b893f4..d8ce2b53f1ad3fbd50dd21bd5f12acd82da1eb8c 100644
+index 65afcb24f6274d30ebf8598ffce291537128858a..a0addbec2ecc8febeb098548897dc5ede0a562e8 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -186,7 +186,7 @@ public class PalettedContainer<T> implements PaletteResize<T> {
diff --git a/patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0808-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0809-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0810-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0811-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch
similarity index 98%
rename from patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch
rename to patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch
index 3342b664b5..da0f208d4e 100644
--- a/patches/server/0812-Fix-kelp-modifier-changing-growth-for-other-crops.patch
+++ b/patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch
@@ -77,7 +77,7 @@ index def3b62feada5cebae4049883fa967b12f6f32b4..8e642ff6d387e05f900acfc3cf6cfa59
          return (BlockState) state.cycle(GrowingPlantHeadBlock.AGE);
      }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 9f7541cb62600f022da75cba74731ff4e57f7f36..f144ca888518f1bdb84ee811410937cba994245c 100644
+index 32f8a6aed0f69ad07ab5b42fee38a3471a59d426..b498b027b127996976a394e9a86cfc90f8a8ed3b 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -103,6 +103,12 @@ public class SpigotWorldConfig
diff --git a/patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0813-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0814-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0815-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0814-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0815-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0815-Add-player-health-update-API.patch b/patches/server/0816-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0815-Add-player-health-update-API.patch
rename to patches/server/0816-Add-player-health-update-API.patch
diff --git a/patches/server/0816-Optimize-HashMapPalette.patch b/patches/server/0817-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0816-Optimize-HashMapPalette.patch
rename to patches/server/0817-Optimize-HashMapPalette.patch
diff --git a/patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0817-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index d43f4a7e64..99a5334c59 100644
--- a/patches/server/0818-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1202,7 +1202,7 @@ index f6410ba180a85b114a296c64ce293f0891f6b96c..b4d20c06a19e021317cff64a9789f057
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d9cd0bb20be6eca5db889f1350b829c0309e021f..639670e7570beec3dba24b348bc3da0ce0231393 100644
+index 03d4d4d95e0cf617726a39ebd7191cd2d10ffdb7..6a3d444fcac8c7d561dcadb02f64eaa3c3d7b1cd 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -936,7 +936,7 @@ public abstract class PlayerList {
@@ -1215,7 +1215,7 @@ index d9cd0bb20be6eca5db889f1350b829c0309e021f..639670e7570beec3dba24b348bc3da0c
          }
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f1c1f58ebb0398df9da9474778d1ad321d9e9433..9b1b038922be3bb29a6f0644d0642ca0c6feb4b5 100644
+index b736af871fefc05437d77c57375fbc57dca130f5..98a8a00d55f87fb210fa6d3825a7ff476f601021 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1095,9 +1095,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch
index 63a2b7f8a3..f33b2ef6aa 100644
--- a/patches/server/0819-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fd858a8c1fd280ec7769e224c7191ca85731f8a7..99ffca8a6c23ccd588695ddaed4f673d52e3aad4 100644
+index 50311a996960b6907ae9d538d68ca327c2a0206e..cb5df601391a05c1c7cfc1c5d86043f89d673407 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -584,7 +584,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
diff --git a/patches/server/0820-Actually-unload-POI-data.patch b/patches/server/0821-Actually-unload-POI-data.patch
similarity index 99%
rename from patches/server/0820-Actually-unload-POI-data.patch
rename to patches/server/0821-Actually-unload-POI-data.patch
index 3ad8dbd201..1530fe9f12 100644
--- a/patches/server/0820-Actually-unload-POI-data.patch
+++ b/patches/server/0821-Actually-unload-POI-data.patch
@@ -10,7 +10,7 @@ This patch also prevents the saving/unloading of POI data when
 world saving is disabled.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ccfd00591da304aa03ea2f10e809c11213db6e0f..b75b218733fd5f171bb0290d5fb0248c17737030 100644
+index 7d877eb5f87b718306ac2fd6cf2dd4106d99d823..b2efa5f24d20cb16218a0e7522866ee2faaef244 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -848,6 +848,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0821-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0822-Update-Log4j.patch b/patches/server/0823-Update-Log4j.patch
similarity index 92%
rename from patches/server/0822-Update-Log4j.patch
rename to patches/server/0823-Update-Log4j.patch
index 7a09e1fa24..e0341c557e 100644
--- a/patches/server/0822-Update-Log4j.patch
+++ b/patches/server/0823-Update-Log4j.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update Log4j
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index eb6c5e292f748aad797a8b9d6a51b5b50e6e1f53..028f6a1795ceb99d1760c73b0980238677b4b8bc 100644
+index faf2b9524687b556af71b6d1cabf4a611e940df2..4662952bd0a389fe77e00ede9ab4a57f33522794 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -29,10 +29,11 @@ dependencies {
diff --git a/patches/server/0823-Add-more-Campfire-API.patch b/patches/server/0824-Add-more-Campfire-API.patch
similarity index 98%
rename from patches/server/0823-Add-more-Campfire-API.patch
rename to patches/server/0824-Add-more-Campfire-API.patch
index ceffa1575f..75cef9d65b 100644
--- a/patches/server/0823-Add-more-Campfire-API.patch
+++ b/patches/server/0824-Add-more-Campfire-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Campfire API
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-index 7c48b26dc4baa3b4046840356132170c6e05a1d6..073ec046c1c09436dfca34045acc5df12ab82eda 100644
+index 1d2dbaec8201de12fb65e2c01ca8a1ead7e873a7..96c161b15a62a720fa991e8849f35956f767ff09 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 @@ -32,12 +32,14 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
diff --git a/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 97%
rename from patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 782f72a306..324e828c7c 100644
--- a/patches/server/0824-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0825-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
@@ -37,7 +37,7 @@ index 8ff8855c5267379b3a5f5d8baa4a275ffee2c4bf..6704ae5c2ee01f8b319f4d425fe08c16
              ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count);
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index 9f6c1de59ca011bd1203499f325fdfa305e215ce..4502362ff3c43eac489125deee59c66d76204e98 100644
+index e5b444c6f2e45c50b4f7ab49c0dad801938f6cd9..303b70f0433ff49a3bee2a0d92c41f01aec38bee 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 @@ -298,10 +298,17 @@ public class RegionFileStorage implements AutoCloseable {
diff --git a/patches/server/0825-Fix-tripwire-state-inconsistency.patch b/patches/server/0826-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0825-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0826-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0827-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0826-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0827-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0828-Forward-CraftEntity-in-teleport-command.patch
similarity index 95%
rename from patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0828-Forward-CraftEntity-in-teleport-command.patch
index cc8671d0cd..9eec59ce99 100644
--- a/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0828-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9b1b038922be3bb29a6f0644d0642ca0c6feb4b5..a2cc34d6a81b7278eacbf980ccf7f275377ee2a8 100644
+index 98a8a00d55f87fb210fa6d3825a7ff476f601021..27eb30d02d08ff61fb9916961d99e4ce01341290 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3203,6 +3203,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
diff --git a/patches/server/0828-Improve-scoreboard-entries.patch b/patches/server/0829-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0828-Improve-scoreboard-entries.patch
rename to patches/server/0829-Improve-scoreboard-entries.patch
diff --git a/patches/server/0829-Entity-powdered-snow-API.patch b/patches/server/0830-Entity-powdered-snow-API.patch
similarity index 94%
rename from patches/server/0829-Entity-powdered-snow-API.patch
rename to patches/server/0830-Entity-powdered-snow-API.patch
index c8d8c7c361..7df19b80b9 100644
--- a/patches/server/0829-Entity-powdered-snow-API.patch
+++ b/patches/server/0830-Entity-powdered-snow-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity powdered snow API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 788148145eddc90eac35881bc847e958b6a47ebe..7490f4127cb9dddf9332a0db7fd4d124e150cd9c 100644
+index 9e5f338d0bb64ac47a99cd08a2ab083d2f5caf6c..0a998832afacb25cbaf39737d14aa33eab6967b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1294,5 +1294,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0830-Add-API-for-item-entity-health.patch b/patches/server/0831-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0830-Add-API-for-item-entity-health.patch
rename to patches/server/0831-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0831-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0833-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0832-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0833-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0833-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0834-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0835-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0834-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0835-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0835-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0836-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0836-Fix-bees-aging-inside-hives.patch b/patches/server/0837-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0836-Fix-bees-aging-inside-hives.patch
rename to patches/server/0837-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0837-Bucketable-API.patch b/patches/server/0838-Bucketable-API.patch
similarity index 100%
rename from patches/server/0837-Bucketable-API.patch
rename to patches/server/0838-Bucketable-API.patch
diff --git a/patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0839-Check-player-world-in-endPortalSoundRadius.patch
similarity index 100%
rename from patches/server/0838-Check-player-world-in-endPortalSoundRadius.patch
rename to patches/server/0839-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0839-Validate-usernames.patch b/patches/server/0840-Validate-usernames.patch
similarity index 100%
rename from patches/server/0839-Validate-usernames.patch
rename to patches/server/0840-Validate-usernames.patch
diff --git a/patches/server/0840-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0841-Fix-saving-configs-with-more-long-comments.patch
similarity index 100%
rename from patches/server/0840-Fix-saving-configs-with-more-long-comments.patch
rename to patches/server/0841-Fix-saving-configs-with-more-long-comments.patch
diff --git a/patches/server/0841-Make-water-animal-spawn-height-configurable.patch b/patches/server/0842-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0841-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0842-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 225bfa5e01..db11b10e30 100644
--- a/patches/server/0842-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0843-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -31,7 +31,7 @@ index fba20c4228a34d4c956ce2a440eb6e495182f8f2..2e803b3b5356c197be05999e9d4749a9
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2420bc805923094d4d7422e69c20ed5de23777de..46b43e515138a2d8b4a30d7007489bf0a7a981fe 100644
+index a8c3c76ec3aed40655a0c5335407cb20ecfbc63d..7dcaa657f1488a922c14537a673d6c4bd158411c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -211,6 +211,31 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0844-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0843-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0844-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0845-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0844-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0845-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0845-Multiple-Entries-with-Scoreboards.patch b/patches/server/0846-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0845-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0846-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0846-Reset-placed-block-on-exception.patch b/patches/server/0847-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0846-Reset-placed-block-on-exception.patch
rename to patches/server/0847-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0847-Add-configurable-height-for-slime-spawn.patch b/patches/server/0848-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0847-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0848-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0849-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0848-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0849-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0849-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0850-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0849-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0850-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0850-Kick-on-main-for-illegal-chars.patch b/patches/server/0851-Kick-on-main-for-illegal-chars.patch
similarity index 100%
rename from patches/server/0850-Kick-on-main-for-illegal-chars.patch
rename to patches/server/0851-Kick-on-main-for-illegal-chars.patch
diff --git a/patches/server/0851-Multi-Block-Change-API-Implementation.patch b/patches/server/0852-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0851-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0852-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0852-Fix-NotePlayEvent.patch b/patches/server/0853-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0852-Fix-NotePlayEvent.patch
rename to patches/server/0853-Fix-NotePlayEvent.patch
diff --git a/patches/server/0853-Freeze-Tick-Lock-API.patch b/patches/server/0854-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0853-Freeze-Tick-Lock-API.patch
rename to patches/server/0854-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0854-Dolphin-API.patch b/patches/server/0855-Dolphin-API.patch
similarity index 100%
rename from patches/server/0854-Dolphin-API.patch
rename to patches/server/0855-Dolphin-API.patch
diff --git a/patches/server/0855-More-PotionEffectType-API.patch b/patches/server/0856-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0855-More-PotionEffectType-API.patch
rename to patches/server/0856-More-PotionEffectType-API.patch
diff --git a/patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0857-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0856-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0857-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0858-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0857-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0858-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0858-Add-config-for-stronghold-seed.patch b/patches/server/0859-Add-config-for-stronghold-seed.patch
similarity index 100%
rename from patches/server/0858-Add-config-for-stronghold-seed.patch
rename to patches/server/0859-Add-config-for-stronghold-seed.patch
diff --git a/patches/server/0859-Implement-regenerateChunk.patch b/patches/server/0860-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0859-Implement-regenerateChunk.patch
rename to patches/server/0860-Implement-regenerateChunk.patch
index fc95412b04..21a5aa32b4 100644
--- a/patches/server/0859-Implement-regenerateChunk.patch
+++ b/patches/server/0860-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 46b43e515138a2d8b4a30d7007489bf0a7a981fe..2e8e066ca3f57cfb9d11cbc620d038cea9dd2b64 100644
+index 7dcaa657f1488a922c14537a673d6c4bd158411c..7e8be67b85fc28ecf9d27241e1a7157b976885a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -132,6 +132,7 @@ import org.bukkit.util.Vector;
diff --git a/patches/server/0860-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0861-Log-exceptions-thrown-during-chat-processing.patch
similarity index 100%
rename from patches/server/0860-Log-exceptions-thrown-during-chat-processing.patch
rename to patches/server/0861-Log-exceptions-thrown-during-chat-processing.patch
diff --git a/patches/server/0861-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0862-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0861-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0862-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0863-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0862-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0863-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0863-Add-GameEvent-tags.patch b/patches/server/0864-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0863-Add-GameEvent-tags.patch
rename to patches/server/0864-Add-GameEvent-tags.patch
diff --git a/patches/server/0864-Replace-player-chunk-loader-system.patch b/patches/server/0865-Replace-player-chunk-loader-system.patch
similarity index 99%
rename from patches/server/0864-Replace-player-chunk-loader-system.patch
rename to patches/server/0865-Replace-player-chunk-loader-system.patch
index a34a1433b6..8322ead428 100644
--- a/patches/server/0864-Replace-player-chunk-loader-system.patch
+++ b/patches/server/0865-Replace-player-chunk-loader-system.patch
@@ -1874,7 +1874,7 @@ index cd6eb305f4d36be923f6c5f0dd85e449d0f94c8f..5793154c0deca7fc570bbe858c6bea0d
                  return true;
              } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4df54aa0828e79960469576cf1adaf002f32d8d3..19e0648c47733dc1973d6ff2ccba2ba6a25f48de 100644
+index 41972a8db871b5a4a74e7735a2883d3d8e24c0ee..8e87aca16879d7dd1dc0bd17d3215fca40b547cd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -658,7 +658,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0866-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0865-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0866-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0866-Replace-ticket-level-propagator.patch b/patches/server/0867-Replace-ticket-level-propagator.patch
similarity index 100%
rename from patches/server/0866-Replace-ticket-level-propagator.patch
rename to patches/server/0867-Replace-ticket-level-propagator.patch
diff --git a/patches/server/0867-Furnace-RecipesUsed-API.patch b/patches/server/0868-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0867-Furnace-RecipesUsed-API.patch
rename to patches/server/0868-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0868-Configurable-sculk-sensor-listener-range.patch b/patches/server/0869-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0868-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0869-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0869-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0870-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0869-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0870-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0871-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0870-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0871-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0871-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0872-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0871-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0872-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0872-Fix-Entity-Position-Desync.patch b/patches/server/0873-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0872-Fix-Entity-Position-Desync.patch
rename to patches/server/0873-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0873-Custom-Potion-Mixes.patch b/patches/server/0874-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0873-Custom-Potion-Mixes.patch
rename to patches/server/0874-Custom-Potion-Mixes.patch