From d02bb811de6f9d7e42001137b93d6a6f88359ab6 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 27 Apr 2024 15:50:33 -0700
Subject: [PATCH] proper migration to gamerules for keep spawn loaded distance

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

diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index be80eac01f..8442ee0f87 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -121,12 +121,13 @@ index 0000000000000000000000000000000000000000..042478cf7ce150f1f1bc5cddd7fa40f8
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e4762e72eff
+index 0000000000000000000000000000000000000000..522156e1b7578663c426fcaf7e47acb93d030486
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -0,0 +1,355 @@
+@@ -0,0 +1,360 @@
 +package io.papermc.paper.configuration;
 +
++import com.google.common.base.Preconditions;
 +import com.mojang.logging.LogUtils;
 +import io.leangen.geantyref.TypeToken;
 +import io.papermc.paper.configuration.constraint.Constraint;
@@ -134,6 +135,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +import net.minecraft.core.RegistryAccess;
 +import net.minecraft.resources.ResourceLocation;
 +import net.minecraft.server.level.ServerLevel;
++import net.minecraft.world.level.GameRules;
 +import org.checkerframework.checker.nullness.qual.Nullable;
 +import org.jetbrains.annotations.MustBeInvokedByOverriders;
 +import org.slf4j.Logger;
@@ -141,6 +143,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +import org.spongepowered.configurate.ConfigurateException;
 +import org.spongepowered.configurate.ConfigurationNode;
 +import org.spongepowered.configurate.ConfigurationOptions;
++import org.spongepowered.configurate.NodePath;
 +import org.spongepowered.configurate.objectmapping.ObjectMapper;
 +import org.spongepowered.configurate.serialize.SerializationException;
 +import org.spongepowered.configurate.util.CheckedFunction;
@@ -210,9 +213,9 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +        return this.createLoaderBuilder();
 +    }
 +
-+    static <T> CheckedFunction<ConfigurationNode, T, SerializationException> creator(Class<T> type, boolean refreshNode) {
++    static <T> CheckedFunction<ConfigurationNode, T, SerializationException> creator(final Class<? extends T> type, final boolean refreshNode) {
 +        return node -> {
-+            T instance = node.require(type);
++            final T instance = node.require(type);
 +            if (refreshNode) {
 +                node.set(type, instance);
 +            }
@@ -300,7 +303,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +        this.applyWorldConfigTransformations(contextMap, node);
 +        final W instance = node.require(this.worldConfigClass);
 +        node.set(this.worldConfigClass, instance);
-+        trySaveFileNode(loader, node, configFile.toString());
++        this.trySaveFileNode(loader, node, configFile.toString());
 +    }
 +
 +    private DefaultWorldLoader createDefaultWorldLoader(final boolean requireFile, final ContextMap contextMap, final Path configFile) {
@@ -335,6 +338,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +    }
 +
 +    protected W createWorldConfig(final ContextMap contextMap, final CheckedFunction<ConfigurationNode, W, SerializationException> creator) throws IOException {
++        Preconditions.checkArgument(!contextMap.isDefaultWorldContext(), "cannot create world map with default world context");
 +        final Path defaultsConfigFile = this.globalFolder.resolve(this.defaultWorldConfigFileName);
 +        final YamlConfigurationLoader defaultsLoader = this.createDefaultWorldLoader(true, this.createDefaultContextMap(contextMap.require(REGISTRY_ACCESS)).build(), defaultsConfigFile).loader();
 +        final ConfigurationNode defaultsNode = defaultsLoader.load();
@@ -360,7 +364,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +        }
 +        this.applyWorldConfigTransformations(contextMap, worldNode);
 +        this.applyDefaultsAwareWorldConfigTransformations(contextMap, worldNode, defaultsNode);
-+        trySaveFileNode(worldLoader, worldNode, worldConfigFile.toString()); // save before loading node NOTE: don't save the backing node after loading it, or you'll fill up the world-specific config
++        this.trySaveFileNode(worldLoader, worldNode, worldConfigFile.toString()); // save before loading node NOTE: don't save the backing node after loading it, or you'll fill up the world-specific config
 +        worldNode.mergeFrom(defaultsNode);
 +        return creator.apply(worldNode);
 +    }
@@ -467,6 +471,7 @@ index 0000000000000000000000000000000000000000..c01b4393439838976965823298f12e47
 +    public static final ContextKey<ResourceLocation> WORLD_KEY = new ContextKey<>(ResourceLocation.class, "world key");
 +    public static final ContextKey<Void> FIRST_DEFAULT = new ContextKey<>(Void.class, "first default");
 +    public static final ContextKey<RegistryAccess> REGISTRY_ACCESS = new ContextKey<>(RegistryAccess.class, "registry access");
++    public static final ContextKey<GameRules> GAME_RULES = new ContextKey<>(GameRules.class, "game rules");
 +
 +    public record ContextKey<T>(TypeToken<T> type, String name) {
 +
@@ -837,10 +842,10 @@ index 0000000000000000000000000000000000000000..69add4a7f1147015806bc9b63a8340d1
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd08e09874
+index 0000000000000000000000000000000000000000..d99489e0216b24d27a19c92a1ce0c10ae10d071f
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -0,0 +1,465 @@
+@@ -0,0 +1,464 @@
 +package io.papermc.paper.configuration;
 +
 +import com.google.common.base.Suppliers;
@@ -864,6 +869,7 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +import io.papermc.paper.configuration.transformation.global.versioned.V29_LogIPs;
 +import io.papermc.paper.configuration.transformation.world.FeatureSeedsGeneration;
 +import io.papermc.paper.configuration.transformation.world.LegacyPaperWorldConfig;
++import io.papermc.paper.configuration.transformation.world.SpawnLoadedRangeToGameRule;
 +import io.papermc.paper.configuration.transformation.world.versioned.V29_ZeroWorldHeight;
 +import io.papermc.paper.configuration.transformation.world.versioned.V30_RenameFilterNbtFromSpawnEgg;
 +import io.papermc.paper.configuration.type.BooleanOrDefault;
@@ -893,6 +899,7 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +import net.minecraft.server.level.ServerLevel;
 +import net.minecraft.world.entity.EntityType;
 +import net.minecraft.world.item.Item;
++import net.minecraft.world.level.GameRules;
 +import net.minecraft.world.level.block.Block;
 +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 +import org.apache.commons.lang3.RandomStringUtils;
@@ -1121,21 +1128,17 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +        versionedBuilder.build().apply(node);
 +    }
 +
-+    private static final List<Transformations.DefaultsAware> DEFAULT_AWARE_TRANSFORMATIONS = List.of(FeatureSeedsGeneration::apply);
++    private static final List<Transformations.DefaultsAware> DEFAULT_AWARE_TRANSFORMATIONS = List.of(
++        FeatureSeedsGeneration::apply,
++        SpawnLoadedRangeToGameRule::apply
++    );
 +
 +    @Override
 +    protected void applyDefaultsAwareWorldConfigTransformations(final ContextMap contextMap, final ConfigurationNode worldNode, final ConfigurationNode defaultsNode) throws ConfigurateException {
 +        final ConfigurationTransformation.Builder builder = ConfigurationTransformation.builder();
 +        // ADD FUTURE TRANSFORMS HERE (these transforms run after the defaults have been merged into the node)
 +        DEFAULT_AWARE_TRANSFORMATIONS.forEach(transform -> transform.apply(builder, contextMap, defaultsNode));
-+
-+        ConfigurationTransformation transformation;
-+        try {
-+            transformation = builder.build(); // build throws IAE if no actions were provided (bad zml)
-+        } catch (IllegalArgumentException ignored) {
-+            return;
-+        }
-+        transformation.apply(worldNode);
++        builder.build().apply(worldNode);
 +    }
 +
 +    @Override
@@ -1166,16 +1169,17 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +    }
 +
 +    private static ContextMap createWorldContextMap(ServerLevel level) {
-+        return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess());
++        return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess(), level.getGameRules());
 +    }
 +
-+    public static ContextMap createWorldContextMap(Path dir, String levelName, ResourceLocation worldKey, SpigotWorldConfig spigotConfig, RegistryAccess registryAccess) {
++    public static ContextMap createWorldContextMap(final Path dir, final String levelName, final ResourceLocation worldKey, final SpigotWorldConfig spigotConfig, final RegistryAccess registryAccess, final GameRules gameRules) {
 +        return ContextMap.builder()
 +            .put(WORLD_DIRECTORY, dir)
 +            .put(WORLD_NAME, levelName)
 +            .put(WORLD_KEY, worldKey)
 +            .put(SPIGOT_WORLD_CONFIG_CONTEXT_KEY, Suppliers.ofInstance(spigotConfig))
 +            .put(REGISTRY_ACCESS, registryAccess)
++            .put(GAME_RULES, gameRules)
 +            .build();
 +    }
 +
@@ -1308,10 +1312,10 @@ index 0000000000000000000000000000000000000000..fa1c0aee8c3a4d0868482cf5c703bbfd
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ede22142ef70bbdc6ede22ff4a13ed69fbce4915
+index 0000000000000000000000000000000000000000..990d1bb46e0f9719f4e9af928d80ac6f8dff23b5
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,82 @@
 +package io.papermc.paper.configuration;
 +
 +import org.spongepowered.configurate.NodePath;
@@ -1368,6 +1372,8 @@ index 0000000000000000000000000000000000000000..ede22142ef70bbdc6ede22ff4a13ed69
 +        path("fixes", "fix-curing-zombie-villager-discount-exploit"),
 +        path("entities", "mob-effects", "undead-immune-to-certain-effects")
 +    };
++    // spawn.keep-spawn-loaded and spawn.keep-spawn-loaded-range are no longer used, but kept
++    // in the world default config for compatibility with old worlds being migrated to use the gamerule
 +
 +    NodePath[] REMOVED_GLOBAL_PATHS = {
 +        path("data-value-allowed-items"),
@@ -1394,10 +1400,10 @@ index 0000000000000000000000000000000000000000..ede22142ef70bbdc6ede22ff4a13ed69
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bfc10ae8e09ac07b969a38eecddfab1e3c308f5a
+index 0000000000000000000000000000000000000000..b3a39a0b1f54d38207fa55485318e6ca257a57ab
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
-@@ -0,0 +1,553 @@
+@@ -0,0 +1,550 @@
 +package io.papermc.paper.configuration;
 +
 +import com.google.common.collect.HashBasedTable;
@@ -1405,7 +1411,6 @@ index 0000000000000000000000000000000000000000..bfc10ae8e09ac07b969a38eecddfab1e
 +import com.mojang.logging.LogUtils;
 +import io.papermc.paper.configuration.legacy.MaxEntityCollisionsInitializer;
 +import io.papermc.paper.configuration.legacy.RequiresSpigotInitialization;
-+import io.papermc.paper.configuration.legacy.SpawnLoadedRangeInitializer;
 +import io.papermc.paper.configuration.mapping.MergeMap;
 +import io.papermc.paper.configuration.serializer.NbtPathSerializer;
 +import io.papermc.paper.configuration.transformation.world.FeatureSeedsGeneration;
@@ -1463,9 +1468,10 @@ index 0000000000000000000000000000000000000000..bfc10ae8e09ac07b969a38eecddfab1e
 +    private static final Logger LOGGER = LogUtils.getClassLogger();
 +    static final int CURRENT_VERSION = 30; // (when you change the version, change the comment, so it conflicts on rebases): rename filter bad nbt from spawn eggs
 +
-+    private transient final SpigotWorldConfig spigotConfig;
-+    private transient final ResourceLocation worldKey;
-+    WorldConfiguration(SpigotWorldConfig spigotConfig, ResourceLocation worldKey) {
++    private final transient SpigotWorldConfig spigotConfig;
++    private final transient ResourceLocation worldKey;
++
++    WorldConfiguration(final SpigotWorldConfig spigotConfig, final ResourceLocation worldKey) {
 +        this.spigotConfig = spigotConfig;
 +        this.worldKey = worldKey;
 +    }
@@ -1821,9 +1827,6 @@ index 0000000000000000000000000000000000000000..bfc10ae8e09ac07b969a38eecddfab1e
 +    public Spawn spawn;
 +
 +    public class Spawn extends ConfigurationPart {
-+        @RequiresSpigotInitialization(SpawnLoadedRangeInitializer.class)
-+        public short keepSpawnLoadedRange = 10;
-+        public boolean keepSpawnLoaded = true;
 +        public boolean allowUsingSignsInsideSpawnProtection = false;
 +    }
 +
@@ -3561,7 +3564,7 @@ index 0000000000000000000000000000000000000000..90071acf589fb2fa1c3480883165b429
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/FeatureSeedsGeneration.java b/src/main/java/io/papermc/paper/configuration/transformation/world/FeatureSeedsGeneration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1326aae8f95ab11f840abdee0c8c7a557705fd73
+index 0000000000000000000000000000000000000000..6cdc40cb4a5f94654c874f9dbdb106fa0e4d41f3
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/transformation/world/FeatureSeedsGeneration.java
 @@ -0,0 +1,71 @@
@@ -3631,7 +3634,7 @@ index 0000000000000000000000000000000000000000..1326aae8f95ab11f840abdee0c8c7a55
 +
 +
 +    public static void apply(final ConfigurationTransformation.Builder builder, final Configurations.ContextMap contextMap, final ConfigurationNode defaultsNode) {
-+        if (!contextMap.isDefaultWorldContext() && defaultsNode.node(FEATURE_SEEDS_KEY, GENERATE_KEY).getBoolean(false)) {
++        if (defaultsNode.node(FEATURE_SEEDS_KEY, GENERATE_KEY).getBoolean(false)) {
 +            builder.addAction(path(), new FeatureSeedsGeneration(contextMap.require(Configurations.WORLD_KEY)));
 +        }
 +    }
@@ -3964,6 +3967,63 @@ index 0000000000000000000000000000000000000000..edaa6ef28c1f9a223943969870889700
 +        moveFromRootAndRename(builder, path("game-mechanics", oldKey), newKey, parents);
 +    }
 +}
+diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/SpawnLoadedRangeToGameRule.java b/src/main/java/io/papermc/paper/configuration/transformation/world/SpawnLoadedRangeToGameRule.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..3f31c0626b6f01da6bb13942126565f844ca5faa
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/configuration/transformation/world/SpawnLoadedRangeToGameRule.java
+@@ -0,0 +1,51 @@
++package io.papermc.paper.configuration.transformation.world;
++
++import io.papermc.paper.configuration.Configurations;
++import net.minecraft.world.level.GameRules;
++import org.checkerframework.checker.nullness.qual.Nullable;
++import org.spongepowered.configurate.ConfigurateException;
++import org.spongepowered.configurate.ConfigurationNode;
++import org.spongepowered.configurate.NodePath;
++import org.spongepowered.configurate.transformation.ConfigurationTransformation;
++import org.spongepowered.configurate.transformation.TransformAction;
++
++import static org.spongepowered.configurate.NodePath.path;
++
++public final class SpawnLoadedRangeToGameRule implements TransformAction {
++
++    private static final String SPAWN = "spawn";
++    private static final String KEEP_SPAWN_LOADED_RANGE = "keep-spawn-loaded-range";
++    private static final String KEEP_SPAWN_LOADED = "keep-spawn-loaded";
++
++    private final GameRules gameRules;
++    private final ConfigurationNode defaultsNode;
++
++    private SpawnLoadedRangeToGameRule(final GameRules gameRules, final ConfigurationNode defaultsNode) {
++        this.gameRules = gameRules;
++        this.defaultsNode = defaultsNode;
++    }
++
++    @Override
++    public Object @Nullable [] visitPath(final NodePath path, final ConfigurationNode value) {
++        final ConfigurationNode worldSpawnNode = value.node(SPAWN);
++        final ConfigurationNode worldLoadedNode = worldSpawnNode.node(KEEP_SPAWN_LOADED);
++        final boolean keepLoaded = worldLoadedNode.getBoolean(this.defaultsNode.node(SPAWN, KEEP_SPAWN_LOADED).getBoolean());
++        worldLoadedNode.raw(null);
++        final ConfigurationNode worldRangeNode = worldSpawnNode.node(KEEP_SPAWN_LOADED_RANGE);
++        final int range = worldRangeNode.getInt(this.defaultsNode.node(SPAWN, KEEP_SPAWN_LOADED_RANGE).getInt());
++        worldRangeNode.raw(null);
++        if (worldSpawnNode.empty()) {
++            worldSpawnNode.raw(null);
++        }
++        if (!keepLoaded) {
++            this.gameRules.getRule(GameRules.RULE_SPAWN_CHUNK_RADIUS).set(0, null);
++        } else {
++            this.gameRules.getRule(GameRules.RULE_SPAWN_CHUNK_RADIUS).set(range, null);
++        }
++        return null;
++    }
++
++    public static void apply(final ConfigurationTransformation.Builder builder, final Configurations.ContextMap contextMap, final ConfigurationNode defaultsNode) {
++        builder.addAction(path(), new SpawnLoadedRangeToGameRule(contextMap.require(Configurations.GAME_RULES), defaultsNode));
++    }
++}
 diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/versioned/V29_ZeroWorldHeight.java b/src/main/java/io/papermc/paper/configuration/transformation/world/versioned/V29_ZeroWorldHeight.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..6e481d509d091e65a4909d79014ac94ea63c8455
@@ -4934,7 +4994,7 @@ index 6d89a5414f46a0c30badb4fcd25bc6cb6d18db3a..0ec3b546db0cf3858dd9cd9ea067d1d6
              }
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d7c5e872136d0452311b316c5703050c45960230..cc5e1076bdf7b4794ee79934fb70234ba61efe15 100644
+index d7c5e872136d0452311b316c5703050c45960230..b84078f8105bccc40da0c14932ad3160c96d371c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -241,7 +241,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -4942,7 +5002,7 @@ index d7c5e872136d0452311b316c5703050c45960230..cc5e1076bdf7b4794ee79934fb70234b
  
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
 -        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env);
-+        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess()))); // Paper - create paper world configs
++        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules()))); // Paper - create paper world configs
          this.pvpMode = minecraftserver.isPvpAllowed();
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
index dcaff2cc56..e93ee80f17 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/server/0008-CB-fixes.patch
@@ -17,7 +17,7 @@ Subject: [PATCH] CB fixes
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cc5e1076bdf7b4794ee79934fb70234ba61efe15..b3caf69f9627ba2114dc9d06551ccf182debfb04 100644
+index b84078f8105bccc40da0c14932ad3160c96d371c..c4bd9be9d1884be1f5040ff1417f44f8ac4b655f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -302,7 +302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index 383fbe5d4f..ee3ac63479 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -6847,7 +6847,7 @@ index 8661ed9962d07fb40390faf7f186b9cd8ce6bc62..23c39b78486b018e222af489c8edbf4e
          ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b3caf69f9627ba2114dc9d06551ccf182debfb04..9332573e6948092ea1cda4efa7f3944729da91be 100644
+index c4bd9be9d1884be1f5040ff1417f44f8ac4b655f..319cb644c0a42e9cc0d3ce9d1cbaa93b9c3dcd5b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -235,6 +235,98 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0023-Timings-v2.patch b/patches/server/0023-Timings-v2.patch
index f377e89d95..e4fc7060f8 100644
--- a/patches/server/0023-Timings-v2.patch
+++ b/patches/server/0023-Timings-v2.patch
@@ -1111,7 +1111,7 @@ index 23c39b78486b018e222af489c8edbf4e749abff6..3f60a3289ec58d5eb3c0c5634ca62ef2
              gameprofilerfiller.pop();
              gameprofilerfiller.pop();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9332573e6948092ea1cda4efa7f3944729da91be..476b513e05a8ef099a17db44732ebc8eed8a595c 100644
+index 319cb644c0a42e9cc0d3ce9d1cbaa93b9c3dcd5b..a6e78b8a6ced8ec84273e2c5d18ffccacb005cb6 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/0033-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0033-Allow-for-toggling-of-spawn-chunks.patch
deleted file mode 100644
index 2aa0d85e0b..0000000000
--- a/patches/server/0033-Allow-for-toggling-of-spawn-chunks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Thu, 3 Mar 2016 03:53:43 -0600
-Subject: [PATCH] Allow for toggling of spawn chunks
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 476b513e05a8ef099a17db44732ebc8eed8a595c..a72b84cdf2b5f4aea5eb7fe4dfc0faad27c46876 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -403,6 +403,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             this.dragonFight = null;
-         }
- 
-+        // Paper start - keep spawn loaded
-+        if (this.paperConfig().spawn.keepSpawnLoaded && this.getGameRules().getInt(GameRules.RULE_SPAWN_CHUNK_RADIUS) == 0) {
-+            this.getGameRules().getRule(GameRules.RULE_SPAWN_CHUNK_RADIUS).set(this.paperConfig().spawn.keepSpawnLoadedRange, this);
-+        }
-+        // Paper end - keep spawn loaded
-+
-         this.sleepStatus = new SleepStatus();
-         this.gameEventDispatcher = new GameEventDispatcher(this);
-         this.randomSequences = (RandomSequences) Objects.requireNonNullElseGet(randomsequences, () -> {
diff --git a/patches/server/0034-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0033-Drop-falling-block-and-tnt-entities-at-the-specified.patch
similarity index 100%
rename from patches/server/0034-Drop-falling-block-and-tnt-entities-at-the-specified.patch
rename to patches/server/0033-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff --git a/patches/server/0035-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
similarity index 100%
rename from patches/server/0035-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
rename to patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
diff --git a/patches/server/0036-Implement-Paper-VersionChecker.patch b/patches/server/0035-Implement-Paper-VersionChecker.patch
similarity index 100%
rename from patches/server/0036-Implement-Paper-VersionChecker.patch
rename to patches/server/0035-Implement-Paper-VersionChecker.patch
diff --git a/patches/server/0037-Add-version-history-to-version-command.patch b/patches/server/0036-Add-version-history-to-version-command.patch
similarity index 100%
rename from patches/server/0037-Add-version-history-to-version-command.patch
rename to patches/server/0036-Add-version-history-to-version-command.patch
diff --git a/patches/server/0038-Player-affects-spawning-API.patch b/patches/server/0037-Player-affects-spawning-API.patch
similarity index 100%
rename from patches/server/0038-Player-affects-spawning-API.patch
rename to patches/server/0037-Player-affects-spawning-API.patch
diff --git a/patches/server/0039-Only-refresh-abilities-if-needed.patch b/patches/server/0038-Only-refresh-abilities-if-needed.patch
similarity index 100%
rename from patches/server/0039-Only-refresh-abilities-if-needed.patch
rename to patches/server/0038-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0040-Entity-Origin-API.patch b/patches/server/0039-Entity-Origin-API.patch
similarity index 97%
rename from patches/server/0040-Entity-Origin-API.patch
rename to patches/server/0039-Entity-Origin-API.patch
index f971fccaba..ac1b821538 100644
--- a/patches/server/0040-Entity-Origin-API.patch
+++ b/patches/server/0039-Entity-Origin-API.patch
@@ -5,10 +5,10 @@ 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 a72b84cdf2b5f4aea5eb7fe4dfc0faad27c46876..c8dadfd6441452817db858ae934b7baed5194403 100644
+index a6e78b8a6ced8ec84273e2c5d18ffccacb005cb6..c476a49f69261868f74ad528a2ad746aed3094a3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2179,6 +2179,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2173,6 +2173,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.inWorld = true; // CraftBukkit - Mark entity as in world
              entity.valid = true; // CraftBukkit
diff --git a/patches/server/0041-Prevent-block-entity-and-entity-crashes.patch b/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch
similarity index 100%
rename from patches/server/0041-Prevent-block-entity-and-entity-crashes.patch
rename to patches/server/0040-Prevent-block-entity-and-entity-crashes.patch
diff --git a/patches/server/0042-Configurable-top-of-nether-void-damage.patch b/patches/server/0041-Configurable-top-of-nether-void-damage.patch
similarity index 100%
rename from patches/server/0042-Configurable-top-of-nether-void-damage.patch
rename to patches/server/0041-Configurable-top-of-nether-void-damage.patch
diff --git a/patches/server/0043-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0042-Check-online-mode-before-converting-and-renaming-pla.patch
similarity index 100%
rename from patches/server/0043-Check-online-mode-before-converting-and-renaming-pla.patch
rename to patches/server/0042-Check-online-mode-before-converting-and-renaming-pla.patch
diff --git a/patches/server/0044-Add-more-entities-to-activation-range-ignore-list.patch b/patches/server/0043-Add-more-entities-to-activation-range-ignore-list.patch
similarity index 100%
rename from patches/server/0044-Add-more-entities-to-activation-range-ignore-list.patch
rename to patches/server/0043-Add-more-entities-to-activation-range-ignore-list.patch
diff --git a/patches/server/0045-Configurable-end-credits.patch b/patches/server/0044-Configurable-end-credits.patch
similarity index 100%
rename from patches/server/0045-Configurable-end-credits.patch
rename to patches/server/0044-Configurable-end-credits.patch
diff --git a/patches/server/0046-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch
similarity index 100%
rename from patches/server/0046-Fix-lag-from-explosions-processing-dead-entities.patch
rename to patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch
diff --git a/patches/server/0047-Optimize-explosions.patch b/patches/server/0046-Optimize-explosions.patch
similarity index 100%
rename from patches/server/0047-Optimize-explosions.patch
rename to patches/server/0046-Optimize-explosions.patch
diff --git a/patches/server/0048-Disable-explosion-knockback.patch b/patches/server/0047-Disable-explosion-knockback.patch
similarity index 100%
rename from patches/server/0048-Disable-explosion-knockback.patch
rename to patches/server/0047-Disable-explosion-knockback.patch
diff --git a/patches/server/0049-Disable-thunder.patch b/patches/server/0048-Disable-thunder.patch
similarity index 87%
rename from patches/server/0049-Disable-thunder.patch
rename to patches/server/0048-Disable-thunder.patch
index bece00e2e2..55d3e6add9 100644
--- a/patches/server/0049-Disable-thunder.patch
+++ b/patches/server/0048-Disable-thunder.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable thunder
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c8dadfd6441452817db858ae934b7baed5194403..b41a4d6dc7fb98b6f6fc172a2b83ea43213643b4 100644
+index c476a49f69261868f74ad528a2ad746aed3094a3..b66b2cc4111073f080620a52883e1b8d6946e768 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -621,7 +621,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -615,7 +615,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
diff --git a/patches/server/0050-Disable-ice-and-snow.patch b/patches/server/0049-Disable-ice-and-snow.patch
similarity index 86%
rename from patches/server/0050-Disable-ice-and-snow.patch
rename to patches/server/0049-Disable-ice-and-snow.patch
index 36c4e1948f..d17551d9f5 100644
--- a/patches/server/0050-Disable-ice-and-snow.patch
+++ b/patches/server/0049-Disable-ice-and-snow.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable ice and snow
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b41a4d6dc7fb98b6f6fc172a2b83ea43213643b4..6440c0459248a9a0de21c8871e4f4ce399b525ec 100644
+index b66b2cc4111073f080620a52883e1b8d6946e768..53e69115a2186c0124d3d8c83f6ca0aecc68c324 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -651,11 +651,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -645,11 +645,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          gameprofilerfiller.popPush("iceandsnow");
  
diff --git a/patches/server/0051-Configurable-mob-spawner-tick-rate.patch b/patches/server/0050-Configurable-mob-spawner-tick-rate.patch
similarity index 100%
rename from patches/server/0051-Configurable-mob-spawner-tick-rate.patch
rename to patches/server/0050-Configurable-mob-spawner-tick-rate.patch
diff --git a/patches/server/0052-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0051-Implement-PlayerLocaleChangeEvent.patch
similarity index 100%
rename from patches/server/0052-Implement-PlayerLocaleChangeEvent.patch
rename to patches/server/0051-Implement-PlayerLocaleChangeEvent.patch
diff --git a/patches/server/0053-Add-BeaconEffectEvent.patch b/patches/server/0052-Add-BeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0053-Add-BeaconEffectEvent.patch
rename to patches/server/0052-Add-BeaconEffectEvent.patch
diff --git a/patches/server/0054-Configurable-container-update-tick-rate.patch b/patches/server/0053-Configurable-container-update-tick-rate.patch
similarity index 100%
rename from patches/server/0054-Configurable-container-update-tick-rate.patch
rename to patches/server/0053-Configurable-container-update-tick-rate.patch
diff --git a/patches/server/0055-Use-UserCache-for-player-heads.patch b/patches/server/0054-Use-UserCache-for-player-heads.patch
similarity index 100%
rename from patches/server/0055-Use-UserCache-for-player-heads.patch
rename to patches/server/0054-Use-UserCache-for-player-heads.patch
diff --git a/patches/server/0056-Disable-spigot-tick-limiters.patch b/patches/server/0055-Disable-spigot-tick-limiters.patch
similarity index 100%
rename from patches/server/0056-Disable-spigot-tick-limiters.patch
rename to patches/server/0055-Disable-spigot-tick-limiters.patch
diff --git a/patches/server/0057-Add-PlayerInitialSpawnEvent.patch b/patches/server/0056-Add-PlayerInitialSpawnEvent.patch
similarity index 100%
rename from patches/server/0057-Add-PlayerInitialSpawnEvent.patch
rename to patches/server/0056-Add-PlayerInitialSpawnEvent.patch
diff --git a/patches/server/0058-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0057-Configurable-Disabling-Cat-Chest-Detection.patch
similarity index 100%
rename from patches/server/0058-Configurable-Disabling-Cat-Chest-Detection.patch
rename to patches/server/0057-Configurable-Disabling-Cat-Chest-Detection.patch
diff --git a/patches/server/0059-Improve-Player-chat-API-handling.patch b/patches/server/0058-Improve-Player-chat-API-handling.patch
similarity index 100%
rename from patches/server/0059-Improve-Player-chat-API-handling.patch
rename to patches/server/0058-Improve-Player-chat-API-handling.patch
diff --git a/patches/server/0060-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0059-All-chunks-are-slime-spawn-chunks-toggle.patch
similarity index 100%
rename from patches/server/0060-All-chunks-are-slime-spawn-chunks-toggle.patch
rename to patches/server/0059-All-chunks-are-slime-spawn-chunks-toggle.patch
diff --git a/patches/server/0061-Expose-server-CommandMap.patch b/patches/server/0060-Expose-server-CommandMap.patch
similarity index 100%
rename from patches/server/0061-Expose-server-CommandMap.patch
rename to patches/server/0060-Expose-server-CommandMap.patch
diff --git a/patches/server/0062-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch
similarity index 100%
rename from patches/server/0062-Be-a-bit-more-informative-in-maxHealth-exception.patch
rename to patches/server/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch
diff --git a/patches/server/0063-Player-Tab-List-and-Title-APIs.patch b/patches/server/0062-Player-Tab-List-and-Title-APIs.patch
similarity index 100%
rename from patches/server/0063-Player-Tab-List-and-Title-APIs.patch
rename to patches/server/0062-Player-Tab-List-and-Title-APIs.patch
diff --git a/patches/server/0064-Add-configurable-portal-search-radius.patch b/patches/server/0063-Add-configurable-portal-search-radius.patch
similarity index 100%
rename from patches/server/0064-Add-configurable-portal-search-radius.patch
rename to patches/server/0063-Add-configurable-portal-search-radius.patch
diff --git a/patches/server/0065-Add-velocity-warnings.patch b/patches/server/0064-Add-velocity-warnings.patch
similarity index 100%
rename from patches/server/0065-Add-velocity-warnings.patch
rename to patches/server/0064-Add-velocity-warnings.patch
diff --git a/patches/server/0066-Configurable-inter-world-teleportation-safety.patch b/patches/server/0065-Configurable-inter-world-teleportation-safety.patch
similarity index 100%
rename from patches/server/0066-Configurable-inter-world-teleportation-safety.patch
rename to patches/server/0065-Configurable-inter-world-teleportation-safety.patch
diff --git a/patches/server/0067-Add-exception-reporting-event.patch b/patches/server/0066-Add-exception-reporting-event.patch
similarity index 100%
rename from patches/server/0067-Add-exception-reporting-event.patch
rename to patches/server/0066-Add-exception-reporting-event.patch
diff --git a/patches/server/0068-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch
similarity index 100%
rename from patches/server/0068-Disable-Scoreboards-for-non-players-by-default.patch
rename to patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch
diff --git a/patches/server/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0068-Add-methods-for-working-with-arrows-stuck-in-living-.patch
similarity index 100%
rename from patches/server/0069-Add-methods-for-working-with-arrows-stuck-in-living-.patch
rename to patches/server/0068-Add-methods-for-working-with-arrows-stuck-in-living-.patch
diff --git a/patches/server/0070-Chunk-Save-Reattempt.patch b/patches/server/0069-Chunk-Save-Reattempt.patch
similarity index 100%
rename from patches/server/0070-Chunk-Save-Reattempt.patch
rename to patches/server/0069-Chunk-Save-Reattempt.patch
diff --git a/patches/server/0071-Complete-resource-pack-API.patch b/patches/server/0070-Complete-resource-pack-API.patch
similarity index 100%
rename from patches/server/0071-Complete-resource-pack-API.patch
rename to patches/server/0070-Complete-resource-pack-API.patch
diff --git a/patches/server/0072-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0071-Default-loading-permissions.yml-before-plugins.patch
similarity index 100%
rename from patches/server/0072-Default-loading-permissions.yml-before-plugins.patch
rename to patches/server/0071-Default-loading-permissions.yml-before-plugins.patch
diff --git a/patches/server/0073-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch
similarity index 100%
rename from patches/server/0073-Allow-Reloading-of-Custom-Permissions.patch
rename to patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch
diff --git a/patches/server/0074-Remove-Metadata-on-reload.patch b/patches/server/0073-Remove-Metadata-on-reload.patch
similarity index 100%
rename from patches/server/0074-Remove-Metadata-on-reload.patch
rename to patches/server/0073-Remove-Metadata-on-reload.patch
diff --git a/patches/server/0075-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch
similarity index 100%
rename from patches/server/0075-Handle-Item-Meta-Inconsistencies.patch
rename to patches/server/0074-Handle-Item-Meta-Inconsistencies.patch
diff --git a/patches/server/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
similarity index 100%
rename from patches/server/0076-Configurable-Non-Player-Arrow-Despawn-Rate.patch
rename to patches/server/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch
diff --git a/patches/server/0077-Add-World-Util-Methods.patch b/patches/server/0076-Add-World-Util-Methods.patch
similarity index 100%
rename from patches/server/0077-Add-World-Util-Methods.patch
rename to patches/server/0076-Add-World-Util-Methods.patch
diff --git a/patches/server/0078-Custom-replacement-for-eaten-items.patch b/patches/server/0077-Custom-replacement-for-eaten-items.patch
similarity index 100%
rename from patches/server/0078-Custom-replacement-for-eaten-items.patch
rename to patches/server/0077-Custom-replacement-for-eaten-items.patch
diff --git a/patches/server/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
similarity index 100%
rename from patches/server/0079-handle-NaN-health-absorb-values-and-repair-bad-data.patch
rename to patches/server/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
diff --git a/patches/server/0080-Use-a-Shared-Random-for-Entities.patch b/patches/server/0079-Use-a-Shared-Random-for-Entities.patch
similarity index 100%
rename from patches/server/0080-Use-a-Shared-Random-for-Entities.patch
rename to patches/server/0079-Use-a-Shared-Random-for-Entities.patch
diff --git a/patches/server/0081-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch
similarity index 90%
rename from patches/server/0081-Configurable-spawn-chances-for-skeleton-horses.patch
rename to patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch
index 8f20b0f7c9..ea9b957f2c 100644
--- a/patches/server/0081-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6440c0459248a9a0de21c8871e4f4ce399b525ec..2b0f4839b128d8a0cdedd0bb8f4a4c6cf02990af 100644
+index 53e69115a2186c0124d3d8c83f6ca0aecc68c324..001cbed05de94cadd4862c38c414b5e039bff818 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -626,7 +626,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -620,7 +620,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
diff --git a/patches/server/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
similarity index 98%
rename from patches/server/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
rename to patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 23d296a257..7a21368c62 100644
--- a/patches/server/0082-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -18,7 +18,7 @@ index 231fba80a25601cdfba4f6f44ac7c2888e505ed2..4dc8fcd8e118a1c2f5fac0fc291b5555
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2b0f4839b128d8a0cdedd0bb8f4a4c6cf02990af..c37e613361a2cc8bae2442c5b4ec425df821f30e 100644
+index 001cbed05de94cadd4862c38c414b5e039bff818..5b44a9e0b6d87e7caba54cb4e972099c1602393b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -226,6 +226,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0083-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0082-Entity-AddTo-RemoveFrom-World-Events.patch
similarity index 84%
rename from patches/server/0083-Entity-AddTo-RemoveFrom-World-Events.patch
rename to patches/server/0082-Entity-AddTo-RemoveFrom-World-Events.patch
index 92094cc1fb..701980a603 100644
--- a/patches/server/0083-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/server/0082-Entity-AddTo-RemoveFrom-World-Events.patch
@@ -5,10 +5,10 @@ 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 c37e613361a2cc8bae2442c5b4ec425df821f30e..b6bc5edad1cf6b54e1b18dddd5acf4002f3c97fd 100644
+index 5b44a9e0b6d87e7caba54cb4e972099c1602393b..2e4567e34369e6a9138aa064adf64b9895e21277 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2191,6 +2191,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2185,6 +2185,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  entity.setOrigin(entity.getOriginVector().toLocation(getWorld()));
              }
              // Paper end - Entity origin API
@@ -16,7 +16,7 @@ index c37e613361a2cc8bae2442c5b4ec425df821f30e..b6bc5edad1cf6b54e1b18dddd5acf400
          }
  
          public void onTrackingEnd(Entity entity) {
-@@ -2261,6 +2262,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2255,6 +2256,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
              // CraftBukkit end
diff --git a/patches/server/0084-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0083-Configurable-Chunk-Inhabited-Time.patch
similarity index 100%
rename from patches/server/0084-Configurable-Chunk-Inhabited-Time.patch
rename to patches/server/0083-Configurable-Chunk-Inhabited-Time.patch
diff --git a/patches/server/0085-EntityPathfindEvent.patch b/patches/server/0084-EntityPathfindEvent.patch
similarity index 100%
rename from patches/server/0085-EntityPathfindEvent.patch
rename to patches/server/0084-EntityPathfindEvent.patch
diff --git a/patches/server/0086-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0085-Sanitise-RegionFileCache-and-make-configurable.patch
similarity index 100%
rename from patches/server/0086-Sanitise-RegionFileCache-and-make-configurable.patch
rename to patches/server/0085-Sanitise-RegionFileCache-and-make-configurable.patch
diff --git a/patches/server/0087-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0086-Do-not-load-chunks-for-Pathfinding.patch
similarity index 100%
rename from patches/server/0087-Do-not-load-chunks-for-Pathfinding.patch
rename to patches/server/0086-Do-not-load-chunks-for-Pathfinding.patch
diff --git a/patches/server/0088-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch
similarity index 100%
rename from patches/server/0088-Add-PlayerUseUnknownEntityEvent.patch
rename to patches/server/0087-Add-PlayerUseUnknownEntityEvent.patch
diff --git a/patches/server/0089-Configurable-random-tick-rates-for-blocks.patch b/patches/server/0088-Configurable-random-tick-rates-for-blocks.patch
similarity index 100%
rename from patches/server/0089-Configurable-random-tick-rates-for-blocks.patch
rename to patches/server/0088-Configurable-random-tick-rates-for-blocks.patch
diff --git a/patches/server/0090-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0089-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
similarity index 82%
rename from patches/server/0090-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
rename to patches/server/0089-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 204de0aa56..0e30285466 100644
--- a/patches/server/0090-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0089-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b6bc5edad1cf6b54e1b18dddd5acf4002f3c97fd..ab91dc3c9a738097b79bdecbcbe41557aa3ed0de 100644
+index 2e4567e34369e6a9138aa064adf64b9895e21277..57c13407fd20bcdd17642b0e6078f10082aea87b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1397,6 +1397,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1391,6 +1391,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void updateNeighborsAt(BlockPos pos, Block sourceBlock) {
diff --git a/patches/server/0091-Optimize-DataBits.patch b/patches/server/0090-Optimize-DataBits.patch
similarity index 100%
rename from patches/server/0091-Optimize-DataBits.patch
rename to patches/server/0090-Optimize-DataBits.patch
diff --git a/patches/server/0092-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0091-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
similarity index 100%
rename from patches/server/0092-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
rename to patches/server/0091-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
diff --git a/patches/server/0093-Configurable-Player-Collision.patch b/patches/server/0092-Configurable-Player-Collision.patch
similarity index 100%
rename from patches/server/0093-Configurable-Player-Collision.patch
rename to patches/server/0092-Configurable-Player-Collision.patch
diff --git a/patches/server/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
similarity index 100%
rename from patches/server/0094-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
rename to patches/server/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
diff --git a/patches/server/0095-Configurable-RCON-IP-address.patch b/patches/server/0094-Configurable-RCON-IP-address.patch
similarity index 100%
rename from patches/server/0095-Configurable-RCON-IP-address.patch
rename to patches/server/0094-Configurable-RCON-IP-address.patch
diff --git a/patches/server/0096-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch
similarity index 100%
rename from patches/server/0096-EntityRegainHealthEvent-isFastRegen-API.patch
rename to patches/server/0095-EntityRegainHealthEvent-isFastRegen-API.patch
diff --git a/patches/server/0097-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0096-Add-ability-to-configure-frosted_ice-properties.patch
similarity index 100%
rename from patches/server/0097-Add-ability-to-configure-frosted_ice-properties.patch
rename to patches/server/0096-Add-ability-to-configure-frosted_ice-properties.patch
diff --git a/patches/server/0098-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0097-remove-null-possibility-for-getServer-singleton.patch
similarity index 100%
rename from patches/server/0098-remove-null-possibility-for-getServer-singleton.patch
rename to patches/server/0097-remove-null-possibility-for-getServer-singleton.patch
diff --git a/patches/server/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
similarity index 100%
rename from patches/server/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
rename to patches/server/0098-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
diff --git a/patches/server/0100-LootTable-API-and-replenishable-lootables.patch b/patches/server/0099-LootTable-API-and-replenishable-lootables.patch
similarity index 100%
rename from patches/server/0100-LootTable-API-and-replenishable-lootables.patch
rename to patches/server/0099-LootTable-API-and-replenishable-lootables.patch
diff --git a/patches/server/0101-System-property-for-disabling-watchdoge.patch b/patches/server/0100-System-property-for-disabling-watchdoge.patch
similarity index 100%
rename from patches/server/0101-System-property-for-disabling-watchdoge.patch
rename to patches/server/0100-System-property-for-disabling-watchdoge.patch
diff --git a/patches/server/0102-Async-GameProfileCache-saving.patch b/patches/server/0101-Async-GameProfileCache-saving.patch
similarity index 100%
rename from patches/server/0102-Async-GameProfileCache-saving.patch
rename to patches/server/0101-Async-GameProfileCache-saving.patch
diff --git a/patches/server/0103-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0102-Optional-TNT-doesn-t-move-in-water.patch
similarity index 100%
rename from patches/server/0103-Optional-TNT-doesn-t-move-in-water.patch
rename to patches/server/0102-Optional-TNT-doesn-t-move-in-water.patch
diff --git a/patches/server/0104-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0103-Faster-redstone-torch-rapid-clock-removal.patch
similarity index 100%
rename from patches/server/0104-Faster-redstone-torch-rapid-clock-removal.patch
rename to patches/server/0103-Faster-redstone-torch-rapid-clock-removal.patch
diff --git a/patches/server/0105-Add-server-name-parameter.patch b/patches/server/0104-Add-server-name-parameter.patch
similarity index 100%
rename from patches/server/0105-Add-server-name-parameter.patch
rename to patches/server/0104-Add-server-name-parameter.patch
diff --git a/patches/server/0106-Fix-global-sound-handling.patch b/patches/server/0105-Fix-global-sound-handling.patch
similarity index 98%
rename from patches/server/0106-Fix-global-sound-handling.patch
rename to patches/server/0105-Fix-global-sound-handling.patch
index 78440e9377..81efd49063 100644
--- a/patches/server/0106-Fix-global-sound-handling.patch
+++ b/patches/server/0105-Fix-global-sound-handling.patch
@@ -11,10 +11,10 @@ Co-authored-by: lexikiq <noellekiq@gmail.com>
 Co-authored-by: Aikar <aikar@aikar.co>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ab91dc3c9a738097b79bdecbcbe41557aa3ed0de..f2016ed77a2239bdc597175c24ce4427a808d1a6 100644
+index 57c13407fd20bcdd17642b0e6078f10082aea87b..0a7dec5ff89c94503908ad011fe7da8dd8256685 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1330,7 +1330,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1324,7 +1324,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void levelEvent(@Nullable Player player, int eventId, BlockPos pos, int data) {
diff --git a/patches/server/0107-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0106-Avoid-blocking-on-Network-Manager-creation.patch
similarity index 100%
rename from patches/server/0107-Avoid-blocking-on-Network-Manager-creation.patch
rename to patches/server/0106-Avoid-blocking-on-Network-Manager-creation.patch
diff --git a/patches/server/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
similarity index 100%
rename from patches/server/0108-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
rename to patches/server/0107-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
diff --git a/patches/server/0109-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0108-Add-setting-for-proxy-online-mode-status.patch
similarity index 100%
rename from patches/server/0109-Add-setting-for-proxy-online-mode-status.patch
rename to patches/server/0108-Add-setting-for-proxy-online-mode-status.patch
diff --git a/patches/server/0110-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0109-Optimise-BlockState-s-hashCode-equals.patch
similarity index 100%
rename from patches/server/0110-Optimise-BlockState-s-hashCode-equals.patch
rename to patches/server/0109-Optimise-BlockState-s-hashCode-equals.patch
diff --git a/patches/server/0111-Configurable-packet-in-spam-threshold.patch b/patches/server/0110-Configurable-packet-in-spam-threshold.patch
similarity index 100%
rename from patches/server/0111-Configurable-packet-in-spam-threshold.patch
rename to patches/server/0110-Configurable-packet-in-spam-threshold.patch
diff --git a/patches/server/0112-Configurable-flying-kick-messages.patch b/patches/server/0111-Configurable-flying-kick-messages.patch
similarity index 100%
rename from patches/server/0112-Configurable-flying-kick-messages.patch
rename to patches/server/0111-Configurable-flying-kick-messages.patch
diff --git a/patches/server/0113-Add-EntityZapEvent.patch b/patches/server/0112-Add-EntityZapEvent.patch
similarity index 100%
rename from patches/server/0113-Add-EntityZapEvent.patch
rename to patches/server/0112-Add-EntityZapEvent.patch
diff --git a/patches/server/0114-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch b/patches/server/0113-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
similarity index 100%
rename from patches/server/0114-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
rename to patches/server/0113-Filter-bad-block-entity-nbt-data-from-falling-blocks.patch
diff --git a/patches/server/0115-Cache-user-authenticator-threads.patch b/patches/server/0114-Cache-user-authenticator-threads.patch
similarity index 100%
rename from patches/server/0115-Cache-user-authenticator-threads.patch
rename to patches/server/0114-Cache-user-authenticator-threads.patch
diff --git a/patches/server/0116-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0115-Allow-Reloading-of-Command-Aliases.patch
similarity index 100%
rename from patches/server/0116-Allow-Reloading-of-Command-Aliases.patch
rename to patches/server/0115-Allow-Reloading-of-Command-Aliases.patch
diff --git a/patches/server/0117-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0116-Add-source-to-PlayerExpChangeEvent.patch
similarity index 100%
rename from patches/server/0117-Add-source-to-PlayerExpChangeEvent.patch
rename to patches/server/0116-Add-source-to-PlayerExpChangeEvent.patch
diff --git a/patches/server/0118-Add-ProjectileCollideEvent.patch b/patches/server/0117-Add-ProjectileCollideEvent.patch
similarity index 100%
rename from patches/server/0118-Add-ProjectileCollideEvent.patch
rename to patches/server/0117-Add-ProjectileCollideEvent.patch
diff --git a/patches/server/0119-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0118-Prevent-Pathfinding-out-of-World-Border.patch
similarity index 100%
rename from patches/server/0119-Prevent-Pathfinding-out-of-World-Border.patch
rename to patches/server/0118-Prevent-Pathfinding-out-of-World-Border.patch
diff --git a/patches/server/0120-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/server/0119-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
similarity index 100%
rename from patches/server/0120-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
rename to patches/server/0119-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
diff --git a/patches/server/0121-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0120-Bound-Treasure-Maps-to-World-Border.patch
similarity index 100%
rename from patches/server/0121-Bound-Treasure-Maps-to-World-Border.patch
rename to patches/server/0120-Bound-Treasure-Maps-to-World-Border.patch
diff --git a/patches/server/0122-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0121-Configurable-Cartographer-Treasure-Maps.patch
similarity index 100%
rename from patches/server/0122-Configurable-Cartographer-Treasure-Maps.patch
rename to patches/server/0121-Configurable-Cartographer-Treasure-Maps.patch
diff --git a/patches/server/0123-Add-API-methods-to-control-if-armor-stands-can-move.patch b/patches/server/0122-Add-API-methods-to-control-if-armor-stands-can-move.patch
similarity index 100%
rename from patches/server/0123-Add-API-methods-to-control-if-armor-stands-can-move.patch
rename to patches/server/0122-Add-API-methods-to-control-if-armor-stands-can-move.patch
diff --git a/patches/server/0124-String-based-Action-Bar-API.patch b/patches/server/0123-String-based-Action-Bar-API.patch
similarity index 100%
rename from patches/server/0124-String-based-Action-Bar-API.patch
rename to patches/server/0123-String-based-Action-Bar-API.patch
diff --git a/patches/server/0125-Properly-fix-item-duplication-bug.patch b/patches/server/0124-Properly-fix-item-duplication-bug.patch
similarity index 100%
rename from patches/server/0125-Properly-fix-item-duplication-bug.patch
rename to patches/server/0124-Properly-fix-item-duplication-bug.patch
diff --git a/patches/server/0126-Firework-API-s.patch b/patches/server/0125-Firework-API-s.patch
similarity index 100%
rename from patches/server/0126-Firework-API-s.patch
rename to patches/server/0125-Firework-API-s.patch
diff --git a/patches/server/0127-PlayerTeleportEndGatewayEvent.patch b/patches/server/0126-PlayerTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0127-PlayerTeleportEndGatewayEvent.patch
rename to patches/server/0126-PlayerTeleportEndGatewayEvent.patch
diff --git a/patches/server/0128-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
similarity index 100%
rename from patches/server/0128-Provide-E-TE-Chunk-count-stat-methods.patch
rename to patches/server/0127-Provide-E-TE-Chunk-count-stat-methods.patch
diff --git a/patches/server/0129-Enforce-Sync-Player-Saves.patch b/patches/server/0128-Enforce-Sync-Player-Saves.patch
similarity index 100%
rename from patches/server/0129-Enforce-Sync-Player-Saves.patch
rename to patches/server/0128-Enforce-Sync-Player-Saves.patch
diff --git a/patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
similarity index 100%
rename from patches/server/0130-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
rename to patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
diff --git a/patches/server/0131-Cap-Entity-Collisions.patch b/patches/server/0130-Cap-Entity-Collisions.patch
similarity index 100%
rename from patches/server/0131-Cap-Entity-Collisions.patch
rename to patches/server/0130-Cap-Entity-Collisions.patch
diff --git a/patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
similarity index 100%
rename from patches/server/0132-Remove-CraftScheduler-Async-Task-Debugger.patch
rename to patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch
diff --git a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
similarity index 100%
rename from patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch
rename to patches/server/0132-Properly-handle-async-calls-to-restart-the-server.patch
diff --git a/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
similarity index 100%
rename from patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
rename to patches/server/0133-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
diff --git a/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
similarity index 100%
rename from patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch
rename to patches/server/0134-Add-configuration-option-to-prevent-player-names-fro.patch
diff --git a/patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
similarity index 100%
rename from patches/server/0136-provide-a-configurable-option-to-disable-creeper-lin.patch
rename to patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch
diff --git a/patches/server/0137-Item-canEntityPickup.patch b/patches/server/0136-Item-canEntityPickup.patch
similarity index 100%
rename from patches/server/0137-Item-canEntityPickup.patch
rename to patches/server/0136-Item-canEntityPickup.patch
diff --git a/patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
similarity index 100%
rename from patches/server/0138-PlayerPickupItemEvent-setFlyAtPlayer.patch
rename to patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch
diff --git a/patches/server/0139-PlayerAttemptPickupItemEvent.patch b/patches/server/0138-PlayerAttemptPickupItemEvent.patch
similarity index 100%
rename from patches/server/0139-PlayerAttemptPickupItemEvent.patch
rename to patches/server/0138-PlayerAttemptPickupItemEvent.patch
diff --git a/patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/0140-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0141-Basic-PlayerProfile-API.patch b/patches/server/0140-Basic-PlayerProfile-API.patch
similarity index 100%
rename from patches/server/0141-Basic-PlayerProfile-API.patch
rename to patches/server/0140-Basic-PlayerProfile-API.patch
diff --git a/patches/server/0142-Add-UnknownCommandEvent.patch b/patches/server/0141-Add-UnknownCommandEvent.patch
similarity index 100%
rename from patches/server/0142-Add-UnknownCommandEvent.patch
rename to patches/server/0141-Add-UnknownCommandEvent.patch
diff --git a/patches/server/0143-Shoulder-Entities-Release-API.patch b/patches/server/0142-Shoulder-Entities-Release-API.patch
similarity index 100%
rename from patches/server/0143-Shoulder-Entities-Release-API.patch
rename to patches/server/0142-Shoulder-Entities-Release-API.patch
diff --git a/patches/server/0144-Profile-Lookup-Events.patch b/patches/server/0143-Profile-Lookup-Events.patch
similarity index 100%
rename from patches/server/0144-Profile-Lookup-Events.patch
rename to patches/server/0143-Profile-Lookup-Events.patch
diff --git a/patches/server/0145-Block-player-logins-during-server-shutdown.patch b/patches/server/0144-Block-player-logins-during-server-shutdown.patch
similarity index 100%
rename from patches/server/0145-Block-player-logins-during-server-shutdown.patch
rename to patches/server/0144-Block-player-logins-during-server-shutdown.patch
diff --git a/patches/server/0146-Entity-fromMobSpawner.patch b/patches/server/0145-Entity-fromMobSpawner.patch
similarity index 100%
rename from patches/server/0146-Entity-fromMobSpawner.patch
rename to patches/server/0145-Entity-fromMobSpawner.patch
diff --git a/patches/server/0147-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
similarity index 100%
rename from patches/server/0147-Improve-the-Saddle-API-for-Horses.patch
rename to patches/server/0146-Improve-the-Saddle-API-for-Horses.patch
diff --git a/patches/server/0148-ensureServerConversions-API.patch b/patches/server/0147-ensureServerConversions-API.patch
similarity index 100%
rename from patches/server/0148-ensureServerConversions-API.patch
rename to patches/server/0147-ensureServerConversions-API.patch
diff --git a/patches/server/0149-Implement-getI18NDisplayName.patch b/patches/server/0148-Implement-getI18NDisplayName.patch
similarity index 100%
rename from patches/server/0149-Implement-getI18NDisplayName.patch
rename to patches/server/0148-Implement-getI18NDisplayName.patch
diff --git a/patches/server/0150-ProfileWhitelistVerifyEvent.patch b/patches/server/0149-ProfileWhitelistVerifyEvent.patch
similarity index 100%
rename from patches/server/0150-ProfileWhitelistVerifyEvent.patch
rename to patches/server/0149-ProfileWhitelistVerifyEvent.patch
diff --git a/patches/server/0151-Fix-this-stupid-bullshit.patch b/patches/server/0150-Fix-this-stupid-bullshit.patch
similarity index 100%
rename from patches/server/0151-Fix-this-stupid-bullshit.patch
rename to patches/server/0150-Fix-this-stupid-bullshit.patch
diff --git a/patches/server/0152-LivingEntity-setKiller.patch b/patches/server/0151-LivingEntity-setKiller.patch
similarity index 100%
rename from patches/server/0152-LivingEntity-setKiller.patch
rename to patches/server/0151-LivingEntity-setKiller.patch
diff --git a/patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
similarity index 100%
rename from patches/server/0153-Ocelot-despawns-should-honor-nametags-and-leash.patch
rename to patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch
diff --git a/patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
similarity index 100%
rename from patches/server/0154-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
rename to patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
diff --git a/patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
similarity index 100%
rename from patches/server/0155-Allow-specifying-a-custom-authentication-servers-dow.patch
rename to patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch
diff --git a/patches/server/0156-Add-PlayerJumpEvent.patch b/patches/server/0155-Add-PlayerJumpEvent.patch
similarity index 100%
rename from patches/server/0156-Add-PlayerJumpEvent.patch
rename to patches/server/0155-Add-PlayerJumpEvent.patch
diff --git a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
similarity index 100%
rename from patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch
rename to patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch
diff --git a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch
rename to patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch
similarity index 100%
rename from patches/server/0159-revert-serverside-behavior-of-keepalives.patch
rename to patches/server/0158-revert-serverside-behavior-of-keepalives.patch
diff --git a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/patches/server/0161-Add-PlayerArmorChangeEvent.patch b/patches/server/0160-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from patches/server/0161-Add-PlayerArmorChangeEvent.patch
rename to patches/server/0160-Add-PlayerArmorChangeEvent.patch
diff --git a/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch
rename to patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/patches/server/0163-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch
similarity index 100%
rename from patches/server/0163-Fix-MC-117075-Block-entity-unload-lag-spike.patch
rename to patches/server/0162-Fix-MC-117075-Block-entity-unload-lag-spike.patch
diff --git a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch
rename to patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch
rename to patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/patches/server/0166-AsyncTabCompleteEvent.patch b/patches/server/0165-AsyncTabCompleteEvent.patch
similarity index 100%
rename from patches/server/0166-AsyncTabCompleteEvent.patch
rename to patches/server/0165-AsyncTabCompleteEvent.patch
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0166-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from patches/server/0167-PlayerPickupExperienceEvent.patch
rename to patches/server/0166-PlayerPickupExperienceEvent.patch
diff --git a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from patches/server/0168-Ability-to-apply-mending-to-XP-API.patch
rename to patches/server/0167-Ability-to-apply-mending-to-XP-API.patch
diff --git a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch
rename to patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch
rename to patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/patches/server/0171-PreCreatureSpawnEvent.patch b/patches/server/0170-PreCreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0171-PreCreatureSpawnEvent.patch
rename to patches/server/0170-PreCreatureSpawnEvent.patch
diff --git a/patches/server/0172-Fill-Profile-Property-Events.patch b/patches/server/0171-Fill-Profile-Property-Events.patch
similarity index 100%
rename from patches/server/0172-Fill-Profile-Property-Events.patch
rename to patches/server/0171-Fill-Profile-Property-Events.patch
diff --git a/patches/server/0173-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from patches/server/0173-Add-PlayerAdvancementCriterionGrantEvent.patch
rename to patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/patches/server/0174-Add-ArmorStand-Item-Meta.patch b/patches/server/0173-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from patches/server/0174-Add-ArmorStand-Item-Meta.patch
rename to patches/server/0173-Add-ArmorStand-Item-Meta.patch
diff --git a/patches/server/0175-Extend-Player-Interact-cancellation.patch b/patches/server/0174-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from patches/server/0175-Extend-Player-Interact-cancellation.patch
rename to patches/server/0174-Extend-Player-Interact-cancellation.patch
diff --git a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch b/patches/server/0175-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from patches/server/0176-Tameable-getOwnerUniqueId-API.patch
rename to patches/server/0175-Tameable-getOwnerUniqueId-API.patch
diff --git a/patches/server/0177-Toggleable-player-crits.patch b/patches/server/0176-Toggleable-player-crits.patch
similarity index 100%
rename from patches/server/0177-Toggleable-player-crits.patch
rename to patches/server/0176-Toggleable-player-crits.patch
diff --git a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch
rename to patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
rename to patches/server/0178-Implement-extended-PaperServerListPingEvent.patch
diff --git a/patches/server/0180-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
similarity index 100%
rename from patches/server/0180-Add-more-fields-to-AsyncPreLoginEvent.patch
rename to patches/server/0179-Add-more-fields-to-AsyncPreLoginEvent.patch
diff --git a/patches/server/0181-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch
similarity index 100%
rename from patches/server/0181-Player.setPlayerProfile-API.patch
rename to patches/server/0180-Player.setPlayerProfile-API.patch
diff --git a/patches/server/0182-getPlayerUniqueId-API.patch b/patches/server/0181-getPlayerUniqueId-API.patch
similarity index 100%
rename from patches/server/0182-getPlayerUniqueId-API.patch
rename to patches/server/0181-getPlayerUniqueId-API.patch
diff --git a/patches/server/0183-Improved-Async-Task-Scheduler.patch b/patches/server/0182-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from patches/server/0183-Improved-Async-Task-Scheduler.patch
rename to patches/server/0182-Improved-Async-Task-Scheduler.patch
diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from patches/server/0184-Make-legacy-ping-handler-more-reliable.patch
rename to patches/server/0183-Make-legacy-ping-handler-more-reliable.patch
diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/server/0185-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from patches/server/0186-Flag-to-disable-the-channel-limit.patch
rename to patches/server/0185-Flag-to-disable-the-channel-limit.patch
diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/server/0186-Add-openSign-method-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0187-Add-openSign-method-to-HumanEntity.patch
rename to patches/server/0186-Add-openSign-method-to-HumanEntity.patch
diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/server/0187-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from patches/server/0188-Configurable-sprint-interruption-on-attack.patch
rename to patches/server/0187-Configurable-sprint-interruption-on-attack.patch
diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0188-EndermanEscapeEvent.patch
similarity index 100%
rename from patches/server/0189-EndermanEscapeEvent.patch
rename to patches/server/0188-EndermanEscapeEvent.patch
diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0189-Enderman.teleportRandomly.patch
similarity index 100%
rename from patches/server/0190-Enderman.teleportRandomly.patch
rename to patches/server/0189-Enderman.teleportRandomly.patch
diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch
similarity index 93%
rename from patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
rename to patches/server/0190-Block-Enderpearl-Travel-Exploit.patch
index e1163117f2..37ffcb8ff8 100644
--- a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch
@@ -16,10 +16,10 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner
 public net.minecraft.world.entity.projectile.Projectile ownerUUID
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f2016ed77a2239bdc597175c24ce4427a808d1a6..7be0547f6225a6be6ca1037f63f4aff8759b5dc4 100644
+index 0a7dec5ff89c94503908ad011fe7da8dd8256685..f31d403420294f479e116013b200ea7e87ac901e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2149,6 +2149,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2143,6 +2143,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTickingEnd(Entity entity) {
              ServerLevel.this.entityTickList.remove(entity);
diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 96%
rename from patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
index a3e3807ea2..763d9a65b6 100644
--- a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,10 +10,10 @@ 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 7be0547f6225a6be6ca1037f63f4aff8759b5dc4..e79329ee9b02a11b55253cf2ce4e08b2fc39a43f 100644
+index f31d403420294f479e116013b200ea7e87ac901e..82947c9743433df9c03732e0a3229563de0ab53c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1516,12 +1516,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1510,12 +1510,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public <T extends ParticleOptions> int sendParticles(ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
diff --git a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/patches/server/0194-EndermanAttackPlayerEvent.patch b/patches/server/0193-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from patches/server/0194-EndermanAttackPlayerEvent.patch
rename to patches/server/0193-EndermanAttackPlayerEvent.patch
diff --git a/patches/server/0195-WitchConsumePotionEvent.patch b/patches/server/0194-WitchConsumePotionEvent.patch
similarity index 100%
rename from patches/server/0195-WitchConsumePotionEvent.patch
rename to patches/server/0194-WitchConsumePotionEvent.patch
diff --git a/patches/server/0196-WitchThrowPotionEvent.patch b/patches/server/0195-WitchThrowPotionEvent.patch
similarity index 100%
rename from patches/server/0196-WitchThrowPotionEvent.patch
rename to patches/server/0195-WitchThrowPotionEvent.patch
diff --git a/patches/server/0197-WitchReadyPotionEvent.patch b/patches/server/0196-WitchReadyPotionEvent.patch
similarity index 100%
rename from patches/server/0197-WitchReadyPotionEvent.patch
rename to patches/server/0196-WitchReadyPotionEvent.patch
diff --git a/patches/server/0198-ItemStack-getMaxItemUseDuration.patch b/patches/server/0197-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from patches/server/0198-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0197-ItemStack-getMaxItemUseDuration.patch
diff --git a/patches/server/0199-Add-EntityTeleportEndGatewayEvent.patch b/patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from patches/server/0199-Add-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
diff --git a/patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/patches/server/0201-Fix-CraftEntity-hashCode.patch b/patches/server/0200-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from patches/server/0201-Fix-CraftEntity-hashCode.patch
rename to patches/server/0200-Fix-CraftEntity-hashCode.patch
diff --git a/patches/server/0202-Configurable-LootPool-luck-formula.patch b/patches/server/0201-Configurable-LootPool-luck-formula.patch
similarity index 100%
rename from patches/server/0202-Configurable-LootPool-luck-formula.patch
rename to patches/server/0201-Configurable-LootPool-luck-formula.patch
diff --git a/patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/patches/server/0204-Make-shield-blocking-delay-configurable.patch b/patches/server/0203-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from patches/server/0204-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0203-Make-shield-blocking-delay-configurable.patch
diff --git a/patches/server/0205-Improve-EntityShootBowEvent.patch b/patches/server/0204-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from patches/server/0205-Improve-EntityShootBowEvent.patch
rename to patches/server/0204-Improve-EntityShootBowEvent.patch
diff --git a/patches/server/0206-PlayerReadyArrowEvent.patch b/patches/server/0205-PlayerReadyArrowEvent.patch
similarity index 100%
rename from patches/server/0206-PlayerReadyArrowEvent.patch
rename to patches/server/0205-PlayerReadyArrowEvent.patch
diff --git a/patches/server/0207-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch b/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
similarity index 100%
rename from patches/server/0207-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
rename to patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
diff --git a/patches/server/0208-Expand-Explosions-API.patch b/patches/server/0207-Expand-Explosions-API.patch
similarity index 100%
rename from patches/server/0208-Expand-Explosions-API.patch
rename to patches/server/0207-Expand-Explosions-API.patch
diff --git a/patches/server/0209-LivingEntity-Active-Item-API.patch b/patches/server/0208-LivingEntity-Active-Item-API.patch
similarity index 100%
rename from patches/server/0209-LivingEntity-Active-Item-API.patch
rename to patches/server/0208-LivingEntity-Active-Item-API.patch
diff --git a/patches/server/0210-RangedEntity-API.patch b/patches/server/0209-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0210-RangedEntity-API.patch
rename to patches/server/0209-RangedEntity-API.patch
diff --git a/patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/patches/server/0212-Implement-World.getEntity-UUID-API.patch b/patches/server/0211-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from patches/server/0212-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0211-Implement-World.getEntity-UUID-API.patch
diff --git a/patches/server/0213-InventoryCloseEvent-Reason-API.patch b/patches/server/0212-InventoryCloseEvent-Reason-API.patch
similarity index 98%
rename from patches/server/0213-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0212-InventoryCloseEvent-Reason-API.patch
index e02b376de2..64b3489350 100644
--- a/patches/server/0213-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0212-InventoryCloseEvent-Reason-API.patch
@@ -7,10 +7,10 @@ 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 e79329ee9b02a11b55253cf2ce4e08b2fc39a43f..c5b89c3149b869a3358434490a001f0f45f716fb 100644
+index 82947c9743433df9c03732e0a3229563de0ab53c..6f2e316480c4cd1ffb32e8d01009a18c2234c731 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1247,7 +1247,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1241,7 +1241,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) {
@@ -19,7 +19,7 @@ index e79329ee9b02a11b55253cf2ce4e08b2fc39a43f..c5b89c3149b869a3358434490a001f0f
                  }
              }
          }
-@@ -2234,7 +2234,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2228,7 +2228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
diff --git a/patches/server/0214-Vex-get-setSummoner-API.patch b/patches/server/0213-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0214-Vex-get-setSummoner-API.patch
rename to patches/server/0213-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/patches/server/0216-add-more-information-to-Entity.toString.patch b/patches/server/0215-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from patches/server/0216-add-more-information-to-Entity.toString.patch
rename to patches/server/0215-add-more-information-to-Entity.toString.patch
diff --git a/patches/server/0217-EnderDragon-Events.patch b/patches/server/0216-EnderDragon-Events.patch
similarity index 100%
rename from patches/server/0217-EnderDragon-Events.patch
rename to patches/server/0216-EnderDragon-Events.patch
diff --git a/patches/server/0218-PlayerElytraBoostEvent.patch b/patches/server/0217-PlayerElytraBoostEvent.patch
similarity index 100%
rename from patches/server/0218-PlayerElytraBoostEvent.patch
rename to patches/server/0217-PlayerElytraBoostEvent.patch
diff --git a/patches/server/0219-PlayerLaunchProjectileEvent.patch b/patches/server/0218-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from patches/server/0219-PlayerLaunchProjectileEvent.patch
rename to patches/server/0218-PlayerLaunchProjectileEvent.patch
diff --git a/patches/server/0220-Improve-BlockPosition-inlining.patch b/patches/server/0219-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from patches/server/0220-Improve-BlockPosition-inlining.patch
rename to patches/server/0219-Improve-BlockPosition-inlining.patch
diff --git a/patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/patches/server/0222-Vanished-players-don-t-have-rights.patch b/patches/server/0221-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from patches/server/0222-Vanished-players-don-t-have-rights.patch
rename to patches/server/0221-Vanished-players-don-t-have-rights.patch
diff --git a/patches/server/0223-Allow-disabling-armor-stand-ticking.patch b/patches/server/0222-Allow-disabling-armor-stand-ticking.patch
similarity index 100%
rename from patches/server/0223-Allow-disabling-armor-stand-ticking.patch
rename to patches/server/0222-Allow-disabling-armor-stand-ticking.patch
diff --git a/patches/server/0224-SkeletonHorse-Additions.patch b/patches/server/0223-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0224-SkeletonHorse-Additions.patch
rename to patches/server/0223-SkeletonHorse-Additions.patch
diff --git a/patches/server/0225-Expand-ArmorStand-API.patch b/patches/server/0224-Expand-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0225-Expand-ArmorStand-API.patch
rename to patches/server/0224-Expand-ArmorStand-API.patch
diff --git a/patches/server/0226-AnvilDamageEvent.patch b/patches/server/0225-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0226-AnvilDamageEvent.patch
rename to patches/server/0225-AnvilDamageEvent.patch
diff --git a/patches/server/0227-Add-TNTPrimeEvent.patch b/patches/server/0226-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0227-Add-TNTPrimeEvent.patch
rename to patches/server/0226-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0228-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from patches/server/0228-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0229-Fix-NBT-type-issues.patch b/patches/server/0228-Fix-NBT-type-issues.patch
similarity index 100%
rename from patches/server/0229-Fix-NBT-type-issues.patch
rename to patches/server/0228-Fix-NBT-type-issues.patch
diff --git a/patches/server/0230-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0230-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0229-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0231-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from patches/server/0231-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 9d19ef52a1..27da8072f4 100644
--- a/patches/server/0231-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -26,10 +26,10 @@ index 46da628073e2bfb77b3deab623dba46228d92618..1c508d1f122d287cd8dc0a905de96436
  
      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 c5b89c3149b869a3358434490a001f0f45f716fb..2879de5d5c6638d9b683e74da8dc3863738f2b65 100644
+index 6f2e316480c4cd1ffb32e8d01009a18c2234c731..42dd9ab70c07e92258da70ad29b51c7780401a5d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1209,6 +1209,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1203,6 +1203,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
      // CraftBukkit start
      private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
diff --git a/patches/server/0232-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from patches/server/0232-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0233-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0232-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0233-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0232-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0234-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0233-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0234-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0233-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0235-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0234-Ability-to-get-block-entities-from-a-chunk-without-s.patch
similarity index 100%
rename from patches/server/0235-Ability-to-get-block-entities-from-a-chunk-without-s.patch
rename to patches/server/0234-Ability-to-get-block-entities-from-a-chunk-without-s.patch
diff --git a/patches/server/0236-Optimize-BlockPosition-helper-methods.patch b/patches/server/0235-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0236-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0235-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0237-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0236-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0237-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0236-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0238-Slime-Pathfinder-Events.patch b/patches/server/0237-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0238-Slime-Pathfinder-Events.patch
rename to patches/server/0237-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0239-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0238-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0239-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0238-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0240-Optimize-CraftBlockData-Creation.patch b/patches/server/0239-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0240-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0239-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0241-Optimize-MappedRegistry.patch b/patches/server/0240-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0241-Optimize-MappedRegistry.patch
rename to patches/server/0240-Optimize-MappedRegistry.patch
diff --git a/patches/server/0242-Add-PhantomPreSpawnEvent.patch b/patches/server/0241-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0242-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0241-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0243-Add-More-Creeper-API.patch b/patches/server/0242-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0243-Add-More-Creeper-API.patch
rename to patches/server/0242-Add-More-Creeper-API.patch
diff --git a/patches/server/0244-Inventory-removeItemAnySlot.patch b/patches/server/0243-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0244-Inventory-removeItemAnySlot.patch
rename to patches/server/0243-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0245-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0244-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0245-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0244-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0246-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0245-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0246-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0245-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0247-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0246-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0247-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0246-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0248-Improve-death-events.patch b/patches/server/0247-Improve-death-events.patch
similarity index 100%
rename from patches/server/0248-Improve-death-events.patch
rename to patches/server/0247-Improve-death-events.patch
diff --git a/patches/server/0249-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0249-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0248-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0250-Mob-Pathfinding-API.patch b/patches/server/0249-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0250-Mob-Pathfinding-API.patch
rename to patches/server/0249-Mob-Pathfinding-API.patch
diff --git a/patches/server/0251-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch
similarity index 100%
rename from patches/server/0251-Prevent-various-interactions-from-causing-chunk-load.patch
rename to patches/server/0250-Prevent-various-interactions-from-causing-chunk-load.patch
diff --git a/patches/server/0252-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0252-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0251-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0253-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0252-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0253-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0252-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0254-Honor-EntityAgeable.ageLock.patch b/patches/server/0253-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0254-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0253-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0255-Configurable-connection-throttle-kick-message.patch b/patches/server/0254-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0255-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0254-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0256-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0255-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0256-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0255-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0257-PreSpawnerSpawnEvent.patch b/patches/server/0256-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0257-PreSpawnerSpawnEvent.patch
rename to patches/server/0256-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0258-Add-LivingEntity-getTargetEntity.patch b/patches/server/0257-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/0258-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0257-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0259-Add-sun-related-API.patch b/patches/server/0258-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0259-Add-sun-related-API.patch
rename to patches/server/0258-Add-sun-related-API.patch
diff --git a/patches/server/0260-Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
similarity index 100%
rename from patches/server/0260-Catch-JsonParseException-in-entity-and-block-entity-.patch
rename to patches/server/0259-Catch-JsonParseException-in-entity-and-block-entity-.patch
diff --git a/patches/server/0261-Turtle-API.patch b/patches/server/0260-Turtle-API.patch
similarity index 100%
rename from patches/server/0261-Turtle-API.patch
rename to patches/server/0260-Turtle-API.patch
diff --git a/patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0262-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0261-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0263-Add-more-Witch-API.patch b/patches/server/0262-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0263-Add-more-Witch-API.patch
rename to patches/server/0262-Add-more-Witch-API.patch
diff --git a/patches/server/0264-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0264-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from patches/server/0265-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0266-Reset-players-airTicks-on-respawn.patch b/patches/server/0265-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0266-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0265-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0267-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0268-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0269-Optimize-World-Time-Updates.patch b/patches/server/0268-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0269-Optimize-World-Time-Updates.patch
rename to patches/server/0268-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0270-Restore-custom-InventoryHolder-support.patch b/patches/server/0269-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0270-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0269-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0271-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0270-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0271-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0270-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0272-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0271-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0273-Make-the-default-permission-message-configurable.patch b/patches/server/0272-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/0273-Make-the-default-permission-message-configurable.patch
rename to patches/server/0272-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0274-force-entity-dismount-during-teleportation.patch b/patches/server/0273-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from patches/server/0274-force-entity-dismount-during-teleportation.patch
rename to patches/server/0273-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0275-Add-more-Zombie-API.patch b/patches/server/0274-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0275-Add-more-Zombie-API.patch
rename to patches/server/0274-Add-more-Zombie-API.patch
diff --git a/patches/server/0276-Book-Size-Limits.patch b/patches/server/0275-Book-Size-Limits.patch
similarity index 100%
rename from patches/server/0276-Book-Size-Limits.patch
rename to patches/server/0275-Book-Size-Limits.patch
diff --git a/patches/server/0277-Add-PlayerConnectionCloseEvent.patch b/patches/server/0276-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0277-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0276-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0278-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0277-Replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0278-Replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0277-Replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0278-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0279-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0278-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0279-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
similarity index 100%
rename from patches/server/0280-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
rename to patches/server/0279-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
diff --git a/patches/server/0281-BlockDestroyEvent.patch b/patches/server/0280-BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/0281-BlockDestroyEvent.patch
rename to patches/server/0280-BlockDestroyEvent.patch
diff --git a/patches/server/0282-Async-command-map-building.patch b/patches/server/0281-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0282-Async-command-map-building.patch
rename to patches/server/0281-Async-command-map-building.patch
diff --git a/patches/server/0283-Brigadier-Mojang-API.patch b/patches/server/0282-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0283-Brigadier-Mojang-API.patch
rename to patches/server/0282-Brigadier-Mojang-API.patch
diff --git a/patches/server/0284-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0283-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from patches/server/0284-Improve-exact-choice-recipe-ingredients.patch
rename to patches/server/0283-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0285-Limit-Client-Sign-length-more.patch b/patches/server/0284-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from patches/server/0285-Limit-Client-Sign-length-more.patch
rename to patches/server/0284-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0285-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0286-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0285-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0287-Entity-getEntitySpawnReason.patch b/patches/server/0286-Entity-getEntitySpawnReason.patch
similarity index 98%
rename from patches/server/0287-Entity-getEntitySpawnReason.patch
rename to patches/server/0286-Entity-getEntitySpawnReason.patch
index 023b0316cd..1a57fcb5d4 100644
--- a/patches/server/0287-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0286-Entity-getEntitySpawnReason.patch
@@ -22,10 +22,10 @@ index bf72cf288ade52ee8cc41ca978f368b3ad575951..798999be50d26be357ef3c6d5b9383ce
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2879de5d5c6638d9b683e74da8dc3863738f2b65..893846b2b216ef67652285a59ba3c67bb2b4c78d 100644
+index 42dd9ab70c07e92258da70ad29b51c7780401a5d..2b524c41daa4fe1605a40c151a90de101d96e8af 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1215,6 +1215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1209,6 +1209,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return true;
          }
          // Paper end - extra debug info
diff --git a/patches/server/0288-Fire-event-on-GS4-query.patch b/patches/server/0287-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0288-Fire-event-on-GS4-query.patch
rename to patches/server/0287-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0289-Add-PlayerPostRespawnEvent.patch b/patches/server/0288-Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0289-Add-PlayerPostRespawnEvent.patch
rename to patches/server/0288-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0289-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0290-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0289-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0291-Server-Tick-Events.patch b/patches/server/0290-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0291-Server-Tick-Events.patch
rename to patches/server/0290-Server-Tick-Events.patch
diff --git a/patches/server/0292-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0291-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0292-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0291-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0293-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0292-Optimize-Captured-BlockEntity-Lookup.patch
similarity index 100%
rename from patches/server/0293-Optimize-Captured-BlockEntity-Lookup.patch
rename to patches/server/0292-Optimize-Captured-BlockEntity-Lookup.patch
diff --git a/patches/server/0294-Add-Heightmap-API.patch b/patches/server/0293-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0294-Add-Heightmap-API.patch
rename to patches/server/0293-Add-Heightmap-API.patch
diff --git a/patches/server/0295-Mob-Spawner-API-Enhancements.patch b/patches/server/0294-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0295-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0294-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0295-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0296-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0295-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0296-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0297-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0296-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0298-Implement-CraftBlockSoundGroup.patch b/patches/server/0297-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0298-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0297-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0299-Expose-the-internal-current-tick.patch b/patches/server/0298-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0299-Expose-the-internal-current-tick.patch
rename to patches/server/0298-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0300-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0299-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0300-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0299-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0301-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0300-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0301-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0300-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0302-Configurable-projectile-relative-velocity.patch b/patches/server/0301-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0302-Configurable-projectile-relative-velocity.patch
rename to patches/server/0301-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0303-offset-item-frame-ticking.patch b/patches/server/0302-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0303-offset-item-frame-ticking.patch
rename to patches/server/0302-offset-item-frame-ticking.patch
diff --git a/patches/server/0304-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0303-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0304-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0303-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0305-Dont-send-unnecessary-sign-update.patch b/patches/server/0304-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0305-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0304-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0306-Add-option-to-disable-pillager-patrols.patch b/patches/server/0305-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0306-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0305-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0307-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0306-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0307-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0306-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0308-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0307-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0308-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0307-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0309-Duplicate-UUID-Resolve-Option.patch b/patches/server/0308-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0309-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0308-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0310-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0309-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0310-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0309-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0311-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0310-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0311-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0310-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0312-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0311-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0312-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0311-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0313-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0313-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch
index 631463b4c8..0428d89897 100644
--- a/patches/server/0313-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0312-Optimise-EntityGetter-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID
 Use the PlayerList map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 893846b2b216ef67652285a59ba3c67bb2b4c78d..9ce6c66213deaac1e57986de980176e58b222368 100644
+index 2b524c41daa4fe1605a40c151a90de101d96e8af..51644c24900600d95c3f6df073769b68be702b2d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -329,6 +329,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0314-Fix-items-not-falling-correctly.patch b/patches/server/0313-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0314-Fix-items-not-falling-correctly.patch
rename to patches/server/0313-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0315-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0314-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0315-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0314-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0316-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0315-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0316-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0315-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0317-Alternative-item-despawn-rate.patch b/patches/server/0316-Alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0317-Alternative-item-despawn-rate.patch
rename to patches/server/0316-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0318-Tracking-Range-Improvements.patch b/patches/server/0317-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0318-Tracking-Range-Improvements.patch
rename to patches/server/0317-Tracking-Range-Improvements.patch
diff --git a/patches/server/0319-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0318-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0319-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0318-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0320-Improve-Block-breakNaturally-API.patch b/patches/server/0319-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0320-Improve-Block-breakNaturally-API.patch
rename to patches/server/0319-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0321-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0320-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0321-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0320-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0322-Add-debug-for-sync-chunk-loads.patch b/patches/server/0321-Add-debug-for-sync-chunk-loads.patch
similarity index 98%
rename from patches/server/0322-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0321-Add-debug-for-sync-chunk-loads.patch
index a4a3835b0e..f96cf2c189 100644
--- a/patches/server/0322-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0321-Add-debug-for-sync-chunk-loads.patch
@@ -312,10 +312,10 @@ index d41c0e4474d057c7b13427bfd896c50f24232615..2d9d4d06b75873f888ef4d8f5779a527
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  this.level.timings.syncChunkLoad.stopTiming(); // Paper
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9ce6c66213deaac1e57986de980176e58b222368..8bc20746d729d5be06be30b23bb196bdc6fcd628 100644
+index 51644c24900600d95c3f6df073769b68be702b2d..1170a0031368ede2e45d24720506f6519cbd55da 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -427,6 +427,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -421,6 +421,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
      }
  
diff --git a/patches/server/0323-Improve-java-version-check.patch b/patches/server/0322-Improve-java-version-check.patch
similarity index 100%
rename from patches/server/0323-Improve-java-version-check.patch
rename to patches/server/0322-Improve-java-version-check.patch
diff --git a/patches/server/0324-Add-ThrownEggHatchEvent.patch b/patches/server/0323-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0324-Add-ThrownEggHatchEvent.patch
rename to patches/server/0323-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0325-Entity-Jump-API.patch b/patches/server/0324-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0325-Entity-Jump-API.patch
rename to patches/server/0324-Entity-Jump-API.patch
diff --git a/patches/server/0326-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0326-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0327-Make-the-GUI-graph-fancier.patch b/patches/server/0326-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0327-Make-the-GUI-graph-fancier.patch
rename to patches/server/0326-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0328-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0328-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0329-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0328-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0329-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0328-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0330-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0330-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0331-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0331-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0332-Optimise-Chunk-getFluid.patch b/patches/server/0331-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0332-Optimise-Chunk-getFluid.patch
rename to patches/server/0331-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0333-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0333-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0334-Add-tick-times-API-and-mspt-command.patch b/patches/server/0333-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0334-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0333-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0335-Expose-MinecraftServer-isRunning.patch b/patches/server/0334-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0335-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0334-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0336-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0335-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0336-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0335-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0337-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0336-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0337-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0336-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0338-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0337-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0338-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0337-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0339-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0338-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0339-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0338-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0340-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 93%
rename from patches/server/0340-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index e2cba50e34..8403fc132e 100644
--- a/patches/server/0340-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0339-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -25,10 +25,10 @@ index f13f8119cf43711b96b4dc5834fceaa0282d632d..66936834a80ef6b645ab44f3439defcb
              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 8bc20746d729d5be06be30b23bb196bdc6fcd628..a17f6ee94a686390b8dd3bb676f11986ec0dc8ac 100644
+index 1170a0031368ede2e45d24720506f6519cbd55da..df623f10def1ecf071971119f449a773063b3ce1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2187,7 +2187,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2181,7 +2181,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTrackingStart(Entity entity) {
              org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
@@ -37,7 +37,7 @@ index 8bc20746d729d5be06be30b23bb196bdc6fcd628..a17f6ee94a686390b8dd3bb676f11986
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.add(entityplayer);
                  ServerLevel.this.updateSleepingPlayerList();
-@@ -2217,6 +2217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2211,6 +2211,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
              entity.inWorld = true; // CraftBukkit - Mark entity as in world
              entity.valid = true; // CraftBukkit
diff --git a/patches/server/0341-Don-t-tick-dead-players.patch b/patches/server/0340-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0341-Don-t-tick-dead-players.patch
rename to patches/server/0340-Don-t-tick-dead-players.patch
diff --git a/patches/server/0342-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0341-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0342-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0341-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0343-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0342-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0343-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0342-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0344-Optimize-Pathfinding.patch b/patches/server/0343-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0344-Optimize-Pathfinding.patch
rename to patches/server/0343-Optimize-Pathfinding.patch
diff --git a/patches/server/0345-Reduce-Either-Optional-allocation.patch b/patches/server/0344-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0345-Reduce-Either-Optional-allocation.patch
rename to patches/server/0344-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0346-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0345-Reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/server/0346-Reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/0345-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0347-Prevent-opening-inventories-when-frozen.patch b/patches/server/0346-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0347-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0346-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0348-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0347-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0348-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0347-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0349-Implement-Player-Client-Options-API.patch b/patches/server/0348-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0349-Implement-Player-Client-Options-API.patch
rename to patches/server/0348-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0350-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0350-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0351-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
similarity index 100%
rename from patches/server/0351-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
rename to patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
diff --git a/patches/server/0352-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0352-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0353-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0353-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0354-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0354-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0355-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0355-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0356-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0355-Fix-item-duplication-and-teleport-issues.patch
similarity index 100%
rename from patches/server/0356-Fix-item-duplication-and-teleport-issues.patch
rename to patches/server/0355-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0357-Villager-Restocks-API.patch b/patches/server/0356-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0357-Villager-Restocks-API.patch
rename to patches/server/0356-Villager-Restocks-API.patch
diff --git a/patches/server/0358-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0358-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0359-Expose-game-version.patch b/patches/server/0358-Expose-game-version.patch
similarity index 100%
rename from patches/server/0359-Expose-game-version.patch
rename to patches/server/0358-Expose-game-version.patch
diff --git a/patches/server/0360-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0360-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0361-misc-debugging-dumps.patch b/patches/server/0360-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0361-misc-debugging-dumps.patch
rename to patches/server/0360-misc-debugging-dumps.patch
diff --git a/patches/server/0362-Prevent-teleporting-dead-entities.patch b/patches/server/0361-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0362-Prevent-teleporting-dead-entities.patch
rename to patches/server/0361-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0363-Implement-Mob-Goal-API.patch b/patches/server/0362-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0363-Implement-Mob-Goal-API.patch
rename to patches/server/0362-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0364-Add-villager-reputation-API.patch b/patches/server/0363-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0364-Add-villager-reputation-API.patch
rename to patches/server/0363-Add-villager-reputation-API.patch
diff --git a/patches/server/0365-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0365-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0366-ExperienceOrbMergeEvent.patch b/patches/server/0365-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0366-ExperienceOrbMergeEvent.patch
rename to patches/server/0365-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0367-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0367-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0368-Potential-bed-API.patch b/patches/server/0367-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0368-Potential-bed-API.patch
rename to patches/server/0367-Potential-bed-API.patch
diff --git a/patches/server/0369-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0369-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0370-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0369-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0370-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0369-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0371-Ensure-safe-gateway-teleport.patch b/patches/server/0370-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0371-Ensure-safe-gateway-teleport.patch
rename to patches/server/0370-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0372-Add-option-for-console-having-all-permissions.patch b/patches/server/0371-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0372-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0371-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0373-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0372-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0373-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0372-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0374-Maps-shouldn-t-load-chunks.patch b/patches/server/0373-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0374-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0373-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0375-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0374-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0375-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0374-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0376-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0375-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0376-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0375-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0377-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0376-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0377-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0376-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0378-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0377-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0378-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0377-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0379-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0378-Prevent-position-desync-causing-tp-exploit.patch
similarity index 100%
rename from patches/server/0379-Prevent-position-desync-causing-tp-exploit.patch
rename to patches/server/0378-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0380-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0379-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0380-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0379-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0381-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0380-Add-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0381-Add-PlayerRecipeBookClickEvent.patch
rename to patches/server/0380-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0382-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0381-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0382-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0381-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0383-Add-permission-for-command-blocks.patch b/patches/server/0382-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0383-Add-permission-for-command-blocks.patch
rename to patches/server/0382-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0384-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0383-Ensure-Entity-position-and-AABB-are-never-invalid.patch
similarity index 100%
rename from patches/server/0384-Ensure-Entity-position-and-AABB-are-never-invalid.patch
rename to patches/server/0383-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0385-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0385-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0386-Paper-dumpitem-command.patch b/patches/server/0385-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0386-Paper-dumpitem-command.patch
rename to patches/server/0385-Paper-dumpitem-command.patch
diff --git a/patches/server/0387-Improve-Legacy-Component-serialization-size.patch b/patches/server/0386-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0387-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0386-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0388-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0387-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0388-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0387-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0389-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0388-Add-BlockStateMeta-clearBlockState.patch
similarity index 100%
rename from patches/server/0389-Add-BlockStateMeta-clearBlockState.patch
rename to patches/server/0388-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0390-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0389-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0390-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0389-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0391-Do-not-accept-invalid-client-settings.patch b/patches/server/0390-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0391-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0390-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0392-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0391-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0392-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0391-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0393-Add-entity-liquid-API.patch b/patches/server/0392-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0393-Add-entity-liquid-API.patch
rename to patches/server/0392-Add-entity-liquid-API.patch
diff --git a/patches/server/0394-Add-PrepareResultEvent.patch b/patches/server/0393-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0394-Add-PrepareResultEvent.patch
rename to patches/server/0393-Add-PrepareResultEvent.patch
diff --git a/patches/server/0395-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0394-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0395-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0394-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0396-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0395-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0396-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0395-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0397-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0396-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0397-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0396-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0398-Fix-SPIGOT-5989.patch b/patches/server/0397-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0398-Fix-SPIGOT-5989.patch
rename to patches/server/0397-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0399-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0398-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0399-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0398-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0400-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0399-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0400-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0399-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0401-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0400-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0401-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0400-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0402-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0401-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0402-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0401-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0403-Fix-some-rails-connecting-improperly.patch b/patches/server/0402-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0403-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0402-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0404-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0403-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0404-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0403-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0405-Brand-support.patch b/patches/server/0404-Brand-support.patch
similarity index 100%
rename from patches/server/0405-Brand-support.patch
rename to patches/server/0404-Brand-support.patch
diff --git a/patches/server/0406-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0405-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0406-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0405-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0407-Don-t-require-FACING-data.patch b/patches/server/0406-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0407-Don-t-require-FACING-data.patch
rename to patches/server/0406-Don-t-require-FACING-data.patch
diff --git a/patches/server/0408-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 94%
rename from patches/server/0408-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 02fed28440..47d790e9ed 100644
--- a/patches/server/0408-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0407-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a17f6ee94a686390b8dd3bb676f11986ec0dc8ac..4efb57b2b252a2bed50685162cc96575f63a9d1d 100644
+index df623f10def1ecf071971119f449a773063b3ce1..f079192644e3b366dc58c4a77c10cbbe65c25eca 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1674,7 +1674,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1668,7 +1668,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
          float f1 = this.levelData.getSpawnAngle();
  
          if (!blockposition1.equals(pos) || f1 != angle) {
diff --git a/patches/server/0409-Add-moon-phase-API.patch b/patches/server/0408-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0409-Add-moon-phase-API.patch
rename to patches/server/0408-Add-moon-phase-API.patch
diff --git a/patches/server/0410-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0409-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0410-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0409-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0411-Prevent-headless-pistons-from-being-created.patch b/patches/server/0410-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0411-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0410-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0412-Add-BellRingEvent.patch b/patches/server/0411-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0412-Add-BellRingEvent.patch
rename to patches/server/0411-Add-BellRingEvent.patch
diff --git a/patches/server/0413-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0412-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0413-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0412-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0414-Buffer-joins-to-world.patch b/patches/server/0413-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0414-Buffer-joins-to-world.patch
rename to patches/server/0413-Buffer-joins-to-world.patch
diff --git a/patches/server/0415-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0414-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0415-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0414-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0416-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0415-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0416-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0415-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0417-Add-more-Evoker-API.patch b/patches/server/0416-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0417-Add-more-Evoker-API.patch
rename to patches/server/0416-Add-more-Evoker-API.patch
diff --git a/patches/server/0418-Add-methods-to-get-translation-keys.patch b/patches/server/0417-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0418-Add-methods-to-get-translation-keys.patch
rename to patches/server/0417-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0419-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0418-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0419-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0418-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0420-Cache-block-data-strings.patch b/patches/server/0419-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0420-Cache-block-data-strings.patch
rename to patches/server/0419-Cache-block-data-strings.patch
diff --git a/patches/server/0421-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0420-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0421-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0420-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0422-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0421-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0422-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0421-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0423-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0422-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0423-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0422-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0424-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 94%
rename from patches/server/0424-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch
index 7d7f14f1ae..bf2c2519f2 100644
--- a/patches/server/0424-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0423-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4efb57b2b252a2bed50685162cc96575f63a9d1d..2506673e2e778b55f1cd9e2cd987d116aed450fb 100644
+index f079192644e3b366dc58c4a77c10cbbe65c25eca..17985c75deaa8d317ea4019f73eafe118d347f41 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1236,6 +1236,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1230,6 +1230,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0425-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0424-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0425-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0424-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0426-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0425-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0426-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0425-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0427-Entity-isTicking.patch b/patches/server/0426-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0427-Entity-isTicking.patch
rename to patches/server/0426-Entity-isTicking.patch
diff --git a/patches/server/0428-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0427-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0428-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0427-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0429-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0428-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0429-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0428-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0430-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0429-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0430-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0429-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0431-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0430-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0431-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0430-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0432-Optimise-getType-calls.patch b/patches/server/0431-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0432-Optimise-getType-calls.patch
rename to patches/server/0431-Optimise-getType-calls.patch
diff --git a/patches/server/0433-Villager-resetOffers.patch b/patches/server/0432-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0433-Villager-resetOffers.patch
rename to patches/server/0432-Villager-resetOffers.patch
diff --git a/patches/server/0434-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0433-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0434-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0433-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0435-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0434-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0435-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0434-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0436-Fix-bell-block-entity-memory-leak.patch b/patches/server/0435-Fix-bell-block-entity-memory-leak.patch
similarity index 100%
rename from patches/server/0436-Fix-bell-block-entity-memory-leak.patch
rename to patches/server/0435-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0437-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0436-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0437-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0436-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0438-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0437-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0438-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0437-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0439-Add-ignore-discounts-API.patch b/patches/server/0438-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0439-Add-ignore-discounts-API.patch
rename to patches/server/0438-Add-ignore-discounts-API.patch
diff --git a/patches/server/0440-Toggle-for-removing-existing-dragon.patch b/patches/server/0439-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0440-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0439-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0441-Fix-client-lag-on-advancement-loading.patch b/patches/server/0440-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0441-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0440-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0442-Item-no-age-no-player-pickup.patch b/patches/server/0441-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0442-Item-no-age-no-player-pickup.patch
rename to patches/server/0441-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0443-Beacon-API-custom-effect-ranges.patch b/patches/server/0442-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0443-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0442-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0444-Add-API-for-quit-reason.patch b/patches/server/0443-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0444-Add-API-for-quit-reason.patch
rename to patches/server/0443-Add-API-for-quit-reason.patch
diff --git a/patches/server/0445-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0444-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0445-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0444-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0446-Expose-world-spawn-angle.patch b/patches/server/0445-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0446-Expose-world-spawn-angle.patch
rename to patches/server/0445-Expose-world-spawn-angle.patch
diff --git a/patches/server/0447-Add-Destroy-Speed-API.patch b/patches/server/0446-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0447-Add-Destroy-Speed-API.patch
rename to patches/server/0446-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0448-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0448-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0449-Add-LivingEntity-clearActiveItem.patch b/patches/server/0448-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0449-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0448-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0450-Add-PlayerItemCooldownEvent.patch b/patches/server/0449-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0450-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0449-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0451-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0451-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0452-More-lightning-API.patch b/patches/server/0451-More-lightning-API.patch
similarity index 100%
rename from patches/server/0452-More-lightning-API.patch
rename to patches/server/0451-More-lightning-API.patch
diff --git a/patches/server/0453-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0453-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0454-Add-missing-default-perms-for-commands.patch b/patches/server/0453-Add-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0454-Add-missing-default-perms-for-commands.patch
rename to patches/server/0453-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0455-Add-PlayerShearBlockEvent.patch b/patches/server/0454-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0455-Add-PlayerShearBlockEvent.patch
rename to patches/server/0454-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0456-Limit-recipe-packets.patch b/patches/server/0455-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0456-Limit-recipe-packets.patch
rename to patches/server/0455-Limit-recipe-packets.patch
diff --git a/patches/server/0457-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0456-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0457-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0456-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0458-Player-Chunk-Load-Unload-Events.patch b/patches/server/0457-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0458-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0457-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0459-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0459-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0460-Expose-LivingEntity-hurt-direction.patch b/patches/server/0459-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0460-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0459-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0461-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0461-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0462-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
similarity index 100%
rename from patches/server/0462-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
rename to patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0463-Add-TargetHitEvent.patch b/patches/server/0462-Add-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0463-Add-TargetHitEvent.patch
rename to patches/server/0462-Add-TargetHitEvent.patch
diff --git a/patches/server/0464-MC-4-Fix-item-position-desync.patch b/patches/server/0463-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0464-MC-4-Fix-item-position-desync.patch
rename to patches/server/0463-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0465-Additional-Block-Material-API.patch b/patches/server/0464-Additional-Block-Material-API.patch
similarity index 100%
rename from patches/server/0465-Additional-Block-Material-API.patch
rename to patches/server/0464-Additional-Block-Material-API.patch
diff --git a/patches/server/0466-Fix-harming-potion-dupe.patch b/patches/server/0465-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0466-Fix-harming-potion-dupe.patch
rename to patches/server/0465-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0467-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/server/0467-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0468-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0468-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0469-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0469-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0470-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0470-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0471-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0471-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0472-Zombie-API-breaking-doors.patch b/patches/server/0471-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0472-Zombie-API-breaking-doors.patch
rename to patches/server/0471-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0473-Fix-nerfed-slime-when-splitting.patch b/patches/server/0472-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0473-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0472-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0474-Add-EntityLoadCrossbowEvent.patch b/patches/server/0473-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0474-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0473-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0475-Add-WorldGameRuleChangeEvent.patch b/patches/server/0474-Add-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0475-Add-WorldGameRuleChangeEvent.patch
rename to patches/server/0474-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0476-Add-ServerResourcesReloadedEvent.patch b/patches/server/0475-Add-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0476-Add-ServerResourcesReloadedEvent.patch
rename to patches/server/0475-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0477-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0476-Add-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0477-Add-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0476-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0478-Add-BlockFailedDispenseEvent.patch b/patches/server/0477-Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0478-Add-BlockFailedDispenseEvent.patch
rename to patches/server/0477-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0479-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0478-Add-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0479-Add-PlayerLecternPageChangeEvent.patch
rename to patches/server/0478-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0480-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0479-Add-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0480-Add-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0479-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0481-Configurable-door-breaking-difficulty.patch b/patches/server/0480-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0481-Configurable-door-breaking-difficulty.patch
rename to patches/server/0480-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0482-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0481-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0482-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0481-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0483-Remove-stale-POIs.patch b/patches/server/0482-Remove-stale-POIs.patch
similarity index 87%
rename from patches/server/0483-Remove-stale-POIs.patch
rename to patches/server/0482-Remove-stale-POIs.patch
index 4223edeb9d..fece7e3371 100644
--- a/patches/server/0483-Remove-stale-POIs.patch
+++ b/patches/server/0482-Remove-stale-POIs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2506673e2e778b55f1cd9e2cd987d116aed450fb..39f9a18ba04f265eb10e154042a90fd56adb4f0d 100644
+index 17985c75deaa8d317ea4019f73eafe118d347f41..a9a39c99874001f1024f71bfc97130e8c9a507e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1749,6 +1749,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1743,6 +1743,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              });
              optional1.ifPresent((holder) -> {
                  this.getServer().execute(() -> {
diff --git a/patches/server/0484-Fix-villager-boat-exploit.patch b/patches/server/0483-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0484-Fix-villager-boat-exploit.patch
rename to patches/server/0483-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0485-Add-sendOpLevel-API.patch b/patches/server/0484-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0485-Add-sendOpLevel-API.patch
rename to patches/server/0484-Add-sendOpLevel-API.patch
diff --git a/patches/server/0486-TODO-Registry-Modification-API.patch b/patches/server/0485-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0486-TODO-Registry-Modification-API.patch
rename to patches/server/0485-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0487-Add-StructuresLocateEvent.patch b/patches/server/0486-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0487-Add-StructuresLocateEvent.patch
rename to patches/server/0486-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0488-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0488-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0487-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0489-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0489-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0490-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0490-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0491-Make-schedule-command-per-world.patch b/patches/server/0490-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0491-Make-schedule-command-per-world.patch
rename to patches/server/0490-Make-schedule-command-per-world.patch
diff --git a/patches/server/0492-Configurable-max-leash-distance.patch b/patches/server/0491-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0492-Configurable-max-leash-distance.patch
rename to patches/server/0491-Configurable-max-leash-distance.patch
diff --git a/patches/server/0493-Add-BlockPreDispenseEvent.patch b/patches/server/0492-Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0493-Add-BlockPreDispenseEvent.patch
rename to patches/server/0492-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0494-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0494-Add-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0495-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0495-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0496-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0496-Add-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0497-Expand-EntityUnleashEvent.patch b/patches/server/0496-Expand-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0497-Expand-EntityUnleashEvent.patch
rename to patches/server/0496-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0498-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0498-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0497-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0499-Add-DragonEggFormEvent.patch b/patches/server/0498-Add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0499-Add-DragonEggFormEvent.patch
rename to patches/server/0498-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0500-Add-EntityMoveEvent.patch b/patches/server/0499-Add-EntityMoveEvent.patch
similarity index 97%
rename from patches/server/0500-Add-EntityMoveEvent.patch
rename to patches/server/0499-Add-EntityMoveEvent.patch
index a96a512102..fdac2ac203 100644
--- a/patches/server/0500-Add-EntityMoveEvent.patch
+++ b/patches/server/0499-Add-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index 7a12028ab83cb6162a7f5d7e22c52af0853b79ee..784bcb1a504482bafcccfe57f72186e5
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 39f9a18ba04f265eb10e154042a90fd56adb4f0d..89e02274d3c8587a3e3eb58e2bbca0341507d173 100644
+index a9a39c99874001f1024f71bfc97130e8c9a507e7..19333b61bcb50f2171ac2c75d7f4ca4fdf4d4743 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -227,6 +227,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0501-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 82%
rename from patches/server/0501-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch
index ab98297dc6..f740499e21 100644
--- a/patches/server/0501-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 89e02274d3c8587a3e3eb58e2bbca0341507d173..d188c34aecf06293f3a3cb50256b51fcdf9ff97f 100644
+index 19333b61bcb50f2171ac2c75d7f4ca4fdf4d4743..714968021716fa7cee9ba0b47204d126fb8272fb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1381,6 +1381,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1375,6 +1375,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          this.getChunkSource().blockChanged(pos);
@@ -16,7 +16,7 @@ index 89e02274d3c8587a3e3eb58e2bbca0341507d173..d188c34aecf06293f3a3cb50256b51fc
          this.pathTypesByPosCache.invalidate(pos);
          VoxelShape voxelshape = oldState.getCollisionShape(this, pos);
          VoxelShape voxelshape1 = newState.getCollisionShape(this, pos);
-@@ -1423,6 +1424,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1417,6 +1418,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
          }
diff --git a/patches/server/0502-Inline-shift-direction-fields.patch b/patches/server/0501-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0502-Inline-shift-direction-fields.patch
rename to patches/server/0501-Inline-shift-direction-fields.patch
diff --git a/patches/server/0503-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0503-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0504-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0504-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0505-living-entity-allow-attribute-registration.patch b/patches/server/0504-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0505-living-entity-allow-attribute-registration.patch
rename to patches/server/0504-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0506-fix-dead-slime-setSize-invincibility.patch b/patches/server/0505-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0506-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0505-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0507-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0507-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0508-Expose-Tracked-Players.patch b/patches/server/0507-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0508-Expose-Tracked-Players.patch
rename to patches/server/0507-Expose-Tracked-Players.patch
diff --git a/patches/server/0509-Improve-ServerGUI.patch b/patches/server/0508-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0509-Improve-ServerGUI.patch
rename to patches/server/0508-Improve-ServerGUI.patch
diff --git a/patches/server/0510-fix-converting-txt-to-json-file.patch b/patches/server/0509-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0510-fix-converting-txt-to-json-file.patch
rename to patches/server/0509-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0511-Add-worldborder-events.patch b/patches/server/0510-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0511-Add-worldborder-events.patch
rename to patches/server/0510-Add-worldborder-events.patch
diff --git a/patches/server/0512-Add-PlayerNameEntityEvent.patch b/patches/server/0511-Add-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0512-Add-PlayerNameEntityEvent.patch
rename to patches/server/0511-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0513-Add-recipe-to-cook-events.patch b/patches/server/0512-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0513-Add-recipe-to-cook-events.patch
rename to patches/server/0512-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0514-Add-Block-isValidTool.patch b/patches/server/0513-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0514-Add-Block-isValidTool.patch
rename to patches/server/0513-Add-Block-isValidTool.patch
diff --git a/patches/server/0515-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0515-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0514-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0516-Expand-world-key-API.patch b/patches/server/0515-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0516-Expand-world-key-API.patch
rename to patches/server/0515-Expand-world-key-API.patch
diff --git a/patches/server/0517-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0517-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0518-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0518-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0519-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0519-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0518-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0520-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0519-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0520-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0519-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0521-Expose-protocol-version.patch b/patches/server/0520-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0521-Expose-protocol-version.patch
rename to patches/server/0520-Expose-protocol-version.patch
diff --git a/patches/server/0522-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0521-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0522-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0521-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0523-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0522-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0523-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0522-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0524-Add-bypass-host-check.patch b/patches/server/0523-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0524-Add-bypass-host-check.patch
rename to patches/server/0523-Add-bypass-host-check.patch
diff --git a/patches/server/0525-Set-area-affect-cloud-rotation.patch b/patches/server/0524-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0525-Set-area-affect-cloud-rotation.patch
rename to patches/server/0524-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0526-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0525-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0526-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0525-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0527-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0526-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0527-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0526-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0528-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0527-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0528-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0527-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0529-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0528-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0529-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0528-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0530-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0529-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0530-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0529-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0531-Add-PlayerDeepSleepEvent.patch b/patches/server/0530-Add-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0531-Add-PlayerDeepSleepEvent.patch
rename to patches/server/0530-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0532-More-World-API.patch b/patches/server/0531-More-World-API.patch
similarity index 100%
rename from patches/server/0532-More-World-API.patch
rename to patches/server/0531-More-World-API.patch
diff --git a/patches/server/0533-Add-PlayerBedFailEnterEvent.patch b/patches/server/0532-Add-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0533-Add-PlayerBedFailEnterEvent.patch
rename to patches/server/0532-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0534-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0533-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0534-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0533-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0535-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0534-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
similarity index 100%
rename from patches/server/0535-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
rename to patches/server/0534-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0536-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0535-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0536-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0535-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0537-Add-Channel-initialization-listeners.patch b/patches/server/0536-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0537-Add-Channel-initialization-listeners.patch
rename to patches/server/0536-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0538-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0537-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0538-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0537-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0539-Add-more-WanderingTrader-API.patch b/patches/server/0538-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0539-Add-more-WanderingTrader-API.patch
rename to patches/server/0538-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0540-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0539-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0540-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0539-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0541-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0540-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0541-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0540-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0542-Add-HiddenPotionEffect-API.patch b/patches/server/0541-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/0542-Add-HiddenPotionEffect-API.patch
rename to patches/server/0541-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0543-Inventory-close.patch b/patches/server/0542-Inventory-close.patch
similarity index 100%
rename from patches/server/0543-Inventory-close.patch
rename to patches/server/0542-Inventory-close.patch
diff --git a/patches/server/0544-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0543-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0544-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0543-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0545-Add-basic-Datapack-API.patch b/patches/server/0544-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0545-Add-basic-Datapack-API.patch
rename to patches/server/0544-Add-basic-Datapack-API.patch
diff --git a/patches/server/0546-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0545-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0546-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0545-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0547-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0546-Expand-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0547-Expand-PlayerGameModeChangeEvent.patch
rename to patches/server/0546-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0548-ItemStack-repair-check-API.patch b/patches/server/0547-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0548-ItemStack-repair-check-API.patch
rename to patches/server/0547-ItemStack-repair-check-API.patch
diff --git a/patches/server/0549-More-Enchantment-API.patch b/patches/server/0548-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0549-More-Enchantment-API.patch
rename to patches/server/0548-More-Enchantment-API.patch
diff --git a/patches/server/0550-Move-range-check-for-block-placing-up.patch b/patches/server/0549-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0550-Move-range-check-for-block-placing-up.patch
rename to patches/server/0549-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0551-Add-Mob-lookAt-API.patch b/patches/server/0550-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0551-Add-Mob-lookAt-API.patch
rename to patches/server/0550-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0552-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/0552-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0553-Add-Unix-domain-socket-support.patch b/patches/server/0552-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0553-Add-Unix-domain-socket-support.patch
rename to patches/server/0552-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0554-Add-EntityInsideBlockEvent.patch b/patches/server/0553-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0554-Add-EntityInsideBlockEvent.patch
rename to patches/server/0553-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0555-Fix-item-default-attributes-API.patch b/patches/server/0554-Fix-item-default-attributes-API.patch
similarity index 100%
rename from patches/server/0555-Fix-item-default-attributes-API.patch
rename to patches/server/0554-Fix-item-default-attributes-API.patch
diff --git a/patches/server/0556-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 96%
rename from patches/server/0556-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch
index 92b87ba18e..d1e76737e3 100644
--- a/patches/server/0556-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d188c34aecf06293f3a3cb50256b51fcdf9ff97f..2236fae8147eea1c315c21d90fc864405bfa602d 100644
+index 714968021716fa7cee9ba0b47204d126fb8272fb..d4e73445f680a283cda9a1e4b823efcd389a84ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -446,8 +446,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -440,8 +440,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.serverLevelData.setClearWeatherTime(clearDuration);
          this.serverLevelData.setRainTime(rainDuration);
          this.serverLevelData.setThunderTime(rainDuration);
@@ -19,7 +19,7 @@ index d188c34aecf06293f3a3cb50256b51fcdf9ff97f..2236fae8147eea1c315c21d90fc86440
      }
  
      @Override
-@@ -880,8 +880,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -874,8 +874,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  this.serverLevelData.setThunderTime(j);
                  this.serverLevelData.setRainTime(k);
                  this.serverLevelData.setClearWeatherTime(i);
@@ -30,7 +30,7 @@ index d188c34aecf06293f3a3cb50256b51fcdf9ff97f..2236fae8147eea1c315c21d90fc86440
              }
  
              this.oThunderLevel = this.thunderLevel;
-@@ -948,14 +948,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -942,14 +942,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @VisibleForTesting
      public void resetWeatherCycle() {
          // CraftBukkit start
diff --git a/patches/server/0557-More-Lidded-Block-API.patch b/patches/server/0556-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0557-More-Lidded-Block-API.patch
rename to patches/server/0556-More-Lidded-Block-API.patch
diff --git a/patches/server/0558-Limit-item-frame-cursors-on-maps.patch b/patches/server/0557-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0558-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0557-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0559-Add-PlayerKickEvent-causes.patch b/patches/server/0558-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0559-Add-PlayerKickEvent-causes.patch
rename to patches/server/0558-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0560-Add-PufferFishStateChangeEvent.patch b/patches/server/0559-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0560-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0559-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0561-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0560-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0561-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0560-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0562-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0561-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0562-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0561-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0563-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0562-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0563-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0562-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0564-Add-BellRevealRaiderEvent.patch b/patches/server/0563-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0564-Add-BellRevealRaiderEvent.patch
rename to patches/server/0563-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0565-Fix-invulnerable-end-crystals.patch b/patches/server/0564-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0565-Fix-invulnerable-end-crystals.patch
rename to patches/server/0564-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0566-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0565-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0566-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0565-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0567-Fix-dangerous-end-portal-logic.patch b/patches/server/0566-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0567-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0566-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0568-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0567-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0568-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0567-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0569-Line-Of-Sight-Changes.patch b/patches/server/0568-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0569-Line-Of-Sight-Changes.patch
rename to patches/server/0568-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0570-add-per-world-spawn-limits.patch b/patches/server/0569-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0570-add-per-world-spawn-limits.patch
rename to patches/server/0569-add-per-world-spawn-limits.patch
diff --git a/patches/server/0571-Fix-potions-splash-events.patch b/patches/server/0570-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0571-Fix-potions-splash-events.patch
rename to patches/server/0570-Fix-potions-splash-events.patch
diff --git a/patches/server/0572-Add-more-LimitedRegion-API.patch b/patches/server/0571-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0572-Add-more-LimitedRegion-API.patch
rename to patches/server/0571-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0573-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0572-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0573-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0572-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0574-Missing-Entity-API.patch b/patches/server/0573-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0574-Missing-Entity-API.patch
rename to patches/server/0573-Missing-Entity-API.patch
diff --git a/patches/server/0575-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0574-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0575-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0574-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0576-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0575-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0576-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0575-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0577-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0576-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 97%
rename from patches/server/0577-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0576-Use-getChunkIfLoadedImmediately-in-places.patch
index 452b5c4a64..0a393f84af 100644
--- a/patches/server/0577-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0576-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 2236fae8147eea1c315c21d90fc864405bfa602d..da3821010598f9c67d6a21fbfc6b559280203100 100644
+index d4e73445f680a283cda9a1e4b823efcd389a84ed..6d7b006525068f32549c8f9cccafd821e5a587ce 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -230,7 +230,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0578-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0577-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0578-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0577-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0579-Add-PlayerArmSwingEvent.patch b/patches/server/0578-Add-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0579-Add-PlayerArmSwingEvent.patch
rename to patches/server/0578-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0580-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0579-Fix-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0580-Fix-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0579-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0581-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0581-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0580-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0582-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0582-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0583-Add-missing-forceDrop-toggles.patch b/patches/server/0582-Add-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0583-Add-missing-forceDrop-toggles.patch
rename to patches/server/0582-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0584-Stinger-API.patch b/patches/server/0583-Stinger-API.patch
similarity index 100%
rename from patches/server/0584-Stinger-API.patch
rename to patches/server/0583-Stinger-API.patch
diff --git a/patches/server/0585-Add-System.out-err-catcher.patch b/patches/server/0584-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0585-Add-System.out-err-catcher.patch
rename to patches/server/0584-Add-System.out-err-catcher.patch
diff --git a/patches/server/0586-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0586-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0587-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0587-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0588-Add-PlayerSetSpawnEvent.patch b/patches/server/0587-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0588-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0587-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0589-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0589-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0590-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0589-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0590-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0589-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0591-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0590-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0591-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0590-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0592-Add-EntityDamageItemEvent.patch b/patches/server/0591-Add-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0592-Add-EntityDamageItemEvent.patch
rename to patches/server/0591-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0593-Optimize-indirect-passenger-iteration.patch b/patches/server/0592-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0593-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0592-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0594-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0594-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0595-Clear-bucket-NBT-after-dispense.patch b/patches/server/0594-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0595-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0594-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0596-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0596-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0597-Add-BlockBreakBlockEvent.patch b/patches/server/0596-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0597-Add-BlockBreakBlockEvent.patch
rename to patches/server/0596-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0598-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch
similarity index 100%
rename from patches/server/0598-Option-to-prevent-data-components-copy-in-smithing-r.patch
rename to patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0599-More-CommandBlock-API.patch b/patches/server/0598-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0599-More-CommandBlock-API.patch
rename to patches/server/0598-More-CommandBlock-API.patch
diff --git a/patches/server/0600-Add-missing-team-sidebar-display-slots.patch b/patches/server/0599-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0600-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0599-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0601-Add-back-EntityPortalExitEvent.patch b/patches/server/0600-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0601-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0600-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0602-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 93%
rename from patches/server/0602-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch
index 7a7068cabb..a6b0c9df56 100644
--- a/patches/server/0602-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index da3821010598f9c67d6a21fbfc6b559280203100..666968eff55e97443fd02e00a7ad11e059de44b8 100644
+index 6d7b006525068f32549c8f9cccafd821e5a587ce..1f556e53c4fa70c2ecab2181a655020ba7669624 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -769,6 +769,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -763,6 +763,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      protected BlockPos findLightningTargetAround(BlockPos pos) {
@@ -22,7 +22,7 @@ index da3821010598f9c67d6a21fbfc6b559280203100..666968eff55e97443fd02e00a7ad11e0
          BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
          Optional<BlockPos> optional = this.findLightningRod(blockposition1);
  
-@@ -783,6 +788,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -777,6 +782,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              if (!list.isEmpty()) {
                  return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition();
              } else {
diff --git a/patches/server/0603-Get-entity-default-attributes.patch b/patches/server/0602-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0603-Get-entity-default-attributes.patch
rename to patches/server/0602-Get-entity-default-attributes.patch
diff --git a/patches/server/0604-Left-handed-API.patch b/patches/server/0603-Left-handed-API.patch
similarity index 100%
rename from patches/server/0604-Left-handed-API.patch
rename to patches/server/0603-Left-handed-API.patch
diff --git a/patches/server/0605-Add-more-advancement-API.patch b/patches/server/0604-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0605-Add-more-advancement-API.patch
rename to patches/server/0604-Add-more-advancement-API.patch
diff --git a/patches/server/0606-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0606-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0607-Add-critical-damage-API.patch b/patches/server/0606-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0607-Add-critical-damage-API.patch
rename to patches/server/0606-Add-critical-damage-API.patch
diff --git a/patches/server/0608-Fix-issues-with-mob-conversion.patch b/patches/server/0607-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0608-Fix-issues-with-mob-conversion.patch
rename to patches/server/0607-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0609-Add-isCollidable-methods-to-various-places.patch b/patches/server/0608-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0609-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0608-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0610-Goat-ram-API.patch b/patches/server/0609-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0610-Goat-ram-API.patch
rename to patches/server/0609-Goat-ram-API.patch
diff --git a/patches/server/0611-Add-API-for-resetting-a-single-score.patch b/patches/server/0610-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0611-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0610-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0612-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0612-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0613-Vanilla-command-permission-fixes.patch b/patches/server/0612-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0613-Vanilla-command-permission-fixes.patch
rename to patches/server/0612-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0614-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 96%
rename from patches/server/0614-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 9675d4a991..96b92ceb04 100644
--- a/patches/server/0614-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,10 +9,10 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 666968eff55e97443fd02e00a7ad11e059de44b8..fbc8fac6ad623be5bf434d3249889de966d1f741 100644
+index 1f556e53c4fa70c2ecab2181a655020ba7669624..efc246d405d58550104bb767a40d296e40b79d70 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1282,9 +1282,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1276,9 +1276,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Spigot Start
          for (net.minecraft.world.level.block.entity.BlockEntity tileentity : chunk.getBlockEntities().values()) {
              if (tileentity instanceof net.minecraft.world.Container) {
diff --git a/patches/server/0615-Fix-GameProfileCache-concurrency.patch b/patches/server/0614-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0615-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0614-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0616-Improve-and-expand-AsyncCatcher.patch b/patches/server/0615-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0616-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0615-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0617-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0617-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0618-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0617-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0618-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0617-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0619-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0618-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0619-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0618-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0620-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0620-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0621-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0621-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0622-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0622-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0623-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 100%
rename from patches/server/0623-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
rename to patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0624-Time-scoreboard-search.patch b/patches/server/0623-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0624-Time-scoreboard-search.patch
rename to patches/server/0623-Time-scoreboard-search.patch
diff --git a/patches/server/0625-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0624-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0625-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0624-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0626-Add-missing-InventoryType.patch b/patches/server/0625-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/0626-Add-missing-InventoryType.patch
rename to patches/server/0625-Add-missing-InventoryType.patch
diff --git a/patches/server/0627-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0627-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0628-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 90%
rename from patches/server/0628-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index f342ae9146..e17f65772c 100644
--- a/patches/server/0628-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fbc8fac6ad623be5bf434d3249889de966d1f741..d4cc0a6c0ec10614737615143e05c2e250e8149d 100644
+index efc246d405d58550104bb767a40d296e40b79d70..dd1f03109a7f8cd65f9e77de94a2a170652ce4ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2283,6 +2283,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2277,6 +2277,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot end
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
diff --git a/patches/server/0629-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0629-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0630-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0630-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0631-Add-packet-limiter-config.patch b/patches/server/0630-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0631-Add-packet-limiter-config.patch
rename to patches/server/0630-Add-packet-limiter-config.patch
diff --git a/patches/server/0632-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0632-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0633-Ensure-valid-vehicle-status.patch b/patches/server/0632-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0633-Ensure-valid-vehicle-status.patch
rename to patches/server/0632-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0634-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0634-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0635-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0635-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0636-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0635-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0636-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0635-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0637-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0636-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0637-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0636-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0638-Preserve-overstacked-loot.patch b/patches/server/0637-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0638-Preserve-overstacked-loot.patch
rename to patches/server/0637-Preserve-overstacked-loot.patch
diff --git a/patches/server/0639-Update-head-rotation-in-missing-places.patch b/patches/server/0638-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0639-Update-head-rotation-in-missing-places.patch
rename to patches/server/0638-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0640-prevent-unintended-light-block-manipulation.patch b/patches/server/0639-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0640-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0639-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0641-Fix-CraftCriteria-defaults-map.patch b/patches/server/0640-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0641-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0640-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0642-Fix-upstreams-block-state-factories.patch b/patches/server/0641-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0642-Fix-upstreams-block-state-factories.patch
rename to patches/server/0641-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0643-Configurable-feature-seeds.patch b/patches/server/0642-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0643-Configurable-feature-seeds.patch
rename to patches/server/0642-Configurable-feature-seeds.patch
diff --git a/patches/server/0644-Add-root-admin-user-detection.patch b/patches/server/0643-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0644-Add-root-admin-user-detection.patch
rename to patches/server/0643-Add-root-admin-user-detection.patch
diff --git a/patches/server/0645-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0645-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0646-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0646-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0647-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0647-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0648-Fix-Spigot-growth-modifiers.patch b/patches/server/0647-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0648-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0647-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0649-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0649-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0650-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0649-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0650-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0649-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0651-Optimize-HashMapPalette.patch b/patches/server/0650-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0651-Optimize-HashMapPalette.patch
rename to patches/server/0650-Optimize-HashMapPalette.patch
diff --git a/patches/server/0652-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0652-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0653-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0653-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0654-Add-more-Campfire-API.patch b/patches/server/0653-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0654-Add-more-Campfire-API.patch
rename to patches/server/0653-Add-more-Campfire-API.patch
diff --git a/patches/server/0655-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0655-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0656-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0656-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0655-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0657-Improve-scoreboard-entries.patch b/patches/server/0656-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0657-Improve-scoreboard-entries.patch
rename to patches/server/0656-Improve-scoreboard-entries.patch
diff --git a/patches/server/0658-Entity-powdered-snow-API.patch b/patches/server/0657-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0658-Entity-powdered-snow-API.patch
rename to patches/server/0657-Entity-powdered-snow-API.patch
diff --git a/patches/server/0659-Add-API-for-item-entity-health.patch b/patches/server/0658-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0659-Add-API-for-item-entity-health.patch
rename to patches/server/0658-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0660-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0660-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0661-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0661-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0662-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0662-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0663-Bucketable-API.patch b/patches/server/0662-Bucketable-API.patch
similarity index 100%
rename from patches/server/0663-Bucketable-API.patch
rename to patches/server/0662-Bucketable-API.patch
diff --git a/patches/server/0664-Validate-usernames.patch b/patches/server/0663-Validate-usernames.patch
similarity index 100%
rename from patches/server/0664-Validate-usernames.patch
rename to patches/server/0663-Validate-usernames.patch
diff --git a/patches/server/0665-Make-water-animal-spawn-height-configurable.patch b/patches/server/0664-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0665-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0664-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0666-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0666-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0667-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0667-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0668-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0668-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0669-Multiple-Entries-with-Scoreboards.patch b/patches/server/0668-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0669-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0668-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0670-Reset-placed-block-on-exception.patch b/patches/server/0669-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0670-Reset-placed-block-on-exception.patch
rename to patches/server/0669-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0671-Add-configurable-height-for-slime-spawn.patch b/patches/server/0670-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0671-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0670-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0672-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0671-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0672-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0671-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0673-Multi-Block-Change-API-Implementation.patch b/patches/server/0672-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0673-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0672-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0674-Fix-NotePlayEvent.patch b/patches/server/0673-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0674-Fix-NotePlayEvent.patch
rename to patches/server/0673-Fix-NotePlayEvent.patch
diff --git a/patches/server/0675-Freeze-Tick-Lock-API.patch b/patches/server/0674-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0675-Freeze-Tick-Lock-API.patch
rename to patches/server/0674-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0676-More-PotionEffectType-API.patch b/patches/server/0675-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0676-More-PotionEffectType-API.patch
rename to patches/server/0675-More-PotionEffectType-API.patch
diff --git a/patches/server/0677-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0677-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0678-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0678-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0679-Add-missing-structure-set-seed-configs.patch b/patches/server/0678-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0679-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0678-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0680-Implement-regenerateChunk.patch b/patches/server/0679-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0680-Implement-regenerateChunk.patch
rename to patches/server/0679-Implement-regenerateChunk.patch
diff --git a/patches/server/0681-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0681-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0682-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0682-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0683-Add-GameEvent-tags.patch b/patches/server/0682-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0683-Add-GameEvent-tags.patch
rename to patches/server/0682-Add-GameEvent-tags.patch
diff --git a/patches/server/0684-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0684-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0685-Furnace-RecipesUsed-API.patch b/patches/server/0684-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0685-Furnace-RecipesUsed-API.patch
rename to patches/server/0684-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0686-Configurable-sculk-sensor-listener-range.patch b/patches/server/0685-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0686-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0685-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0687-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0686-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0687-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0686-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0688-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0687-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0688-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0687-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0689-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0688-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0689-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0688-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0690-Fix-Entity-Position-Desync.patch b/patches/server/0689-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0690-Fix-Entity-Position-Desync.patch
rename to patches/server/0689-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0691-Custom-Potion-Mixes.patch b/patches/server/0690-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0691-Custom-Potion-Mixes.patch
rename to patches/server/0690-Custom-Potion-Mixes.patch
diff --git a/patches/server/0692-Force-close-world-loading-screen.patch b/patches/server/0691-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0692-Force-close-world-loading-screen.patch
rename to patches/server/0691-Force-close-world-loading-screen.patch
diff --git a/patches/server/0693-Fix-falling-block-spawn-methods.patch b/patches/server/0692-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0693-Fix-falling-block-spawn-methods.patch
rename to patches/server/0692-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0694-Expose-furnace-minecart-push-values.patch b/patches/server/0693-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0694-Expose-furnace-minecart-push-values.patch
rename to patches/server/0693-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0695-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0694-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0695-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0694-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0696-More-Projectile-API.patch b/patches/server/0695-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0696-More-Projectile-API.patch
rename to patches/server/0695-More-Projectile-API.patch
diff --git a/patches/server/0697-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0696-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0697-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0696-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0698-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0697-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0698-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0697-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0699-Implement-getComputedBiome-API.patch b/patches/server/0698-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0699-Implement-getComputedBiome-API.patch
rename to patches/server/0698-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0700-Make-some-itemstacks-nonnull.patch b/patches/server/0699-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0700-Make-some-itemstacks-nonnull.patch
rename to patches/server/0699-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0701-Implement-enchantWithLevels-API.patch b/patches/server/0700-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0701-Implement-enchantWithLevels-API.patch
rename to patches/server/0700-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0702-Fix-saving-in-unloadWorld.patch b/patches/server/0701-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0702-Fix-saving-in-unloadWorld.patch
rename to patches/server/0701-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0703-Buffer-OOB-setBlock-calls.patch b/patches/server/0702-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0703-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0702-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0704-Add-TameableDeathMessageEvent.patch b/patches/server/0703-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0704-Add-TameableDeathMessageEvent.patch
rename to patches/server/0703-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0705-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0704-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0705-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0704-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0706-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0706-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0705-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0707-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0706-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0707-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0706-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0708-cache-resource-keys.patch b/patches/server/0707-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0708-cache-resource-keys.patch
rename to patches/server/0707-cache-resource-keys.patch
diff --git a/patches/server/0709-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0708-Allow-changing-the-EnderDragon-podium.patch
similarity index 100%
rename from patches/server/0709-Allow-changing-the-EnderDragon-podium.patch
rename to patches/server/0708-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0710-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0709-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0710-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0709-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0711-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0710-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0711-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0710-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0712-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0711-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0712-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0711-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0713-Expand-PlayerItemDamageEvent.patch b/patches/server/0712-Expand-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0713-Expand-PlayerItemDamageEvent.patch
rename to patches/server/0712-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0714-WorldCreator-keepSpawnLoaded.patch b/patches/server/0713-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0714-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0713-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0715-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0714-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0715-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0714-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0716-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0715-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0716-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0715-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0717-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0716-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0717-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0716-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0718-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0717-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0718-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0717-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0719-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0718-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0719-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0718-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0720-Add-PlayerStopUsingItemEvent.patch b/patches/server/0719-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0720-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0719-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0721-Don-t-tick-markers.patch b/patches/server/0720-Don-t-tick-markers.patch
similarity index 93%
rename from patches/server/0721-Don-t-tick-markers.patch
rename to patches/server/0720-Don-t-tick-markers.patch
index 33c11195ac..429927b2bf 100644
--- a/patches/server/0721-Don-t-tick-markers.patch
+++ b/patches/server/0720-Don-t-tick-markers.patch
@@ -23,10 +23,10 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5e5a018433414af76eaa1e781f61612d
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d4cc0a6c0ec10614737615143e05c2e250e8149d..842a47a61ac58337f1c1dc9c905a196524a28c97 100644
+index dd1f03109a7f8cd65f9e77de94a2a170652ce4ed..376a03b48db954479dd3d8bdbe7f1b7c956e322b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2198,6 +2198,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2192,6 +2192,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          public void onTickingStart(Entity entity) {
diff --git a/patches/server/0722-Expand-FallingBlock-API.patch b/patches/server/0721-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0722-Expand-FallingBlock-API.patch
rename to patches/server/0721-Expand-FallingBlock-API.patch
diff --git a/patches/server/0723-Add-support-for-Proxy-Protocol.patch b/patches/server/0722-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0723-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0722-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0724-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0723-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0724-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0723-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0725-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0724-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0725-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0724-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0726-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0725-Sanitize-sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0726-Sanitize-sent-BlockEntity-NBT.patch
rename to patches/server/0725-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0727-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0726-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0727-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0726-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0728-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0727-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0728-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0727-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0729-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0728-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0729-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0728-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0730-Dont-resent-entity-on-art-update.patch b/patches/server/0729-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0730-Dont-resent-entity-on-art-update.patch
rename to patches/server/0729-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0731-Add-WardenAngerChangeEvent.patch b/patches/server/0730-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0731-Add-WardenAngerChangeEvent.patch
rename to patches/server/0730-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0732-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0732-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0733-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0733-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0734-Nameable-Banner-API.patch b/patches/server/0733-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0734-Nameable-Banner-API.patch
rename to patches/server/0733-Nameable-Banner-API.patch
diff --git a/patches/server/0735-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0735-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0736-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch
similarity index 89%
rename from patches/server/0736-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch
index a619a30fd0..f3d82c1fbd 100644
--- a/patches/server/0736-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,10 +7,10 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca
 Just simply prevent them from being added to the world instead.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 842a47a61ac58337f1c1dc9c905a196524a28c97..1e60b0d2873381d9e91ed2cc2a912a94b94fd21d 100644
+index 376a03b48db954479dd3d8bdbe7f1b7c956e322b..23c9aca7c05a4457e357699c67c7780894ebe3de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1243,6 +1243,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1237,6 +1237,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0737-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0737-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0738-Add-Player-getFishHook.patch b/patches/server/0737-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0738-Add-Player-getFishHook.patch
rename to patches/server/0737-Add-Player-getFishHook.patch
diff --git a/patches/server/0739-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0739-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0740-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0740-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0741-Fix-Bee-flower-NPE.patch b/patches/server/0740-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0741-Fix-Bee-flower-NPE.patch
rename to patches/server/0740-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0742-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0742-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0743-More-Teleport-API.patch b/patches/server/0742-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0743-More-Teleport-API.patch
rename to patches/server/0742-More-Teleport-API.patch
diff --git a/patches/server/0744-Add-EntityPortalReadyEvent.patch b/patches/server/0743-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0744-Add-EntityPortalReadyEvent.patch
rename to patches/server/0743-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0745-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0745-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0746-Send-block-entities-after-destroy-prediction.patch b/patches/server/0745-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0746-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0745-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0747-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0747-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0748-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0748-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0749-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0749-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0750-Collision-API.patch b/patches/server/0749-Collision-API.patch
similarity index 100%
rename from patches/server/0750-Collision-API.patch
rename to patches/server/0749-Collision-API.patch
diff --git a/patches/server/0751-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0751-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0752-Block-Ticking-API.patch b/patches/server/0751-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0752-Block-Ticking-API.patch
rename to patches/server/0751-Block-Ticking-API.patch
diff --git a/patches/server/0753-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0753-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0754-Add-NamespacedKey-biome-methods.patch b/patches/server/0753-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0754-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0753-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0755-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0755-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0756-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0755-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0756-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0755-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0757-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0757-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0758-Missing-eating-regain-reason.patch b/patches/server/0757-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0758-Missing-eating-regain-reason.patch
rename to patches/server/0757-Missing-eating-regain-reason.patch
diff --git a/patches/server/0759-Missing-effect-cause.patch b/patches/server/0758-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0759-Missing-effect-cause.patch
rename to patches/server/0758-Missing-effect-cause.patch
diff --git a/patches/server/0760-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0760-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0761-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0761-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0762-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0761-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0762-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0761-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0763-Configurable-chat-thread-limit.patch b/patches/server/0762-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0763-Configurable-chat-thread-limit.patch
rename to patches/server/0762-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0764-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0764-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0765-fix-Jigsaw-block-kicking-user.patch b/patches/server/0764-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0765-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0764-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0766-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0766-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0767-Add-getDrops-to-BlockState.patch b/patches/server/0766-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0767-Add-getDrops-to-BlockState.patch
rename to patches/server/0766-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0768-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 99%
rename from patches/server/0768-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch
index f847c09279..81cd4525ce 100644
--- a/patches/server/0768-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch
@@ -117,10 +117,10 @@ index 3532febc8e34c8436a69a4c4b472b1776f21ee48..de19a5ea96fa38621513e970e04d1535
          return this.anyPlayerCloseEnoughForSpawning(pos, false);
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1e60b0d2873381d9e91ed2cc2a912a94b94fd21d..48177251377644d79c91eae67a970659c225e0d5 100644
+index 23c9aca7c05a4457e357699c67c7780894ebe3de..ab31102de7c43a4fc923b26d9072242453a3f199 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -782,7 +782,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -776,7 +776,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          } else {
              AABB axisalignedbb = AABB.encapsulatingFullBlocks(blockposition1, new BlockPos(blockposition1.atY(this.getMaxBuildHeight()))).inflate(3.0D);
              List<LivingEntity> list = this.getEntitiesOfClass(LivingEntity.class, axisalignedbb, (entityliving) -> {
diff --git a/patches/server/0769-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 87%
rename from patches/server/0769-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 8e43d21dd8..73e5958d98 100644
--- a/patches/server/0769-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 48177251377644d79c91eae67a970659c225e0d5..9377b2d46100f1e0f28e5e908fbb7eaea2be2fdb 100644
+index ab31102de7c43a4fc923b26d9072242453a3f199..93f6864c69761b70735795186cf118d1f091d092 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2222,7 +2222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2216,7 +2216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              if (entity instanceof Mob entityinsentient) {
@@ -17,7 +17,7 @@ index 48177251377644d79c91eae67a970659c225e0d5..9377b2d46100f1e0f28e5e908fbb7eae
                      String s = "onTrackingStart called during navigation iteration";
  
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
-@@ -2302,7 +2302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2296,7 +2296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              if (entity instanceof Mob entityinsentient) {
diff --git a/patches/server/0770-Fix-custom-piglin-loved-items.patch b/patches/server/0769-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0770-Fix-custom-piglin-loved-items.patch
rename to patches/server/0769-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0771-EntityPickupItemEvent-fixes.patch b/patches/server/0770-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0771-EntityPickupItemEvent-fixes.patch
rename to patches/server/0770-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0772-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0772-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0773-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0773-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0774-Elder-Guardian-appearance-API.patch b/patches/server/0773-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0774-Elder-Guardian-appearance-API.patch
rename to patches/server/0773-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0775-Allow-changing-bed-s-occupied-property.patch b/patches/server/0774-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0775-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0774-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0776-Add-entity-knockback-API.patch b/patches/server/0775-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0776-Add-entity-knockback-API.patch
rename to patches/server/0775-Add-entity-knockback-API.patch
diff --git a/patches/server/0777-Detect-headless-JREs.patch b/patches/server/0776-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0777-Detect-headless-JREs.patch
rename to patches/server/0776-Detect-headless-JREs.patch
diff --git a/patches/server/0778-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0778-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0779-Add-EntityToggleSitEvent.patch b/patches/server/0778-Add-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0779-Add-EntityToggleSitEvent.patch
rename to patches/server/0778-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0780-Add-fire-tick-delay-option.patch b/patches/server/0779-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0780-Add-fire-tick-delay-option.patch
rename to patches/server/0779-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0781-Add-Moving-Piston-API.patch b/patches/server/0780-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0781-Add-Moving-Piston-API.patch
rename to patches/server/0780-Add-Moving-Piston-API.patch
diff --git a/patches/server/0782-Ignore-impossible-spawn-tick.patch b/patches/server/0781-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0782-Ignore-impossible-spawn-tick.patch
rename to patches/server/0781-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0783-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0783-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0784-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0784-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0785-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0784-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0785-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0784-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0786-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0786-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0787-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0787-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0788-Add-Player-Warden-Warning-API.patch b/patches/server/0787-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0788-Add-Player-Warden-Warning-API.patch
rename to patches/server/0787-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0789-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0789-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0790-Add-paper-dumplisteners-command.patch b/patches/server/0789-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0790-Add-paper-dumplisteners-command.patch
rename to patches/server/0789-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0791-check-global-player-list-where-appropriate.patch b/patches/server/0790-check-global-player-list-where-appropriate.patch
similarity index 96%
rename from patches/server/0791-check-global-player-list-where-appropriate.patch
rename to patches/server/0790-check-global-player-list-where-appropriate.patch
index 38c66589bb..a0e80701f5 100644
--- a/patches/server/0791-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0790-check-global-player-list-where-appropriate.patch
@@ -7,10 +7,10 @@ Makes certain entities check all players when searching for a player
 instead of just checking players in their world.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9377b2d46100f1e0f28e5e908fbb7eaea2be2fdb..d4ac2a2d3f59cfdd80baf59c45d532cad22b46bb 100644
+index 93f6864c69761b70735795186cf118d1f091d092..3ce6604a74d7ab0b045901261d58736ca4c543a7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2338,4 +2338,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2332,4 +2332,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::move);
          }
      }
diff --git a/patches/server/0792-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0792-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0793-ItemStack-damage-API.patch b/patches/server/0792-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0793-ItemStack-damage-API.patch
rename to patches/server/0792-ItemStack-damage-API.patch
diff --git a/patches/server/0794-Friction-API.patch b/patches/server/0793-Friction-API.patch
similarity index 100%
rename from patches/server/0794-Friction-API.patch
rename to patches/server/0793-Friction-API.patch
diff --git a/patches/server/0795-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0795-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0796-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch
similarity index 100%
rename from patches/server/0796-Fix-premature-player-kicks-on-shutdown.patch
rename to patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0797-Sync-offhand-slot-in-menus.patch b/patches/server/0796-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0797-Sync-offhand-slot-in-menus.patch
rename to patches/server/0796-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0798-Player-Entity-Tracking-Events.patch b/patches/server/0797-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0798-Player-Entity-Tracking-Events.patch
rename to patches/server/0797-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0799-Limit-pet-look-distance.patch b/patches/server/0798-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0799-Limit-pet-look-distance.patch
rename to patches/server/0798-Limit-pet-look-distance.patch
diff --git a/patches/server/0800-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0799-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0800-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0799-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0801-fix-Instruments.patch b/patches/server/0800-fix-Instruments.patch
similarity index 100%
rename from patches/server/0801-fix-Instruments.patch
rename to patches/server/0800-fix-Instruments.patch
diff --git a/patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0801-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0801-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0803-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0802-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0803-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0802-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0804-Add-BlockLockCheckEvent.patch b/patches/server/0803-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0804-Add-BlockLockCheckEvent.patch
rename to patches/server/0803-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0805-Add-Sneaking-API-for-Entities.patch b/patches/server/0804-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0805-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0804-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0806-Improve-logging-and-errors.patch b/patches/server/0805-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0806-Improve-logging-and-errors.patch
rename to patches/server/0805-Improve-logging-and-errors.patch
diff --git a/patches/server/0807-Improve-PortalEvents.patch b/patches/server/0806-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0807-Improve-PortalEvents.patch
rename to patches/server/0806-Improve-PortalEvents.patch
diff --git a/patches/server/0808-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0807-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0808-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0807-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0809-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0808-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0809-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0808-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0810-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0810-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0811-Flying-Fall-Damage.patch b/patches/server/0810-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0811-Flying-Fall-Damage.patch
rename to patches/server/0810-Flying-Fall-Damage.patch
diff --git a/patches/server/0812-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0811-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0812-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0811-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0813-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0812-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0813-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0812-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0814-config-for-disabling-entity-tag-tags.patch b/patches/server/0813-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0814-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0813-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0815-Use-single-player-info-update-packet-on-join.patch b/patches/server/0814-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0815-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0814-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0816-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0816-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0815-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0817-Win-Screen-API.patch b/patches/server/0816-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0817-Win-Screen-API.patch
rename to patches/server/0816-Win-Screen-API.patch
diff --git a/patches/server/0818-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0817-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0818-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0817-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0819-Fix-force-opening-enchantment-tables.patch b/patches/server/0818-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0819-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0818-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0820-Add-Entity-Body-Yaw-API.patch b/patches/server/0819-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0820-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0819-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0821-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0820-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0821-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0820-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0822-Add-EntityFertilizeEggEvent.patch b/patches/server/0821-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0822-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0821-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0823-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0822-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0823-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0822-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0824-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0823-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0824-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0823-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0825-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0824-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0825-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0824-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0826-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0825-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0826-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0825-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0827-Fix-text-display-error-on-spawn.patch b/patches/server/0826-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0827-Fix-text-display-error-on-spawn.patch
rename to patches/server/0826-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0828-Fix-inventories-returning-null-Locations.patch b/patches/server/0827-Fix-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0828-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0827-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0829-Add-Shearable-API.patch b/patches/server/0828-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0829-Add-Shearable-API.patch
rename to patches/server/0828-Add-Shearable-API.patch
diff --git a/patches/server/0830-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0829-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0830-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0829-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0831-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0830-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0831-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0830-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0832-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0831-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0832-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0831-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0833-remove-duplicate-animate-packet-for-records.patch b/patches/server/0832-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0833-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0832-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0834-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0833-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0834-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0833-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0835-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0834-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 86%
rename from patches/server/0835-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0834-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 45b84428cb..98ae07fa8b 100644
--- a/patches/server/0835-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0834-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d4ac2a2d3f59cfdd80baf59c45d532cad22b46bb..b8aac1c72bac15bf421d0f7ae406feefe1cad587 100644
+index 3ce6604a74d7ab0b045901261d58736ca4c543a7..751efd2400a1c6fa6e1db72080c4f17fa9a9c548 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1380,6 +1380,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1374,6 +1374,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void gameEvent(Holder<GameEvent> event, Vec3 emitterPos, GameEvent.Context emitter) {
diff --git a/patches/server/0836-Use-array-for-gamerule-storage.patch b/patches/server/0835-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0836-Use-array-for-gamerule-storage.patch
rename to patches/server/0835-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0837-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0836-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0837-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0836-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0838-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0837-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0838-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0837-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0839-Add-Mob-Experience-reward-API.patch b/patches/server/0838-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0839-Add-Mob-Experience-reward-API.patch
rename to patches/server/0838-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0840-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0839-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0840-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0839-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0841-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0840-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0841-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0840-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0842-More-accurate-isInOpenWater-impl.patch b/patches/server/0841-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0842-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0841-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0843-Expand-PlayerItemMendEvent.patch b/patches/server/0842-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0843-Expand-PlayerItemMendEvent.patch
rename to patches/server/0842-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0844-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0843-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0844-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0843-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0845-Add-transient-modifier-API.patch b/patches/server/0844-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0845-Add-transient-modifier-API.patch
rename to patches/server/0844-Add-transient-modifier-API.patch
diff --git a/patches/server/0846-Fix-block-place-logic.patch b/patches/server/0845-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0846-Fix-block-place-logic.patch
rename to patches/server/0845-Fix-block-place-logic.patch
diff --git a/patches/server/0847-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0846-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0847-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0846-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0848-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0847-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0848-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0847-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0849-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0848-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0849-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0848-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0850-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0849-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0850-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0849-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0851-Fix-sniffer-removeExploredLocation.patch b/patches/server/0850-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0851-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0850-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0852-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0851-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0852-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0851-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0853-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0852-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0853-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0852-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0854-Add-event-for-player-editing-sign.patch b/patches/server/0853-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0854-Add-event-for-player-editing-sign.patch
rename to patches/server/0853-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0855-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0854-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0855-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0854-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0856-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0855-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0856-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0855-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0857-Add-option-to-disable-block-updates.patch b/patches/server/0856-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0857-Add-option-to-disable-block-updates.patch
rename to patches/server/0856-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0858-Call-missing-BlockDispenseEvent.patch b/patches/server/0857-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0858-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0857-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0859-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0858-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0859-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0858-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0860-Optimize-player-lookups-for-beacons.patch b/patches/server/0859-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0860-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0859-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0861-Add-Sign-getInteractableSideFor.patch b/patches/server/0860-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0861-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0860-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0862-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0861-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0862-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0861-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0863-Fix-BanList-API.patch b/patches/server/0862-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0863-Fix-BanList-API.patch
rename to patches/server/0862-Fix-BanList-API.patch
diff --git a/patches/server/0864-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0863-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0864-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0863-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0865-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0864-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0865-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0864-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0866-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0865-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0866-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0865-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0867-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0866-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0867-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0866-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0868-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0867-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0868-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0867-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0869-Add-whitelist-events.patch b/patches/server/0868-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0869-Add-whitelist-events.patch
rename to patches/server/0868-Add-whitelist-events.patch
diff --git a/patches/server/0870-Implement-PlayerFailMoveEvent.patch b/patches/server/0869-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0870-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0869-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0871-Folia-scheduler-and-owned-region-API.patch b/patches/server/0870-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0871-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0870-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0872-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0871-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0872-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0871-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0873-API-for-updating-recipes-on-clients.patch b/patches/server/0872-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0873-API-for-updating-recipes-on-clients.patch
rename to patches/server/0872-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0874-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0873-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0874-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0873-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0875-Only-capture-actual-tree-growth.patch b/patches/server/0874-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0875-Only-capture-actual-tree-growth.patch
rename to patches/server/0874-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0876-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0875-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0876-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0875-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0877-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0876-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0877-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0876-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0878-Use-correct-seed-on-api-world-load.patch b/patches/server/0877-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0878-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0877-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0879-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0878-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0879-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0878-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0880-Cache-map-ids-on-item-frames.patch b/patches/server/0879-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0880-Cache-map-ids-on-item-frames.patch
rename to patches/server/0879-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0881-Fix-custom-statistic-criteria-creation.patch b/patches/server/0880-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0881-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0880-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0882-Bandaid-fix-for-Effect.patch b/patches/server/0881-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0882-Bandaid-fix-for-Effect.patch
rename to patches/server/0881-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0883-SculkCatalyst-bloom-API.patch b/patches/server/0882-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0883-SculkCatalyst-bloom-API.patch
rename to patches/server/0882-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0884-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0883-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0884-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0883-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0885-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0884-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0885-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0884-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0886-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0885-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0886-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0885-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0887-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0886-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0887-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0886-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0888-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0887-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0888-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0887-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0889-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0888-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0889-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0888-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0890-Add-Listing-API-for-Player.patch b/patches/server/0889-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0890-Add-Listing-API-for-Player.patch
rename to patches/server/0889-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0891-Configurable-Region-Compression-Format.patch b/patches/server/0890-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0891-Configurable-Region-Compression-Format.patch
rename to patches/server/0890-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0892-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0891-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0892-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0891-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0893-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0892-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0893-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0892-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0894-Expand-Pose-API.patch b/patches/server/0893-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/0894-Expand-Pose-API.patch
rename to patches/server/0893-Expand-Pose-API.patch
diff --git a/patches/server/0895-More-DragonBattle-API.patch b/patches/server/0894-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0895-More-DragonBattle-API.patch
rename to patches/server/0894-More-DragonBattle-API.patch
diff --git a/patches/server/0896-Add-PlayerPickItemEvent.patch b/patches/server/0895-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/0896-Add-PlayerPickItemEvent.patch
rename to patches/server/0895-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0897-Allow-trident-custom-damage.patch b/patches/server/0896-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0897-Allow-trident-custom-damage.patch
rename to patches/server/0896-Allow-trident-custom-damage.patch
diff --git a/patches/server/0898-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0897-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0898-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0897-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0899-Optimize-nearest-structure-border-iteration.patch b/patches/server/0898-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0899-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0898-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0900-Implement-OfflinePlayer-isConnected.patch b/patches/server/0899-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/0900-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0899-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0901-Fix-inventory-desync.patch b/patches/server/0900-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0901-Fix-inventory-desync.patch
rename to patches/server/0900-Fix-inventory-desync.patch
diff --git a/patches/server/0902-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0901-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/0902-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0901-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0903-Configure-sniffer-egg-hatch-time.patch b/patches/server/0902-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0903-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0902-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0904-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0903-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0904-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0903-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0905-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0904-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0905-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0904-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0906-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0905-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/0906-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0905-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0907-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0906-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0907-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0906-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0908-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0907-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/0908-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0907-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0909-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0908-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/0909-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0908-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0910-Fix-spigot-s-Forced-Stats.patch b/patches/server/0909-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0910-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0909-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0911-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0910-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/0911-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0910-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0912-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0911-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/0912-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0911-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0913-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0912-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/0913-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0912-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0914-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0913-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/0914-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/0913-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0915-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0914-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/0915-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/0914-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0916-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0915-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/0916-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/0915-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0917-Fix-missing-map-initialize-event-call.patch b/patches/server/0916-Fix-missing-map-initialize-event-call.patch
similarity index 93%
rename from patches/server/0917-Fix-missing-map-initialize-event-call.patch
rename to patches/server/0916-Fix-missing-map-initialize-event-call.patch
index be9f07bfc2..df02af5590 100644
--- a/patches/server/0917-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0916-Fix-missing-map-initialize-event-call.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix missing map initialize event call
 public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData;
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b8aac1c72bac15bf421d0f7ae406feefe1cad587..601ddb8a2ed1559a3c439c1aca49f772ffdd092a 100644
+index 751efd2400a1c6fa6e1db72080c4f17fa9a9c548..b37cad7d65e72ead9f3967baaae45f1b734ad726 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1670,13 +1670,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1664,13 +1664,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Nullable
      @Override
      public MapItemSavedData getMapData(MapId id) {
diff --git a/patches/server/0918-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0917-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/0918-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/0917-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0919-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0918-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/0919-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/0918-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0920-Add-player-idle-duration-API.patch b/patches/server/0919-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/server/0920-Add-player-idle-duration-API.patch
rename to patches/server/0919-Add-player-idle-duration-API.patch
diff --git a/patches/server/0921-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0920-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/0921-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/0920-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0922-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0921-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/0922-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/0921-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0923-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0922-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 100%
rename from patches/server/0923-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/0922-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0924-Optimize-VarInts.patch b/patches/server/0923-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/0924-Optimize-VarInts.patch
rename to patches/server/0923-Optimize-VarInts.patch
diff --git a/patches/server/0925-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0924-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/0925-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/0924-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0926-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0925-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/server/0926-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/0925-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0927-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0926-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 100%
rename from patches/server/0927-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/0926-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0928-Expand-LingeringPotion-API.patch b/patches/server/0927-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/0928-Expand-LingeringPotion-API.patch
rename to patches/server/0927-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0929-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0928-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/0929-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/0928-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0930-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0929-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/0930-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/0929-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0932-Add-UUID-attribute-modifier-API.patch b/patches/server/0931-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/0932-Add-UUID-attribute-modifier-API.patch
rename to patches/server/0931-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0933-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0932-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/0933-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/0932-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0934-Lazily-create-LootContext-for-criterions.patch b/patches/server/0933-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/0934-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/0933-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0935-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0934-Don-t-fire-sync-events-during-worldgen.patch
similarity index 98%
rename from patches/server/0935-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/0934-Don-t-fire-sync-events-during-worldgen.patch
index 492d95271a..24e5999fbb 100644
--- a/patches/server/0935-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0934-Don-t-fire-sync-events-during-worldgen.patch
@@ -19,10 +19,10 @@ where generation happened directly to a ServerLevel and the
 entity still has the flag set.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 601ddb8a2ed1559a3c439c1aca49f772ffdd092a..6e7f98fd7b43b46171c3cd58ed91b53960bd0d8a 100644
+index b37cad7d65e72ead9f3967baaae45f1b734ad726..4e5b08093413fb6571a3c49b1563f50b05d8fce1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1232,6 +1232,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1226,6 +1226,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
      // CraftBukkit start
      private boolean addEntity(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
diff --git a/patches/server/0936-Add-Structure-check-API.patch b/patches/server/0935-Add-Structure-check-API.patch
similarity index 100%
rename from patches/server/0936-Add-Structure-check-API.patch
rename to patches/server/0935-Add-Structure-check-API.patch
diff --git a/patches/server/0937-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0936-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/0937-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/0936-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0938-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0937-Restore-vanilla-entity-drops-behavior.patch
similarity index 100%
rename from patches/server/0938-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/0937-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0939-Dont-resend-blocks-on-interactions.patch b/patches/server/0938-Dont-resend-blocks-on-interactions.patch
similarity index 100%
rename from patches/server/0939-Dont-resend-blocks-on-interactions.patch
rename to patches/server/0938-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0940-add-more-scoreboard-API.patch b/patches/server/0939-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/0940-add-more-scoreboard-API.patch
rename to patches/server/0939-add-more-scoreboard-API.patch
diff --git a/patches/server/0941-Improve-Registry.patch b/patches/server/0940-Improve-Registry.patch
similarity index 100%
rename from patches/server/0941-Improve-Registry.patch
rename to patches/server/0940-Improve-Registry.patch
diff --git a/patches/server/0942-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0941-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 100%
rename from patches/server/0942-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/0941-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0943-Add-experience-points-API.patch b/patches/server/0942-Add-experience-points-API.patch
similarity index 100%
rename from patches/server/0943-Add-experience-points-API.patch
rename to patches/server/0942-Add-experience-points-API.patch
diff --git a/patches/server/0944-Add-drops-to-shear-events.patch b/patches/server/0943-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/server/0944-Add-drops-to-shear-events.patch
rename to patches/server/0943-Add-drops-to-shear-events.patch
diff --git a/patches/server/0945-Add-PlayerShieldDisableEvent.patch b/patches/server/0944-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/server/0945-Add-PlayerShieldDisableEvent.patch
rename to patches/server/0944-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0946-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0945-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 100%
rename from patches/server/0946-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/0945-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0947-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0946-Properly-handle-experience-dropping-on-block-break.patch
similarity index 100%
rename from patches/server/0947-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/0946-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0948-Fixup-NamespacedKey-handling.patch b/patches/server/0947-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/0948-Fixup-NamespacedKey-handling.patch
rename to patches/server/0947-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0949-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0948-Expose-LootTable-of-DecoratedPot.patch
similarity index 100%
rename from patches/server/0949-Expose-LootTable-of-DecoratedPot.patch
rename to patches/server/0948-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0950-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0949-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0950-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0949-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0951-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0950-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0951-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0950-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0952-Add-ShulkerDuplicateEvent.patch b/patches/server/0951-Add-ShulkerDuplicateEvent.patch
similarity index 100%
rename from patches/server/0952-Add-ShulkerDuplicateEvent.patch
rename to patches/server/0951-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0953-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0952-Add-api-for-spawn-egg-texture-colors.patch
similarity index 100%
rename from patches/server/0953-Add-api-for-spawn-egg-texture-colors.patch
rename to patches/server/0952-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0954-Add-Lifecycle-Event-system.patch b/patches/server/0953-Add-Lifecycle-Event-system.patch
similarity index 100%
rename from patches/server/0954-Add-Lifecycle-Event-system.patch
rename to patches/server/0953-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0955-ItemStack-Tooltip-API.patch b/patches/server/0954-ItemStack-Tooltip-API.patch
similarity index 100%
rename from patches/server/0955-ItemStack-Tooltip-API.patch
rename to patches/server/0954-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0956-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0955-Add-getChunkSnapshot-includeLightData-parameter.patch
similarity index 100%
rename from patches/server/0956-Add-getChunkSnapshot-includeLightData-parameter.patch
rename to patches/server/0955-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0957-Add-FluidState-API.patch b/patches/server/0956-Add-FluidState-API.patch
similarity index 100%
rename from patches/server/0957-Add-FluidState-API.patch
rename to patches/server/0956-Add-FluidState-API.patch
diff --git a/patches/server/0958-add-number-format-api.patch b/patches/server/0957-add-number-format-api.patch
similarity index 100%
rename from patches/server/0958-add-number-format-api.patch
rename to patches/server/0957-add-number-format-api.patch
diff --git a/patches/server/0959-improve-BanList-types.patch b/patches/server/0958-improve-BanList-types.patch
similarity index 100%
rename from patches/server/0959-improve-BanList-types.patch
rename to patches/server/0958-improve-BanList-types.patch
diff --git a/patches/server/0960-Expanded-Hopper-API.patch b/patches/server/0959-Expanded-Hopper-API.patch
similarity index 100%
rename from patches/server/0960-Expanded-Hopper-API.patch
rename to patches/server/0959-Expanded-Hopper-API.patch
diff --git a/patches/server/0961-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0960-Add-BlockBreakProgressUpdateEvent.patch
similarity index 89%
rename from patches/server/0961-Add-BlockBreakProgressUpdateEvent.patch
rename to patches/server/0960-Add-BlockBreakProgressUpdateEvent.patch
index 67abc67fb7..8ecbca8a5a 100644
--- a/patches/server/0961-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0960-Add-BlockBreakProgressUpdateEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add BlockBreakProgressUpdateEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 6e7f98fd7b43b46171c3cd58ed91b53960bd0d8a..55c7c078e0219e4a6a9e22db23f671ba728ff036 100644
+index 4e5b08093413fb6571a3c49b1563f50b05d8fce1..57d96e809bc230bce5db589c9f150f614fcea699 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1328,6 +1328,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1322,6 +1322,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity instanceof Player) entityhuman = (Player) entity;
          // CraftBukkit end
  
diff --git a/patches/server/0962-Deprecate-ItemStack-setType.patch b/patches/server/0961-Deprecate-ItemStack-setType.patch
similarity index 100%
rename from patches/server/0962-Deprecate-ItemStack-setType.patch
rename to patches/server/0961-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0963-Add-CartographyItemEvent.patch b/patches/server/0962-Add-CartographyItemEvent.patch
similarity index 100%
rename from patches/server/0963-Add-CartographyItemEvent.patch
rename to patches/server/0962-Add-CartographyItemEvent.patch
diff --git a/patches/server/0964-More-Raid-API.patch b/patches/server/0963-More-Raid-API.patch
similarity index 100%
rename from patches/server/0964-More-Raid-API.patch
rename to patches/server/0963-More-Raid-API.patch
diff --git a/patches/server/0965-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0964-Add-onboarding-message-for-initial-server-start.patch
similarity index 97%
rename from patches/server/0965-Add-onboarding-message-for-initial-server-start.patch
rename to patches/server/0964-Add-onboarding-message-for-initial-server-start.patch
index ee7cedb905..29e25a735d 100644
--- a/patches/server/0965-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0964-Add-onboarding-message-for-initial-server-start.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add onboarding message for initial server start
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java
-index c01b4393439838976965823298f12e4762e72eff..218bf89fd7583d6db9f64754c4db8fcce5415bdb 100644
+index 522156e1b7578663c426fcaf7e47acb93d030486..4495e1e8930619a0d58745cc55c69a5b574eb698 100644
 --- a/src/main/java/io/papermc/paper/configuration/Configurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/Configurations.java
-@@ -126,6 +126,7 @@ public abstract class Configurations<G, W> {
+@@ -129,6 +129,7 @@ public abstract class Configurations<G, W> {
          if (Files.notExists(configFile)) {
              node = CommentedConfigurationNode.root(loader.defaultOptions());
              node.node(Configuration.VERSION_FIELD).raw(this.globalConfigVersion());
diff --git a/patches/server/0966-Configurable-max-block-fluid-ticks.patch b/patches/server/0965-Configurable-max-block-fluid-ticks.patch
similarity index 87%
rename from patches/server/0966-Configurable-max-block-fluid-ticks.patch
rename to patches/server/0965-Configurable-max-block-fluid-ticks.patch
index ed1c561d6e..daf283c431 100644
--- a/patches/server/0966-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0965-Configurable-max-block-fluid-ticks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max block/fluid ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 55c7c078e0219e4a6a9e22db23f671ba728ff036..5eab8532bfe3b7082123a12b8a3e62d25a4463d3 100644
+index 57d96e809bc230bce5db589c9f150f614fcea699..39819cfb316ee24db5c6648e32f929e15fd71157 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -506,9 +506,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -500,9 +500,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (!this.isDebug() && flag) {
              j = this.getGameTime();
              gameprofilerfiller.push("blockTicks");
diff --git a/patches/server/0967-Fix-bees-aging-inside-hives.patch b/patches/server/0966-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0967-Fix-bees-aging-inside-hives.patch
rename to patches/server/0966-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0968-Disable-memory-reserve-allocating.patch b/patches/server/0967-Disable-memory-reserve-allocating.patch
similarity index 100%
rename from patches/server/0968-Disable-memory-reserve-allocating.patch
rename to patches/server/0967-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0969-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0968-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
similarity index 100%
rename from patches/server/0969-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
rename to patches/server/0968-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0970-Fix-DamageSource-API.patch b/patches/server/0969-Fix-DamageSource-API.patch
similarity index 100%
rename from patches/server/0970-Fix-DamageSource-API.patch
rename to patches/server/0969-Fix-DamageSource-API.patch
diff --git a/patches/server/0971-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0970-Fix-creation-of-invalid-block-entity-during-world-ge.patch
similarity index 100%
rename from patches/server/0971-Fix-creation-of-invalid-block-entity-during-world-ge.patch
rename to patches/server/0970-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0972-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0971-Fix-possible-StackOverflowError-for-some-dispenses.patch
similarity index 100%
rename from patches/server/0972-Fix-possible-StackOverflowError-for-some-dispenses.patch
rename to patches/server/0971-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0973-Improve-tag-parser-handling.patch b/patches/server/0972-Improve-tag-parser-handling.patch
similarity index 100%
rename from patches/server/0973-Improve-tag-parser-handling.patch
rename to patches/server/0972-Improve-tag-parser-handling.patch
diff --git a/patches/server/0974-Item-Mutation-Fixes.patch b/patches/server/0973-Item-Mutation-Fixes.patch
similarity index 100%
rename from patches/server/0974-Item-Mutation-Fixes.patch
rename to patches/server/0973-Item-Mutation-Fixes.patch
diff --git a/patches/server/0975-Per-world-ticks-per-spawn-settings.patch b/patches/server/0974-Per-world-ticks-per-spawn-settings.patch
similarity index 100%
rename from patches/server/0975-Per-world-ticks-per-spawn-settings.patch
rename to patches/server/0974-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0976-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0975-Properly-track-the-changed-item-from-dispense-events.patch
similarity index 100%
rename from patches/server/0976-Properly-track-the-changed-item-from-dispense-events.patch
rename to patches/server/0975-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0977-Rewrite-dataconverter-system.patch b/patches/server/0976-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0977-Rewrite-dataconverter-system.patch
rename to patches/server/0976-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0978-Suspicious-Effect-Entry-API.patch b/patches/server/0977-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/server/0978-Suspicious-Effect-Entry-API.patch
rename to patches/server/0977-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0979-check-if-itemstack-is-stackable-first.patch b/patches/server/0978-check-if-itemstack-is-stackable-first.patch
similarity index 100%
rename from patches/server/0979-check-if-itemstack-is-stackable-first.patch
rename to patches/server/0978-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0980-disable-forced-empty-world-ticks.patch b/patches/server/0979-disable-forced-empty-world-ticks.patch
similarity index 86%
rename from patches/server/0980-disable-forced-empty-world-ticks.patch
rename to patches/server/0979-disable-forced-empty-world-ticks.patch
index 6ef5295591..35b666570c 100644
--- a/patches/server/0980-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0979-disable-forced-empty-world-ticks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] disable forced empty world ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5eab8532bfe3b7082123a12b8a3e62d25a4463d3..7dfbb3dd6100180abd2ebab4d1e9e34928666f9e 100644
+index 39819cfb316ee24db5c6648e32f929e15fd71157..4f15b9d7c706a9b11ce2df0fa3b67d49f2b73d09 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -533,7 +533,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -527,7 +527,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          this.handlingTick = false;
          gameprofilerfiller.pop();
diff --git a/patches/server/0981-Starlight.patch b/patches/server/0980-Starlight.patch
similarity index 100%
rename from patches/server/0981-Starlight.patch
rename to patches/server/0980-Starlight.patch
diff --git a/patches/server/0982-Rewrite-chunk-system.patch b/patches/server/0981-Rewrite-chunk-system.patch
similarity index 99%
rename from patches/server/0982-Rewrite-chunk-system.patch
rename to patches/server/0981-Rewrite-chunk-system.patch
index 882d275984..bda9e3aa31 100644
--- a/patches/server/0982-Rewrite-chunk-system.patch
+++ b/patches/server/0981-Rewrite-chunk-system.patch
@@ -18398,7 +18398,7 @@ index 2d9d4d06b75873f888ef4d8f5779a52706f821a8..f74efe41cd0da2f9749fc96fb9e0f7cf
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0ae6f7321 100644
+index 4f15b9d7c706a9b11ce2df0fa3b67d49f2b73d09..60fd84819ea7aa96f351db743e8667334af9e96b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -199,7 +199,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18756,7 +18756,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
              return minecraftserver.overworld().getDataStorage();
          });
          this.chunkSource.getGeneratorState().ensureStructuresGenerated();
-@@ -426,6 +657,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -420,6 +651,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return (RandomSequences) this.getDataStorage().computeIfAbsent(RandomSequences.factory(l), "random_sequences");
          });
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
@@ -18766,7 +18766,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      // Paper start
-@@ -558,7 +792,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -552,7 +786,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                          gameprofilerfiller.push("checkDespawn");
                          entity.checkDespawn();
                          gameprofilerfiller.pop();
@@ -18775,7 +18775,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
                              Entity entity1 = entity.getVehicle();
  
                              if (entity1 != null) {
-@@ -583,13 +817,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -577,13 +811,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          gameprofilerfiller.push("entityManagement");
@@ -18794,7 +18794,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      protected void tickTime() {
-@@ -1066,6 +1303,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1060,6 +1297,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void save(@Nullable ProgressListener progressListener, boolean flush, boolean savingDisabled) {
@@ -18806,7 +18806,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
          ServerChunkCache chunkproviderserver = this.getChunkSource();
  
          if (!savingDisabled) {
-@@ -1081,16 +1323,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1075,16 +1317,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
                  timings.worldSaveChunks.startTiming(); // Paper
@@ -18827,7 +18827,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
          ServerLevel worldserver1 = this;
-@@ -1226,7 +1465,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1220,7 +1459,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.removePlayerImmediately((ServerPlayer) entity, Entity.RemovalReason.DISCARDED);
          }
  
@@ -18836,7 +18836,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      // CraftBukkit start
-@@ -1257,7 +1496,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1251,7 +1490,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
              // CraftBukkit end
  
@@ -18845,7 +18845,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
          }
      }
  
-@@ -1269,10 +1508,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1263,10 +1502,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
      public boolean tryAddFreshEntityWithPassengers(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
          // CraftBukkit end
          Stream<UUID> stream = entity.getSelfAndPassengers().map(Entity::getUUID); // CraftBukkit - decompile error
@@ -18859,7 +18859,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
              return false;
          } else {
              this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit
-@@ -1858,7 +2097,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1852,7 +2091,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
  
@@ -18868,7 +18868,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
              bufferedwriter.write(String.format(Locale.ROOT, "block_entity_tickers: %d\n", this.blockEntityTickers.size()));
              bufferedwriter.write(String.format(Locale.ROOT, "block_ticks: %d\n", this.getBlockTicks().count()));
              bufferedwriter.write(String.format(Locale.ROOT, "fluid_ticks: %d\n", this.getFluidTicks().count()));
-@@ -1907,7 +2146,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1901,7 +2140,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter2 = Files.newBufferedWriter(path1);
  
          try {
@@ -18877,7 +18877,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
          } catch (Throwable throwable4) {
              if (bufferedwriter2 != null) {
                  try {
-@@ -1928,7 +2167,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1922,7 +2161,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter3 = Files.newBufferedWriter(path2);
  
          try {
@@ -18886,7 +18886,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
          } catch (Throwable throwable6) {
              if (bufferedwriter3 != null) {
                  try {
-@@ -2070,7 +2309,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2064,7 +2303,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public String getWatchdogStats() {
@@ -18895,7 +18895,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
              return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString();
          }), this.blockEntityTickers.size(), ServerLevel.getTypeCount(this.blockEntityTickers, TickingBlockEntity::getType), this.getBlockTicks().count(), this.getFluidTicks().count(), this.gatherChunkSourceStats());
      }
-@@ -2130,15 +2369,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2124,15 +2363,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public LevelEntityGetter<Entity> getEntities() {
          org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot
@@ -18916,7 +18916,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      public void startTickingChunk(LevelChunk chunk) {
-@@ -2158,34 +2397,49 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2152,34 +2391,49 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public void close() throws IOException {
          super.close();
@@ -18973,7 +18973,7 @@ index 7dfbb3dd6100180abd2ebab4d1e9e34928666f9e..7f8793fa8260cb8a1f55d0ba405e6df0
      }
  
      @Override
-@@ -2211,7 +2465,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2205,7 +2459,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          CrashReportCategory crashreportsystemdetails = super.fillReportDetails(report);
  
          crashreportsystemdetails.setDetail("Loaded entity count", () -> {
diff --git a/patches/server/0983-incremental-chunk-and-player-saving.patch b/patches/server/0982-incremental-chunk-and-player-saving.patch
similarity index 98%
rename from patches/server/0983-incremental-chunk-and-player-saving.patch
rename to patches/server/0982-incremental-chunk-and-player-saving.patch
index 36bfcb0797..22cf818d37 100644
--- a/patches/server/0983-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0982-incremental-chunk-and-player-saving.patch
@@ -76,10 +76,10 @@ index f74efe41cd0da2f9749fc96fb9e0f7cf237ad1c6..d1728e13a7b649f308bde90ab633c79d
      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 7f8793fa8260cb8a1f55d0ba405e6df0ae6f7321..db6a54c752ac39012537ec85ad31d5c8b886be1a 100644
+index 60fd84819ea7aa96f351db743e8667334af9e96b..afc1639c96c01197c6c11873fcd5d779e4ed93a9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1302,6 +1302,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1296,6 +1296,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
      }
  
diff --git a/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0983-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 100%
rename from patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0983-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0984-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 97%
rename from patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0984-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index c004efe2f5..73b3fa9e9c 100644
--- a/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0984-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@@ -13,10 +13,10 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index db6a54c752ac39012537ec85ad31d5c8b886be1a..5285cc76b001a8b5fd5e11764a3aa11e45c9d999 100644
+index afc1639c96c01197c6c11873fcd5d779e4ed93a9..7106f388aed2ef2ce14a2228eb85b51092cb983d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2588,6 +2588,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2582,6 +2582,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                              {
                                  if ( iter.next().player == entity )
                                  {
diff --git a/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0985-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 100%
rename from patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0985-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0986-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0986-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0987-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0987-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0989-Fix-World-isChunkGenerated-calls.patch b/patches/server/0988-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0989-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0988-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0990-Flat-bedrock-generator-settings.patch b/patches/server/0989-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0990-Flat-bedrock-generator-settings.patch
rename to patches/server/0989-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0991-Entity-Activation-Range-2.0.patch b/patches/server/0990-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0991-Entity-Activation-Range-2.0.patch
rename to patches/server/0990-Entity-Activation-Range-2.0.patch
index fee8d41d7e..6db2a7e550 100644
--- a/patches/server/0991-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0990-Entity-Activation-Range-2.0.patch
@@ -17,7 +17,7 @@ Adds villagers as separate config
 public net.minecraft.world.entity.Entity isInsidePortal
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a1747553d7d7 100644
+index 7106f388aed2ef2ce14a2228eb85b51092cb983d..c5e7743f1712bd15a93046e494ef5f7df1273b3c 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;
@@ -28,7 +28,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
  import com.google.common.collect.Lists;
  import com.mojang.datafixers.DataFixer;
  import com.mojang.datafixers.util.Pair;
-@@ -1234,17 +1233,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1228,17 +1227,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
@@ -50,7 +50,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
          try {
          // Paper end - timings
          entity.setOldPosAndRot();
-@@ -1255,9 +1254,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1249,9 +1248,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString();
          });
          gameprofilerfiller.incrementCounter("tickNonPassenger");
@@ -64,7 +64,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1265,13 +1268,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1259,13 +1262,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              this.tickPassenger(entity, entity1);
          }
@@ -84,7 +84,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
                  ProfilerFiller gameprofilerfiller = this.getProfiler();
-@@ -1280,8 +1288,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1274,8 +1282,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      return BuiltInRegistries.ENTITY_TYPE.getKey(passenger.getType()).toString();
                  });
                  gameprofilerfiller.incrementCounter("tickPassenger");
@@ -102,7 +102,7 @@ index 5285cc76b001a8b5fd5e11764a3aa11e45c9d999..b7ca39623348090c5b85e2d80f67a174
                  gameprofilerfiller.pop();
                  Iterator iterator = passenger.getPassengers().iterator();
  
-@@ -1291,6 +1308,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1285,6 +1302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      this.tickPassenger(passenger, entity2);
                  }
  
diff --git a/patches/server/0992-Optional-per-player-mob-spawns.patch b/patches/server/0991-Optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0992-Optional-per-player-mob-spawns.patch
rename to patches/server/0991-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0993-Anti-Xray.patch b/patches/server/0992-Anti-Xray.patch
similarity index 99%
rename from patches/server/0993-Anti-Xray.patch
rename to patches/server/0992-Anti-Xray.patch
index 2175c15308..11b005d518 100644
--- a/patches/server/0993-Anti-Xray.patch
+++ b/patches/server/0992-Anti-Xray.patch
@@ -1104,15 +1104,15 @@ index 183b2191fa1c1b27adedf39593e1b5a223fb1279..8ead66c134688b11dca15f6509147e72
  
      private ClientboundLevelChunkWithLightPacket(RegistryFriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b7ca39623348090c5b85e2d80f67a1747553d7d7..bc609da7105293dfa4ed339f553be66b0a632698 100644
+index c5e7743f1712bd15a93046e494ef5f7df1273b3c..87f0ded1b878e00fde433afb341e5a79d77f6f57 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -575,7 +575,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // Holder holder = worlddimension.type(); // CraftBukkit - decompile error
  
          // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
--        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess()))); // Paper - create paper world configs
-+        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
+-        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules()))); // Paper - create paper world configs
++        super(iworlddataserver, resourcekey, minecraftserver.registryAccess(), worlddimension.type(), minecraftserver::getProfiler, false, flag, i, minecraftserver.getMaxChainedNeighborUpdates(), gen, biomeProvider, env, spigotConfig -> minecraftserver.paperConfigurations.createWorldConfig(io.papermc.paper.configuration.PaperConfigurations.createWorldContextMap(convertable_conversionsession.levelDirectory.path(), iworlddataserver.getLevelName(), resourcekey.location(), spigotConfig, minecraftserver.registryAccess(), iworlddataserver.getGameRules())), executor); // Paper - create paper world configs; Async-Anti-Xray: Pass executor
          this.pvpMode = minecraftserver.isPvpAllowed();
          this.convertable = convertable_conversionsession;
          this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
diff --git a/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0993-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0994-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0995-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0994-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0995-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0995-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0997-Entity-load-save-limit-per-chunk.patch b/patches/server/0996-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0997-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0996-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0998-Improved-Watchdog-Support.patch b/patches/server/0997-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/0998-Improved-Watchdog-Support.patch
rename to patches/server/0997-Improved-Watchdog-Support.patch
diff --git a/patches/server/0999-Optimize-Voxel-Shape-Merging.patch b/patches/server/0998-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0999-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0998-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0999-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/1000-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0999-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/1001-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1000-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/1001-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/1000-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/1002-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1001-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/1002-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/1001-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1003-Remove-streams-from-hot-code.patch b/patches/server/1002-Remove-streams-from-hot-code.patch
similarity index 100%
rename from patches/server/1003-Remove-streams-from-hot-code.patch
rename to patches/server/1002-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1004-Eigencraft-redstone-implementation.patch b/patches/server/1003-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/1004-Eigencraft-redstone-implementation.patch
rename to patches/server/1003-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/1004-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1006-Improve-boat-collision-performance.patch b/patches/server/1005-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/1006-Improve-boat-collision-performance.patch
rename to patches/server/1005-Improve-boat-collision-performance.patch
diff --git a/patches/server/1007-Optimise-general-POI-access.patch b/patches/server/1006-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/1007-Optimise-general-POI-access.patch
rename to patches/server/1006-Optimise-general-POI-access.patch
diff --git a/patches/server/1008-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/1008-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1009-Execute-chunk-tasks-mid-tick.patch b/patches/server/1008-Execute-chunk-tasks-mid-tick.patch
similarity index 97%
rename from patches/server/1009-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/1008-Execute-chunk-tasks-mid-tick.patch
index 191ea66bd4..f31ae8f976 100644
--- a/patches/server/1009-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1008-Execute-chunk-tasks-mid-tick.patch
@@ -123,7 +123,7 @@ index c7b7f153895a4b95b2071a31db00c9c4b69fa094..7fbeebe63f755624b967374072aa2e05
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bc609da7105293dfa4ed339f553be66b0a632698..f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d 100644
+index 87f0ded1b878e00fde433afb341e5a79d77f6f57..dbc7092d4951a1e0090e7c139840b3bad741e8bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -134,7 +134,7 @@ index bc609da7105293dfa4ed339f553be66b0a632698..f9de1196c01c6e32ff1bfad33761bc64
  
      // CraftBukkit start
      public final LevelStorageSource.LevelStorageAccess convertable;
-@@ -1217,6 +1218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1211,6 +1212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (fluid1.is(fluid)) {
              fluid1.tick(this, pos);
          }
@@ -142,7 +142,7 @@ index bc609da7105293dfa4ed339f553be66b0a632698..f9de1196c01c6e32ff1bfad33761bc64
  
      }
  
-@@ -1226,6 +1228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1220,6 +1222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (iblockdata.is(block)) {
              iblockdata.tick(this, pos, this.random);
          }
diff --git a/patches/server/1010-Optimise-random-block-ticking.patch b/patches/server/1009-Optimise-random-block-ticking.patch
similarity index 97%
rename from patches/server/1010-Optimise-random-block-ticking.patch
rename to patches/server/1009-Optimise-random-block-ticking.patch
index b3874d8f37..a414d7b769 100644
--- a/patches/server/1010-Optimise-random-block-ticking.patch
+++ b/patches/server/1009-Optimise-random-block-ticking.patch
@@ -90,10 +90,10 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a3f7ba8dc 100644
+index dbc7092d4951a1e0090e7c139840b3bad741e8bd..11d5729f91b45bbd5b634c8c63469396bc2a3f9c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -867,6 +867,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -861,6 +861,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entityplayer.stopSleepInBed(false, false);
          });
      }
@@ -104,7 +104,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
  
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
-@@ -876,8 +880,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -870,8 +874,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
@@ -116,7 +116,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
  
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
-@@ -909,7 +915,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -903,7 +909,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (!this.paperConfig().environment.disableIceAndSnow) { // Paper - Option to disable ice and snow
          for (int l = 0; l < randomTickSpeed; ++l) {
              if (this.random.nextInt(48) == 0) {
@@ -128,7 +128,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
              }
          }
          } // Paper - Option to disable ice and snow
-@@ -917,36 +926,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -911,36 +920,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.popPush("tickBlocks");
          timings.chunkTicksBlocks.startTiming(); // Paper
          if (randomTickSpeed > 0) {
@@ -190,7 +190,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
  
          timings.chunkTicksBlocks.stopTiming(); // Paper
          gameprofilerfiller.pop();
-@@ -954,17 +964,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -948,17 +958,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public void tickPrecipitation(BlockPos pos) {
@@ -220,7 +220,7 @@ index f9de1196c01c6e32ff1bfad33761bc64c1c6dc5d..b776f1083b8693d13ea523985bf6ec6a
              if (i > 0 && biomebase.shouldSnow(this, blockposition1)) {
                  BlockState iblockdata = this.getBlockState(blockposition1);
  
-@@ -982,12 +1000,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -976,12 +994,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
  
diff --git a/patches/server/1011-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1010-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/1011-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/1010-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1011-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/1012-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/1011-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1013-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1012-Detail-more-information-in-watchdog-dumps.patch
similarity index 98%
rename from patches/server/1013-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/1012-Detail-more-information-in-watchdog-dumps.patch
index 6aa867b8a8..e7c3992145 100644
--- a/patches/server/1013-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1012-Detail-more-information-in-watchdog-dumps.patch
@@ -76,10 +76,10 @@ index e161ad0f53a21a68e8c78575ba5d3cdbdb11fca0..57e76b53e5e314c3e6b8856010f7a841
              });
              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 b776f1083b8693d13ea523985bf6ec6a3f7ba8dc..b27dbee5bef643ed6e79845587f5c02ef238124c 100644
+index 11d5729f91b45bbd5b634c8c63469396bc2a3f9c..e8e18748d12c567eec990d3247086fca8c13620f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1251,7 +1251,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1245,7 +1245,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      }
  
@@ -106,7 +106,7 @@ index b776f1083b8693d13ea523985bf6ec6a3f7ba8dc..b27dbee5bef643ed6e79845587f5c02e
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
-@@ -1291,7 +1310,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1285,7 +1304,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.tickPassenger(entity, entity1);
          }
          // } finally { timer.stopTiming(); } // Paper - timings - move up
diff --git a/patches/server/1014-Collision-optimisations.patch b/patches/server/1013-Collision-optimisations.patch
similarity index 100%
rename from patches/server/1014-Collision-optimisations.patch
rename to patches/server/1013-Collision-optimisations.patch
diff --git a/patches/server/1015-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1014-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/1015-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/1014-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1016-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1015-Fix-tripwire-disarming-not-working-as-intended.patch
similarity index 100%
rename from patches/server/1016-Fix-tripwire-disarming-not-working-as-intended.patch
rename to patches/server/1015-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1017-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1016-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/1017-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/1016-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1018-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1017-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/1018-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/1017-Add-Alternate-Current-redstone-implementation.patch
index 5b234ecc82..6fcb4ef6f5 100644
--- a/patches/server/1018-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1017-Add-Alternate-Current-redstone-implementation.patch
@@ -2009,7 +2009,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b27dbee5bef643ed6e79845587f5c02ef238124c..232ee4e3f32b93f5ae725b025abd538fe8927d90 100644
+index e8e18748d12c567eec990d3247086fca8c13620f..35751ff961383280ffce1be18fc3c1aa311f0c08 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -228,6 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2020,7 +2020,7 @@ index b27dbee5bef643ed6e79845587f5c02ef238124c..232ee4e3f32b93f5ae725b025abd538f
  
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
-@@ -2566,6 +2567,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2560,6 +2561,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return crashreportsystemdetails;
      }
  
diff --git a/patches/server/1019-optimize-dirt-and-snow-spreading.patch b/patches/server/1018-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/1019-optimize-dirt-and-snow-spreading.patch
rename to patches/server/1018-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1020-Properly-resend-entities.patch b/patches/server/1019-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/1020-Properly-resend-entities.patch
rename to patches/server/1019-Properly-resend-entities.patch
diff --git a/patches/server/1021-Optimize-Hoppers.patch b/patches/server/1020-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/1021-Optimize-Hoppers.patch
rename to patches/server/1020-Optimize-Hoppers.patch
diff --git a/patches/server/1022-Improve-performance-of-mass-crafts.patch b/patches/server/1021-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1022-Improve-performance-of-mass-crafts.patch
rename to patches/server/1021-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1023-Actually-optimise-explosions.patch b/patches/server/1022-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1023-Actually-optimise-explosions.patch
rename to patches/server/1022-Actually-optimise-explosions.patch
diff --git a/patches/server/1024-Optimise-chunk-tick-iteration.patch b/patches/server/1023-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/1024-Optimise-chunk-tick-iteration.patch
rename to patches/server/1023-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1025-Lag-compensation-ticks.patch b/patches/server/1024-Lag-compensation-ticks.patch
similarity index 98%
rename from patches/server/1025-Lag-compensation-ticks.patch
rename to patches/server/1024-Lag-compensation-ticks.patch
index fb9ab1a352..dbf7a195bd 100644
--- a/patches/server/1025-Lag-compensation-ticks.patch
+++ b/patches/server/1024-Lag-compensation-ticks.patch
@@ -28,7 +28,7 @@ index b21daeeb043df885fba5e6a7572d311fd0830815..8515cec5e21ad291ca427baaafb4c2f3
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 232ee4e3f32b93f5ae725b025abd538fe8927d90..05e7a908c18b5eef49afb088b7519185bc806056 100644
+index 35751ff961383280ffce1be18fc3c1aa311f0c08..a378866740b4f283d542028ad4dd75064083d5b7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -570,6 +570,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1026-Optimise-nearby-player-retrieval.patch b/patches/server/1025-Optimise-nearby-player-retrieval.patch
similarity index 99%
rename from patches/server/1026-Optimise-nearby-player-retrieval.patch
rename to patches/server/1025-Optimise-nearby-player-retrieval.patch
index 92bfc2ab50..22e16a6576 100644
--- a/patches/server/1026-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1025-Optimise-nearby-player-retrieval.patch
@@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce
 the number of tests per search.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 05e7a908c18b5eef49afb088b7519185bc806056..de3da37c40053789ba2c5d3754452ab49fa9962b 100644
+index a378866740b4f283d542028ad4dd75064083d5b7..0b0fd9e32d2772098d1aade83083b38cac01b76e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -581,6 +581,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1027-Distance-manager-tick-timings.patch b/patches/server/1026-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/1027-Distance-manager-tick-timings.patch
rename to patches/server/1026-Distance-manager-tick-timings.patch
diff --git a/patches/server/1028-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1027-Handle-Oversized-block-entities-in-chunks.patch
similarity index 100%
rename from patches/server/1028-Handle-Oversized-block-entities-in-chunks.patch
rename to patches/server/1027-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1029-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1028-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/1029-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/1028-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1030-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1029-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/1030-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/1029-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/1031-API-for-checking-sent-chunks.patch b/patches/server/1030-API-for-checking-sent-chunks.patch
similarity index 100%
rename from patches/server/1031-API-for-checking-sent-chunks.patch
rename to patches/server/1030-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1032-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch b/patches/server/1031-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
similarity index 100%
rename from patches/server/1032-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
rename to patches/server/1031-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
diff --git a/patches/server/1033-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1032-handle-converting-old-serialized-names-to-new-names.patch
similarity index 100%
rename from patches/server/1033-handle-converting-old-serialized-names-to-new-names.patch
rename to patches/server/1032-handle-converting-old-serialized-names-to-new-names.patch
diff --git a/patches/server/1034-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1033-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/1034-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/1033-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/1035-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1034-Deep-clone-nbt-tags-in-PDC.patch
similarity index 100%
rename from patches/server/1035-Deep-clone-nbt-tags-in-PDC.patch
rename to patches/server/1034-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/1036-Support-old-UUID-format-for-NBT.patch b/patches/server/1035-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/1036-Support-old-UUID-format-for-NBT.patch
rename to patches/server/1035-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/1037-Fix-shield-disable-inconsistency.patch b/patches/server/1036-Fix-shield-disable-inconsistency.patch
similarity index 100%
rename from patches/server/1037-Fix-shield-disable-inconsistency.patch
rename to patches/server/1036-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/1038-Write-SavedData-IO-async.patch b/patches/server/1037-Write-SavedData-IO-async.patch
similarity index 97%
rename from patches/server/1038-Write-SavedData-IO-async.patch
rename to patches/server/1037-Write-SavedData-IO-async.patch
index 601abd1ff6..932cd936fb 100644
--- a/patches/server/1038-Write-SavedData-IO-async.patch
+++ b/patches/server/1037-Write-SavedData-IO-async.patch
@@ -44,10 +44,10 @@ index 36caf354634d6675a3f1ec6829f4778e1d0623bc..b99f50604bafecbc68835974c9ed0caa
  
      // CraftBukkit start - modelled on below
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index de3da37c40053789ba2c5d3754452ab49fa9962b..12a9342634ffa7d6aaa9a7fdd65a45bccec8dd13 100644
+index 0b0fd9e32d2772098d1aade83083b38cac01b76e..0981d440d0dbfe4df668d1f3f1b5706a93bc4434 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1498,7 +1498,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1492,7 +1492,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) {
              if (doFull) {
@@ -56,7 +56,7 @@ index de3da37c40053789ba2c5d3754452ab49fa9962b..12a9342634ffa7d6aaa9a7fdd65a45bc
              }
  
              this.timings.worldSaveChunks.startTiming(); // Paper
-@@ -1534,7 +1534,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1528,7 +1528,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
              }
  
@@ -65,7 +65,7 @@ index de3da37c40053789ba2c5d3754452ab49fa9962b..12a9342634ffa7d6aaa9a7fdd65a45bc
              if (progressListener != null) {
                  progressListener.progressStage(Component.translatable("menu.savingChunks"));
              }
-@@ -1557,12 +1557,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1551,12 +1551,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // CraftBukkit end
      }
  
diff --git a/patches/server/1039-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/1038-Don-t-lose-removed-data-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/1039-Don-t-lose-removed-data-components-in-ItemMeta.patch
rename to patches/server/1038-Don-t-lose-removed-data-components-in-ItemMeta.patch
diff --git a/patches/server/1040-Add-experimental-improved-give-command.patch b/patches/server/1039-Add-experimental-improved-give-command.patch
similarity index 100%
rename from patches/server/1040-Add-experimental-improved-give-command.patch
rename to patches/server/1039-Add-experimental-improved-give-command.patch
diff --git a/patches/server/1041-Handle-Large-Packets-disconnecting-client.patch b/patches/server/1040-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/1041-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/1040-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/1042-Fix-ItemFlags.patch b/patches/server/1041-Fix-ItemFlags.patch
similarity index 100%
rename from patches/server/1042-Fix-ItemFlags.patch
rename to patches/server/1041-Fix-ItemFlags.patch
diff --git a/patches/server/1043-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/1042-Fix-helmet-damage-reduction-inconsistencies.patch
similarity index 100%
rename from patches/server/1043-Fix-helmet-damage-reduction-inconsistencies.patch
rename to patches/server/1042-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/1044-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/1043-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
similarity index 100%
rename from patches/server/1044-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
rename to patches/server/1043-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/removed-patches-1-20-5/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/removed-patches-1-20-5/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch
deleted file mode 100644
index 4d9cba2dd0..0000000000
--- a/removed-patches-1-20-5/0310-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 13 Sep 2014 23:14:43 -0400
-Subject: [PATCH] Configurable Keep Spawn Loaded range per world
-
-This lets you disable it for some worlds and lower it for others.
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 176378ddbf21d758694e8e624cc6c555c78e0fab..6342b7a3c4ccad528f026384da64e973e630f030 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -768,30 +768,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     // CraftBukkit start
-     public void prepareLevels(ChunkProgressListener worldloadlistener, ServerLevel worldserver) {
-+        ServerChunkCache chunkproviderserver = worldserver.getChunkSource(); // Paper - Configurable Keep Spawn Loaded range per world
-         // WorldServer worldserver = this.overworld();
-         this.forceTicks = true;
-         // CraftBukkit end
-+        if (worldserver.getWorld().getKeepSpawnInMemory()) { // Paper - Configurable Keep Spawn Loaded range per world
- 
-         MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.dimension().location());
-         BlockPos blockposition = worldserver.getSharedSpawnPos();
- 
-         worldloadlistener.updateSpawnPos(new ChunkPos(blockposition));
--        ServerChunkCache chunkproviderserver = worldserver.getChunkSource();
-+        //ChunkProviderServer chunkproviderserver = worldserver.getChunkProvider(); // Paper - Configurable Keep Spawn Loaded range per world; move up
- 
-         this.nextTickTimeNanos = Util.getNanos();
--        // CraftBukkit start
--        if (worldserver.getWorld().getKeepSpawnInMemory()) {
--            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(blockposition), 11, Unit.INSTANCE);
-+        // Paper start - Configurable Keep Spawn Loaded range per world
-+        int radiusBlocks = worldserver.paperConfig().spawn.keepSpawnLoadedRange * 16;
-+        int radiusChunks = radiusBlocks / 16 + ((radiusBlocks & 15) != 0 ? 1 : 0);
-+        int totalChunks = ((radiusChunks) * 2 + 1);
-+        totalChunks *= totalChunks;
-+        worldloadlistener.setChunkRadius(radiusBlocks / 16);
- 
--            while (chunkproviderserver.getTickingGenerated() != 441) {
--                // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
--                this.executeModerately();
--            }
--        }
-+        worldserver.addTicketsForSpawn(radiusBlocks, blockposition);
-+        // Paper end - Configurable Keep Spawn Loaded range per world
- 
-         // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
-         this.executeModerately();
-         // Iterator iterator = this.levels.values().iterator();
-+        } // Paper - Configurable Keep Spawn Loaded range per world
- 
-         if (true) {
-             ServerLevel worldserver1 = worldserver;
-@@ -814,7 +817,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         // this.nextTickTimeNanos = SystemUtils.getNanos() + MinecraftServer.PREPARE_LEVELS_DEFAULT_DELAY_NANOS;
-         this.executeModerately();
-         // CraftBukkit end
--        worldloadlistener.stop();
-+        if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.stop(); // Paper - Configurable Keep Spawn Loaded range per world
-         // CraftBukkit start
-         // this.updateMobSpawningFlags();
-         worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 57f129651778d6c20c695bf7b3a8b4d40c402a20..20de3be232ccc7ec7bbc3c6aee9acf66fd396af1 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1640,12 +1640,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         return ((MapIndex) this.getServer().overworld().getDataStorage().computeIfAbsent(MapIndex.factory(), "idcounts")).getFreeAuxValueForMap();
-     }
- 
-+    // Paper start - Configurable Keep Spawn Loaded range per world
-+    public void addTicketsForSpawn(int radiusInBlocks, BlockPos spawn) {
-+        // In order to respect vanilla behavior, which is ensuring everything but the spawn border can tick, we add tickets
-+        // with level 31 for the non-border spawn chunks
-+        ServerChunkCache chunkproviderserver = this.getChunkSource();
-+        int tickRadius = radiusInBlocks - 16;
-+
-+        // add ticking chunks
-+        for (int x = -tickRadius; x <= tickRadius; x += 16) {
-+            for (int z = -tickRadius; z <= tickRadius; z += 16) {
-+                // radius of 2 will have the current chunk be level 31
-+                chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, z)), 2, Unit.INSTANCE);
-+            }
-+        }
-+
-+        // add border chunks
-+
-+        // add border along x axis (including corner chunks)
-+        for (int x = -radiusInBlocks; x <= radiusInBlocks; x += 16) {
-+            // top
-+            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
-+            // bottom
-+            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, -radiusInBlocks)), 1, Unit.INSTANCE); // level 32
-+        }
-+
-+        // add border along z axis (excluding corner chunks)
-+        for (int z = -radiusInBlocks + 16; z < radiusInBlocks; z += 16) {
-+            // right
-+            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
-+            // left
-+            chunkproviderserver.addRegionTicket(TicketType.START, new ChunkPos(spawn.offset(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
-+        }
-+    }
-+    public void removeTicketsForSpawn(int radiusInBlocks, BlockPos spawn) {
-+        // In order to respect vanilla behavior, which is ensuring everything but the spawn border can tick, we added tickets
-+        // with level 31 for the non-border spawn chunks
-+        ServerChunkCache chunkproviderserver = this.getChunkSource();
-+        int tickRadius = radiusInBlocks - 16;
-+
-+        // remove ticking chunks
-+        for (int x = -tickRadius; x <= tickRadius; x += 16) {
-+            for (int z = -tickRadius; z <= tickRadius; z += 16) {
-+                // radius of 2 will have the current chunk be level 31
-+                chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, z)), 2, Unit.INSTANCE);
-+            }
-+        }
-+
-+        // remove border chunks
-+
-+        // remove border along x axis (including corner chunks)
-+        for (int x = -radiusInBlocks; x <= radiusInBlocks; x += 16) {
-+            // top
-+            chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, radiusInBlocks)), 1, Unit.INSTANCE); // level 32
-+            // bottom
-+            chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(x, 0, -radiusInBlocks)), 1, Unit.INSTANCE); // level 32
-+        }
-+
-+        // remove border along z axis (excluding corner chunks)
-+        for (int z = -radiusInBlocks + 16; z < radiusInBlocks; z += 16) {
-+            // right
-+            chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
-+            // left
-+            chunkproviderserver.removeRegionTicket(TicketType.START, new ChunkPos(spawn.offset(-radiusInBlocks, 0, z)), 1, Unit.INSTANCE); // level 32
-+        }
-+    }
-+    // Paper end - Configurable Keep Spawn Loaded range per world
-+
-     public void setDefaultSpawnPos(BlockPos pos, float angle) {
--        ChunkPos chunkcoordintpair = new ChunkPos(new BlockPos(this.levelData.getXSpawn(), 0, this.levelData.getZSpawn()));
-+        // Paper start - Configurable Keep Spawn Loaded range per world
-+        BlockPos prevSpawn = this.getSharedSpawnPos();
-+        //ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(new BlockPosition(this.worldData.a(), 0, this.worldData.c()));
- 
-         this.levelData.setSpawn(pos, angle);
--        this.getChunkSource().removeRegionTicket(TicketType.START, chunkcoordintpair, 11, Unit.INSTANCE);
--        this.getChunkSource().addRegionTicket(TicketType.START, new ChunkPos(pos), 11, Unit.INSTANCE);
-+        if (this.keepSpawnInMemory) {
-+            // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
-+            this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
-+            this.addTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, pos);
-+        }
-         this.getServer().getPlayerList().broadcastAll(new ClientboundSetDefaultSpawnPositionPacket(pos, angle));
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java b/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
-index 1b565b2809c2d367e21971c5154f35c9763995e6..4792eaa30464f4c4ca7f2d6cf20f734beed81f23 100644
---- a/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
-+++ b/src/main/java/net/minecraft/server/level/progress/ChunkProgressListener.java
-@@ -12,4 +12,6 @@ public interface ChunkProgressListener {
-     void start();
- 
-     void stop();
-+
-+    void setChunkRadius(int radius); // Paper - Configurable Keep Spawn Loaded range per world
- }
-diff --git a/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java b/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
-index c9667df492e5681bf933a7f8878b0fdb324afed3..09d0c702132d4cc52ce36712aed11d30efe89f54 100644
---- a/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
-+++ b/src/main/java/net/minecraft/server/level/progress/LoggerChunkProgressListener.java
-@@ -11,12 +11,19 @@ import org.slf4j.Logger;
- 
- public class LoggerChunkProgressListener implements ChunkProgressListener {
-     private static final Logger LOGGER = LogUtils.getLogger();
--    private final int maxCount;
-+    private int maxCount; // Paper - remove final
-     private int count;
-     private long startTime;
-     private long nextTickTime = Long.MAX_VALUE;
- 
-     public LoggerChunkProgressListener(int radius) {
-+        // Paper start - Configurable Keep Spawn Loaded range per world
-+        this.setChunkRadius(radius); // Move to method
-+    }
-+
-+    @Override
-+    public void setChunkRadius(int radius) {
-+        // Paper end - Configurable Keep Spawn Loaded range per world
-         int i = radius * 2 + 1;
-         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 4001a8c13ceed6037174bb81fd06d9758fa0336c..b39721208f8b66c1478e89553a592070cf90fb97 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1411,15 +1411,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
- 
-     @Override
-     public void setKeepSpawnInMemory(boolean keepLoaded) {
-+        // Paper start - Configurable spawn radius
-+        if (keepLoaded == this.world.keepSpawnInMemory) {
-+            // do nothing, nothing has changed
-+            return;
-+        }
-         this.world.keepSpawnInMemory = keepLoaded;
-         // Grab the worlds spawn chunk
-         BlockPos chunkcoordinates = this.world.getSharedSpawnPos();
-         if (keepLoaded) {
--            this.world.getChunkSource().addRegionTicket(TicketType.START, new ChunkPos(chunkcoordinates), 11, Unit.INSTANCE);
-+            this.world.addTicketsForSpawn(this.world.paperConfig().spawn.keepSpawnLoadedRange * 16, chunkcoordinates);
-         } else {
--            // TODO: doesn't work well if spawn changed....
--            this.world.getChunkSource().removeRegionTicket(TicketType.START, new ChunkPos(chunkcoordinates), 11, Unit.INSTANCE);
-+            // TODO: doesn't work well if spawn changed.... // Paper - resolved
-+            this.world.removeTicketsForSpawn(this.world.paperConfig().spawn.keepSpawnLoadedRange * 16, chunkcoordinates);
-         }
-+        // Paper end
-     }
- 
-     @Override