From d01f6b2fd23b43f2aec598f2eb7ecfd631b95b27 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 25 Apr 2024 21:40:53 +0200
Subject: [PATCH] Fix more compile issues

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

diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 27a292058c..0d86acf833 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -1804,10 +1804,10 @@ index 0000000000000000000000000000000000000000..8323f135d6bf2e1f12525e05094ffa3f
 +}
 diff --git a/src/main/java/io/papermc/paper/adventure/providers/DataComponentValueConverterProviderImpl.java b/src/main/java/io/papermc/paper/adventure/providers/DataComponentValueConverterProviderImpl.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c197e28d8d8cdf751be1cf3fdc413f8ca0d03038
+index 0000000000000000000000000000000000000000..ef19891a895e699cac638bd9b9f2fa0eaf1371ba
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/adventure/providers/DataComponentValueConverterProviderImpl.java
-@@ -0,0 +1,76 @@
+@@ -0,0 +1,75 @@
 +package io.papermc.paper.adventure.providers;
 +
 +import com.google.gson.JsonElement;
@@ -1828,8 +1828,7 @@ index 0000000000000000000000000000000000000000..c197e28d8d8cdf751be1cf3fdc413f8c
 +import org.checkerframework.checker.nullness.qual.Nullable;
 +import org.checkerframework.framework.qual.DefaultQualifier;
 +
-+import static net.kyori.adventure.nbt.api.BinaryTagHolder.binaryTagHolder;
-+import static net.kyori.adventure.text.serializer.gson.GsonDataComponentValue.gsonDatacomponentValue;
++import static net.kyori.adventure.text.serializer.gson.GsonDataComponentValue.gsonDataComponentValue;
 +
 +@DefaultQualifier(NonNull.class)
 +public class DataComponentValueConverterProviderImpl implements DataComponentValueConverterRegistry.Provider {
@@ -1848,7 +1847,7 @@ index 0000000000000000000000000000000000000000..c197e28d8d8cdf751be1cf3fdc413f8c
 +            DataComponentValueConverterRegistry.Conversion.convert(
 +                PaperAdventure.DataComponentValueImpl.class,
 +                GsonDataComponentValue.class,
-+                (key, dataComponentValue) -> gsonDatacomponentValue((JsonElement) dataComponentValue.codec().encodeStart(JsonOps.INSTANCE, dataComponentValue.value()).getOrThrow())
++                (key, dataComponentValue) -> gsonDataComponentValue((JsonElement) dataComponentValue.codec().encodeStart(JsonOps.INSTANCE, dataComponentValue.value()).getOrThrow())
 +            ),
 +            DataComponentValueConverterRegistry.Conversion.convert(
 +                GsonDataComponentValue.class,
diff --git a/patches/server/0035-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0035-Allow-for-toggling-of-spawn-chunks.patch
index 3a1d7f94a7..2aa0d85e0b 100644
--- a/patches/server/0035-Allow-for-toggling-of-spawn-chunks.patch
+++ b/patches/server/0035-Allow-for-toggling-of-spawn-chunks.patch
@@ -4,15 +4,20 @@ 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/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5f881af95bd5ee94daadfd9e5d64ee6d411255c4..10e0630d30864f8d38434e58f43c63a6984b974b 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -258,6 +258,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         });
-         // CraftBukkit end
-         this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
-+        this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper - Option to keep spawn chunks loaded
-         this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
-         this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
-     }
+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/0042-Entity-Origin-API.patch b/patches/server/0042-Entity-Origin-API.patch
index 29e20019ee..f971fccaba 100644
--- a/patches/server/0042-Entity-Origin-API.patch
+++ b/patches/server/0042-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 476b513e05a8ef099a17db44732ebc8eed8a595c..53a448b60168c0bcbb0979884a589a31baf9c841 100644
+index a72b84cdf2b5f4aea5eb7fe4dfc0faad27c46876..c8dadfd6441452817db858ae934b7baed5194403 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2173,6 +2173,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2179,6 +2179,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/0043-Prevent-block-entity-and-entity-crashes.patch b/patches/server/0043-Prevent-block-entity-and-entity-crashes.patch
index 9c6c663354..ada6a4d53e 100644
--- a/patches/server/0043-Prevent-block-entity-and-entity-crashes.patch
+++ b/patches/server/0043-Prevent-block-entity-and-entity-crashes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent block entity and entity crashes
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 10e0630d30864f8d38434e58f43c63a6984b974b..d878203f7d013ab5648bca82c9a71cceeda1f11f 100644
+index 5f881af95bd5ee94daadfd9e5d64ee6d411255c4..472df81e4aef21e0cf2684a9e04d6ce18d6d6922 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -727,11 +727,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -726,11 +726,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
diff --git a/patches/server/0049-Optimize-explosions.patch b/patches/server/0049-Optimize-explosions.patch
index ee597e2426..bcdadcb975 100644
--- a/patches/server/0049-Optimize-explosions.patch
+++ b/patches/server/0049-Optimize-explosions.patch
@@ -120,7 +120,7 @@ index cd6d831d8519b406571e6f626053afb662799ad9..8a4c086d7ac4bf59f39ab37e583b0e8d
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d878203f7d013ab5648bca82c9a71cceeda1f11f..b638e223c9ac1019fac9d1a8203feac90cfcc724 100644
+index 472df81e4aef21e0cf2684a9e04d6ce18d6d6922..395744b57e0dcff2de5f2675c03c2e696123d386 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -167,6 +167,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0051-Disable-thunder.patch b/patches/server/0051-Disable-thunder.patch
index 4835c0aded..bece00e2e2 100644
--- a/patches/server/0051-Disable-thunder.patch
+++ b/patches/server/0051-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 53a448b60168c0bcbb0979884a589a31baf9c841..057ae550d0cb3617f2f6c282d172f46be1c0b263 100644
+index c8dadfd6441452817db858ae934b7baed5194403..b41a4d6dc7fb98b6f6fc172a2b83ea43213643b4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -615,7 +615,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -621,7 +621,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
diff --git a/patches/server/0052-Disable-ice-and-snow.patch b/patches/server/0052-Disable-ice-and-snow.patch
index 19ff204bd0..36c4e1948f 100644
--- a/patches/server/0052-Disable-ice-and-snow.patch
+++ b/patches/server/0052-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 057ae550d0cb3617f2f6c282d172f46be1c0b263..de6601291b7f8a8e3ee37aceeccfca9083f9fb90 100644
+index b41a4d6dc7fb98b6f6fc172a2b83ea43213643b4..6440c0459248a9a0de21c8871e4f4ce399b525ec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -645,11 +645,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -651,11 +651,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          gameprofilerfiller.popPush("iceandsnow");
  
diff --git a/patches/server/0058-Disable-spigot-tick-limiters.patch b/patches/server/0058-Disable-spigot-tick-limiters.patch
index 862c1b54ff..0884563fa8 100644
--- a/patches/server/0058-Disable-spigot-tick-limiters.patch
+++ b/patches/server/0058-Disable-spigot-tick-limiters.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable spigot tick limiters
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b638e223c9ac1019fac9d1a8203feac90cfcc724..dac9c71d696a3fd1554408a6beb6840382bbc30c 100644
+index 395744b57e0dcff2de5f2675c03c2e696123d386..03fec2504579acb0a8ba835939e0067f3649ab6a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -700,9 +700,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -699,9 +699,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          boolean flag = this.tickRateManager().runsNormally();
  
          int tilesThisCycle = 0;
diff --git a/patches/server/0069-Add-exception-reporting-event.patch b/patches/server/0069-Add-exception-reporting-event.patch
index 4157fa5a21..b0a4afc624 100644
--- a/patches/server/0069-Add-exception-reporting-event.patch
+++ b/patches/server/0069-Add-exception-reporting-event.patch
@@ -91,10 +91,10 @@ index 8183c26b4a5ad169a53702b8c45fd05cda934e80..36dec6cd78a0990ba3c09a4a748c259e
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index dac9c71d696a3fd1554408a6beb6840382bbc30c..29fe6aaa9e344a9c373399d63dd63ff0c04cbfda 100644
+index 03fec2504579acb0a8ba835939e0067f3649ab6a..2eb2fbe57a33701770baefea5dc727684f2779ec 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -729,6 +729,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -728,6 +728,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper start - Prevent block entity and entity crashes
              final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
              MinecraftServer.LOGGER.error(msg, throwable);
diff --git a/patches/server/0079-Add-World-Util-Methods.patch b/patches/server/0079-Add-World-Util-Methods.patch
index 281c7f2bd8..ddac3fe2dc 100644
--- a/patches/server/0079-Add-World-Util-Methods.patch
+++ b/patches/server/0079-Add-World-Util-Methods.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 29fe6aaa9e344a9c373399d63dd63ff0c04cbfda..0e0ab7b2790c1b7540eeb27eb17099e39a6099d4 100644
+index 2eb2fbe57a33701770baefea5dc727684f2779ec..8ba4395670304647d62987952c6339d394140af6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -341,6 +341,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -340,6 +340,22 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return chunk == null ? null : chunk.getFluidState(blockposition);
      }
  
diff --git a/patches/server/0083-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0083-Configurable-spawn-chances-for-skeleton-horses.patch
index 11d3e3395e..8f20b0f7c9 100644
--- a/patches/server/0083-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/patches/server/0083-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 de6601291b7f8a8e3ee37aceeccfca9083f9fb90..0dfcf5b2a0865f6f14a2a34622d27c9742af6948 100644
+index 6440c0459248a9a0de21c8871e4f4ce399b525ec..2b0f4839b128d8a0cdedd0bb8f4a4c6cf02990af 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -620,7 +620,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -626,7 +626,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
diff --git a/patches/server/0084-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0084-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index 03667aecf0..289a2928b8 100644
--- a/patches/server/0084-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0084-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -18,7 +18,7 @@ index b5f305c7d0972438a686d9b3a022156e39b130a2..d5b5eb914278fbd85921c039a8da3492
              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 0dfcf5b2a0865f6f14a2a34622d27c9742af6948..4badda17dd48bd6dbb8228774d8b1824de6d1d87 100644
+index 2b0f4839b128d8a0cdedd0bb8f4a4c6cf02990af..c37e613361a2cc8bae2442c5b4ec425df821f30e 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 {
@@ -30,10 +30,10 @@ index 0dfcf5b2a0865f6f14a2a34622d27c9742af6948..4badda17dd48bd6dbb8228774d8b1824
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0e0ab7b2790c1b7540eeb27eb17099e39a6099d4..2a7d2eea46e05d85ce3e72a69dfd26a671a882ac 100644
+index 8ba4395670304647d62987952c6339d394140af6..33c9001970fe01bedd72f6ba4388b43ed9707fc8 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -491,7 +491,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -490,7 +490,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0085-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0085-Entity-AddTo-RemoveFrom-World-Events.patch
index c5b1c01897..92094cc1fb 100644
--- a/patches/server/0085-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/patches/server/0085-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 4badda17dd48bd6dbb8228774d8b1824de6d1d87..ede5afa51818f3c36d40787ff3e6d0d45108cdf8 100644
+index c37e613361a2cc8bae2442c5b4ec425df821f30e..b6bc5edad1cf6b54e1b18dddd5acf4002f3c97fd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2185,6 +2185,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2191,6 +2191,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  entity.setOrigin(entity.getOriginVector().toLocation(getWorld()));
              }
              // Paper end - Entity origin API
@@ -16,7 +16,7 @@ index 4badda17dd48bd6dbb8228774d8b1824de6d1d87..ede5afa51818f3c36d40787ff3e6d0d4
          }
  
          public void onTrackingEnd(Entity entity) {
-@@ -2255,6 +2256,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2261,6 +2262,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
              // CraftBukkit end
diff --git a/patches/server/0092-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0092-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
index 4d5901f228..204de0aa56 100644
--- a/patches/server/0092-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/patches/server/0092-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 ede5afa51818f3c36d40787ff3e6d0d45108cdf8..0d0a20d5ca09404d8be4d67fc4221c1fb0d24c1c 100644
+index b6bc5edad1cf6b54e1b18dddd5acf4002f3c97fd..ab91dc3c9a738097b79bdecbcbe41557aa3ed0de 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1391,6 +1391,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1397,6 +1397,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void updateNeighborsAt(BlockPos pos, Block sourceBlock) {
diff --git a/patches/server/0106-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0106-Faster-redstone-torch-rapid-clock-removal.patch
index 4b63858b29..4ec00fb17a 100644
--- a/patches/server/0106-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/patches/server/0106-Faster-redstone-torch-rapid-clock-removal.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal
 Only resize the the redstone torch list once, since resizing arrays / lists is costly
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2a7d2eea46e05d85ce3e72a69dfd26a671a882ac..afb1c203f6299b90179244b4b0d0c6332f961e35 100644
+index 33c9001970fe01bedd72f6ba4388b43ed9707fc8..95fc5fc293eb7d77868fa0a37beb792ee0620fcd 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -168,6 +168,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0108-Fix-global-sound-handling.patch b/patches/server/0108-Fix-global-sound-handling.patch
index e590dd6363..78440e9377 100644
--- a/patches/server/0108-Fix-global-sound-handling.patch
+++ b/patches/server/0108-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 0d0a20d5ca09404d8be4d67fc4221c1fb0d24c1c..6e16a95472922faf34c1743f6e082b631eac4257 100644
+index ab91dc3c9a738097b79bdecbcbe41557aa3ed0de..f2016ed77a2239bdc597175c24ce4427a808d1a6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1324,7 +1324,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1330,7 +1330,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @Override
      public void levelEvent(@Nullable Player player, int eventId, BlockPos pos, int data) {
@@ -81,10 +81,10 @@ index 6df874ac5091896be5edddd362c11958c0ad815b..37cfb9694dc06f693b7b54f20bc31dfd
                              double deltaLength = Math.sqrt(distanceSquared);
                              double relativeX = player.getX() + (deltaX / deltaLength) * viewDistance;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index afb1c203f6299b90179244b4b0d0c6332f961e35..57856f334370da394e9119fb1f8c7fb9c4916aa3 100644
+index 95fc5fc293eb7d77868fa0a37beb792ee0620fcd..edcab2dd4070703101ed9bef86f320093be6c1cb 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1263,4 +1263,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1262,4 +1262,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
          private ExplosionInteraction() {}
      }
diff --git a/patches/server/0122-Optimize-Level.hasChunkAt-BlockPosition-Z.patch b/patches/server/0122-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
index b20375f51a..e4bdedfa83 100644
--- a/patches/server/0122-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
+++ b/patches/server/0122-Optimize-Level.hasChunkAt-BlockPosition-Z.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize Level.hasChunkAt(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 57856f334370da394e9119fb1f8c7fb9c4916aa3..b2b0dea688df220a06abd458ac47aae3d67a7797 100644
+index edcab2dd4070703101ed9bef86f320093be6c1cb..004dd17181a49df5c2255a9eeca03f5a354920aa 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -342,6 +342,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -341,6 +341,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return chunk == null ? null : chunk.getFluidState(blockposition);
      }
  
diff --git a/patches/server/0130-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0130-Provide-E-TE-Chunk-count-stat-methods.patch
index 366e2db789..775c0bbd63 100644
--- a/patches/server/0130-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/patches/server/0130-Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b2b0dea688df220a06abd458ac47aae3d67a7797..e78f39ce95e587b84afccae0e4635171370b7323 100644
+index 004dd17181a49df5c2255a9eeca03f5a354920aa..ec6640bc761b6232d6b48a32fae11e60d5cdcbdf 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -113,7 +113,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0165-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/server/0165-Fix-MC-117075-Block-entity-unload-lag-spike.patch
index 77a896be6d..4dda00330b 100644
--- a/patches/server/0165-Fix-MC-117075-Block-entity-unload-lag-spike.patch
+++ b/patches/server/0165-Fix-MC-117075-Block-entity-unload-lag-spike.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix MC-117075: Block entity unload lag spike
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e78f39ce95e587b84afccae0e4635171370b7323..b650a3c8c141c8848dd3c88991f1cad7b0606adb 100644
+index ec6640bc761b6232d6b48a32fae11e60d5cdcbdf..917ee31fedd92184d97f2c0a11fd61583361de92 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -722,6 +722,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -721,6 +721,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          boolean flag = this.tickRateManager().runsNormally();
  
          int tilesThisCycle = 0;
@@ -17,7 +17,7 @@ index e78f39ce95e587b84afccae0e4635171370b7323..b650a3c8c141c8848dd3c88991f1cad7
          for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters
              this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0;
              TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(this.tileTickPosition);
-@@ -730,12 +732,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -729,12 +731,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (tickingblockentity.isRemoved()) {
                  // Spigot start
                  tilesThisCycle--;
diff --git a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
index 63bdff45c5..50782d18cc 100644
--- a/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
+++ b/patches/server/0166-use-CB-BlockState-implementations-for-captured-block.patch
@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b650a3c8c141c8848dd3c88991f1cad7b0606adb..ce2957c8955b95865c07eb3f3d7d9fcca2438e5e 100644
+index 917ee31fedd92184d97f2c0a11fd61583361de92..26adc305c5d5ef16dda141f931973666ee163d01 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -149,7 +149,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -30,7 +30,7 @@ index b650a3c8c141c8848dd3c88991f1cad7b0606adb..ce2957c8955b95865c07eb3f3d7d9fcc
      public Map<BlockPos, BlockEntity> capturedTileEntities = new HashMap<>();
      public List<ItemEntity> captureDrops;
      public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<SpawnCategory> ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();
-@@ -384,7 +384,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -383,7 +383,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
@@ -39,7 +39,7 @@ index b650a3c8c141c8848dd3c88991f1cad7b0606adb..ce2957c8955b95865c07eb3f3d7d9fcc
              if (blockstate == null) {
                  blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags);
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
-@@ -405,7 +405,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -404,7 +404,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // CraftBukkit start - capture blockstates
              boolean captured = false;
              if (this.captureBlockStates && !this.capturedBlockStates.containsKey(pos)) {
@@ -49,7 +49,7 @@ index b650a3c8c141c8848dd3c88991f1cad7b0606adb..ce2957c8955b95865c07eb3f3d7d9fcc
                  this.capturedBlockStates.put(pos.immutable(), blockstate);
                  captured = true;
              }
-@@ -606,7 +607,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -605,7 +606,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public BlockState getBlockState(BlockPos pos) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
diff --git a/patches/server/0193-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0193-Block-Enderpearl-Travel-Exploit.patch
index dab23052ef..e1163117f2 100644
--- a/patches/server/0193-Block-Enderpearl-Travel-Exploit.patch
+++ b/patches/server/0193-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 6e16a95472922faf34c1743f6e082b631eac4257..2522c7a602338f515569cac42c71ae423daca6b3 100644
+index f2016ed77a2239bdc597175c24ce4427a808d1a6..7be0547f6225a6be6ca1037f63f4aff8759b5dc4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2143,6 +2143,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2149,6 +2149,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          public void onTickingEnd(Entity entity) {
              ServerLevel.this.entityTickList.remove(entity);
diff --git a/patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch
index a35dab6847..6c3c4c593f 100644
--- a/patches/server/0194-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0194-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 2522c7a602338f515569cac42c71ae423daca6b3..a4369e73a8af5d2f0f216939685f6553433debd1 100644
+index 7be0547f6225a6be6ca1037f63f4aff8759b5dc4..e79329ee9b02a11b55253cf2ce4e08b2fc39a43f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1510,12 +1510,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1516,12 +1516,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/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch
index 621b259413..37420eebb4 100644
--- a/patches/server/0215-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0215-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 a4369e73a8af5d2f0f216939685f6553433debd1..542a940ec2ebf367920d9f96f99d703ee1b3351f 100644
+index e79329ee9b02a11b55253cf2ce4e08b2fc39a43f..c5b89c3149b869a3358434490a001f0f45f716fb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1241,7 +1241,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1247,7 +1247,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 a4369e73a8af5d2f0f216939685f6553433debd1..542a940ec2ebf367920d9f96f99d703e
                  }
              }
          }
-@@ -2228,7 +2228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2234,7 +2234,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/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index 705de5b49a..4c4526b87a 100644
--- a/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -17,10 +17,10 @@ index d33c49c4a4b87a5203f9b4592deff9389e6e870d..62d63883f6a9f4da099491f697b309d4
          Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ce2957c8955b95865c07eb3f3d7d9fcca2438e5e..9e717a360dd50a2b4a5344011ae77811a3e182c1 100644
+index 26adc305c5d5ef16dda141f931973666ee163d01..6e23e4d0477f361f2eb5bb93bd9dd2bf5073833c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -760,6 +760,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -759,6 +759,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper end - Prevent block entity and entity crashes
          }
      }
diff --git a/patches/server/0224-Vanished-players-don-t-have-rights.patch b/patches/server/0224-Vanished-players-don-t-have-rights.patch
index bcb5370317..5eead4a61f 100644
--- a/patches/server/0224-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0224-Vanished-players-don-t-have-rights.patch
@@ -39,10 +39,10 @@ index 6ca74a5cf691ee92c84bd031e875f72440df6b32..cee3f1200af602b5dfd0b27d05eb0182
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9e717a360dd50a2b4a5344011ae77811a3e182c1..d050d72eb87a2d1b4723ab831dfef5e25c6a65b2 100644
+index 6e23e4d0477f361f2eb5bb93bd9dd2bf5073833c..be2220eff094c735bdb0c3e777bfbcfa4d44a578 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -265,6 +265,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -264,6 +264,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
      }
  
diff --git a/patches/server/0228-Expand-ArmorStand-API.patch b/patches/server/0227-Expand-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0228-Expand-ArmorStand-API.patch
rename to patches/server/0227-Expand-ArmorStand-API.patch
diff --git a/patches/server/0229-AnvilDamageEvent.patch b/patches/server/0228-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0229-AnvilDamageEvent.patch
rename to patches/server/0228-AnvilDamageEvent.patch
diff --git a/patches/server/0230-Add-TNTPrimeEvent.patch b/patches/server/0229-Add-TNTPrimeEvent.patch
similarity index 100%
rename from patches/server/0230-Add-TNTPrimeEvent.patch
rename to patches/server/0229-Add-TNTPrimeEvent.patch
diff --git a/patches/server/0231-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from patches/server/0231-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/patches/server/0232-Fix-NBT-type-issues.patch b/patches/server/0231-Fix-NBT-type-issues.patch
similarity index 100%
rename from patches/server/0232-Fix-NBT-type-issues.patch
rename to patches/server/0231-Fix-NBT-type-issues.patch
diff --git a/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0232-Remove-unnecessary-itemmeta-handling.patch
similarity index 100%
rename from patches/server/0233-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0232-Remove-unnecessary-itemmeta-handling.patch
diff --git a/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 96%
rename from patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 08aa8035d6..9d19ef52a1 100644
--- a/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0233-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 542a940ec2ebf367920d9f96f99d703ee1b3351f..1beb2541cf799c7862685b5332ecbbfae1edc170 100644
+index c5b89c3149b869a3358434490a001f0f45f716fb..2879de5d5c6638d9b683e74da8dc3863738f2b65 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1203,6 +1203,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1209,6 +1209,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/0235-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from patches/server/0235-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/patches/server/0237-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0236-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0237-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0236-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0238-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0237-Ability-to-get-block-entities-from-a-chunk-without-s.patch
similarity index 100%
rename from patches/server/0238-Ability-to-get-block-entities-from-a-chunk-without-s.patch
rename to patches/server/0237-Ability-to-get-block-entities-from-a-chunk-without-s.patch
diff --git a/patches/server/0239-Optimize-BlockPosition-helper-methods.patch b/patches/server/0238-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0239-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0238-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0240-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0239-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0240-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0239-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0241-Slime-Pathfinder-Events.patch b/patches/server/0240-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0241-Slime-Pathfinder-Events.patch
rename to patches/server/0240-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0242-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0241-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0242-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0241-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0243-Optimize-CraftBlockData-Creation.patch b/patches/server/0242-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0243-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0242-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0244-Optimize-MappedRegistry.patch b/patches/server/0243-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0244-Optimize-MappedRegistry.patch
rename to patches/server/0243-Optimize-MappedRegistry.patch
diff --git a/patches/server/0245-Add-PhantomPreSpawnEvent.patch b/patches/server/0244-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0245-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0244-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0246-Add-More-Creeper-API.patch b/patches/server/0245-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0246-Add-More-Creeper-API.patch
rename to patches/server/0245-Add-More-Creeper-API.patch
diff --git a/patches/server/0247-Inventory-removeItemAnySlot.patch b/patches/server/0246-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0247-Inventory-removeItemAnySlot.patch
rename to patches/server/0246-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0248-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0248-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0249-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0249-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/server/0251-Improve-death-events.patch b/patches/server/0250-Improve-death-events.patch
similarity index 100%
rename from patches/server/0251-Improve-death-events.patch
rename to patches/server/0250-Improve-death-events.patch
diff --git a/patches/server/0252-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0251-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0252-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0251-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0253-Mob-Pathfinding-API.patch b/patches/server/0252-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0253-Mob-Pathfinding-API.patch
rename to patches/server/0252-Mob-Pathfinding-API.patch
diff --git a/patches/server/0254-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0253-Prevent-various-interactions-from-causing-chunk-load.patch
similarity index 100%
rename from patches/server/0254-Prevent-various-interactions-from-causing-chunk-load.patch
rename to patches/server/0253-Prevent-various-interactions-from-causing-chunk-load.patch
diff --git a/patches/server/0255-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0254-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0255-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0254-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0256-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0255-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0256-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0255-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0257-Honor-EntityAgeable.ageLock.patch b/patches/server/0256-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0257-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0256-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0258-Configurable-connection-throttle-kick-message.patch b/patches/server/0257-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from patches/server/0258-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0257-Configurable-connection-throttle-kick-message.patch
diff --git a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0260-PreSpawnerSpawnEvent.patch b/patches/server/0259-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0260-PreSpawnerSpawnEvent.patch
rename to patches/server/0259-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0261-Add-LivingEntity-getTargetEntity.patch b/patches/server/0260-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/0261-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0260-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0262-Add-sun-related-API.patch b/patches/server/0261-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0262-Add-sun-related-API.patch
rename to patches/server/0261-Add-sun-related-API.patch
diff --git a/patches/server/0263-Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/server/0262-Catch-JsonParseException-in-entity-and-block-entity-.patch
similarity index 100%
rename from patches/server/0263-Catch-JsonParseException-in-entity-and-block-entity-.patch
rename to patches/server/0262-Catch-JsonParseException-in-entity-and-block-entity-.patch
diff --git a/patches/server/0264-Turtle-API.patch b/patches/server/0263-Turtle-API.patch
similarity index 100%
rename from patches/server/0264-Turtle-API.patch
rename to patches/server/0263-Turtle-API.patch
diff --git a/patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0264-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0264-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0266-Add-more-Witch-API.patch b/patches/server/0265-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0266-Add-more-Witch-API.patch
rename to patches/server/0265-Add-more-Witch-API.patch
diff --git a/patches/server/0267-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0266-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0267-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0266-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0268-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0267-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from patches/server/0268-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0267-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/patches/server/0269-Reset-players-airTicks-on-respawn.patch b/patches/server/0268-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0269-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0268-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0270-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0269-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0270-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0269-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0271-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0270-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0271-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0270-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0272-Optimize-World-Time-Updates.patch b/patches/server/0271-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0272-Optimize-World-Time-Updates.patch
rename to patches/server/0271-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0273-Restore-custom-InventoryHolder-support.patch b/patches/server/0272-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0273-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0272-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0274-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0273-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0274-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0273-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0275-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0274-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0275-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0274-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/patches/server/0276-Make-the-default-permission-message-configurable.patch b/patches/server/0275-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/server/0276-Make-the-default-permission-message-configurable.patch
rename to patches/server/0275-Make-the-default-permission-message-configurable.patch
diff --git a/patches/server/0277-force-entity-dismount-during-teleportation.patch b/patches/server/0276-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from patches/server/0277-force-entity-dismount-during-teleportation.patch
rename to patches/server/0276-force-entity-dismount-during-teleportation.patch
diff --git a/patches/server/0278-Add-more-Zombie-API.patch b/patches/server/0277-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0278-Add-more-Zombie-API.patch
rename to patches/server/0277-Add-more-Zombie-API.patch
diff --git a/patches/server/0279-Book-Size-Limits.patch b/patches/server/0278-Book-Size-Limits.patch
similarity index 100%
rename from patches/server/0279-Book-Size-Limits.patch
rename to patches/server/0278-Book-Size-Limits.patch
diff --git a/patches/server/0280-Add-PlayerConnectionCloseEvent.patch b/patches/server/0279-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0280-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0279-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0281-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0280-Replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/server/0281-Replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0280-Replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/server/0282-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0281-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0282-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0281-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0283-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0282-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
similarity index 100%
rename from patches/server/0283-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
rename to patches/server/0282-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
diff --git a/patches/server/0284-BlockDestroyEvent.patch b/patches/server/0283-BlockDestroyEvent.patch
similarity index 94%
rename from patches/server/0284-BlockDestroyEvent.patch
rename to patches/server/0283-BlockDestroyEvent.patch
index 01c3230ad6..726ae64149 100644
--- a/patches/server/0284-BlockDestroyEvent.patch
+++ b/patches/server/0283-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index d050d72eb87a2d1b4723ab831dfef5e25c6a65b2..65b556d6ecae489c1c40b60d0eb432f4e1542e04 100644
+index be2220eff094c735bdb0c3e777bfbcfa4d44a578..30ceb1e2765217e284abcb786b2c1f7b60f9c3dc 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -25,6 +25,7 @@ import net.minecraft.core.registries.Registries;
@@ -22,7 +22,7 @@ index d050d72eb87a2d1b4723ab831dfef5e25c6a65b2..65b556d6ecae489c1c40b60d0eb432f4
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.FullChunkStatus;
  import net.minecraft.server.level.ServerLevel;
-@@ -576,9 +577,26 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -575,9 +576,26 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              return false;
          } else {
              FluidState fluid = this.getFluidState(pos);
diff --git a/patches/server/0285-Async-command-map-building.patch b/patches/server/0284-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0285-Async-command-map-building.patch
rename to patches/server/0284-Async-command-map-building.patch
diff --git a/patches/server/0286-Brigadier-Mojang-API.patch b/patches/server/0285-Brigadier-Mojang-API.patch
similarity index 100%
rename from patches/server/0286-Brigadier-Mojang-API.patch
rename to patches/server/0285-Brigadier-Mojang-API.patch
diff --git a/patches/server/0287-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0286-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from patches/server/0287-Improve-exact-choice-recipe-ingredients.patch
rename to patches/server/0286-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0288-Limit-Client-Sign-length-more.patch b/patches/server/0287-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from patches/server/0288-Limit-Client-Sign-length-more.patch
rename to patches/server/0287-Limit-Client-Sign-length-more.patch
diff --git a/patches/server/0289-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0288-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0289-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0288-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0290-Entity-getEntitySpawnReason.patch b/patches/server/0289-Entity-getEntitySpawnReason.patch
similarity index 98%
rename from patches/server/0290-Entity-getEntitySpawnReason.patch
rename to patches/server/0289-Entity-getEntitySpawnReason.patch
index 52481c50bc..086ad22ac4 100644
--- a/patches/server/0290-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0289-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 1beb2541cf799c7862685b5332ecbbfae1edc170..81b6ae88c37b0876dc24b1d85a6aa20e242eae8b 100644
+index 2879de5d5c6638d9b683e74da8dc3863738f2b65..893846b2b216ef67652285a59ba3c67bb2b4c78d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1209,6 +1209,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1215,6 +1215,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return true;
          }
          // Paper end - extra debug info
diff --git a/patches/server/0291-Fire-event-on-GS4-query.patch b/patches/server/0290-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0291-Fire-event-on-GS4-query.patch
rename to patches/server/0290-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0292-Add-PlayerPostRespawnEvent.patch b/patches/server/0291-Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0292-Add-PlayerPostRespawnEvent.patch
rename to patches/server/0291-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0293-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0292-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0293-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0292-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0294-Server-Tick-Events.patch b/patches/server/0293-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0294-Server-Tick-Events.patch
rename to patches/server/0293-Server-Tick-Events.patch
diff --git a/patches/server/0295-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0294-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0295-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0294-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0296-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0295-Optimize-Captured-BlockEntity-Lookup.patch
similarity index 90%
rename from patches/server/0296-Optimize-Captured-BlockEntity-Lookup.patch
rename to patches/server/0295-Optimize-Captured-BlockEntity-Lookup.patch
index 3f8b8e5203..ca3803242c 100644
--- a/patches/server/0296-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0295-Optimize-Captured-BlockEntity-Lookup.patch
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 65b556d6ecae489c1c40b60d0eb432f4e1542e04..eec2ca8306d42e4eafdf3ab0778bf2023739cb83 100644
+index 30ceb1e2765217e284abcb786b2c1f7b60f9c3dc..895c263570acf0f8ac2e8d680a6187bc189a205e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -908,9 +908,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -907,9 +907,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Nullable
      public BlockEntity getBlockEntity(BlockPos blockposition, boolean validate) {
diff --git a/patches/server/0297-Add-Heightmap-API.patch b/patches/server/0296-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0297-Add-Heightmap-API.patch
rename to patches/server/0296-Add-Heightmap-API.patch
diff --git a/patches/server/0298-Mob-Spawner-API-Enhancements.patch b/patches/server/0297-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0298-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0297-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0299-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0298-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from patches/server/0299-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0298-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0300-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0299-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0300-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0299-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0301-Implement-CraftBlockSoundGroup.patch b/patches/server/0300-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0301-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0300-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0302-Expose-the-internal-current-tick.patch b/patches/server/0301-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0302-Expose-the-internal-current-tick.patch
rename to patches/server/0301-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0303-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0302-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0303-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0302-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0304-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0303-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0304-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0303-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0305-Configurable-projectile-relative-velocity.patch b/patches/server/0304-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0305-Configurable-projectile-relative-velocity.patch
rename to patches/server/0304-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0306-offset-item-frame-ticking.patch b/patches/server/0305-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0306-offset-item-frame-ticking.patch
rename to patches/server/0305-offset-item-frame-ticking.patch
diff --git a/patches/server/0307-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0306-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0307-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0306-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0308-Dont-send-unnecessary-sign-update.patch b/patches/server/0307-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0308-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0307-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0309-Add-option-to-disable-pillager-patrols.patch b/patches/server/0308-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0309-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0308-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0310-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0309-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0310-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0309-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0311-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0310-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0311-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0310-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0312-Duplicate-UUID-Resolve-Option.patch b/patches/server/0311-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0312-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0311-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0313-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0312-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0313-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0312-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0314-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0313-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0314-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0313-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0315-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0314-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0315-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0314-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0316-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0315-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0316-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0315-Optimise-EntityGetter-getPlayerByUUID.patch
index dac2a3c736..631463b4c8 100644
--- a/patches/server/0316-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0315-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 81b6ae88c37b0876dc24b1d85a6aa20e242eae8b..705a05fb0c59160d728336461f564dd39c9fb4ac 100644
+index 893846b2b216ef67652285a59ba3c67bb2b4c78d..9ce6c66213deaac1e57986de980176e58b222368 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/0317-Fix-items-not-falling-correctly.patch b/patches/server/0316-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0317-Fix-items-not-falling-correctly.patch
rename to patches/server/0316-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0318-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0317-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0318-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0317-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0319-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0318-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0319-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0318-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0320-Alternative-item-despawn-rate.patch b/patches/server/0319-Alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0320-Alternative-item-despawn-rate.patch
rename to patches/server/0319-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0321-Tracking-Range-Improvements.patch b/patches/server/0320-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0321-Tracking-Range-Improvements.patch
rename to patches/server/0320-Tracking-Range-Improvements.patch
diff --git a/patches/server/0322-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0321-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0322-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0321-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0323-Improve-Block-breakNaturally-API.patch b/patches/server/0322-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0323-Improve-Block-breakNaturally-API.patch
rename to patches/server/0322-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0324-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0323-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0324-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0323-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0325-Add-debug-for-sync-chunk-loads.patch b/patches/server/0324-Add-debug-for-sync-chunk-loads.patch
similarity index 98%
rename from patches/server/0325-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0324-Add-debug-for-sync-chunk-loads.patch
index 0dd9e9da94..a4a3835b0e 100644
--- a/patches/server/0325-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0324-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 705a05fb0c59160d728336461f564dd39c9fb4ac..fb43ccbe51510b1a2c599ecfc15d21ec29ff7c70 100644
+index 9ce6c66213deaac1e57986de980176e58b222368..8bc20746d729d5be06be30b23bb196bdc6fcd628 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -421,6 +421,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -427,6 +427,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
      }
  
diff --git a/patches/server/0326-Improve-java-version-check.patch b/patches/server/0325-Improve-java-version-check.patch
similarity index 100%
rename from patches/server/0326-Improve-java-version-check.patch
rename to patches/server/0325-Improve-java-version-check.patch
diff --git a/patches/server/0327-Add-ThrownEggHatchEvent.patch b/patches/server/0326-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0327-Add-ThrownEggHatchEvent.patch
rename to patches/server/0326-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0328-Entity-Jump-API.patch b/patches/server/0327-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0328-Entity-Jump-API.patch
rename to patches/server/0327-Entity-Jump-API.patch
diff --git a/patches/server/0329-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0328-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0329-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0328-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0330-Make-the-GUI-graph-fancier.patch b/patches/server/0329-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0330-Make-the-GUI-graph-fancier.patch
rename to patches/server/0329-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0331-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0330-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0331-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0330-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0332-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0331-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0332-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0331-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0333-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0332-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0333-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0332-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0334-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0333-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0334-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0333-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0335-Optimise-Chunk-getFluid.patch b/patches/server/0334-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0335-Optimise-Chunk-getFluid.patch
rename to patches/server/0334-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0336-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0335-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0336-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0335-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0337-Add-tick-times-API-and-mspt-command.patch b/patches/server/0336-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from patches/server/0337-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0336-Add-tick-times-API-and-mspt-command.patch
diff --git a/patches/server/0338-Expose-MinecraftServer-isRunning.patch b/patches/server/0337-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0338-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0337-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0339-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0338-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0339-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0338-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0340-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0339-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0340-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0339-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0341-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0340-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0341-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0340-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0342-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0341-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0342-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0341-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0343-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0342-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 93%
rename from patches/server/0343-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0342-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 23143dda89..e2cba50e34 100644
--- a/patches/server/0343-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0342-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 fb43ccbe51510b1a2c599ecfc15d21ec29ff7c70..21ffa93f0e92f408dd30f16bb0ca0e22b1c27198 100644
+index 8bc20746d729d5be06be30b23bb196bdc6fcd628..a17f6ee94a686390b8dd3bb676f11986ec0dc8ac 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2181,7 +2181,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2187,7 +2187,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 fb43ccbe51510b1a2c599ecfc15d21ec29ff7c70..21ffa93f0e92f408dd30f16bb0ca0e22
              if (entity instanceof ServerPlayer entityplayer) {
                  ServerLevel.this.players.add(entityplayer);
                  ServerLevel.this.updateSleepingPlayerList();
-@@ -2211,6 +2211,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2217,6 +2217,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/0344-Don-t-tick-dead-players.patch b/patches/server/0343-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0344-Don-t-tick-dead-players.patch
rename to patches/server/0343-Don-t-tick-dead-players.patch
diff --git a/patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0344-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from patches/server/0345-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0344-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0346-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0345-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0346-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0345-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0347-Optimize-Pathfinding.patch b/patches/server/0346-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0347-Optimize-Pathfinding.patch
rename to patches/server/0346-Optimize-Pathfinding.patch
diff --git a/patches/server/0348-Reduce-Either-Optional-allocation.patch b/patches/server/0347-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0348-Reduce-Either-Optional-allocation.patch
rename to patches/server/0347-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0349-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0348-Reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/server/0349-Reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/0348-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0350-Prevent-opening-inventories-when-frozen.patch b/patches/server/0349-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0350-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0349-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0351-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0350-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0351-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0350-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0352-Implement-Player-Client-Options-API.patch b/patches/server/0351-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0352-Implement-Player-Client-Options-API.patch
rename to patches/server/0351-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0353-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0352-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0353-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0352-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0354-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0353-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
similarity index 100%
rename from patches/server/0354-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
rename to patches/server/0353-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
diff --git a/patches/server/0355-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0354-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0355-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0354-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0356-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0355-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0356-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0355-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0357-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0356-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0357-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0356-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0358-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0357-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0358-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0357-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0359-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0358-Fix-item-duplication-and-teleport-issues.patch
similarity index 100%
rename from patches/server/0359-Fix-item-duplication-and-teleport-issues.patch
rename to patches/server/0358-Fix-item-duplication-and-teleport-issues.patch
diff --git a/patches/server/0360-Villager-Restocks-API.patch b/patches/server/0359-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0360-Villager-Restocks-API.patch
rename to patches/server/0359-Villager-Restocks-API.patch
diff --git a/patches/server/0361-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0360-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from patches/server/0361-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0360-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0362-Expose-game-version.patch b/patches/server/0361-Expose-game-version.patch
similarity index 100%
rename from patches/server/0362-Expose-game-version.patch
rename to patches/server/0361-Expose-game-version.patch
diff --git a/patches/server/0363-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0362-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0363-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0362-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0364-misc-debugging-dumps.patch b/patches/server/0363-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0364-misc-debugging-dumps.patch
rename to patches/server/0363-misc-debugging-dumps.patch
diff --git a/patches/server/0365-Prevent-teleporting-dead-entities.patch b/patches/server/0364-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from patches/server/0365-Prevent-teleporting-dead-entities.patch
rename to patches/server/0364-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0366-Implement-Mob-Goal-API.patch b/patches/server/0365-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0366-Implement-Mob-Goal-API.patch
rename to patches/server/0365-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0367-Add-villager-reputation-API.patch b/patches/server/0366-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0367-Add-villager-reputation-API.patch
rename to patches/server/0366-Add-villager-reputation-API.patch
diff --git a/patches/server/0368-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0367-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0368-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0367-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0369-ExperienceOrbMergeEvent.patch b/patches/server/0368-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0369-ExperienceOrbMergeEvent.patch
rename to patches/server/0368-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0370-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0369-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0370-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0369-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0371-Potential-bed-API.patch b/patches/server/0370-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0371-Potential-bed-API.patch
rename to patches/server/0370-Potential-bed-API.patch
diff --git a/patches/server/0372-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0371-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0372-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0371-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0373-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0372-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0373-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0372-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0374-Ensure-safe-gateway-teleport.patch b/patches/server/0373-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0374-Ensure-safe-gateway-teleport.patch
rename to patches/server/0373-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0375-Add-option-for-console-having-all-permissions.patch b/patches/server/0374-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0375-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0374-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0376-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0375-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0376-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0375-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0377-Maps-shouldn-t-load-chunks.patch b/patches/server/0376-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0377-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0376-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0378-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0377-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0378-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0377-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0379-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0378-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0379-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0378-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0380-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0379-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0380-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0379-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0381-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0380-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0381-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0380-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0382-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0381-Prevent-position-desync-causing-tp-exploit.patch
similarity index 100%
rename from patches/server/0382-Prevent-position-desync-causing-tp-exploit.patch
rename to patches/server/0381-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0383-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0382-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0383-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0382-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0384-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0383-Add-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0384-Add-PlayerRecipeBookClickEvent.patch
rename to patches/server/0383-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0385-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0384-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0385-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0384-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0386-Add-permission-for-command-blocks.patch b/patches/server/0385-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0386-Add-permission-for-command-blocks.patch
rename to patches/server/0385-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0387-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0386-Ensure-Entity-position-and-AABB-are-never-invalid.patch
similarity index 100%
rename from patches/server/0387-Ensure-Entity-position-and-AABB-are-never-invalid.patch
rename to patches/server/0386-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0388-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0387-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from patches/server/0388-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0387-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/patches/server/0389-Paper-dumpitem-command.patch b/patches/server/0388-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0389-Paper-dumpitem-command.patch
rename to patches/server/0388-Paper-dumpitem-command.patch
diff --git a/patches/server/0390-Improve-Legacy-Component-serialization-size.patch b/patches/server/0389-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0390-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0389-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0391-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0390-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0391-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0390-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0392-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0391-Add-BlockStateMeta-clearBlockState.patch
similarity index 100%
rename from patches/server/0392-Add-BlockStateMeta-clearBlockState.patch
rename to patches/server/0391-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0393-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0392-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0393-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0392-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0394-Do-not-accept-invalid-client-settings.patch b/patches/server/0393-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0394-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0393-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0395-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0394-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0395-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0394-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0396-Add-entity-liquid-API.patch b/patches/server/0395-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0396-Add-entity-liquid-API.patch
rename to patches/server/0395-Add-entity-liquid-API.patch
diff --git a/patches/server/0397-Add-PrepareResultEvent.patch b/patches/server/0396-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0397-Add-PrepareResultEvent.patch
rename to patches/server/0396-Add-PrepareResultEvent.patch
diff --git a/patches/server/0398-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0397-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0398-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0397-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0399-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0398-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0399-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0398-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0400-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0399-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0400-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0399-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0401-Fix-SPIGOT-5989.patch b/patches/server/0400-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0401-Fix-SPIGOT-5989.patch
rename to patches/server/0400-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0402-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0401-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0402-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0401-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0403-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0402-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0403-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0402-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0404-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0403-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0404-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0403-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0405-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0404-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0405-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0404-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0406-Fix-some-rails-connecting-improperly.patch b/patches/server/0405-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0406-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0405-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0407-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0406-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0407-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0406-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0408-Brand-support.patch b/patches/server/0407-Brand-support.patch
similarity index 100%
rename from patches/server/0408-Brand-support.patch
rename to patches/server/0407-Brand-support.patch
diff --git a/patches/server/0409-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0408-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0409-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0408-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0410-Don-t-require-FACING-data.patch b/patches/server/0409-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0410-Don-t-require-FACING-data.patch
rename to patches/server/0409-Don-t-require-FACING-data.patch
diff --git a/patches/server/0411-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0410-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 94%
rename from patches/server/0411-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0410-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index ac97c84e6b..1684f104f9 100644
--- a/patches/server/0411-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0410-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 21ffa93f0e92f408dd30f16bb0ca0e22b1c27198..49bec03d5be3020b451092d8c36aae8c78085174 100644
+index a17f6ee94a686390b8dd3bb676f11986ec0dc8ac..4efb57b2b252a2bed50685162cc96575f63a9d1d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1668,7 +1668,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1674,7 +1674,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
          float f1 = this.levelData.getSpawnAngle();
  
          if (!blockposition1.equals(pos) || f1 != angle) {
diff --git a/patches/server/0412-Add-moon-phase-API.patch b/patches/server/0411-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0412-Add-moon-phase-API.patch
rename to patches/server/0411-Add-moon-phase-API.patch
diff --git a/patches/server/0413-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0412-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0413-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0412-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0414-Prevent-headless-pistons-from-being-created.patch b/patches/server/0413-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0414-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0413-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0415-Add-BellRingEvent.patch b/patches/server/0414-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0415-Add-BellRingEvent.patch
rename to patches/server/0414-Add-BellRingEvent.patch
diff --git a/patches/server/0416-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0415-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0416-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0415-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0417-Buffer-joins-to-world.patch b/patches/server/0416-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0417-Buffer-joins-to-world.patch
rename to patches/server/0416-Buffer-joins-to-world.patch
diff --git a/patches/server/0418-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0417-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0418-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0417-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0419-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0418-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0419-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0418-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0420-Add-more-Evoker-API.patch b/patches/server/0419-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0420-Add-more-Evoker-API.patch
rename to patches/server/0419-Add-more-Evoker-API.patch
diff --git a/patches/server/0421-Add-methods-to-get-translation-keys.patch b/patches/server/0420-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0421-Add-methods-to-get-translation-keys.patch
rename to patches/server/0420-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0422-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0421-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0422-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0421-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0423-Cache-block-data-strings.patch b/patches/server/0422-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0423-Cache-block-data-strings.patch
rename to patches/server/0422-Cache-block-data-strings.patch
diff --git a/patches/server/0424-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0423-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0424-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0423-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0425-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0424-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0425-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0424-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0426-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0425-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0426-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0425-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0427-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0426-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 94%
rename from patches/server/0427-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0426-Extend-block-drop-capture-to-capture-all-items-added.patch
index 303b0bae84..7d7f14f1ae 100644
--- a/patches/server/0427-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0426-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 49bec03d5be3020b451092d8c36aae8c78085174..7b129a3c34d82a43899179f2ab3b3fc4c283a989 100644
+index 4efb57b2b252a2bed50685162cc96575f63a9d1d..2506673e2e778b55f1cd9e2cd987d116aed450fb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1230,6 +1230,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1236,6 +1236,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/0428-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0427-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0428-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0427-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0429-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0428-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0429-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0428-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0430-Entity-isTicking.patch b/patches/server/0429-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0430-Entity-isTicking.patch
rename to patches/server/0429-Entity-isTicking.patch
diff --git a/patches/server/0431-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0430-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0431-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0430-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0432-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0431-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0432-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0431-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0433-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0432-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0433-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0432-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0434-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0433-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0434-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0433-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0435-Optimise-getType-calls.patch b/patches/server/0434-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0435-Optimise-getType-calls.patch
rename to patches/server/0434-Optimise-getType-calls.patch
diff --git a/patches/server/0436-Villager-resetOffers.patch b/patches/server/0435-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0436-Villager-resetOffers.patch
rename to patches/server/0435-Villager-resetOffers.patch
diff --git a/patches/server/0437-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0436-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0437-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0436-Retain-block-place-order-when-capturing-blockstates.patch
index 5df78528b6..9de684873f 100644
--- a/patches/server/0437-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0436-Retain-block-place-order-when-capturing-blockstates.patch
@@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling
 cases where a captured entry is overriden) - but for now this will do.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index eec2ca8306d42e4eafdf3ab0778bf2023739cb83..411841f2d8013ae9142b96c251aabd54d16c5b73 100644
+index 895c263570acf0f8ac2e8d680a6187bc189a205e..88b09635590958b4edf992490dd30616c35d4d6d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -151,7 +151,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0438-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0437-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0438-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0437-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0439-Fix-bell-block-entity-memory-leak.patch b/patches/server/0438-Fix-bell-block-entity-memory-leak.patch
similarity index 100%
rename from patches/server/0439-Fix-bell-block-entity-memory-leak.patch
rename to patches/server/0438-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0440-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0439-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0440-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0439-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0441-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0440-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0441-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0440-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0442-Add-ignore-discounts-API.patch b/patches/server/0441-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0442-Add-ignore-discounts-API.patch
rename to patches/server/0441-Add-ignore-discounts-API.patch
diff --git a/patches/server/0443-Toggle-for-removing-existing-dragon.patch b/patches/server/0442-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0443-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0442-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0444-Fix-client-lag-on-advancement-loading.patch b/patches/server/0443-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0444-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0443-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0445-Item-no-age-no-player-pickup.patch b/patches/server/0444-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0445-Item-no-age-no-player-pickup.patch
rename to patches/server/0444-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0446-Beacon-API-custom-effect-ranges.patch b/patches/server/0445-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0446-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0445-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0447-Add-API-for-quit-reason.patch b/patches/server/0446-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/server/0447-Add-API-for-quit-reason.patch
rename to patches/server/0446-Add-API-for-quit-reason.patch
diff --git a/patches/server/0448-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0447-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0448-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0447-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0449-Expose-world-spawn-angle.patch b/patches/server/0448-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0449-Expose-world-spawn-angle.patch
rename to patches/server/0448-Expose-world-spawn-angle.patch
diff --git a/patches/server/0450-Add-Destroy-Speed-API.patch b/patches/server/0449-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0450-Add-Destroy-Speed-API.patch
rename to patches/server/0449-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0451-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0450-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0451-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0450-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0452-Add-LivingEntity-clearActiveItem.patch b/patches/server/0451-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0452-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0451-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0453-Add-PlayerItemCooldownEvent.patch b/patches/server/0452-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0453-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0452-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0454-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0453-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0454-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0453-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0455-More-lightning-API.patch b/patches/server/0454-More-lightning-API.patch
similarity index 100%
rename from patches/server/0455-More-lightning-API.patch
rename to patches/server/0454-More-lightning-API.patch
diff --git a/patches/server/0456-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0455-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0456-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0455-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0457-Add-missing-default-perms-for-commands.patch b/patches/server/0456-Add-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0457-Add-missing-default-perms-for-commands.patch
rename to patches/server/0456-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0458-Add-PlayerShearBlockEvent.patch b/patches/server/0457-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0458-Add-PlayerShearBlockEvent.patch
rename to patches/server/0457-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0459-Limit-recipe-packets.patch b/patches/server/0458-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0459-Limit-recipe-packets.patch
rename to patches/server/0458-Limit-recipe-packets.patch
diff --git a/patches/server/0460-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0459-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0460-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0459-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0461-Player-Chunk-Load-Unload-Events.patch b/patches/server/0460-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0461-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0460-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0462-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0461-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0462-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0461-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0463-Expose-LivingEntity-hurt-direction.patch b/patches/server/0462-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0463-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0462-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0464-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0463-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0464-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0463-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0465-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0464-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
similarity index 100%
rename from patches/server/0465-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
rename to patches/server/0464-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0466-Add-TargetHitEvent.patch b/patches/server/0465-Add-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0466-Add-TargetHitEvent.patch
rename to patches/server/0465-Add-TargetHitEvent.patch
diff --git a/patches/server/0467-MC-4-Fix-item-position-desync.patch b/patches/server/0466-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0467-MC-4-Fix-item-position-desync.patch
rename to patches/server/0466-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0468-Additional-Block-Material-API.patch b/patches/server/0467-Additional-Block-Material-API.patch
similarity index 100%
rename from patches/server/0468-Additional-Block-Material-API.patch
rename to patches/server/0467-Additional-Block-Material-API.patch
diff --git a/patches/server/0469-Fix-harming-potion-dupe.patch b/patches/server/0468-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0469-Fix-harming-potion-dupe.patch
rename to patches/server/0468-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0470-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0469-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/server/0470-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/server/0469-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0471-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0470-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0471-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0470-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0472-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0471-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0472-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0471-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0473-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0472-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0473-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0472-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0474-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0473-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0474-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0473-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0475-Zombie-API-breaking-doors.patch b/patches/server/0474-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0475-Zombie-API-breaking-doors.patch
rename to patches/server/0474-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0476-Fix-nerfed-slime-when-splitting.patch b/patches/server/0475-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0476-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0475-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0477-Add-EntityLoadCrossbowEvent.patch b/patches/server/0476-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0477-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0476-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0478-Add-WorldGameRuleChangeEvent.patch b/patches/server/0477-Add-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0478-Add-WorldGameRuleChangeEvent.patch
rename to patches/server/0477-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0479-Add-ServerResourcesReloadedEvent.patch b/patches/server/0478-Add-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0479-Add-ServerResourcesReloadedEvent.patch
rename to patches/server/0478-Add-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0480-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0479-Add-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0480-Add-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0479-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0481-Add-BlockFailedDispenseEvent.patch b/patches/server/0480-Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0481-Add-BlockFailedDispenseEvent.patch
rename to patches/server/0480-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0482-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0481-Add-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0482-Add-PlayerLecternPageChangeEvent.patch
rename to patches/server/0481-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0483-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0482-Add-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0483-Add-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0482-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0484-Configurable-door-breaking-difficulty.patch b/patches/server/0483-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0484-Configurable-door-breaking-difficulty.patch
rename to patches/server/0483-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0485-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0484-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0485-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0484-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0486-Remove-stale-POIs.patch b/patches/server/0485-Remove-stale-POIs.patch
similarity index 87%
rename from patches/server/0486-Remove-stale-POIs.patch
rename to patches/server/0485-Remove-stale-POIs.patch
index 17912adc20..4223edeb9d 100644
--- a/patches/server/0486-Remove-stale-POIs.patch
+++ b/patches/server/0485-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 7b129a3c34d82a43899179f2ab3b3fc4c283a989..1dd53726a478817c7d7f7d5a2fb90acee434be98 100644
+index 2506673e2e778b55f1cd9e2cd987d116aed450fb..39f9a18ba04f265eb10e154042a90fd56adb4f0d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1743,6 +1743,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1749,6 +1749,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
              });
              optional1.ifPresent((holder) -> {
                  this.getServer().execute(() -> {
diff --git a/patches/server/0487-Fix-villager-boat-exploit.patch b/patches/server/0486-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0487-Fix-villager-boat-exploit.patch
rename to patches/server/0486-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0488-Add-sendOpLevel-API.patch b/patches/server/0487-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0488-Add-sendOpLevel-API.patch
rename to patches/server/0487-Add-sendOpLevel-API.patch
diff --git a/patches/server/0489-TODO-Registry-Modification-API.patch b/patches/server/0488-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0489-TODO-Registry-Modification-API.patch
rename to patches/server/0488-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0490-Add-StructuresLocateEvent.patch b/patches/server/0489-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0490-Add-StructuresLocateEvent.patch
rename to patches/server/0489-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0491-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0490-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0491-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0490-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0492-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0491-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0492-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0491-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0493-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0492-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0493-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0492-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0494-Make-schedule-command-per-world.patch b/patches/server/0493-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0494-Make-schedule-command-per-world.patch
rename to patches/server/0493-Make-schedule-command-per-world.patch
diff --git a/patches/server/0495-Configurable-max-leash-distance.patch b/patches/server/0494-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0495-Configurable-max-leash-distance.patch
rename to patches/server/0494-Configurable-max-leash-distance.patch
diff --git a/patches/server/0496-Add-BlockPreDispenseEvent.patch b/patches/server/0495-Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0496-Add-BlockPreDispenseEvent.patch
rename to patches/server/0495-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0497-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0496-Add-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0497-Add-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0496-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0498-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0497-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0498-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0497-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0499-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0498-Add-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0499-Add-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0498-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0500-Expand-EntityUnleashEvent.patch b/patches/server/0499-Expand-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0500-Expand-EntityUnleashEvent.patch
rename to patches/server/0499-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0501-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0500-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0501-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0500-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0502-Add-DragonEggFormEvent.patch b/patches/server/0501-Add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0502-Add-DragonEggFormEvent.patch
rename to patches/server/0501-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0503-Add-EntityMoveEvent.patch b/patches/server/0502-Add-EntityMoveEvent.patch
similarity index 97%
rename from patches/server/0503-Add-EntityMoveEvent.patch
rename to patches/server/0502-Add-EntityMoveEvent.patch
index d8b995bdda..fbfb887c06 100644
--- a/patches/server/0503-Add-EntityMoveEvent.patch
+++ b/patches/server/0502-Add-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index b083298d2bcf0d4c6213d6ac8645b8c084cfc6de..e9ea8ad5689c0e6edd2e7335ab9932b3
              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 1dd53726a478817c7d7f7d5a2fb90acee434be98..7add6c4a1b8ff4f1e607f1d0e7cb47a0cb750c8f 100644
+index 39f9a18ba04f265eb10e154042a90fd56adb4f0d..89e02274d3c8587a3e3eb58e2bbca0341507d173 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/0504-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0503-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 82%
rename from patches/server/0504-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0503-added-option-to-disable-pathfinding-updates-on-block.patch
index 4852591c8a..ab98297dc6 100644
--- a/patches/server/0504-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0503-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 7add6c4a1b8ff4f1e607f1d0e7cb47a0cb750c8f..5eff010cd4169ba71edf6efe47f53edf9287ea8f 100644
+index 89e02274d3c8587a3e3eb58e2bbca0341507d173..d188c34aecf06293f3a3cb50256b51fcdf9ff97f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1375,6 +1375,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1381,6 +1381,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          this.getChunkSource().blockChanged(pos);
@@ -16,7 +16,7 @@ index 7add6c4a1b8ff4f1e607f1d0e7cb47a0cb750c8f..5eff010cd4169ba71edf6efe47f53edf
          this.pathTypesByPosCache.invalidate(pos);
          VoxelShape voxelshape = oldState.getCollisionShape(this, pos);
          VoxelShape voxelshape1 = newState.getCollisionShape(this, pos);
-@@ -1417,6 +1418,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1423,6 +1424,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
          }
diff --git a/patches/server/0505-Inline-shift-direction-fields.patch b/patches/server/0504-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0505-Inline-shift-direction-fields.patch
rename to patches/server/0504-Inline-shift-direction-fields.patch
diff --git a/patches/server/0506-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0505-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0506-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0505-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0507-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0506-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0507-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0506-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0508-living-entity-allow-attribute-registration.patch b/patches/server/0507-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0508-living-entity-allow-attribute-registration.patch
rename to patches/server/0507-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0509-fix-dead-slime-setSize-invincibility.patch b/patches/server/0508-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0509-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0508-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0510-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0509-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0510-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0509-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0511-Expose-Tracked-Players.patch b/patches/server/0510-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0511-Expose-Tracked-Players.patch
rename to patches/server/0510-Expose-Tracked-Players.patch
diff --git a/patches/server/0512-Improve-ServerGUI.patch b/patches/server/0511-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0512-Improve-ServerGUI.patch
rename to patches/server/0511-Improve-ServerGUI.patch
diff --git a/patches/server/0513-fix-converting-txt-to-json-file.patch b/patches/server/0512-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0513-fix-converting-txt-to-json-file.patch
rename to patches/server/0512-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0514-Add-worldborder-events.patch b/patches/server/0513-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0514-Add-worldborder-events.patch
rename to patches/server/0513-Add-worldborder-events.patch
diff --git a/patches/server/0515-Add-PlayerNameEntityEvent.patch b/patches/server/0514-Add-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0515-Add-PlayerNameEntityEvent.patch
rename to patches/server/0514-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0516-Add-recipe-to-cook-events.patch b/patches/server/0515-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0516-Add-recipe-to-cook-events.patch
rename to patches/server/0515-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0517-Add-Block-isValidTool.patch b/patches/server/0516-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0517-Add-Block-isValidTool.patch
rename to patches/server/0516-Add-Block-isValidTool.patch
diff --git a/patches/server/0518-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0517-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0518-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0517-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0519-Expand-world-key-API.patch b/patches/server/0518-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0519-Expand-world-key-API.patch
rename to patches/server/0518-Expand-world-key-API.patch
diff --git a/patches/server/0520-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0519-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0520-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0519-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0521-Item-Rarity-API.patch b/patches/server/0520-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0521-Item-Rarity-API.patch
rename to patches/server/0520-Item-Rarity-API.patch
diff --git a/patches/server/0522-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0521-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0522-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0521-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0523-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0522-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0523-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0522-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0524-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0523-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0524-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0523-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0525-Expose-protocol-version.patch b/patches/server/0524-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0525-Expose-protocol-version.patch
rename to patches/server/0524-Expose-protocol-version.patch
diff --git a/patches/server/0526-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0525-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0526-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0525-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0527-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0526-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0527-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0526-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0528-Add-bypass-host-check.patch b/patches/server/0527-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0528-Add-bypass-host-check.patch
rename to patches/server/0527-Add-bypass-host-check.patch
diff --git a/patches/server/0529-Set-area-affect-cloud-rotation.patch b/patches/server/0528-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0529-Set-area-affect-cloud-rotation.patch
rename to patches/server/0528-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0530-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0529-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0530-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0529-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0531-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0530-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0531-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0530-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0532-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0531-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0532-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0531-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0533-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0532-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0533-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0532-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0534-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0533-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0534-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0533-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0535-Add-PlayerDeepSleepEvent.patch b/patches/server/0534-Add-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0535-Add-PlayerDeepSleepEvent.patch
rename to patches/server/0534-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0536-More-World-API.patch b/patches/server/0535-More-World-API.patch
similarity index 100%
rename from patches/server/0536-More-World-API.patch
rename to patches/server/0535-More-World-API.patch
diff --git a/patches/server/0537-Add-PlayerBedFailEnterEvent.patch b/patches/server/0536-Add-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0537-Add-PlayerBedFailEnterEvent.patch
rename to patches/server/0536-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0538-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0537-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0538-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0537-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0539-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0538-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
similarity index 100%
rename from patches/server/0539-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
rename to patches/server/0538-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0540-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0539-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0540-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0539-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0541-Add-Channel-initialization-listeners.patch b/patches/server/0540-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0541-Add-Channel-initialization-listeners.patch
rename to patches/server/0540-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0542-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0541-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0542-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0541-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0543-Add-more-WanderingTrader-API.patch b/patches/server/0542-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0543-Add-more-WanderingTrader-API.patch
rename to patches/server/0542-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0544-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0543-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0544-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0543-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0545-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0544-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0545-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0544-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0546-Add-HiddenPotionEffect-API.patch b/patches/server/0545-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/0546-Add-HiddenPotionEffect-API.patch
rename to patches/server/0545-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0547-Inventory-close.patch b/patches/server/0546-Inventory-close.patch
similarity index 100%
rename from patches/server/0547-Inventory-close.patch
rename to patches/server/0546-Inventory-close.patch
diff --git a/patches/server/0548-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0547-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0548-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0547-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0549-Add-basic-Datapack-API.patch b/patches/server/0548-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0549-Add-basic-Datapack-API.patch
rename to patches/server/0548-Add-basic-Datapack-API.patch
diff --git a/patches/server/0550-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0549-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0550-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0549-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0551-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0550-Expand-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0551-Expand-PlayerGameModeChangeEvent.patch
rename to patches/server/0550-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0552-ItemStack-repair-check-API.patch b/patches/server/0551-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0552-ItemStack-repair-check-API.patch
rename to patches/server/0551-ItemStack-repair-check-API.patch
diff --git a/patches/server/0553-More-Enchantment-API.patch b/patches/server/0552-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0553-More-Enchantment-API.patch
rename to patches/server/0552-More-Enchantment-API.patch
diff --git a/patches/server/0554-Move-range-check-for-block-placing-up.patch b/patches/server/0553-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0554-Move-range-check-for-block-placing-up.patch
rename to patches/server/0553-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0555-Add-Mob-lookAt-API.patch b/patches/server/0554-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0555-Add-Mob-lookAt-API.patch
rename to patches/server/0554-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0556-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0555-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/0556-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/0555-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0557-Add-Unix-domain-socket-support.patch b/patches/server/0556-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0557-Add-Unix-domain-socket-support.patch
rename to patches/server/0556-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0558-Add-EntityInsideBlockEvent.patch b/patches/server/0557-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0558-Add-EntityInsideBlockEvent.patch
rename to patches/server/0557-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0559-Attributes-API-for-item-defaults.patch b/patches/server/0558-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0559-Attributes-API-for-item-defaults.patch
rename to patches/server/0558-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0560-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0559-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 96%
rename from patches/server/0560-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0559-Add-cause-to-Weather-ThunderChangeEvents.patch
index 1bd3b1c21e..ae6c28be86 100644
--- a/patches/server/0560-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0559-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 5eff010cd4169ba71edf6efe47f53edf9287ea8f..890e5f31d44c7a02f2591e7847378b981a96a363 100644
+index d188c34aecf06293f3a3cb50256b51fcdf9ff97f..2236fae8147eea1c315c21d90fc864405bfa602d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -440,8 +440,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -446,8 +446,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 5eff010cd4169ba71edf6efe47f53edf9287ea8f..890e5f31d44c7a02f2591e7847378b98
      }
  
      @Override
-@@ -874,8 +874,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -880,8 +880,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 5eff010cd4169ba71edf6efe47f53edf9287ea8f..890e5f31d44c7a02f2591e7847378b98
              }
  
              this.oThunderLevel = this.thunderLevel;
-@@ -942,14 +942,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -948,14 +948,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @VisibleForTesting
      public void resetWeatherCycle() {
          // CraftBukkit start
diff --git a/patches/server/0561-More-Lidded-Block-API.patch b/patches/server/0560-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0561-More-Lidded-Block-API.patch
rename to patches/server/0560-More-Lidded-Block-API.patch
diff --git a/patches/server/0562-Limit-item-frame-cursors-on-maps.patch b/patches/server/0561-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0562-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0561-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0563-Add-PlayerKickEvent-causes.patch b/patches/server/0562-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0563-Add-PlayerKickEvent-causes.patch
rename to patches/server/0562-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0564-Add-PufferFishStateChangeEvent.patch b/patches/server/0563-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0564-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0563-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0565-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0564-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0565-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0564-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0566-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0565-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0566-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0565-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0567-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0566-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0567-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0566-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0568-Add-BellRevealRaiderEvent.patch b/patches/server/0567-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0568-Add-BellRevealRaiderEvent.patch
rename to patches/server/0567-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0569-Fix-invulnerable-end-crystals.patch b/patches/server/0568-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0569-Fix-invulnerable-end-crystals.patch
rename to patches/server/0568-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0570-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0569-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0570-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0569-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0571-Fix-dangerous-end-portal-logic.patch b/patches/server/0570-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0571-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0570-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0572-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0571-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0572-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0571-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0573-Line-Of-Sight-Changes.patch b/patches/server/0572-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0573-Line-Of-Sight-Changes.patch
rename to patches/server/0572-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0574-add-per-world-spawn-limits.patch b/patches/server/0573-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0574-add-per-world-spawn-limits.patch
rename to patches/server/0573-add-per-world-spawn-limits.patch
diff --git a/patches/server/0575-Fix-potions-splash-events.patch b/patches/server/0574-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0575-Fix-potions-splash-events.patch
rename to patches/server/0574-Fix-potions-splash-events.patch
diff --git a/patches/server/0576-Add-more-LimitedRegion-API.patch b/patches/server/0575-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0576-Add-more-LimitedRegion-API.patch
rename to patches/server/0575-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0577-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0576-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0577-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0576-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0578-Missing-Entity-API.patch b/patches/server/0577-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0578-Missing-Entity-API.patch
rename to patches/server/0577-Missing-Entity-API.patch
diff --git a/patches/server/0579-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0578-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0579-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0578-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0580-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0579-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0580-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0579-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0581-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0580-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 94%
rename from patches/server/0581-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0580-Use-getChunkIfLoadedImmediately-in-places.patch
index 9b20042b10..452b5c4a64 100644
--- a/patches/server/0581-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0580-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 890e5f31d44c7a02f2591e7847378b981a96a363..e0669492427faa3f53bce10b7d933969a3ecf9d8 100644
+index 2236fae8147eea1c315c21d90fc864405bfa602d..da3821010598f9c67d6a21fbfc6b559280203100 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 {
@@ -21,7 +21,7 @@ index 890e5f31d44c7a02f2591e7847378b981a96a363..e0669492427faa3f53bce10b7d933969
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 411841f2d8013ae9142b96c251aabd54d16c5b73..efda6fbe8d02477cf8251c68683ae8bf7c5f1667 100644
+index 88b09635590958b4edf992490dd30616c35d4d6d..fd5dc0e09c89f4e21fde5d06b0fc0d4d45e52280 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -179,6 +179,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0582-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0581-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0582-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0581-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0583-Add-PlayerArmSwingEvent.patch b/patches/server/0582-Add-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0583-Add-PlayerArmSwingEvent.patch
rename to patches/server/0582-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0584-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0583-Fix-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0584-Fix-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0583-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0585-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0584-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0585-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0584-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0586-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0585-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0586-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0585-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0587-Add-missing-forceDrop-toggles.patch b/patches/server/0586-Add-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0587-Add-missing-forceDrop-toggles.patch
rename to patches/server/0586-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0588-Stinger-API.patch b/patches/server/0587-Stinger-API.patch
similarity index 100%
rename from patches/server/0588-Stinger-API.patch
rename to patches/server/0587-Stinger-API.patch
diff --git a/patches/server/0589-Add-System.out-err-catcher.patch b/patches/server/0588-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0589-Add-System.out-err-catcher.patch
rename to patches/server/0588-Add-System.out-err-catcher.patch
diff --git a/patches/server/0590-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0589-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0590-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0589-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0591-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0590-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0591-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0590-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0592-Add-PlayerSetSpawnEvent.patch b/patches/server/0591-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0592-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0591-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0593-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0592-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0593-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0592-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0594-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0593-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0594-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0593-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0595-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0594-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0595-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0594-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0596-Add-EntityDamageItemEvent.patch b/patches/server/0595-Add-EntityDamageItemEvent.patch
similarity index 96%
rename from patches/server/0596-Add-EntityDamageItemEvent.patch
rename to patches/server/0595-Add-EntityDamageItemEvent.patch
index 8356a17cc2..8c30c61354 100644
--- a/patches/server/0596-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0595-Add-EntityDamageItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityDamageItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index c8af2f886ad834d6a405df00560b0f8225fcf471..2623df859c2e484515abf53e3f35d0335467dceb 100644
+index c8af2f886ad834d6a405df00560b0f8225fcf471..210d9b05b13f286b6fc834aded0652eb790a4792 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -648,7 +648,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -36,7 +36,7 @@ index c8af2f886ad834d6a405df00560b0f8225fcf471..2623df859c2e484515abf53e3f35d033
 +                } else if (player != null) {
 +                    io.papermc.paper.event.entity.EntityDamageItemEvent event = new io.papermc.paper.event.entity.EntityDamageItemEvent(player.getBukkitLivingEntity(), CraftItemStack.asCraftMirror(this), amount);
 +                    if (!event.callEvent()) {
-+                        return false;
++                        return;
 +                    }
 +                    amount = event.getDamage();
 +                    // Paper end - Add EntityDamageItemEvent
diff --git a/patches/server/0597-Optimize-indirect-passenger-iteration.patch b/patches/server/0596-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0597-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0596-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0598-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0597-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0598-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0597-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0599-Clear-bucket-NBT-after-dispense.patch b/patches/server/0598-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0599-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0598-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0600-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0599-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0600-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0599-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0601-Add-BlockBreakBlockEvent.patch b/patches/server/0600-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0601-Add-BlockBreakBlockEvent.patch
rename to patches/server/0600-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0602-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0601-Option-to-prevent-data-components-copy-in-smithing-r.patch
similarity index 100%
rename from patches/server/0602-Option-to-prevent-data-components-copy-in-smithing-r.patch
rename to patches/server/0601-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0603-More-CommandBlock-API.patch b/patches/server/0602-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0603-More-CommandBlock-API.patch
rename to patches/server/0602-More-CommandBlock-API.patch
diff --git a/patches/server/0604-Add-missing-team-sidebar-display-slots.patch b/patches/server/0603-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0604-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0603-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0605-Add-back-EntityPortalExitEvent.patch b/patches/server/0604-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0605-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0604-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0606-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0605-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 93%
rename from patches/server/0606-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0605-Add-methods-to-find-targets-for-lightning-strikes.patch
index 8fb3904668..3a9135307c 100644
--- a/patches/server/0606-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0605-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 e0669492427faa3f53bce10b7d933969a3ecf9d8..6073817a9fd910fa3744ec910d312093192cbd84 100644
+index da3821010598f9c67d6a21fbfc6b559280203100..666968eff55e97443fd02e00a7ad11e059de44b8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -763,6 +763,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -769,6 +769,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      protected BlockPos findLightningTargetAround(BlockPos pos) {
@@ -22,7 +22,7 @@ index e0669492427faa3f53bce10b7d933969a3ecf9d8..6073817a9fd910fa3744ec910d312093
          BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
          Optional<BlockPos> optional = this.findLightningRod(blockposition1);
  
-@@ -777,6 +782,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -783,6 +788,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/0607-Get-entity-default-attributes.patch b/patches/server/0606-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0607-Get-entity-default-attributes.patch
rename to patches/server/0606-Get-entity-default-attributes.patch
diff --git a/patches/server/0608-Left-handed-API.patch b/patches/server/0607-Left-handed-API.patch
similarity index 100%
rename from patches/server/0608-Left-handed-API.patch
rename to patches/server/0607-Left-handed-API.patch
diff --git a/patches/server/0609-Add-more-advancement-API.patch b/patches/server/0608-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0609-Add-more-advancement-API.patch
rename to patches/server/0608-Add-more-advancement-API.patch
diff --git a/patches/server/0610-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0609-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0610-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0609-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0611-Add-critical-damage-API.patch b/patches/server/0610-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0611-Add-critical-damage-API.patch
rename to patches/server/0610-Add-critical-damage-API.patch
diff --git a/patches/server/0612-Fix-issues-with-mob-conversion.patch b/patches/server/0611-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0612-Fix-issues-with-mob-conversion.patch
rename to patches/server/0611-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0613-Add-isCollidable-methods-to-various-places.patch b/patches/server/0612-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0613-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0612-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0614-Goat-ram-API.patch b/patches/server/0613-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0614-Goat-ram-API.patch
rename to patches/server/0613-Goat-ram-API.patch
diff --git a/patches/server/0615-Add-API-for-resetting-a-single-score.patch b/patches/server/0614-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0615-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0614-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0616-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0615-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0616-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0615-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0617-Vanilla-command-permission-fixes.patch b/patches/server/0616-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0617-Vanilla-command-permission-fixes.patch
rename to patches/server/0616-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0618-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0617-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 96%
rename from patches/server/0618-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0617-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 3bf48e9620..9675d4a991 100644
--- a/patches/server/0618-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0617-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 6073817a9fd910fa3744ec910d312093192cbd84..5504a0028d62c3fd543f446093dc8becc45d245e 100644
+index 666968eff55e97443fd02e00a7ad11e059de44b8..fbc8fac6ad623be5bf434d3249889de966d1f741 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1276,9 +1276,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1282,9 +1282,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/0619-Fix-GameProfileCache-concurrency.patch b/patches/server/0618-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0619-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0618-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0620-Improve-and-expand-AsyncCatcher.patch b/patches/server/0619-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0620-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0619-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0621-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0620-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0621-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0620-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0622-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0621-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0622-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0621-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0623-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0622-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0623-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0622-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0624-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0623-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0624-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0623-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0625-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0624-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 90%
rename from patches/server/0625-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0624-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 6a75595cee..ffee136c87 100644
--- a/patches/server/0625-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0624-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -10,10 +10,10 @@ chunks did get inlined, but the standard CPS.getChunkAt
 method was not inlined.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index efda6fbe8d02477cf8251c68683ae8bf7c5f1667..12a104fd9aa6c02a4e983f9651e07804a8df606e 100644
+index fd5dc0e09c89f4e21fde5d06b0fc0d4d45e52280..1408faa8754b2492879f2dbb525aba3bfc8f0421 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -352,6 +352,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -351,6 +351,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public final LevelChunk getChunk(int chunkX, int chunkZ) { // Paper - final to help inline
diff --git a/patches/server/0626-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0625-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0626-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0625-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0627-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0626-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 100%
rename from patches/server/0627-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
rename to patches/server/0626-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0628-Time-scoreboard-search.patch b/patches/server/0627-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0628-Time-scoreboard-search.patch
rename to patches/server/0627-Time-scoreboard-search.patch
diff --git a/patches/server/0629-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0628-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0629-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0628-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0630-Add-missing-InventoryType.patch b/patches/server/0629-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/0630-Add-missing-InventoryType.patch
rename to patches/server/0629-Add-missing-InventoryType.patch
diff --git a/patches/server/0631-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0630-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0631-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0630-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0632-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0631-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 90%
rename from patches/server/0632-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0631-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 8f3de2fdfc..f342ae9146 100644
--- a/patches/server/0632-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0631-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 5504a0028d62c3fd543f446093dc8becc45d245e..e7110eda41196c9b162185ae85e511a339ebbd94 100644
+index fbc8fac6ad623be5bf434d3249889de966d1f741..d4cc0a6c0ec10614737615143e05c2e250e8149d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2277,6 +2277,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2283,6 +2283,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/0633-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0632-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0633-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0632-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0634-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0633-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0634-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0633-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0635-Add-packet-limiter-config.patch b/patches/server/0634-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0635-Add-packet-limiter-config.patch
rename to patches/server/0634-Add-packet-limiter-config.patch
diff --git a/patches/server/0636-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0635-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0636-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0635-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0637-Ensure-valid-vehicle-status.patch b/patches/server/0636-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0637-Ensure-valid-vehicle-status.patch
rename to patches/server/0636-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0638-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0637-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0638-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0637-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0639-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0638-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0639-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0638-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0640-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0639-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0640-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0639-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0641-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0640-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0641-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0640-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0642-Preserve-overstacked-loot.patch b/patches/server/0641-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0642-Preserve-overstacked-loot.patch
rename to patches/server/0641-Preserve-overstacked-loot.patch
diff --git a/patches/server/0643-Update-head-rotation-in-missing-places.patch b/patches/server/0642-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0643-Update-head-rotation-in-missing-places.patch
rename to patches/server/0642-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0644-prevent-unintended-light-block-manipulation.patch b/patches/server/0643-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0644-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0643-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0645-Fix-CraftCriteria-defaults-map.patch b/patches/server/0644-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0645-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0644-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0646-Fix-upstreams-block-state-factories.patch b/patches/server/0645-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0646-Fix-upstreams-block-state-factories.patch
rename to patches/server/0645-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0647-Configurable-feature-seeds.patch b/patches/server/0646-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0647-Configurable-feature-seeds.patch
rename to patches/server/0646-Configurable-feature-seeds.patch
diff --git a/patches/server/0648-Add-root-admin-user-detection.patch b/patches/server/0647-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0648-Add-root-admin-user-detection.patch
rename to patches/server/0647-Add-root-admin-user-detection.patch
diff --git a/patches/server/0649-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0648-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0649-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0648-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0650-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0649-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0650-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0649-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0651-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0650-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0651-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0650-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0652-Fix-Spigot-growth-modifiers.patch b/patches/server/0651-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0652-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0651-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0653-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0652-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0653-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0652-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0654-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0653-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0654-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0653-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0655-Optimize-HashMapPalette.patch b/patches/server/0654-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0655-Optimize-HashMapPalette.patch
rename to patches/server/0654-Optimize-HashMapPalette.patch
diff --git a/patches/server/0656-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0655-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0656-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0655-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0657-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0656-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0657-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0656-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0658-Add-more-Campfire-API.patch b/patches/server/0657-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0658-Add-more-Campfire-API.patch
rename to patches/server/0657-Add-more-Campfire-API.patch
diff --git a/patches/server/0659-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0658-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0659-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0658-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0660-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0659-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0660-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0659-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0661-Improve-scoreboard-entries.patch b/patches/server/0660-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0661-Improve-scoreboard-entries.patch
rename to patches/server/0660-Improve-scoreboard-entries.patch
diff --git a/patches/server/0662-Entity-powdered-snow-API.patch b/patches/server/0661-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0662-Entity-powdered-snow-API.patch
rename to patches/server/0661-Entity-powdered-snow-API.patch
diff --git a/patches/server/0663-Add-API-for-item-entity-health.patch b/patches/server/0662-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0663-Add-API-for-item-entity-health.patch
rename to patches/server/0662-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0664-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0663-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0664-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0663-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0665-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0664-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0665-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0664-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0666-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0665-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0666-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0665-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0667-Bucketable-API.patch b/patches/server/0666-Bucketable-API.patch
similarity index 100%
rename from patches/server/0667-Bucketable-API.patch
rename to patches/server/0666-Bucketable-API.patch
diff --git a/patches/server/0668-Validate-usernames.patch b/patches/server/0667-Validate-usernames.patch
similarity index 100%
rename from patches/server/0668-Validate-usernames.patch
rename to patches/server/0667-Validate-usernames.patch
diff --git a/patches/server/0669-Make-water-animal-spawn-height-configurable.patch b/patches/server/0668-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0669-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0668-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0670-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0669-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0670-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0669-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0671-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0670-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0671-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0670-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0672-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0671-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0672-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0671-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0673-Multiple-Entries-with-Scoreboards.patch b/patches/server/0672-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0673-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0672-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0674-Reset-placed-block-on-exception.patch b/patches/server/0673-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0674-Reset-placed-block-on-exception.patch
rename to patches/server/0673-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0675-Add-configurable-height-for-slime-spawn.patch b/patches/server/0674-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0675-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0674-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0676-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0675-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0676-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0675-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0677-Multi-Block-Change-API-Implementation.patch b/patches/server/0676-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0677-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0676-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0678-Fix-NotePlayEvent.patch b/patches/server/0677-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0678-Fix-NotePlayEvent.patch
rename to patches/server/0677-Fix-NotePlayEvent.patch
diff --git a/patches/server/0679-Freeze-Tick-Lock-API.patch b/patches/server/0678-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0679-Freeze-Tick-Lock-API.patch
rename to patches/server/0678-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0680-More-PotionEffectType-API.patch b/patches/server/0679-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0680-More-PotionEffectType-API.patch
rename to patches/server/0679-More-PotionEffectType-API.patch
diff --git a/patches/server/0681-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0680-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0681-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0680-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0682-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0681-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0682-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0681-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0683-Add-missing-structure-set-seed-configs.patch b/patches/server/0682-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0683-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0682-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0684-Implement-regenerateChunk.patch b/patches/server/0683-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0684-Implement-regenerateChunk.patch
rename to patches/server/0683-Implement-regenerateChunk.patch
diff --git a/patches/server/0685-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0684-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 95%
rename from patches/server/0685-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0684-Fix-cancelled-powdered-snow-bucket-placement.patch
index 84f4a9bd0d..d805bbc70e 100644
--- a/patches/server/0685-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0684-Fix-cancelled-powdered-snow-bucket-placement.patch
@@ -8,7 +8,7 @@ snow bucket didn't revert grass that became snowy because of the
 placement.
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 2623df859c2e484515abf53e3f35d0335467dceb..dbcea75b6a42df126c58792bac5384d41005ed06 100644
+index 210d9b05b13f286b6fc834aded0652eb790a4792..463eef2942bcc1b6acf6706fc6bd099f5f4b729e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -402,7 +402,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0686-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0685-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0686-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0685-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0687-Add-GameEvent-tags.patch b/patches/server/0686-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0687-Add-GameEvent-tags.patch
rename to patches/server/0686-Add-GameEvent-tags.patch
diff --git a/patches/server/0688-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0687-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0688-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0687-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0689-Furnace-RecipesUsed-API.patch b/patches/server/0688-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0689-Furnace-RecipesUsed-API.patch
rename to patches/server/0688-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0690-Configurable-sculk-sensor-listener-range.patch b/patches/server/0689-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0690-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0689-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0691-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0690-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0691-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0690-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0692-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0691-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0692-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0691-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0693-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0692-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0693-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0692-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0694-Fix-Entity-Position-Desync.patch b/patches/server/0693-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0694-Fix-Entity-Position-Desync.patch
rename to patches/server/0693-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0695-Custom-Potion-Mixes.patch b/patches/server/0694-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0695-Custom-Potion-Mixes.patch
rename to patches/server/0694-Custom-Potion-Mixes.patch
diff --git a/patches/server/0696-Force-close-world-loading-screen.patch b/patches/server/0695-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0696-Force-close-world-loading-screen.patch
rename to patches/server/0695-Force-close-world-loading-screen.patch
diff --git a/patches/server/0697-Fix-falling-block-spawn-methods.patch b/patches/server/0696-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0697-Fix-falling-block-spawn-methods.patch
rename to patches/server/0696-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0698-Expose-furnace-minecart-push-values.patch b/patches/server/0697-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0698-Expose-furnace-minecart-push-values.patch
rename to patches/server/0697-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0699-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0698-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0699-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0698-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0700-More-Projectile-API.patch b/patches/server/0699-More-Projectile-API.patch
similarity index 98%
rename from patches/server/0700-More-Projectile-API.patch
rename to patches/server/0699-More-Projectile-API.patch
index e06a0a1828..aa2104e4d1 100644
--- a/patches/server/0700-More-Projectile-API.patch
+++ b/patches/server/0699-More-Projectile-API.patch
@@ -572,16 +572,18 @@ index 28d371e59d8780bf6e154bac56ee189b3b43b201..dd092e44a18e238e4a8b4d8a791ef426
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 13e6fc9f42d63fdbd659462070dc7f0767fbb1d9..79529a5208810d25aeab537eac70ed9c6583ef18 100644
+index a58e865a047550cc4508d0515cc6f2fc639f9b3d..9c870aaa147478b46719702ee91615095d41cadb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -293,12 +293,20 @@ public final class CraftItemStack extends ItemStack {
+@@ -293,12 +293,22 @@ public final class CraftItemStack extends ItemStack {
      public ItemMeta getItemMeta() {
          return CraftItemStack.getItemMeta(this.handle);
      }
 +    // Paper start
-+    public static void applyMetaToItem(net.minecraft.world.item.ItemStack itemStack, ItemMeta meta) {
-+        ((org.bukkit.craftbukkit.inventory.CraftMetaItem) meta).applyToItem(itemStack.getOrCreateTag());
++    public static void applyMetaToItem(net.minecraft.world.item.ItemStack itemStack, ItemMeta itemMeta) {
++        final CraftMetaItem.Applicator tag = new CraftMetaItem.Applicator();
++        ((CraftMetaItem) itemMeta).applyToItem(tag);
++        itemStack.applyComponents(tag.build());
 +    }
  
      public static ItemMeta getItemMeta(net.minecraft.world.item.ItemStack item) {
diff --git a/patches/server/0701-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0700-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0701-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0700-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0702-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0701-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0702-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0701-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0703-Implement-getComputedBiome-API.patch b/patches/server/0702-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0703-Implement-getComputedBiome-API.patch
rename to patches/server/0702-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0704-Make-some-itemstacks-nonnull.patch b/patches/server/0703-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0704-Make-some-itemstacks-nonnull.patch
rename to patches/server/0703-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0705-Implement-enchantWithLevels-API.patch b/patches/server/0704-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0705-Implement-enchantWithLevels-API.patch
rename to patches/server/0704-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0706-Fix-saving-in-unloadWorld.patch b/patches/server/0705-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0706-Fix-saving-in-unloadWorld.patch
rename to patches/server/0705-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0707-Buffer-OOB-setBlock-calls.patch b/patches/server/0706-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0707-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0706-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0708-Add-TameableDeathMessageEvent.patch b/patches/server/0707-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0708-Add-TameableDeathMessageEvent.patch
rename to patches/server/0707-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0709-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0708-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0709-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0708-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0710-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0709-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0710-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0709-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0711-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0710-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0711-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0710-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0712-cache-resource-keys.patch b/patches/server/0711-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0712-cache-resource-keys.patch
rename to patches/server/0711-cache-resource-keys.patch
diff --git a/patches/server/0713-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0712-Allow-changing-the-EnderDragon-podium.patch
similarity index 100%
rename from patches/server/0713-Allow-changing-the-EnderDragon-podium.patch
rename to patches/server/0712-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0714-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0713-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0714-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0713-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0715-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0714-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0715-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0714-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0716-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0715-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0716-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0715-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0717-Expand-PlayerItemDamageEvent.patch b/patches/server/0716-Expand-PlayerItemDamageEvent.patch
similarity index 93%
rename from patches/server/0717-Expand-PlayerItemDamageEvent.patch
rename to patches/server/0716-Expand-PlayerItemDamageEvent.patch
index 26d445d8a2..7b4af3c0fc 100644
--- a/patches/server/0717-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0716-Expand-PlayerItemDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index dbcea75b6a42df126c58792bac5384d41005ed06..4470acd572f2b1f93082df74dd34b23a7897ddab 100644
+index 463eef2942bcc1b6acf6706fc6bd099f5f4b729e..4958c780ebf61890c7da2087725329c807d19d27 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -662,10 +662,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0718-WorldCreator-keepSpawnLoaded.patch b/patches/server/0717-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0718-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0717-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0719-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0718-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0719-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0718-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0720-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0719-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0720-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0719-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0721-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0720-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0721-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0720-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0722-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0721-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0722-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0721-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0723-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0722-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0723-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0722-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0724-Add-PlayerStopUsingItemEvent.patch b/patches/server/0723-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0724-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0723-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0725-Don-t-tick-markers.patch b/patches/server/0724-Don-t-tick-markers.patch
similarity index 93%
rename from patches/server/0725-Don-t-tick-markers.patch
rename to patches/server/0724-Don-t-tick-markers.patch
index 6d3e5d5286..33c11195ac 100644
--- a/patches/server/0725-Don-t-tick-markers.patch
+++ b/patches/server/0724-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 e7110eda41196c9b162185ae85e511a339ebbd94..bac72f9444de0414bcec883209fd9d414856342b 100644
+index d4cc0a6c0ec10614737615143e05c2e250e8149d..842a47a61ac58337f1c1dc9c905a196524a28c97 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2192,6 +2192,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2198,6 +2198,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          public void onTickingStart(Entity entity) {
diff --git a/patches/server/0726-Expand-FallingBlock-API.patch b/patches/server/0725-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0726-Expand-FallingBlock-API.patch
rename to patches/server/0725-Expand-FallingBlock-API.patch
diff --git a/patches/server/0727-Add-support-for-Proxy-Protocol.patch b/patches/server/0726-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0727-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0726-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0728-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0727-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0728-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0727-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0729-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0728-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0729-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0728-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0730-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0729-Sanitize-sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0730-Sanitize-sent-BlockEntity-NBT.patch
rename to patches/server/0729-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0731-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0730-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0731-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0730-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0732-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0731-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0732-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0731-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0733-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0732-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0733-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0732-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0734-Dont-resent-entity-on-art-update.patch b/patches/server/0733-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0734-Dont-resent-entity-on-art-update.patch
rename to patches/server/0733-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0735-Add-WardenAngerChangeEvent.patch b/patches/server/0734-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0735-Add-WardenAngerChangeEvent.patch
rename to patches/server/0734-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0736-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0735-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0736-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0735-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0737-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0736-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0737-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0736-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0738-Nameable-Banner-API.patch b/patches/server/0737-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0738-Nameable-Banner-API.patch
rename to patches/server/0737-Nameable-Banner-API.patch
diff --git a/patches/server/0739-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0738-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0739-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0738-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0740-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0739-Prevent-empty-items-from-being-added-to-world.patch
similarity index 89%
rename from patches/server/0740-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0739-Prevent-empty-items-from-being-added-to-world.patch
index 86b07410e8..a619a30fd0 100644
--- a/patches/server/0740-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0739-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 bac72f9444de0414bcec883209fd9d414856342b..e701a1e024f0702c0c2232f5165eeeebb6f081bc 100644
+index 842a47a61ac58337f1c1dc9c905a196524a28c97..1e60b0d2873381d9e91ed2cc2a912a94b94fd21d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1237,6 +1237,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1243,6 +1243,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/0741-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0740-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0741-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0740-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0742-Add-Player-getFishHook.patch b/patches/server/0741-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0742-Add-Player-getFishHook.patch
rename to patches/server/0741-Add-Player-getFishHook.patch
diff --git a/patches/server/0743-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0742-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0743-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0742-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0744-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0743-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0744-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0743-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0745-Fix-Bee-flower-NPE.patch b/patches/server/0744-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0745-Fix-Bee-flower-NPE.patch
rename to patches/server/0744-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0746-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0745-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0746-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0745-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0747-More-Teleport-API.patch b/patches/server/0746-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0747-More-Teleport-API.patch
rename to patches/server/0746-More-Teleport-API.patch
diff --git a/patches/server/0748-Add-EntityPortalReadyEvent.patch b/patches/server/0747-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0748-Add-EntityPortalReadyEvent.patch
rename to patches/server/0747-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0749-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0748-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0749-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0748-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0750-Send-block-entities-after-destroy-prediction.patch b/patches/server/0749-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0750-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0749-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0751-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0750-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 97%
rename from patches/server/0751-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0750-Warn-on-plugins-accessing-faraway-chunks.patch
index d2a128badd..9ac0785b1e 100644
--- a/patches/server/0751-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0750-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 12a104fd9aa6c02a4e983f9651e07804a8df606e..37c81d6c95efaab12a05075e6397ab2548c76722 100644
+index 1408faa8754b2492879f2dbb525aba3bfc8f0421..0fb975d74b8e91617de91dacb206699ff572a38a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -339,7 +339,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -338,7 +338,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      private static boolean isInWorldBoundsHorizontal(BlockPos pos) {
diff --git a/patches/server/0752-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0752-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0753-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0752-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0753-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0752-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0754-Collision-API.patch b/patches/server/0753-Collision-API.patch
similarity index 100%
rename from patches/server/0754-Collision-API.patch
rename to patches/server/0753-Collision-API.patch
diff --git a/patches/server/0755-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0754-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0755-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0754-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0756-Block-Ticking-API.patch b/patches/server/0755-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0756-Block-Ticking-API.patch
rename to patches/server/0755-Block-Ticking-API.patch
diff --git a/patches/server/0757-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0756-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0757-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0756-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0758-Add-NamespacedKey-biome-methods.patch b/patches/server/0757-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0758-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0757-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0759-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0758-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0759-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0758-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0760-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0759-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0760-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0759-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0761-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0760-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0761-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0760-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0762-Missing-eating-regain-reason.patch b/patches/server/0761-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0762-Missing-eating-regain-reason.patch
rename to patches/server/0761-Missing-eating-regain-reason.patch
diff --git a/patches/server/0763-Missing-effect-cause.patch b/patches/server/0762-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0763-Missing-effect-cause.patch
rename to patches/server/0762-Missing-effect-cause.patch
diff --git a/patches/server/0764-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0763-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0764-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0763-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0765-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0764-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0765-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0764-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0766-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0765-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0766-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0765-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0767-Configurable-chat-thread-limit.patch b/patches/server/0766-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0767-Configurable-chat-thread-limit.patch
rename to patches/server/0766-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0768-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0767-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0768-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0767-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0769-fix-Jigsaw-block-kicking-user.patch b/patches/server/0768-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0769-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0768-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0770-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0769-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0770-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0769-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0771-Add-getDrops-to-BlockState.patch b/patches/server/0770-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0771-Add-getDrops-to-BlockState.patch
rename to patches/server/0770-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0772-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0771-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 99%
rename from patches/server/0772-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0771-Fix-a-bunch-of-vanilla-bugs.patch
index 4b79f3dd46..80369ed2a6 100644
--- a/patches/server/0772-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0771-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 e701a1e024f0702c0c2232f5165eeeebb6f081bc..ca1f19e5c76cf431e7b05111c85736acaf945e66 100644
+index 1e60b0d2873381d9e91ed2cc2a912a94b94fd21d..48177251377644d79c91eae67a970659c225e0d5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -776,7 +776,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -782,7 +782,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/0773-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0772-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 87%
rename from patches/server/0773-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0772-Remove-unnecessary-onTrackingStart-during-navigation.patch
index e9a27e63bd..8e43d21dd8 100644
--- a/patches/server/0773-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0772-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 ca1f19e5c76cf431e7b05111c85736acaf945e66..9f5a0d3ddf8df7e873dc73cf3eaccf243ef9553c 100644
+index 48177251377644d79c91eae67a970659c225e0d5..9377b2d46100f1e0f28e5e908fbb7eaea2be2fdb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2216,7 +2216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2222,7 +2222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              if (entity instanceof Mob entityinsentient) {
@@ -17,7 +17,7 @@ index ca1f19e5c76cf431e7b05111c85736acaf945e66..9f5a0d3ddf8df7e873dc73cf3eaccf24
                      String s = "onTrackingStart called during navigation iteration";
  
                      Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration"));
-@@ -2296,7 +2296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2302,7 +2302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
              if (entity instanceof Mob entityinsentient) {
diff --git a/patches/server/0774-Fix-custom-piglin-loved-items.patch b/patches/server/0773-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0774-Fix-custom-piglin-loved-items.patch
rename to patches/server/0773-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0775-EntityPickupItemEvent-fixes.patch b/patches/server/0774-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0775-EntityPickupItemEvent-fixes.patch
rename to patches/server/0774-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0776-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0775-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0776-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0775-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0777-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0776-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0777-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0776-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0778-Elder-Guardian-appearance-API.patch b/patches/server/0777-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0778-Elder-Guardian-appearance-API.patch
rename to patches/server/0777-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0779-Allow-changing-bed-s-occupied-property.patch b/patches/server/0778-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0779-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0778-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0780-Add-entity-knockback-API.patch b/patches/server/0779-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0780-Add-entity-knockback-API.patch
rename to patches/server/0779-Add-entity-knockback-API.patch
diff --git a/patches/server/0781-Detect-headless-JREs.patch b/patches/server/0780-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0781-Detect-headless-JREs.patch
rename to patches/server/0780-Detect-headless-JREs.patch
diff --git a/patches/server/0782-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0781-fix-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0782-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0781-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0783-Add-EntityToggleSitEvent.patch b/patches/server/0782-Add-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0783-Add-EntityToggleSitEvent.patch
rename to patches/server/0782-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0784-Add-fire-tick-delay-option.patch b/patches/server/0783-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0784-Add-fire-tick-delay-option.patch
rename to patches/server/0783-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0785-Add-Moving-Piston-API.patch b/patches/server/0784-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0785-Add-Moving-Piston-API.patch
rename to patches/server/0784-Add-Moving-Piston-API.patch
diff --git a/patches/server/0786-Ignore-impossible-spawn-tick.patch b/patches/server/0785-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0786-Ignore-impossible-spawn-tick.patch
rename to patches/server/0785-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0787-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0786-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0787-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0786-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0788-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0787-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0788-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0787-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0789-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0788-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0789-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0788-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0790-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0789-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0790-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0789-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0791-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0790-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0791-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0790-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0792-Add-Player-Warden-Warning-API.patch b/patches/server/0791-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0792-Add-Player-Warden-Warning-API.patch
rename to patches/server/0791-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0793-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0792-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0793-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0792-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0794-Add-paper-dumplisteners-command.patch b/patches/server/0793-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0794-Add-paper-dumplisteners-command.patch
rename to patches/server/0793-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0795-check-global-player-list-where-appropriate.patch b/patches/server/0794-check-global-player-list-where-appropriate.patch
similarity index 96%
rename from patches/server/0795-check-global-player-list-where-appropriate.patch
rename to patches/server/0794-check-global-player-list-where-appropriate.patch
index 0b8c77538c..38c66589bb 100644
--- a/patches/server/0795-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0794-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 9f5a0d3ddf8df7e873dc73cf3eaccf243ef9553c..e7597b1a9e5f571d7f42ddd508bc63588b420723 100644
+index 9377b2d46100f1e0f28e5e908fbb7eaea2be2fdb..d4ac2a2d3f59cfdd80baf59c45d532cad22b46bb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2332,4 +2332,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2338,4 +2338,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entity.updateDynamicGameEventListener(DynamicGameEventListener::move);
          }
      }
diff --git a/patches/server/0796-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0795-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0796-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0795-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0797-ItemStack-damage-API.patch b/patches/server/0796-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0797-ItemStack-damage-API.patch
rename to patches/server/0796-ItemStack-damage-API.patch
diff --git a/patches/server/0798-Friction-API.patch b/patches/server/0797-Friction-API.patch
similarity index 100%
rename from patches/server/0798-Friction-API.patch
rename to patches/server/0797-Friction-API.patch
diff --git a/patches/server/0799-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0798-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0799-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0798-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0800-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0799-Fix-premature-player-kicks-on-shutdown.patch
similarity index 100%
rename from patches/server/0800-Fix-premature-player-kicks-on-shutdown.patch
rename to patches/server/0799-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0801-Sync-offhand-slot-in-menus.patch b/patches/server/0800-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0801-Sync-offhand-slot-in-menus.patch
rename to patches/server/0800-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0802-Player-Entity-Tracking-Events.patch b/patches/server/0801-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0802-Player-Entity-Tracking-Events.patch
rename to patches/server/0801-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0803-Limit-pet-look-distance.patch b/patches/server/0802-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0803-Limit-pet-look-distance.patch
rename to patches/server/0802-Limit-pet-look-distance.patch
diff --git a/patches/server/0804-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0803-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0804-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0803-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0805-fix-Instruments.patch b/patches/server/0804-fix-Instruments.patch
similarity index 100%
rename from patches/server/0805-fix-Instruments.patch
rename to patches/server/0804-fix-Instruments.patch
diff --git a/patches/server/0806-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0805-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0806-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0805-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0807-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0806-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0807-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0806-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0808-Add-BlockLockCheckEvent.patch b/patches/server/0807-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0808-Add-BlockLockCheckEvent.patch
rename to patches/server/0807-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0809-Add-Sneaking-API-for-Entities.patch b/patches/server/0808-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0809-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0808-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0810-Improve-logging-and-errors.patch b/patches/server/0809-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0810-Improve-logging-and-errors.patch
rename to patches/server/0809-Improve-logging-and-errors.patch
diff --git a/patches/server/0811-Improve-PortalEvents.patch b/patches/server/0810-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0811-Improve-PortalEvents.patch
rename to patches/server/0810-Improve-PortalEvents.patch
diff --git a/patches/server/0812-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0811-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0812-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0811-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0813-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0812-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0813-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0812-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0814-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0813-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0814-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0813-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0815-Flying-Fall-Damage.patch b/patches/server/0814-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0815-Flying-Fall-Damage.patch
rename to patches/server/0814-Flying-Fall-Damage.patch
diff --git a/patches/server/0816-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0815-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0816-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0815-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0817-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0816-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0817-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0816-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0818-config-for-disabling-entity-tag-tags.patch b/patches/server/0817-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0818-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0817-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0819-Use-single-player-info-update-packet-on-join.patch b/patches/server/0818-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0819-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0818-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0820-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0819-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0820-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0819-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0821-Win-Screen-API.patch b/patches/server/0820-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0821-Win-Screen-API.patch
rename to patches/server/0820-Win-Screen-API.patch
diff --git a/patches/server/0822-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0821-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 93%
rename from patches/server/0822-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0821-Remove-CraftItemStack-setAmount-null-assignment.patch
index 35eb74a747..d70677da9f 100644
--- a/patches/server/0822-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0821-Remove-CraftItemStack-setAmount-null-assignment.patch
@@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create
 a problem with operations on the vanilla ItemStack.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 79529a5208810d25aeab537eac70ed9c6583ef18..be2b7c2b412a1d64466c25c1b19b10a869cd288d 100644
+index 9c870aaa147478b46719702ee91615095d41cadb..f5f0f67fac6e94a0dc1936036212c4eece16b71e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -160,7 +160,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0823-Fix-force-opening-enchantment-tables.patch b/patches/server/0822-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0823-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0822-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0824-Add-Entity-Body-Yaw-API.patch b/patches/server/0823-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0824-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0823-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0825-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0824-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0825-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0824-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0826-Add-EntityFertilizeEggEvent.patch b/patches/server/0825-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0826-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0825-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0827-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0826-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0827-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0826-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0828-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0827-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0828-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0827-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0829-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0828-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0829-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0828-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0830-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0829-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0830-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0829-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0831-Fix-text-display-error-on-spawn.patch b/patches/server/0830-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0831-Fix-text-display-error-on-spawn.patch
rename to patches/server/0830-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0832-Fix-inventories-returning-null-Locations.patch b/patches/server/0831-Fix-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0832-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0831-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0833-Add-Shearable-API.patch b/patches/server/0832-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0833-Add-Shearable-API.patch
rename to patches/server/0832-Add-Shearable-API.patch
diff --git a/patches/server/0834-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0833-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0834-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0833-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0835-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0834-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0835-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0834-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0836-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0835-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0836-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0835-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0837-remove-duplicate-animate-packet-for-records.patch b/patches/server/0836-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0837-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0836-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0838-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0837-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0838-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0837-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0839-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0838-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 86%
rename from patches/server/0839-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0838-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 189af599d9..45b84428cb 100644
--- a/patches/server/0839-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0838-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 e7597b1a9e5f571d7f42ddd508bc63588b420723..edbbfd4b0cc7701a303e7f3b2bab76a531b3357c 100644
+index d4ac2a2d3f59cfdd80baf59c45d532cad22b46bb..b8aac1c72bac15bf421d0f7ae406feefe1cad587 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1374,6 +1374,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1380,6 +1380,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/0840-Use-array-for-gamerule-storage.patch b/patches/server/0839-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0840-Use-array-for-gamerule-storage.patch
rename to patches/server/0839-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0841-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0840-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0841-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0840-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0842-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0841-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0842-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0841-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0843-Add-Mob-Experience-reward-API.patch b/patches/server/0842-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0843-Add-Mob-Experience-reward-API.patch
rename to patches/server/0842-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0844-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0843-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0844-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0843-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0845-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0844-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0845-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0844-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0846-More-accurate-isInOpenWater-impl.patch b/patches/server/0845-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0846-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0845-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0847-Expand-PlayerItemMendEvent.patch b/patches/server/0846-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0847-Expand-PlayerItemMendEvent.patch
rename to patches/server/0846-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0848-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0847-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0848-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0847-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0849-Add-transient-modifier-API.patch b/patches/server/0848-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0849-Add-transient-modifier-API.patch
rename to patches/server/0848-Add-transient-modifier-API.patch
diff --git a/patches/server/0850-Fix-block-place-logic.patch b/patches/server/0849-Fix-block-place-logic.patch
similarity index 94%
rename from patches/server/0850-Fix-block-place-logic.patch
rename to patches/server/0849-Fix-block-place-logic.patch
index 7a62be5090..5af50bf21e 100644
--- a/patches/server/0850-Fix-block-place-logic.patch
+++ b/patches/server/0849-Fix-block-place-logic.patch
@@ -22,7 +22,7 @@ index 7d76cdc59984b156628273c8357485eb10046007..7180996027f70aef7afe32fb2adfce64
                      itemstack.consume(1, entityhuman);
                      return InteractionResult.sidedSuccess(world.isClientSide);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 4470acd572f2b1f93082df74dd34b23a7897ddab..61db36b5a79cdd237ea75e73dfa1fd9ad48c9c41 100644
+index 4958c780ebf61890c7da2087725329c807d19d27..df8d8f2130b8006793b2f509550de4d49e0aa2a0 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -516,13 +516,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -41,10 +41,10 @@ index 4470acd572f2b1f93082df74dd34b23a7897ddab..61db36b5a79cdd237ea75e73dfa1fd9a
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 37c81d6c95efaab12a05075e6397ab2548c76722..19a177041e6e9621b0e35ca4f4ceb79b72448680 100644
+index 0fb975d74b8e91617de91dacb206699ff572a38a..61fc08cac437bd5dd6f3ff7561fab3d4c108388d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -554,17 +554,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -553,17 +553,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // CraftBukkit start
                  iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((ServerLevel) this).getWorld();
diff --git a/patches/server/0851-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0850-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 94%
rename from patches/server/0851-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0850-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index cc13b4d7b4..4626deae75 100644
--- a/patches/server/0851-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0850-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 61db36b5a79cdd237ea75e73dfa1fd9ad48c9c41..989e7bc98e492ac2a27f0d7a32e6467d7176f277 100644
+index df8d8f2130b8006793b2f509550de4d49e0aa2a0..38eccd642144c98dde32ae8e48a5b0d94a1ada06 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -567,7 +567,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0852-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0851-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0852-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0851-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0853-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0852-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0853-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0852-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0854-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0853-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0854-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0853-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0855-Fix-sniffer-removeExploredLocation.patch b/patches/server/0854-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0855-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0854-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0856-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0855-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0856-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0855-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0857-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0856-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0857-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0856-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0858-Add-event-for-player-editing-sign.patch b/patches/server/0857-Add-event-for-player-editing-sign.patch
similarity index 98%
rename from patches/server/0858-Add-event-for-player-editing-sign.patch
rename to patches/server/0857-Add-event-for-player-editing-sign.patch
index 642078564d..638060c2bd 100644
--- a/patches/server/0858-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0857-Add-event-for-player-editing-sign.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add event for player editing sign
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 989e7bc98e492ac2a27f0d7a32e6467d7176f277..ffa53f5bd6601c623395c3f93a60d2d773783342 100644
+index 38eccd642144c98dde32ae8e48a5b0d94a1ada06..9a261e93526ab48d24bfe5ca914064d8da4c262c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -546,7 +546,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0859-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0858-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0859-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0858-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0860-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0859-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0860-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0859-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0861-Add-option-to-disable-block-updates.patch b/patches/server/0860-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0861-Add-option-to-disable-block-updates.patch
rename to patches/server/0860-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0862-Call-missing-BlockDispenseEvent.patch b/patches/server/0861-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0862-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0861-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0863-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0862-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0863-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0862-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0864-Optimize-player-lookups-for-beacons.patch b/patches/server/0863-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0864-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0863-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0865-Add-Sign-getInteractableSideFor.patch b/patches/server/0864-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0865-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0864-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0866-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0865-fix-item-meta-for-tadpole-buckets.patch
similarity index 92%
rename from patches/server/0866-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0865-fix-item-meta-for-tadpole-buckets.patch
index 178a11c942..74eda7a640 100644
--- a/patches/server/0866-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0865-fix-item-meta-for-tadpole-buckets.patch
@@ -17,10 +17,10 @@ index da1b01c6489f96cfbded87e651e1d6df1dd0751a..c7533d6c512fd61ca77c1e07f844e0dd
          case GLOW_ITEM_FRAME:
          case PAINTING:
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index be2b7c2b412a1d64466c25c1b19b10a869cd288d..d544a4e4d88b51cf6ca53e048c411aa23c64d78f 100644
+index f5f0f67fac6e94a0dc1936036212c4eece16b71e..52e70f78dcefe69e110dba5300af26b7015f4d76 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -600,6 +600,7 @@ public final class CraftItemStack extends ItemStack {
+@@ -602,6 +602,7 @@ public final class CraftItemStack extends ItemStack {
              case COD_BUCKET:
              case PUFFERFISH_BUCKET:
              case SALMON_BUCKET:
@@ -41,10 +41,10 @@ index 27af7ca9d62bdb4a24be5af139c181d7bc271ba5..3ff0340c40e9dc9a6e690de15ccade7a
              Material.GLOW_ITEM_FRAME,
              Material.PAINTING
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 7237e24686885c754c87e7eec53c6400fd0b47bf..f071968be481a164192085a3e405bea2d26062b6 100644
+index cf436c9e62a11b8c6cbf7638de0e5635c67459ac..9338743f1e2197f82d610490a22235ee6728e0da 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-@@ -234,6 +234,27 @@ public class ItemMetaTest extends AbstractTestingBase {
+@@ -206,6 +206,27 @@ public class ItemMetaTest extends AbstractTestingBase {
          }
      }
  
diff --git a/patches/server/0867-Fix-BanList-API.patch b/patches/server/0866-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0867-Fix-BanList-API.patch
rename to patches/server/0866-Fix-BanList-API.patch
diff --git a/patches/server/0868-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0867-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0868-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0867-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0869-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0868-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0869-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0868-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0870-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0869-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0870-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0869-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0871-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0870-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0871-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0870-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0872-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0871-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0872-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0871-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0873-Add-whitelist-events.patch b/patches/server/0872-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0873-Add-whitelist-events.patch
rename to patches/server/0872-Add-whitelist-events.patch
diff --git a/patches/server/0874-Implement-PlayerFailMoveEvent.patch b/patches/server/0873-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0874-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0873-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0875-Folia-scheduler-and-owned-region-API.patch b/patches/server/0874-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0875-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0874-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0876-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0875-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0876-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0875-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0877-API-for-updating-recipes-on-clients.patch b/patches/server/0876-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0877-API-for-updating-recipes-on-clients.patch
rename to patches/server/0876-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0878-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0877-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0878-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0877-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0879-Only-capture-actual-tree-growth.patch b/patches/server/0878-Only-capture-actual-tree-growth.patch
similarity index 95%
rename from patches/server/0879-Only-capture-actual-tree-growth.patch
rename to patches/server/0878-Only-capture-actual-tree-growth.patch
index eb1b382e8b..fe8b9e91d1 100644
--- a/patches/server/0879-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0878-Only-capture-actual-tree-growth.patch
@@ -17,7 +17,7 @@ index 5bbadc890a72f1cb22c6881ebcc163b0c06a367a..4fa838bf97ede6e1c893ba64f53aa7af
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index ffa53f5bd6601c623395c3f93a60d2d773783342..a5159bdb5c5a36c88fabacc0ed337ffe31f16939 100644
+index 9a261e93526ab48d24bfe5ca914064d8da4c262c..a3e1fdd3010faf06f43d2477c60558089cb18052 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -446,6 +446,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -29,10 +29,10 @@ index ffa53f5bd6601c623395c3f93a60d2d773783342..a5159bdb5c5a36c88fabacc0ed337ffe
                      entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat
                  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 19a177041e6e9621b0e35ca4f4ceb79b72448680..f3486d042a592cb538c5e8f681673a0c2c45ffd9 100644
+index 61fc08cac437bd5dd6f3ff7561fab3d4c108388d..2f018922fb12dc4c3c9c28c7b0597a2b97d1cb02 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1366,4 +1366,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1365,4 +1365,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return range <= 0 ? 64.0 * 64.0 : range * range; // 64 is taken from default in ServerLevel#levelEvent
      }
      // Paper end - respect global sound events gamerule
diff --git a/patches/server/0880-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0879-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0880-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0879-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0881-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0880-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0881-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0880-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0882-Use-correct-seed-on-api-world-load.patch b/patches/server/0881-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0882-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0881-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0883-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0882-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0883-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0882-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0884-Cache-map-ids-on-item-frames.patch b/patches/server/0883-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0884-Cache-map-ids-on-item-frames.patch
rename to patches/server/0883-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0885-Fix-custom-statistic-criteria-creation.patch b/patches/server/0884-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0885-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0884-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0886-Bandaid-fix-for-Effect.patch b/patches/server/0885-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0886-Bandaid-fix-for-Effect.patch
rename to patches/server/0885-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0887-SculkCatalyst-bloom-API.patch b/patches/server/0886-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0887-SculkCatalyst-bloom-API.patch
rename to patches/server/0886-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0888-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0887-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0888-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0887-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0889-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0888-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0889-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0888-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0890-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0889-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0890-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0889-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0891-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0890-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0891-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0890-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0892-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0891-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0892-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0891-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0893-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0892-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0893-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0892-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0894-Add-Listing-API-for-Player.patch b/patches/server/0893-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0894-Add-Listing-API-for-Player.patch
rename to patches/server/0893-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0895-Configurable-Region-Compression-Format.patch b/patches/server/0894-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0895-Configurable-Region-Compression-Format.patch
rename to patches/server/0894-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0896-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0895-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0896-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0895-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0897-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0896-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0897-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0896-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0898-Expand-Pose-API.patch b/patches/server/0897-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/0898-Expand-Pose-API.patch
rename to patches/server/0897-Expand-Pose-API.patch
diff --git a/patches/server/0899-More-DragonBattle-API.patch b/patches/server/0898-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0899-More-DragonBattle-API.patch
rename to patches/server/0898-More-DragonBattle-API.patch
diff --git a/patches/server/0900-Add-PlayerPickItemEvent.patch b/patches/server/0899-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/0900-Add-PlayerPickItemEvent.patch
rename to patches/server/0899-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0901-Allow-trident-custom-damage.patch b/patches/server/0900-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0901-Allow-trident-custom-damage.patch
rename to patches/server/0900-Allow-trident-custom-damage.patch
diff --git a/patches/server/0902-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0901-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0902-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0901-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0903-Optimize-nearest-structure-border-iteration.patch b/patches/server/0902-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0903-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0902-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0904-Implement-OfflinePlayer-isConnected.patch b/patches/server/0903-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/0904-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0903-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0905-Fix-inventory-desync.patch b/patches/server/0904-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0905-Fix-inventory-desync.patch
rename to patches/server/0904-Fix-inventory-desync.patch
diff --git a/patches/server/0906-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0905-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/0906-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0905-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0907-Configure-sniffer-egg-hatch-time.patch b/patches/server/0906-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0907-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0906-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0908-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0907-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0908-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0907-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0909-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0908-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0909-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0908-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0910-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0909-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/0910-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0909-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0911-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0910-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0911-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0910-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0912-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0911-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 93%
rename from patches/server/0912-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0911-Allow-proper-checking-of-empty-item-stacks.patch
index 70c9dc2da8..431623fe02 100644
--- a/patches/server/0912-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0911-Allow-proper-checking-of-empty-item-stacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow proper checking of empty item stacks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index d544a4e4d88b51cf6ca53e048c411aa23c64d78f..97e1bd56de2c7f6d606e3a4968b2f55cd4689b91 100644
+index 52e70f78dcefe69e110dba5300af26b7015f4d76..0e7a78d0b8b637de3076f1da25dcdfe32bf8ddf3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -36,12 +36,19 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0913-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0912-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/0913-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0912-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0914-Fix-spigot-s-Forced-Stats.patch b/patches/server/0913-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0914-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0913-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0915-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0914-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/0915-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0914-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0916-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0915-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/0916-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0915-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0917-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0916-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/0917-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0916-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0918-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0917-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/0918-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/0917-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0919-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0918-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/0919-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/0918-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0920-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0919-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/0920-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/0919-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0921-Fix-missing-map-initialize-event-call.patch b/patches/server/0920-Fix-missing-map-initialize-event-call.patch
similarity index 92%
rename from patches/server/0921-Fix-missing-map-initialize-event-call.patch
rename to patches/server/0920-Fix-missing-map-initialize-event-call.patch
index b204963c68..54a02f94c8 100644
--- a/patches/server/0921-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0920-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 edbbfd4b0cc7701a303e7f3b2bab76a531b3357c..5e515cdf897de00284ac9f345a3496986146dee9 100644
+index b8aac1c72bac15bf421d0f7ae406feefe1cad587..91ef138bdd0bfe77692353e7598b47a43511eb3b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1664,13 +1664,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1670,13 +1670,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Nullable
      @Override
      public MapItemSavedData getMapData(MapId id) {
diff --git a/patches/server/0922-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0921-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/0922-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/0921-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0923-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0922-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/0923-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/0922-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0924-Add-player-idle-duration-API.patch b/patches/server/0923-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/server/0924-Add-player-idle-duration-API.patch
rename to patches/server/0923-Add-player-idle-duration-API.patch
diff --git a/patches/server/0925-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0924-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/0925-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/0924-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0926-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0925-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/0926-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/0925-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0927-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 100%
rename from patches/server/0927-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0928-Optimize-VarInts.patch b/patches/server/0927-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/0928-Optimize-VarInts.patch
rename to patches/server/0927-Optimize-VarInts.patch
diff --git a/patches/server/0929-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0928-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/0929-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/0928-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0930-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0929-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/server/0930-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/0929-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0931-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0930-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 100%
rename from patches/server/0931-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/0930-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0932-Expand-LingeringPotion-API.patch b/patches/server/0931-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/0932-Expand-LingeringPotion-API.patch
rename to patches/server/0931-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0933-Add-MaterialTagsTest.patch b/patches/server/0932-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/0933-Add-MaterialTagsTest.patch
rename to patches/server/0932-Add-MaterialTagsTest.patch
diff --git a/patches/server/0934-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0933-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/0934-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/0933-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0935-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0934-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/0935-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/0934-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0936-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0935-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/0936-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/0935-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0937-Add-UUID-attribute-modifier-API.patch b/patches/server/0936-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/0937-Add-UUID-attribute-modifier-API.patch
rename to patches/server/0936-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0938-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0937-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/0938-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/0937-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0939-Lazily-create-LootContext-for-criterions.patch b/patches/server/0938-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/0939-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/0938-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0940-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0939-Don-t-fire-sync-events-during-worldgen.patch
similarity index 98%
rename from patches/server/0940-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/0939-Don-t-fire-sync-events-during-worldgen.patch
index 45110cd44a..0fc39b4dd1 100644
--- a/patches/server/0940-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0939-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 5e515cdf897de00284ac9f345a3496986146dee9..f2d7c9b56fb1ec80e74e23abe2635f8979fdaae6 100644
+index 91ef138bdd0bfe77692353e7598b47a43511eb3b..b13c219929baf15b6233ba0460b5e73d2f342d19 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1226,6 +1226,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1232,6 +1232,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/0941-Add-Structure-check-API.patch b/patches/server/0940-Add-Structure-check-API.patch
similarity index 100%
rename from patches/server/0941-Add-Structure-check-API.patch
rename to patches/server/0940-Add-Structure-check-API.patch
diff --git a/patches/server/0942-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0941-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/0942-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/0941-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0943-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0942-Restore-vanilla-entity-drops-behavior.patch
similarity index 100%
rename from patches/server/0943-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/0942-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0944-Dont-resend-blocks-on-interactions.patch b/patches/server/0943-Dont-resend-blocks-on-interactions.patch
similarity index 99%
rename from patches/server/0944-Dont-resend-blocks-on-interactions.patch
rename to patches/server/0943-Dont-resend-blocks-on-interactions.patch
index ad84b8babb..53bb0d32a1 100644
--- a/patches/server/0944-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0943-Dont-resend-blocks-on-interactions.patch
@@ -149,7 +149,7 @@ index 6d494b80ae002aea00afa44adf83dad1ae5bbbc1..49557d6f22c5725c663a231deab019d4
                      return false;
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index a5159bdb5c5a36c88fabacc0ed337ffe31f16939..9510558d03faf5b704a763456c5f2d4f28bca6e8 100644
+index a3e1fdd3010faf06f43d2477c60558089cb18052..655fa32422c24c81d682791110413e4c771677e0 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -480,10 +480,12 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0945-add-more-scoreboard-API.patch b/patches/server/0944-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/0945-add-more-scoreboard-API.patch
rename to patches/server/0944-add-more-scoreboard-API.patch
diff --git a/patches/server/0946-Improve-Registry.patch b/patches/server/0945-Improve-Registry.patch
similarity index 100%
rename from patches/server/0946-Improve-Registry.patch
rename to patches/server/0945-Improve-Registry.patch
diff --git a/patches/server/0947-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0946-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 100%
rename from patches/server/0947-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/0946-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0948-Add-experience-points-API.patch b/patches/server/0947-Add-experience-points-API.patch
similarity index 100%
rename from patches/server/0948-Add-experience-points-API.patch
rename to patches/server/0947-Add-experience-points-API.patch
diff --git a/patches/server/0949-Add-drops-to-shear-events.patch b/patches/server/0948-Add-drops-to-shear-events.patch
similarity index 99%
rename from patches/server/0949-Add-drops-to-shear-events.patch
rename to patches/server/0948-Add-drops-to-shear-events.patch
index cf438dfbb5..0cc7dc88b2 100644
--- a/patches/server/0949-Add-drops-to-shear-events.patch
+++ b/patches/server/0948-Add-drops-to-shear-events.patch
@@ -264,7 +264,7 @@ index 822bfebc779646dde655239ac217bad011a9eee4..444287fea080182df533198f5c659533
  
      public static Cancellable handleStatisticsIncrease(net.minecraft.world.entity.player.Player entityHuman, net.minecraft.stats.Stat<?> statistic, int current, int newValue) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 97e1bd56de2c7f6d606e3a4968b2f55cd4689b91..6138bcfeac622e091267b226f5be3a807f01312d 100644
+index 0e7a78d0b8b637de3076f1da25dcdfe32bf8ddf3..e37656794bce0221c9869147f87d26a2c8290eef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -65,6 +65,16 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0950-Add-PlayerShieldDisableEvent.patch b/patches/server/0949-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/server/0950-Add-PlayerShieldDisableEvent.patch
rename to patches/server/0949-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0951-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0950-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 100%
rename from patches/server/0951-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/0950-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0952-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0951-Properly-handle-experience-dropping-on-block-break.patch
similarity index 97%
rename from patches/server/0952-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/0951-Properly-handle-experience-dropping-on-block-break.patch
index 9303d64d44..e9378e05a5 100644
--- a/patches/server/0952-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0951-Properly-handle-experience-dropping-on-block-break.patch
@@ -7,10 +7,10 @@ This causes spawnAfterBreak to spawn xp by default, removing the need to manuall
 For classes that use custom xp amounts, they can drop the resources with disabling
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f3486d042a592cb538c5e8f681673a0c2c45ffd9..6ef8b68ceaf710e37ceb63040db95ca47b103ac3 100644
+index 2f018922fb12dc4c3c9c28c7b0597a2b97d1cb02..51c4877ffb77ece41e90d9c6ac06c04dc941e35c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -619,7 +619,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -618,7 +618,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (drop) {
                  BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
  
diff --git a/patches/server/0953-Fixup-NamespacedKey-handling.patch b/patches/server/0952-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/0953-Fixup-NamespacedKey-handling.patch
rename to patches/server/0952-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0954-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0953-Expose-LootTable-of-DecoratedPot.patch
similarity index 100%
rename from patches/server/0954-Expose-LootTable-of-DecoratedPot.patch
rename to patches/server/0953-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0955-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0954-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0955-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0954-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0956-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0955-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0956-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0955-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0957-Add-ShulkerDuplicateEvent.patch b/patches/server/0956-Add-ShulkerDuplicateEvent.patch
similarity index 100%
rename from patches/server/0957-Add-ShulkerDuplicateEvent.patch
rename to patches/server/0956-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0958-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0957-Add-api-for-spawn-egg-texture-colors.patch
similarity index 100%
rename from patches/server/0958-Add-api-for-spawn-egg-texture-colors.patch
rename to patches/server/0957-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0959-Add-Lifecycle-Event-system.patch b/patches/server/0958-Add-Lifecycle-Event-system.patch
similarity index 100%
rename from patches/server/0959-Add-Lifecycle-Event-system.patch
rename to patches/server/0958-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0960-ItemStack-Tooltip-API.patch b/patches/server/0959-ItemStack-Tooltip-API.patch
similarity index 100%
rename from patches/server/0960-ItemStack-Tooltip-API.patch
rename to patches/server/0959-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0961-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0960-Add-getChunkSnapshot-includeLightData-parameter.patch
similarity index 100%
rename from patches/server/0961-Add-getChunkSnapshot-includeLightData-parameter.patch
rename to patches/server/0960-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0962-Add-FluidState-API.patch b/patches/server/0961-Add-FluidState-API.patch
similarity index 100%
rename from patches/server/0962-Add-FluidState-API.patch
rename to patches/server/0961-Add-FluidState-API.patch
diff --git a/patches/server/0963-add-number-format-api.patch b/patches/server/0962-add-number-format-api.patch
similarity index 100%
rename from patches/server/0963-add-number-format-api.patch
rename to patches/server/0962-add-number-format-api.patch
diff --git a/patches/server/0964-improve-BanList-types.patch b/patches/server/0963-improve-BanList-types.patch
similarity index 100%
rename from patches/server/0964-improve-BanList-types.patch
rename to patches/server/0963-improve-BanList-types.patch
diff --git a/patches/server/0965-Expanded-Hopper-API.patch b/patches/server/0964-Expanded-Hopper-API.patch
similarity index 100%
rename from patches/server/0965-Expanded-Hopper-API.patch
rename to patches/server/0964-Expanded-Hopper-API.patch
diff --git a/patches/server/0966-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0965-Add-BlockBreakProgressUpdateEvent.patch
similarity index 89%
rename from patches/server/0966-Add-BlockBreakProgressUpdateEvent.patch
rename to patches/server/0965-Add-BlockBreakProgressUpdateEvent.patch
index 551f8ad87d..48c96933c7 100644
--- a/patches/server/0966-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0965-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 f2d7c9b56fb1ec80e74e23abe2635f8979fdaae6..06c185eae0063ff1b1714be0a5c7b0cdd538816b 100644
+index b13c219929baf15b6233ba0460b5e73d2f342d19..28a4d1e556c08b4f07f00ea684587e7bf786f67c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1322,6 +1322,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1328,6 +1328,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (entity instanceof Player) entityhuman = (Player) entity;
          // CraftBukkit end
  
diff --git a/patches/server/0967-Deprecate-ItemStack-setType.patch b/patches/server/0966-Deprecate-ItemStack-setType.patch
similarity index 89%
rename from patches/server/0967-Deprecate-ItemStack-setType.patch
rename to patches/server/0966-Deprecate-ItemStack-setType.patch
index a0c8f6fbab..5a622e9747 100644
--- a/patches/server/0967-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0966-Deprecate-ItemStack-setType.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate ItemStack#setType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 6138bcfeac622e091267b226f5be3a807f01312d..8a31b154460db1c5102c27ceee2b83f60ad5f506 100644
+index e37656794bce0221c9869147f87d26a2c8290eef..23f41734400587c4fda3c8ae9e59f60868ed88a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -713,4 +713,19 @@ public final class CraftItemStack extends ItemStack {
+@@ -715,4 +715,19 @@ public final class CraftItemStack extends ItemStack {
      static boolean hasItemMeta(net.minecraft.world.item.ItemStack item) {
          return !(item == null || item.getComponentsPatch().isEmpty());
      }
diff --git a/patches/server/0968-Add-CartographyItemEvent.patch b/patches/server/0967-Add-CartographyItemEvent.patch
similarity index 100%
rename from patches/server/0968-Add-CartographyItemEvent.patch
rename to patches/server/0967-Add-CartographyItemEvent.patch
diff --git a/patches/server/0969-More-Raid-API.patch b/patches/server/0968-More-Raid-API.patch
similarity index 100%
rename from patches/server/0969-More-Raid-API.patch
rename to patches/server/0968-More-Raid-API.patch
diff --git a/patches/server/0970-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0969-Add-onboarding-message-for-initial-server-start.patch
similarity index 100%
rename from patches/server/0970-Add-onboarding-message-for-initial-server-start.patch
rename to patches/server/0969-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0971-Configurable-max-block-fluid-ticks.patch b/patches/server/0970-Configurable-max-block-fluid-ticks.patch
similarity index 87%
rename from patches/server/0971-Configurable-max-block-fluid-ticks.patch
rename to patches/server/0970-Configurable-max-block-fluid-ticks.patch
index b5d71eb141..dae373e8f4 100644
--- a/patches/server/0971-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0970-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 06c185eae0063ff1b1714be0a5c7b0cdd538816b..b6a4feb182975b36c397a7b6e8ee37e4dbaddb64 100644
+index 28a4d1e556c08b4f07f00ea684587e7bf786f67c..101044fe17a963c8a96519f157a50e42f5d0658a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -500,9 +500,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -506,9 +506,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (!this.isDebug() && flag) {
              j = this.getGameTime();
              gameprofilerfiller.push("blockTicks");
diff --git a/patches/server/0972-Disable-memory-reserve-allocating.patch b/patches/server/0971-Disable-memory-reserve-allocating.patch
similarity index 100%
rename from patches/server/0972-Disable-memory-reserve-allocating.patch
rename to patches/server/0971-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0973-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0972-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
similarity index 100%
rename from patches/server/0973-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
rename to patches/server/0972-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0974-Fix-DamageSource-API.patch b/patches/server/0973-Fix-DamageSource-API.patch
similarity index 100%
rename from patches/server/0974-Fix-DamageSource-API.patch
rename to patches/server/0973-Fix-DamageSource-API.patch
diff --git a/patches/server/0975-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0974-Fix-creation-of-invalid-block-entity-during-world-ge.patch
similarity index 100%
rename from patches/server/0975-Fix-creation-of-invalid-block-entity-during-world-ge.patch
rename to patches/server/0974-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0976-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0975-Fix-possible-StackOverflowError-for-some-dispenses.patch
similarity index 100%
rename from patches/server/0976-Fix-possible-StackOverflowError-for-some-dispenses.patch
rename to patches/server/0975-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0977-Improve-tag-parser-handling.patch b/patches/server/0976-Improve-tag-parser-handling.patch
similarity index 100%
rename from patches/server/0977-Improve-tag-parser-handling.patch
rename to patches/server/0976-Improve-tag-parser-handling.patch
diff --git a/patches/server/0978-Item-Mutation-Fixes.patch b/patches/server/0977-Item-Mutation-Fixes.patch
similarity index 100%
rename from patches/server/0978-Item-Mutation-Fixes.patch
rename to patches/server/0977-Item-Mutation-Fixes.patch
diff --git a/patches/server/0979-Per-world-ticks-per-spawn-settings.patch b/patches/server/0978-Per-world-ticks-per-spawn-settings.patch
similarity index 94%
rename from patches/server/0979-Per-world-ticks-per-spawn-settings.patch
rename to patches/server/0978-Per-world-ticks-per-spawn-settings.patch
index f89b02d6c6..ebdf89762d 100644
--- a/patches/server/0979-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0978-Per-world-ticks-per-spawn-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Per world ticks per spawn settings
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6ef8b68ceaf710e37ceb63040db95ca47b103ac3..b1f6d6a12865f3b30e9136fb548fa0a48a5ecb6e 100644
+index 51c4877ffb77ece41e90d9c6ac06c04dc941e35c..975fcd4b8f93cb8c602ddeb165c485214eac10a4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -185,6 +185,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0980-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0979-Properly-track-the-changed-item-from-dispense-events.patch
similarity index 100%
rename from patches/server/0980-Properly-track-the-changed-item-from-dispense-events.patch
rename to patches/server/0979-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0981-Rewrite-dataconverter-system.patch b/patches/server/0980-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0981-Rewrite-dataconverter-system.patch
rename to patches/server/0980-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0982-Suspicious-Effect-Entry-API.patch b/patches/server/0981-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/server/0982-Suspicious-Effect-Entry-API.patch
rename to patches/server/0981-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0983-check-if-itemstack-is-stackable-first.patch b/patches/server/0982-check-if-itemstack-is-stackable-first.patch
similarity index 100%
rename from patches/server/0983-check-if-itemstack-is-stackable-first.patch
rename to patches/server/0982-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0984-disable-forced-empty-world-ticks.patch b/patches/server/0983-disable-forced-empty-world-ticks.patch
similarity index 86%
rename from patches/server/0984-disable-forced-empty-world-ticks.patch
rename to patches/server/0983-disable-forced-empty-world-ticks.patch
index 1490668793..4b589ba549 100644
--- a/patches/server/0984-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0983-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 b6a4feb182975b36c397a7b6e8ee37e4dbaddb64..f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5 100644
+index 101044fe17a963c8a96519f157a50e42f5d0658a..78c1da700cb2a11a3fdb3725e89bcdb62c8f72e7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -527,7 +527,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -533,7 +533,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          this.handlingTick = false;
          gameprofilerfiller.pop();
diff --git a/patches/server/0985-Starlight.patch b/patches/server/0984-Starlight.patch
similarity index 100%
rename from patches/server/0985-Starlight.patch
rename to patches/server/0984-Starlight.patch
diff --git a/patches/server/0986-Rewrite-chunk-system.patch b/patches/server/0985-Rewrite-chunk-system.patch
similarity index 99%
rename from patches/server/0986-Rewrite-chunk-system.patch
rename to patches/server/0985-Rewrite-chunk-system.patch
index ef7a915629..d306e132fa 100644
--- a/patches/server/0986-Rewrite-chunk-system.patch
+++ b/patches/server/0985-Rewrite-chunk-system.patch
@@ -18390,7 +18390,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 f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9f8061125 100644
+index 78c1da700cb2a11a3fdb3725e89bcdb62c8f72e7..3b8213723670201909a3b07e181d05aecc7ec296 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 {
@@ -18748,7 +18748,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
              return minecraftserver.overworld().getDataStorage();
          });
          this.chunkSource.getGeneratorState().ensureStructuresGenerated();
-@@ -420,6 +651,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -426,6 +657,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return (RandomSequences) this.getDataStorage().computeIfAbsent(RandomSequences.factory(l), "random_sequences");
          });
          this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
@@ -18758,7 +18758,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
      }
  
      // Paper start
-@@ -552,7 +786,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -558,7 +792,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                          gameprofilerfiller.push("checkDespawn");
                          entity.checkDespawn();
                          gameprofilerfiller.pop();
@@ -18767,7 +18767,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
                              Entity entity1 = entity.getVehicle();
  
                              if (entity1 != null) {
-@@ -577,13 +811,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -583,13 +817,16 @@ public class ServerLevel extends Level implements WorldGenLevel {
          }
  
          gameprofilerfiller.push("entityManagement");
@@ -18786,7 +18786,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
      }
  
      protected void tickTime() {
-@@ -1060,6 +1297,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1066,6 +1303,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
      }
  
      public void save(@Nullable ProgressListener progressListener, boolean flush, boolean savingDisabled) {
@@ -18798,7 +18798,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
          ServerChunkCache chunkproviderserver = this.getChunkSource();
  
          if (!savingDisabled) {
-@@ -1075,16 +1317,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1081,16 +1323,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
  
                  timings.worldSaveChunks.startTiming(); // Paper
@@ -18819,7 +18819,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
          ServerLevel worldserver1 = this;
-@@ -1220,7 +1459,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1226,7 +1465,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.removePlayerImmediately((ServerPlayer) entity, Entity.RemovalReason.DISCARDED);
          }
  
@@ -18828,7 +18828,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
      }
  
      // CraftBukkit start
-@@ -1251,7 +1490,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1257,7 +1496,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              }
              // CraftBukkit end
  
@@ -18837,7 +18837,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
          }
      }
  
-@@ -1263,10 +1502,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1269,10 +1508,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
@@ -18851,7 +18851,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
              return false;
          } else {
              this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit
-@@ -1852,7 +2091,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1858,7 +2097,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
  
@@ -18860,7 +18860,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
              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()));
-@@ -1901,7 +2140,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1907,7 +2146,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter2 = Files.newBufferedWriter(path1);
  
          try {
@@ -18869,7 +18869,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
          } catch (Throwable throwable4) {
              if (bufferedwriter2 != null) {
                  try {
-@@ -1922,7 +2161,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1928,7 +2167,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          BufferedWriter bufferedwriter3 = Files.newBufferedWriter(path2);
  
          try {
@@ -18878,7 +18878,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
          } catch (Throwable throwable6) {
              if (bufferedwriter3 != null) {
                  try {
-@@ -2064,7 +2303,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2070,7 +2309,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public String getWatchdogStats() {
@@ -18887,7 +18887,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
              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());
      }
-@@ -2124,15 +2363,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2130,15 +2369,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public LevelEntityGetter<Entity> getEntities() {
          org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot
@@ -18908,7 +18908,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
      }
  
      public void startTickingChunk(LevelChunk chunk) {
-@@ -2152,34 +2391,49 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2158,34 +2397,49 @@ public class ServerLevel extends Level implements WorldGenLevel {
      @Override
      public void close() throws IOException {
          super.close();
@@ -18965,7 +18965,7 @@ index f2ccc126bb75bd3b88f17af885a507fd5ab0d7e5..d2fff98640a44f48d85044cd037cb3e9
      }
  
      @Override
-@@ -2205,7 +2459,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2211,7 +2465,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          CrashReportCategory crashreportsystemdetails = super.fillReportDetails(report);
  
          crashreportsystemdetails.setDetail("Loaded entity count", () -> {
@@ -19895,10 +19895,10 @@ index bd20bea7f76a7307f1698fb2dfef37125032d166..9a28912f52824acdc80a62243b136e6f
  
      <T extends Entity> List<T> getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index b1f6d6a12865f3b30e9136fb548fa0a48a5ecb6e..1f8e12f5bdd00c683bb55ffbb157d6c78500c683 100644
+index 975fcd4b8f93cb8c602ddeb165c485214eac10a4..d3137c9e5cc42ef191ea233b0d37eafeffc6f82c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -548,6 +548,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -547,6 +547,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
              if ((i & 2) != 0 && (!this.isClientSide || (i & 4) == 0) && (this.isClientSide || chunk == null || (chunk.getFullStatus() != null && chunk.getFullStatus().isOrAfter(FullChunkStatus.BLOCK_TICKING)))) { // allow chunk to be null here as chunk.isReady() is false when we send our notification during block placement
                  this.sendBlockUpdated(blockposition, iblockdata1, iblockdata, i);
@@ -19910,7 +19910,7 @@ index b1f6d6a12865f3b30e9136fb548fa0a48a5ecb6e..1f8e12f5bdd00c683bb55ffbb157d6c7
              }
  
              if ((i & 1) != 0) {
-@@ -942,7 +947,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -941,7 +946,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
          // Paper end - Perf: Optimize capturedTileEntities lookup
          // CraftBukkit end
@@ -19919,7 +19919,7 @@ index b1f6d6a12865f3b30e9136fb548fa0a48a5ecb6e..1f8e12f5bdd00c683bb55ffbb157d6c7
      }
  
      public void setBlockEntity(BlockEntity blockEntity) {
-@@ -1033,26 +1038,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1032,26 +1037,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
          this.getProfiler().incrementCounter("getEntities");
          List<Entity> list = Lists.newArrayList();
@@ -19947,7 +19947,7 @@ index b1f6d6a12865f3b30e9136fb548fa0a48a5ecb6e..1f8e12f5bdd00c683bb55ffbb157d6c7
          return list;
      }
  
-@@ -1070,33 +1056,23 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1069,33 +1055,23 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
          this.getProfiler().incrementCounter("getEntities");
@@ -19997,7 +19997,7 @@ index b1f6d6a12865f3b30e9136fb548fa0a48a5ecb6e..1f8e12f5bdd00c683bb55ffbb157d6c7
      }
  
      @Nullable
-@@ -1386,4 +1362,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1385,4 +1361,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
      }
      // Paper end - notify observers even if grow failed
diff --git a/patches/server/0987-incremental-chunk-and-player-saving.patch b/patches/server/0986-incremental-chunk-and-player-saving.patch
similarity index 98%
rename from patches/server/0987-incremental-chunk-and-player-saving.patch
rename to patches/server/0986-incremental-chunk-and-player-saving.patch
index 9385746d87..91c57a54a9 100644
--- a/patches/server/0987-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0986-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 d2fff98640a44f48d85044cd037cb3e9f8061125..b06cb60d937523e0143da9d93c3932ab64ead147 100644
+index 3b8213723670201909a3b07e181d05aecc7ec296..19d549e33c0eb085661fcaa29a6bd8f2dba062bd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1296,6 +1296,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1302,6 +1302,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
      }
  
diff --git a/patches/server/0988-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 96%
rename from patches/server/0988-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index ef56c1e746..474f3d6165 100644
--- a/patches/server/0988-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
@@ -29,10 +29,10 @@ index 02367ef1371dde94ff6c4cd40bd32e800d6ccaaf..7b0fc7135bc107103dcaed6dc0707b18
          this.x = x;
          this.y = y;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 1f8e12f5bdd00c683bb55ffbb157d6c78500c683..93763e0e8a632b1662556bcaff4f0e266ac1fbe4 100644
+index d3137c9e5cc42ef191ea233b0d37eafeffc6f82c..eb7df68d146f9e841bdf99fa2d85fb4b04e603ce 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -340,7 +340,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -339,7 +339,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      // Paper end
  
      public boolean isInWorldBounds(BlockPos pos) {
diff --git a/patches/server/0989-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 97%
rename from patches/server/0989-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 06172d0f40..e326101721 100644
--- a/patches/server/0989-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0988-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 b06cb60d937523e0143da9d93c3932ab64ead147..1d23269ef14bb625c202236f819a7f43cdd9d960 100644
+index 19d549e33c0eb085661fcaa29a6bd8f2dba062bd..c01b40e8b59fd3414e24908fa1d879f231c57091 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2582,6 +2582,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2588,6 +2588,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                              {
                                  if ( iter.next().player == entity )
                                  {
diff --git a/patches/server/0990-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 98%
rename from patches/server/0990-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 09a60cf0d3..1a86ce02de 100644
--- a/patches/server/0990-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -62,10 +62,10 @@ index bb8e962e63c7a2d931f9bd7f7c002aa35cfa5fd3..0fa131a6c98adb498fc8d534e0e39647
      default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
          // Paper start - Add predicate for blocks when raytracing
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 93763e0e8a632b1662556bcaff4f0e266ac1fbe4..a5e5f393afcf641dda9e9d847280bebf2301157d 100644
+index eb7df68d146f9e841bdf99fa2d85fb4b04e603ce..12ab7097562d49dc466737378046707dc1b36b3b 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -332,10 +332,87 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -331,10 +331,87 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
  
diff --git a/patches/server/0991-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 97%
rename from patches/server/0991-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index 8360f8cb92..84396ba635 100644
--- a/patches/server/0991-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
@@ -333,7 +333,7 @@ index f57679d88cd015caa8996d44b486da694df29521..f94458d4270042062b9ae18931cc8179
 +    // Paper end - Optimize network
  }
 diff --git a/src/main/java/net/minecraft/network/protocol/Packet.java b/src/main/java/net/minecraft/network/protocol/Packet.java
-index 4c776c591dd0a7b36945a6487fdfe86d1187b4af..1ffb80e431b88b24c698f364b40b10590c61b656 100644
+index 4c776c591dd0a7b36945a6487fdfe86d1187b4af..5ee2ba1225fb7e4f02152b45adeb66f79ed1650d 100644
 --- a/src/main/java/net/minecraft/network/protocol/Packet.java
 +++ b/src/main/java/net/minecraft/network/protocol/Packet.java
 @@ -22,4 +22,31 @@ public interface Packet<T extends PacketListener> {
@@ -345,14 +345,14 @@ index 4c776c591dd0a7b36945a6487fdfe86d1187b4af..1ffb80e431b88b24c698f364b40b1059
 +    /**
 +     * @param player Null if not at PLAY stage yet
 +     */
-+    default void onPacketDispatch(@Nullable net.minecraft.server.level.ServerPlayer player) {
++    default void onPacketDispatch(@org.jetbrains.annotations.Nullable net.minecraft.server.level.ServerPlayer player) {
 +    }
 +
 +    /**
 +     * @param player Null if not at PLAY stage yet
 +     * @param future Can be null if packet was cancelled
 +     */
-+    default void onPacketDispatchFinish(@Nullable net.minecraft.server.level.ServerPlayer player, @Nullable io.netty.channel.ChannelFuture future) {}
++    default void onPacketDispatchFinish(@org.jetbrains.annotations.Nullable net.minecraft.server.level.ServerPlayer player, @org.jetbrains.annotations.Nullable io.netty.channel.ChannelFuture future) {}
 +
 +    default boolean hasFinishListener() {
 +        return false;
@@ -362,7 +362,7 @@ index 4c776c591dd0a7b36945a6487fdfe86d1187b4af..1ffb80e431b88b24c698f364b40b1059
 +        return true;
 +    }
 +
-+    @Nullable
++    @org.jetbrains.annotations.Nullable
 +    default java.util.List<Packet<?>> getExtraPackets() {
 +        return null;
 +    }
diff --git a/patches/server/0992-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0991-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0992-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0991-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0993-Fix-World-isChunkGenerated-calls.patch b/patches/server/0992-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0993-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0992-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0994-Flat-bedrock-generator-settings.patch b/patches/server/0993-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0994-Flat-bedrock-generator-settings.patch
rename to patches/server/0993-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0995-Entity-Activation-Range-2.0.patch b/patches/server/0994-Entity-Activation-Range-2.0.patch
similarity index 98%
rename from patches/server/0995-Entity-Activation-Range-2.0.patch
rename to patches/server/0994-Entity-Activation-Range-2.0.patch
index f46512e3dc..ff562af6ec 100644
--- a/patches/server/0995-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0994-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 1d23269ef14bb625c202236f819a7f43cdd9d960..aca9a9d8d004567f6189eff04c77063c561a8df0 100644
+index c01b40e8b59fd3414e24908fa1d879f231c57091..b2309742c5eefdff58ef188670023ed49675e2b5 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 1d23269ef14bb625c202236f819a7f43cdd9d960..aca9a9d8d004567f6189eff04c77063c
  import com.google.common.collect.Lists;
  import com.mojang.datafixers.DataFixer;
  import com.mojang.datafixers.util.Pair;
-@@ -1228,17 +1227,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1234,17 +1233,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 1d23269ef14bb625c202236f819a7f43cdd9d960..aca9a9d8d004567f6189eff04c77063c
          try {
          // Paper end - timings
          entity.setOldPosAndRot();
-@@ -1249,9 +1248,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1255,9 +1254,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString();
          });
          gameprofilerfiller.incrementCounter("tickNonPassenger");
@@ -64,7 +64,7 @@ index 1d23269ef14bb625c202236f819a7f43cdd9d960..aca9a9d8d004567f6189eff04c77063c
          Iterator iterator = entity.getPassengers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1259,13 +1262,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1265,13 +1268,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
              this.tickPassenger(entity, entity1);
          }
@@ -84,7 +84,7 @@ index 1d23269ef14bb625c202236f819a7f43cdd9d960..aca9a9d8d004567f6189eff04c77063c
                  passenger.setOldPosAndRot();
                  ++passenger.tickCount;
                  ProfilerFiller gameprofilerfiller = this.getProfiler();
-@@ -1274,8 +1282,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1280,8 +1288,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      return BuiltInRegistries.ENTITY_TYPE.getKey(passenger.getType()).toString();
                  });
                  gameprofilerfiller.incrementCounter("tickPassenger");
@@ -102,7 +102,7 @@ index 1d23269ef14bb625c202236f819a7f43cdd9d960..aca9a9d8d004567f6189eff04c77063c
                  gameprofilerfiller.pop();
                  Iterator iterator = passenger.getPassengers().iterator();
  
-@@ -1285,6 +1302,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1291,6 +1308,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      this.tickPassenger(passenger, entity2);
                  }
  
@@ -340,7 +340,7 @@ index 0b7f52021441d633c37543e8ae485e81c292b747..d7f8464bf3eed0e42a5fc7f14a5b243d
 +
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a5e5f393afcf641dda9e9d847280bebf2301157d..6d0437fa1dc43f69ed3e7cc61e0e6955c7d1f7ca 100644
+index 12ab7097562d49dc466737378046707dc1b36b3b..2d829eb4d39aec82c23a55f30f22a9a5f7003d27 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -154,6 +154,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0996-Optional-per-player-mob-spawns.patch b/patches/server/0995-Optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0996-Optional-per-player-mob-spawns.patch
rename to patches/server/0995-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0997-Anti-Xray.patch b/patches/server/0996-Anti-Xray.patch
similarity index 99%
rename from patches/server/0997-Anti-Xray.patch
rename to patches/server/0996-Anti-Xray.patch
index ba54ec81dc..f8fa4e94a1 100644
--- a/patches/server/0997-Anti-Xray.patch
+++ b/patches/server/0996-Anti-Xray.patch
@@ -1104,7 +1104,7 @@ 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 aca9a9d8d004567f6189eff04c77063c561a8df0..ed8e875fff01c6b464fbaefbb0a3f417f9d67a72 100644
+index b2309742c5eefdff58ef188670023ed49675e2b5..2092029f19e40a005c477b989639fe7a62b76fbb 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 {
@@ -1168,7 +1168,7 @@ index 11f13eb06516aefca926e150b9b66bafdebf4226..5b031c7c13fb2c2e593eec4c8f6a973a
          }
          // Paper end - Send empty chunk
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6d0437fa1dc43f69ed3e7cc61e0e6955c7d1f7ca..a0d0c7d55158a00e0ca4bfaab67bb5c7f80f2a74 100644
+index 2d829eb4d39aec82c23a55f30f22a9a5f7003d27..ff8d947c5a498e097a4c480a5dc9af71b0be5ee9 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -169,6 +169,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1188,15 +1188,15 @@ index 6d0437fa1dc43f69ed3e7cc61e0e6955c7d1f7ca..a0d0c7d55158a00e0ca4bfaab67bb5c7
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
          this.generator = gen;
-@@ -286,6 +287,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper - Option to keep spawn chunks loaded
+@@ -285,6 +286,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+         this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
          this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
 +        this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
      }
  
      // Paper start - Cancel hit for vanished players
-@@ -561,6 +563,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -560,6 +562,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // CraftBukkit end
  
              BlockState iblockdata1 = chunk.setBlockState(pos, state, (flags & 64) != 0, (flags & 1024) == 0); // CraftBukkit custom NO_PLACE flag
diff --git a/patches/server/0998-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/0998-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0999-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0999-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0998-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/1000-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/1000-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1001-Entity-load-save-limit-per-chunk.patch b/patches/server/1000-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/1001-Entity-load-save-limit-per-chunk.patch
rename to patches/server/1000-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1002-Improved-Watchdog-Support.patch b/patches/server/1001-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/1002-Improved-Watchdog-Support.patch
rename to patches/server/1001-Improved-Watchdog-Support.patch
index 5266944c88..bafe036e53 100644
--- a/patches/server/1002-Improved-Watchdog-Support.patch
+++ b/patches/server/1001-Improved-Watchdog-Support.patch
@@ -291,10 +291,10 @@ index 2510589400b3012b827efcab477c6483d9d55901..43487a9ee202c5b0e5a416519939111f
          }
      }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a0d0c7d55158a00e0ca4bfaab67bb5c7f80f2a74..799db7d6229de9e4b7b97da91037dc8fed5b379e 100644
+index ff8d947c5a498e097a4c480a5dc9af71b0be5ee9..ee49f59ba8ce5708fc5e244eba7b1f910cf69263 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -927,6 +927,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -926,6 +926,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
diff --git a/patches/server/1003-Optimize-Voxel-Shape-Merging.patch b/patches/server/1002-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/1003-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/1002-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1004-Write-SavedData-IO-async.patch b/patches/server/1003-Write-SavedData-IO-async.patch
similarity index 96%
rename from patches/server/1004-Write-SavedData-IO-async.patch
rename to patches/server/1003-Write-SavedData-IO-async.patch
index a1052c55c9..f074fb039e 100644
--- a/patches/server/1004-Write-SavedData-IO-async.patch
+++ b/patches/server/1003-Write-SavedData-IO-async.patch
@@ -24,10 +24,10 @@ index c7b7f153895a4b95b2071a31db00c9c4b69fa094..0b7a38b9e92b19345a34c6226413a9b1
  
      // 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 ed8e875fff01c6b464fbaefbb0a3f417f9d67a72..aba5f694b25507c9ab2e214bc1f25e0a895e8a95 100644
+index 2092029f19e40a005c477b989639fe7a62b76fbb..ec40198d3dd8df954ccb753f08bd207e9583b3db 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1324,7 +1324,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1330,7 +1330,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
          try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) {
              if (doFull) {
@@ -36,7 +36,7 @@ index ed8e875fff01c6b464fbaefbb0a3f417f9d67a72..aba5f694b25507c9ab2e214bc1f25e0a
              }
  
              this.timings.worldSaveChunks.startTiming(); // Paper
-@@ -1360,7 +1360,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1366,7 +1366,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
              }
  
@@ -45,7 +45,7 @@ index ed8e875fff01c6b464fbaefbb0a3f417f9d67a72..aba5f694b25507c9ab2e214bc1f25e0a
              if (progressListener != null) {
                  progressListener.progressStage(Component.translatable("menu.savingChunks"));
              }
-@@ -1383,12 +1383,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1389,12 +1389,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // CraftBukkit end
      }
  
diff --git a/patches/server/1005-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 98%
rename from patches/server/1005-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 8ee31531f2..85b58c0866 100644
--- a/patches/server/1005-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -25,10 +25,10 @@ index 550c0cf4d84afc0cd6b2675bdc6aa2282d87e312..6bd6533e314b64d3512cbb46f5174a49
  
                              if (!this.level.isInWorldBounds(blockposition)) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 799db7d6229de9e4b7b97da91037dc8fed5b379e..232ac315fa1ed0e6e9ff4882d3378745804e4e1c 100644
+index ee49f59ba8ce5708fc5e244eba7b1f910cf69263..d3d7abb2d31e8ce9f9c53eca66a83a1c28fec792 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -534,6 +534,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -533,6 +533,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) {
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
diff --git a/patches/server/1006-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/1006-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/1007-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/1007-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1008-Remove-streams-from-hot-code.patch b/patches/server/1007-Remove-streams-from-hot-code.patch
similarity index 100%
rename from patches/server/1008-Remove-streams-from-hot-code.patch
rename to patches/server/1007-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1009-Eigencraft-redstone-implementation.patch b/patches/server/1008-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/1009-Eigencraft-redstone-implementation.patch
rename to patches/server/1008-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/1010-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/1010-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1011-Improve-boat-collision-performance.patch b/patches/server/1010-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/1011-Improve-boat-collision-performance.patch
rename to patches/server/1010-Improve-boat-collision-performance.patch
diff --git a/patches/server/1012-Optimise-general-POI-access.patch b/patches/server/1011-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/1012-Optimise-general-POI-access.patch
rename to patches/server/1011-Optimise-general-POI-access.patch
diff --git a/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 98%
rename from patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch
index 3eeecba88d..96d90abea3 100644
--- a/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch
@@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..57d0cd3ad6f972e986c72a57f1a6e360
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
-index daedcfd867ed6171fb61bdcbded417a11c8a5b0f..223ab2d0256fa6df8064f16bc5f8fbe87a1422e4 100644
+index daedcfd867ed6171fb61bdcbded417a11c8a5b0f..45744d86e9582a93a0cec26009deea091080fbbe 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java
 @@ -39,11 +39,13 @@ public abstract class StateHolder<O, S> {
@@ -186,7 +186,7 @@ index daedcfd867ed6171fb61bdcbded417a11c8a5b0f..223ab2d0256fa6df8064f16bc5f8fbe8
          this.owner = owner;
          this.values = propertyMap;
          this.propertiesCodec = codec;
-+        this.optimisedTable = new io.papermc.paper.util.table.ZeroCollidingReferenceStateTable(this, entries); // Paper - optimise state lookup
++        this.optimisedTable = new io.papermc.paper.util.table.ZeroCollidingReferenceStateTable(this, propertyMap); // Paper - optimise state lookup
      }
  
      public <T extends Comparable<T>> S cycle(Property<T> property) {
diff --git a/patches/server/1014-Execute-chunk-tasks-mid-tick.patch b/patches/server/1013-Execute-chunk-tasks-mid-tick.patch
similarity index 95%
rename from patches/server/1014-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/1013-Execute-chunk-tasks-mid-tick.patch
index a79f7ed4f7..1413d8d94c 100644
--- a/patches/server/1014-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/1013-Execute-chunk-tasks-mid-tick.patch
@@ -123,7 +123,7 @@ index 0b7a38b9e92b19345a34c6226413a9b133264077..18640c8681f6a3b2276123d19e3e8f0a
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index aba5f694b25507c9ab2e214bc1f25e0a895e8a95..d917407dbab842c6aec5f5a37f29dc9dd6d86407 100644
+index ec40198d3dd8df954ccb753f08bd207e9583b3db..b80ccdd40c9ecafae31834d5ffa79c3cf2d470ee 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 aba5f694b25507c9ab2e214bc1f25e0a895e8a95..d917407dbab842c6aec5f5a37f29dc9d
  
      // CraftBukkit start
      public final LevelStorageSource.LevelStorageAccess convertable;
-@@ -1211,6 +1212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1217,6 +1218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (fluid1.is(fluid)) {
              fluid1.tick(this, pos);
          }
@@ -142,7 +142,7 @@ index aba5f694b25507c9ab2e214bc1f25e0a895e8a95..d917407dbab842c6aec5f5a37f29dc9d
  
      }
  
-@@ -1220,6 +1222,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1226,6 +1228,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          if (iblockdata.is(block)) {
              iblockdata.tick(this, pos, this.random);
          }
@@ -151,10 +151,10 @@ index aba5f694b25507c9ab2e214bc1f25e0a895e8a95..d917407dbab842c6aec5f5a37f29dc9d
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 232ac315fa1ed0e6e9ff4882d3378745804e4e1c..e982de0ec4e45219962ea775f355a5740b3906af 100644
+index d3d7abb2d31e8ce9f9c53eca66a83a1c28fec792..dab55ab08665f2b5ae0c899a4ab07c18460552ae 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -916,6 +916,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -915,6 +915,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  // Spigot end
              } else if (flag && this.shouldTickBlocksAt(tickingblockentity.getPos())) {
                  tickingblockentity.tick();
@@ -166,7 +166,7 @@ index 232ac315fa1ed0e6e9ff4882d3378745804e4e1c..e982de0ec4e45219962ea775f355a574
              }
          }
          this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075
-@@ -930,6 +935,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -929,6 +934,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public <T extends Entity> void guardEntityTick(Consumer<T> tickConsumer, T entity) {
          try {
              tickConsumer.accept(entity);
diff --git a/patches/server/1015-Optimise-random-block-ticking.patch b/patches/server/1014-Optimise-random-block-ticking.patch
similarity index 96%
rename from patches/server/1015-Optimise-random-block-ticking.patch
rename to patches/server/1014-Optimise-random-block-ticking.patch
index 7e57e5f795..d468b8bfa1 100644
--- a/patches/server/1015-Optimise-random-block-ticking.patch
+++ b/patches/server/1014-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 d917407dbab842c6aec5f5a37f29dc9dd6d86407..16d24e70072e3846b3c35d331c3f474238a8def2 100644
+index b80ccdd40c9ecafae31834d5ffa79c3cf2d470ee..00d8290bf851de501a93ff8219be35f88a2fa081 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -861,6 +861,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -867,6 +867,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
              entityplayer.stopSleepInBed(false, false);
          });
      }
@@ -104,7 +104,7 @@ index d917407dbab842c6aec5f5a37f29dc9dd6d86407..16d24e70072e3846b3c35d331c3f4742
  
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
-@@ -870,8 +874,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -876,8 +880,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
          ProfilerFiller gameprofilerfiller = this.getProfiler();
  
          gameprofilerfiller.push("thunder");
@@ -116,7 +116,7 @@ index d917407dbab842c6aec5f5a37f29dc9dd6d86407..16d24e70072e3846b3c35d331c3f4742
  
              if (this.isRainingAt(blockposition)) {
                  DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
-@@ -903,7 +909,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -909,7 +915,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 d917407dbab842c6aec5f5a37f29dc9dd6d86407..16d24e70072e3846b3c35d331c3f4742
              }
          }
          } // Paper - Option to disable ice and snow
-@@ -911,36 +920,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -917,36 +926,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
          gameprofilerfiller.popPush("tickBlocks");
          timings.chunkTicksBlocks.startTiming(); // Paper
          if (randomTickSpeed > 0) {
@@ -190,7 +190,7 @@ index d917407dbab842c6aec5f5a37f29dc9dd6d86407..16d24e70072e3846b3c35d331c3f4742
  
          timings.chunkTicksBlocks.stopTiming(); // Paper
          gameprofilerfiller.pop();
-@@ -948,17 +958,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -954,17 +964,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      @VisibleForTesting
      public void tickPrecipitation(BlockPos pos) {
@@ -220,7 +220,7 @@ index d917407dbab842c6aec5f5a37f29dc9dd6d86407..16d24e70072e3846b3c35d331c3f4742
              if (i > 0 && biomebase.shouldSnow(this, blockposition1)) {
                  BlockState iblockdata = this.getBlockState(blockposition1);
  
-@@ -976,12 +994,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -982,12 +1000,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  }
              }
  
@@ -324,10 +324,10 @@ index ffffa53fcaa6ec8681b283fa20bb5a3320ad9c11..30b87b5cb18c25cdd04eab64cfbe5acd
  
      public BlockPos getHomePos() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index e982de0ec4e45219962ea775f355a5740b3906af..5b3143723e1637c2ab44363b208cd26b659d70cc 100644
+index dab55ab08665f2b5ae0c899a4ab07c18460552ae..4001bec504b8fcda1eec03f49abd4e4d82cf6336 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1388,10 +1388,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1387,10 +1387,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public abstract RecipeManager getRecipeManager();
  
      public BlockPos getBlockRandomPos(int x, int y, int z, int l) {
diff --git a/patches/server/1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1017-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/1017-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1018-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch
similarity index 98%
rename from patches/server/1018-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/1017-Detail-more-information-in-watchdog-dumps.patch
index f9c0ba3190..2fba561ba5 100644
--- a/patches/server/1018-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1017-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 16d24e70072e3846b3c35d331c3f474238a8def2..98fded81545a96deb6a05df713a5b69e27189cf4 100644
+index 00d8290bf851de501a93ff8219be35f88a2fa081..8432d48086f5ff5c43e5217382aad023abc5bb5a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1245,7 +1245,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1251,7 +1251,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      }
  
@@ -106,7 +106,7 @@ index 16d24e70072e3846b3c35d331c3f474238a8def2..98fded81545a96deb6a05df713a5b69e
          ++TimingHistory.entityTicks; // Paper - timings
          // Spigot start
          co.aikar.timings.Timing timer; // Paper
-@@ -1285,7 +1304,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -1291,7 +1310,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
              this.tickPassenger(entity, entity1);
          }
          // } finally { timer.stopTiming(); } // Paper - timings - move up
diff --git a/patches/server/1019-Collision-optimisations.patch b/patches/server/1018-Collision-optimisations.patch
similarity index 99%
rename from patches/server/1019-Collision-optimisations.patch
rename to patches/server/1018-Collision-optimisations.patch
index d017c63f57..5c38c5ae4e 100644
--- a/patches/server/1019-Collision-optimisations.patch
+++ b/patches/server/1018-Collision-optimisations.patch
@@ -2616,10 +2616,10 @@ index 9a28912f52824acdc80a62243b136e6f365bf567..21843501355a0c0c8d594e3e5312e978
  
      // Paper start - Affects Spawning API
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5b3143723e1637c2ab44363b208cd26b659d70cc..ae569a4837dc82bbc390d281d774179706772959 100644
+index 4001bec504b8fcda1eec03f49abd4e4d82cf6336..07281d73fcbca2ea5f8bce25f6bf961d258bf8a0 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -288,6 +288,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -287,6 +287,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
          this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
          this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
@@ -2630,7 +2630,7 @@ index 5b3143723e1637c2ab44363b208cd26b659d70cc..ae569a4837dc82bbc390d281d7741797
      }
  
      // Paper start - Cancel hit for vanished players
-@@ -329,6 +333,366 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -328,6 +332,366 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return true;
      }
      // Paper end - Cancel hit for vanished players
@@ -2997,7 +2997,7 @@ index 5b3143723e1637c2ab44363b208cd26b659d70cc..ae569a4837dc82bbc390d281d7741797
      @Override
      public boolean isClientSide() {
          return this.isClientSide;
-@@ -950,7 +1314,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -949,7 +1313,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      @Override
      public boolean noCollision(@Nullable Entity entity, AABB box) {
          if (entity instanceof net.minecraft.world.entity.decoration.ArmorStand && !entity.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return false;
diff --git a/patches/server/1020-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/1020-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch
similarity index 100%
rename from patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch
rename to patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1022-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/1022-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1023-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/1023-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/1022-Add-Alternate-Current-redstone-implementation.patch
index f2c62489a6..c70ff9baaf 100644
--- a/patches/server/1023-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/1022-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 98fded81545a96deb6a05df713a5b69e27189cf4..a2a5a43c5e73ba2cccbec4e1ac563f692ae901b5 100644
+index 8432d48086f5ff5c43e5217382aad023abc5bb5a..8960bf9b5a22b7c6dc9c7a89183c7653bf844630 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 98fded81545a96deb6a05df713a5b69e27189cf4..a2a5a43c5e73ba2cccbec4e1ac563f69
  
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
-@@ -2560,6 +2561,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2566,6 +2567,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
          return crashreportsystemdetails;
      }
  
@@ -2035,10 +2035,10 @@ index 98fded81545a96deb6a05df713a5b69e27189cf4..a2a5a43c5e73ba2cccbec4e1ac563f69
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index ae569a4837dc82bbc390d281d774179706772959..68746df814aa1a8714e199ff887cad9f8bfa283c 100644
+index 07281d73fcbca2ea5f8bce25f6bf961d258bf8a0..0a8eeebb2d702ebcefd9f26cc0f41d1eab497902 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1882,4 +1882,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1881,4 +1881,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return ret;
      }
      // Paper end
diff --git a/patches/server/1024-optimize-dirt-and-snow-spreading.patch b/patches/server/1023-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/1024-optimize-dirt-and-snow-spreading.patch
rename to patches/server/1023-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1025-Properly-resend-entities.patch b/patches/server/1024-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/1025-Properly-resend-entities.patch
rename to patches/server/1024-Properly-resend-entities.patch
index 9613194ecf..adce92a9f0 100644
--- a/patches/server/1025-Properly-resend-entities.patch
+++ b/patches/server/1024-Properly-resend-entities.patch
@@ -166,7 +166,7 @@ index 8ad2d17615ff489b2fbbb13480dd0b217a42d805..2bc85351e6e52f90da5fdb29d8d042a0
      public boolean equals(Object object) {
          return object instanceof Entity ? ((Entity) object).id == this.id : false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 75e01c1e01e0782fc8af48777bbe4716d37aeafa..9ff43ff4076c658b8561c5a7abd067423830f964 100644
+index 75e01c1e01e0782fc8af48777bbe4716d37aeafa..2d375fc98e72246f6a640c390cb50d055fb59f8b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3828,6 +3828,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -175,7 +175,7 @@ index 75e01c1e01e0782fc8af48777bbe4716d37aeafa..9ff43ff4076c658b8561c5a7abd06742
  
 +    // Paper start - Properly cancel usable items
 +    public void resyncUsingItem(ServerPlayer serverPlayer) {
-+        this.getEntityData().resendPossiblyDesyncedDataValues(java.util.List.of(DATA_LIVING_ENTITY_FLAGS), serverPlayer);
++        this.resendPossiblyDesyncedDataValues(java.util.List.of(DATA_LIVING_ENTITY_FLAGS), serverPlayer);
 +    }
 +    // Paper end - Properly cancel usable items
      private void updatingUsingItem() {
diff --git a/patches/server/1026-Optimize-Hoppers.patch b/patches/server/1025-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/1026-Optimize-Hoppers.patch
rename to patches/server/1025-Optimize-Hoppers.patch
index 3ff55551b9..8dc3029475 100644
--- a/patches/server/1026-Optimize-Hoppers.patch
+++ b/patches/server/1025-Optimize-Hoppers.patch
@@ -62,7 +62,7 @@ index 88549de2768149885c4eabbaaa71a38341453aed..1adcbfb16ea1fe3378cde7c53e886884
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 9510558d03faf5b704a763456c5f2d4f28bca6e8..8e5d8e146ae045797e07260e4108ba5f1e4d976d 100644
+index 655fa32422c24c81d682791110413e4c771677e0..ee8cbff27506a9e26ac0e058b1c361c4f8006eb1 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -795,7 +795,13 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/1027-Improve-performance-of-mass-crafts.patch b/patches/server/1026-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1027-Improve-performance-of-mass-crafts.patch
rename to patches/server/1026-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1028-Actually-optimise-explosions.patch b/patches/server/1027-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1028-Actually-optimise-explosions.patch
rename to patches/server/1027-Actually-optimise-explosions.patch
diff --git a/patches/server/1029-Optimise-chunk-tick-iteration.patch b/patches/server/1028-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/1029-Optimise-chunk-tick-iteration.patch
rename to patches/server/1028-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1030-Lag-compensation-ticks.patch b/patches/server/1029-Lag-compensation-ticks.patch
similarity index 93%
rename from patches/server/1030-Lag-compensation-ticks.patch
rename to patches/server/1029-Lag-compensation-ticks.patch
index 98579a7095..f4d7aa8589 100644
--- a/patches/server/1030-Lag-compensation-ticks.patch
+++ b/patches/server/1029-Lag-compensation-ticks.patch
@@ -28,7 +28,7 @@ index 1adcbfb16ea1fe3378cde7c53e8868840eade963..5f3b35f0dbd9e78ad18ef5cf7be1a807
              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 a2a5a43c5e73ba2cccbec4e1ac563f692ae901b5..14e37f4720f35c5aca1f31f1de5f60f7d9ef06cd 100644
+index 8960bf9b5a22b7c6dc9c7a89183c7653bf844630..b732bcb4ae21f4b79d18dd6233148fc780d8d53f 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 {
@@ -63,11 +63,11 @@ index f168044d36f22080504da171e5ed31a6f02385ba..5cedce1f432f6b809b25269242a16477
  
          if (this.hasDelayedDestroy) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9ff43ff4076c658b8561c5a7abd067423830f964..1ba83df3c2717dbd027b02d4d69e50091977d35f 100644
+index 2d375fc98e72246f6a640c390cb50d055fb59f8b..bad6a69246f6b0a4ada222b820f16469f91b0534 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3833,6 +3833,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
-         this.getEntityData().resendPossiblyDesyncedDataValues(java.util.List.of(DATA_LIVING_ENTITY_FLAGS), serverPlayer);
+         this.resendPossiblyDesyncedDataValues(java.util.List.of(DATA_LIVING_ENTITY_FLAGS), serverPlayer);
      }
      // Paper end - Properly cancel usable items
 +    // Paper start - lag compensate eating
@@ -84,7 +84,7 @@ index 9ff43ff4076c658b8561c5a7abd067423830f964..1ba83df3c2717dbd027b02d4d69e5009
 -        if (--this.useItemRemaining == 0 && !this.level().isClientSide && !stack.useOnRelease()) {
 +        // Paper start - lag compensate eating
 +        // we add 1 to the expected time to avoid lag compensating when we should not
-+        boolean shouldLagCompensate = this.useItem.getItem().isEdible() && this.eatStartTime != -1 && (System.nanoTime() - this.eatStartTime) > ((1 + this.totalEatTimeTicks) * 50 * (1000 * 1000));
++        boolean shouldLagCompensate = this.useItem.getItem().components().has(DataComponents.FOOD) && this.eatStartTime != -1 && (System.nanoTime() - this.eatStartTime) > ((1 + this.totalEatTimeTicks) * 50 * (1000 * 1000));
 +        if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !this.level().isClientSide && !stack.useOnRelease()) {
 +            this.useItemRemaining = 0;
 +            // Paper end - lag compensate eating
diff --git a/patches/server/1031-Optimise-nearby-player-retrieval.patch b/patches/server/1030-Optimise-nearby-player-retrieval.patch
similarity index 99%
rename from patches/server/1031-Optimise-nearby-player-retrieval.patch
rename to patches/server/1030-Optimise-nearby-player-retrieval.patch
index 7834340d07..a109760ec2 100644
--- a/patches/server/1031-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/1030-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 14e37f4720f35c5aca1f31f1de5f60f7d9ef06cd..16387f864b24c649927d5883d8158b0f7e6d0854 100644
+index b732bcb4ae21f4b79d18dd6233148fc780d8d53f..614dff798fe02dbbff6485bee75aa9d9cd0ba2d5 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/1032-Distance-manager-tick-timings.patch b/patches/server/1031-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/1032-Distance-manager-tick-timings.patch
rename to patches/server/1031-Distance-manager-tick-timings.patch
diff --git a/patches/server/1033-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch
similarity index 100%
rename from patches/server/1033-Handle-Oversized-block-entities-in-chunks.patch
rename to patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1034-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/1034-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1035-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1034-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/1035-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/1034-Fix-and-optimise-world-force-upgrading.patch
index abb2977eac..22eddc217c 100644
--- a/patches/server/1035-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/1034-Fix-and-optimise-world-force-upgrading.patch
@@ -301,7 +301,7 @@ index 5f3b35f0dbd9e78ad18ef5cf7be1a807beffeaf1..a43f597d1148e00a6533f74c25ce272c
  
              if (dimensionKey == LevelStem.OVERWORLD) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 68746df814aa1a8714e199ff887cad9f8bfa283c..6ddbb71ad67530a49efbecec949b9578c4425b39 100644
+index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..b4ef3ad2c17168085372f1fe46809f02d9dfe74a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -178,6 +178,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/1036-API-for-checking-sent-chunks.patch b/patches/server/1035-API-for-checking-sent-chunks.patch
similarity index 100%
rename from patches/server/1036-API-for-checking-sent-chunks.patch
rename to patches/server/1035-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1037-Fix-bees-aging-inside-hives.patch b/patches/server/1036-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/1037-Fix-bees-aging-inside-hives.patch
rename to patches/server/1036-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch b/removed-patches-1-20-5/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to removed-patches-1-20-5/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch