From 27cabc19a02e054276b58bfe0a40fc0add14d25e Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sun, 21 Jan 2024 19:37:09 +0100
Subject: [PATCH] [ci skip] Add more patch identifying comments

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

diff --git a/patches/api/0299-Missing-Entity-API.patch b/patches/api/0299-Missing-Entity-API.patch
index 16b4ca0bfd..31c2013ee9 100644
--- a/patches/api/0299-Missing-Entity-API.patch
+++ b/patches/api/0299-Missing-Entity-API.patch
@@ -1427,7 +1427,7 @@ index 87a814f63c3f35be35bfa210c9248ad211c0dd8f..14543c2238b45c526dd9aebea2aa5c22
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/ZombieVillager.java b/src/main/java/org/bukkit/entity/ZombieVillager.java
-index 7cc1d9a966454af70b7c25735fe474fe3eb97eb4..ad2eaee347cd2864aef30d2af48c1be6dc115c22 100644
+index 7cc1d9a966454af70b7c25735fe474fe3eb97eb4..ac6fd8ca95771c185c145f4589ddd5b2a6e8c2da 100644
 --- a/src/main/java/org/bukkit/entity/ZombieVillager.java
 +++ b/src/main/java/org/bukkit/entity/ZombieVillager.java
 @@ -90,4 +90,22 @@ public interface ZombieVillager extends Zombie {
@@ -1451,7 +1451,7 @@ index 7cc1d9a966454af70b7c25735fe474fe3eb97eb4..ad2eaee347cd2864aef30d2af48c1be6
 +     *                             org.bukkit.{@link org.bukkit.Sound#ENTITY_ZOMBIE_VILLAGER_CURE} from playing.
 +     */
 +    void setConversionTime(int time, boolean broadcastEntityEvent);
-+    // Paper stop - missing entity behaviour api - converting without entity event
++    // Paper end - missing entity behaviour api - converting without entity event
  }
 diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
 index db69687a7ad4b18d17ab1677cae5d8dd4dcd3678..304b05aeaea5febf493fc40d433a23acb384b4f0 100644
diff --git a/patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch
index 9382ddd92c..a88d2a93be 100644
--- a/patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0326-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2e29da775e60c149d2c251d78ee7c60b494215a4..c5ac78c4a4711e9c44d5eb7f66b28f448bcda63a 100644
+index 2e29da775e60c149d2c251d78ee7c60b494215a4..27fd3ea4d0f96efa24167623c756f463995161bd 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -2056,6 +2056,24 @@ public final class Bukkit {
@@ -28,7 +28,7 @@ index 2e29da775e60c149d2c251d78ee7c60b494215a4..c5ac78c4a4711e9c44d5eb7f66b28f44
 +    public static ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
 +        return server.createVanillaChunkData(world, x, z);
 +    }
-+    // Paper stop
++    // Paper end
 +
      /**
       * Creates a boss bar instance to display to players. The progress
diff --git a/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
index c2ea27c3e8..0752dc8c8b 100644
--- a/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -10,43 +10,43 @@ 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 8afcd4e3a3805c7bccffaf6ff751e23101db6ed8..e96abf6afd434c104437e2461431f8b4c82c1d00 100644
+index c6fd543d03813d6edc12aa919e77bb9a7c7315e7..d5ff2037fd2756da1aac9660e65453913be172cd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1742,12 +1742,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) {
-+        // Paper start - Particle API Expansion
++        // Paper start - Particle API
 +        return sendParticles(players, sender, t0, d0, d1, d2, i, d3, d4, d5, d6, force);
 +    }
 +    public <T extends ParticleOptions> int sendParticles(List<ServerPlayer> receivers, @Nullable ServerPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {
-+        // Paper end
++        // Paper end - Particle API
          ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(t0, force, d0, d1, d2, (float) d3, (float) d4, (float) d5, (float) d6, i);
          // CraftBukkit end
          int j = 0;
  
 -        for (int k = 0; k < this.players.size(); ++k) {
 -            ServerPlayer entityplayer = (ServerPlayer) this.players.get(k);
-+        for (Player entityhuman : receivers) { // Paper - Particle API Expansion
-+            ServerPlayer entityplayer = (ServerPlayer) entityhuman; // Paper - Particle API Expansion
++        for (Player entityhuman : receivers) { // Paper - Particle API
++            ServerPlayer entityplayer = (ServerPlayer) entityhuman; // Paper - Particle API
              if (sender != null && !entityplayer.getBukkitEntity().canSee(sender.getBukkitEntity())) continue; // CraftBukkit
  
              if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index eeb62a48a4c56d3465f74f63278bf76c6abe84ec..ac6bafab570738db2b706bf2b045ea4eec12131c 100644
+index 35ac3878b4391da29e248d26a6c76bf1582ea09d..c8e13ea3bc256b112fa5fd916c0fb583322c081b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1948,13 +1948,20 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
-+        // Paper start - Particle API Expansion
++        // Paper start - Particle API
 +        spawnParticle(particle, null, null, x, y, z, count, offsetX, offsetY, offsetZ, extra, data, force);
 +    }
 +    @Override
 +    public <T> void spawnParticle(Particle particle, List<Player> receivers, Player sender, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
-+        // Paper end
++        // Paper end - Particle API
          particle = CraftParticle.convertLegacy(particle);
          data = CraftParticle.convertLegacy(data);
          if (data != null) {
@@ -54,8 +54,8 @@ index eeb62a48a4c56d3465f74f63278bf76c6abe84ec..ac6bafab570738db2b706bf2b045ea4e
          }
          this.getHandle().sendParticles(
 -                null, // Sender
-+                receivers == null ? getHandle().players() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper -  Particle API Expansion
-+                sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API Expansion
++                receivers == null ? getHandle().players() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper -  Particle API
++                sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API
                  CraftParticle.createParticleParam(particle, data), // Particle
                  x, y, z, // Position
                  count,  // Count
diff --git a/patches/server/0194-EndermanAttackPlayerEvent.patch b/patches/server/0193-EndermanAttackPlayerEvent.patch
similarity index 91%
rename from patches/server/0194-EndermanAttackPlayerEvent.patch
rename to patches/server/0193-EndermanAttackPlayerEvent.patch
index 7870cc0325..42534bc87a 100644
--- a/patches/server/0194-EndermanAttackPlayerEvent.patch
+++ b/patches/server/0193-EndermanAttackPlayerEvent.patch
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index c897d55acdceae54bc2e7f3f3694ce421a8df687..5c620989acaff4fdb842944ea2d8ae331699a2b4 100644
+index c897d55acdceae54bc2e7f3f3694ce421a8df687..259ba77dcbc8ed5f7e4015a6683799cc4604dfb8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -236,7 +236,15 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -24,7 +24,7 @@ index c897d55acdceae54bc2e7f3f3694ce421a8df687..5c620989acaff4fdb842944ea2d8ae33
 +        return event.callEvent();
 +    }
 +    private boolean isLookingAtMe_check(Player player) {
-+        // Paper end
++        // Paper end - EndermanAttackPlayerEvent
          ItemStack itemstack = (ItemStack) player.getInventory().armor.get(3);
  
          if (itemstack.is(Blocks.CARVED_PUMPKIN.asItem())) {
diff --git a/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
deleted file mode 100644
index 662e3954c3..0000000000
--- a/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 10 Mar 2018 16:33:15 -0500
-Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
-
-1.17: Shouldn't be needed as blocks no longer tick without at least 1 radius chunk loaded.
-
-diff --git a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-index 0d08a9d5555ebc296a1461aefbf48e8eee6b462d..7f1946d371f9be2662788957c6f11a2e087df616 100644
---- a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java
-@@ -46,7 +46,8 @@ public class FrostedIceBlock extends IceBlock {
- 
-             for(Direction direction : Direction.values()) {
-                 mutableBlockPos.setWithOffset(pos, direction);
--                BlockState blockState = world.getBlockState(mutableBlockPos);
-+                BlockState blockState = world.getBlockStateIfLoaded(mutableBlockPos); // Paper
-+                if (blockState == null) { continue; } // Paper
-                 if (blockState.is(this) && !this.slightlyMelt(blockState, world, mutableBlockPos)) {
-                     world.scheduleTick(mutableBlockPos, this, Mth.nextInt(random, world.paperConfig().environment.frostedIce.delay.min, world.paperConfig().environment.frostedIce.delay.max)); // Paper - use configurable min/max delay
-                 }
-@@ -83,7 +84,10 @@ public class FrostedIceBlock extends IceBlock {
- 
-         for(Direction direction : Direction.values()) {
-             mutableBlockPos.setWithOffset(pos, direction);
--            if (world.getBlockState(mutableBlockPos).is(this)) {
-+            // Paper start
-+            BlockState blockState = world.getBlockStateIfLoaded(mutableBlockPos);
-+            if (blockState != null && blockState.is(this)) {
-+                // Paper end
-                 ++i;
-                 if (i >= maxNeighbors) {
-                     return false;
diff --git a/patches/server/0195-WitchConsumePotionEvent.patch b/patches/server/0194-WitchConsumePotionEvent.patch
similarity index 86%
rename from patches/server/0195-WitchConsumePotionEvent.patch
rename to patches/server/0194-WitchConsumePotionEvent.patch
index 23ce9ddbba..657554b31e 100644
--- a/patches/server/0195-WitchConsumePotionEvent.patch
+++ b/patches/server/0194-WitchConsumePotionEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index eeecb9057e039b4696ca4de1cd7191a95d17a1a6..a949e8546ecc2d6fd6690d8a00207dc187e2451a 100644
+index eeecb9057e039b4696ca4de1cd7191a95d17a1a6..d2cff117f178a370a7056865246276e795b6bace 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -126,7 +126,11 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -14,11 +14,11 @@ index eeecb9057e039b4696ca4de1cd7191a95d17a1a6..a949e8546ecc2d6fd6690d8a00207dc1
                      this.setItemSlot(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
                      if (itemstack.is(Items.POTION)) {
 -                        List<MobEffectInstance> list = PotionUtils.getMobEffects(itemstack);
-+                        // Paper start
++                        // Paper start - WitchConsumePotionEvent
 +                        com.destroystokyo.paper.event.entity.WitchConsumePotionEvent event = new com.destroystokyo.paper.event.entity.WitchConsumePotionEvent((org.bukkit.entity.Witch) this.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack));
 +
 +                        List<MobEffectInstance> list = event.callEvent() ? PotionUtils.getMobEffects(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion())) : null;
-+                        // Paper end
++                        // Paper end - WitchConsumePotionEvent
  
                          if (list != null) {
                              Iterator iterator = list.iterator();
diff --git a/patches/server/0196-WitchThrowPotionEvent.patch b/patches/server/0195-WitchThrowPotionEvent.patch
similarity index 89%
rename from patches/server/0196-WitchThrowPotionEvent.patch
rename to patches/server/0195-WitchThrowPotionEvent.patch
index 860191b9db..5f6cac02f4 100644
--- a/patches/server/0196-WitchThrowPotionEvent.patch
+++ b/patches/server/0195-WitchThrowPotionEvent.patch
@@ -6,14 +6,14 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index a949e8546ecc2d6fd6690d8a00207dc187e2451a..40876df2503eed53c5d7769931f8201fb709cf6f 100644
+index d2cff117f178a370a7056865246276e795b6bace..96a87db9f8976d3f1ff09beb9598db31fff72d5b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -239,9 +239,16 @@ public class Witch extends Raider implements RangedAttackMob {
                  potionregistry = Potions.WEAKNESS;
              }
  
-+            // Paper start
++            // Paper start - WitchThrowPotionEvent
 +            ItemStack potion = PotionUtils.setPotion(new ItemStack(Items.SPLASH_POTION), potionregistry);
 +            com.destroystokyo.paper.event.entity.WitchThrowPotionEvent event = new com.destroystokyo.paper.event.entity.WitchThrowPotionEvent((org.bukkit.entity.Witch) this.getBukkitEntity(), (org.bukkit.entity.LivingEntity) target.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(potion));
 +            if (!event.callEvent()) {
@@ -24,7 +24,7 @@ index a949e8546ecc2d6fd6690d8a00207dc187e2451a..40876df2503eed53c5d7769931f8201f
 -
 -            entitypotion.setItem(PotionUtils.setPotion(new ItemStack(Items.SPLASH_POTION), potionregistry));
 +            entitypotion.setItem(potion);
-+            // Paper end
++            // Paper end - WitchThrowPotionEvent
              entitypotion.setXRot(entitypotion.getXRot() - -20.0F);
              entitypotion.shoot(d0, d1 + d3 * 0.2D, d2, 0.75F, 8.0F);
              if (!this.isSilent()) {
diff --git a/patches/server/0197-WitchReadyPotionEvent.patch b/patches/server/0196-WitchReadyPotionEvent.patch
similarity index 93%
rename from patches/server/0197-WitchReadyPotionEvent.patch
rename to patches/server/0196-WitchReadyPotionEvent.patch
index d22f2f2885..dcaae5d271 100644
--- a/patches/server/0197-WitchReadyPotionEvent.patch
+++ b/patches/server/0196-WitchReadyPotionEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 40876df2503eed53c5d7769931f8201fb709cf6f..ca24b592273208e61e0e0ba59b7e5a3c11ebf952 100644
+index 96a87db9f8976d3f1ff09beb9598db31fff72d5b..f45b46e30e1ad0516c5b380e476bc7dacb91391a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -160,7 +160,11 @@ public class Witch extends Raider implements RangedAttackMob {
diff --git a/patches/server/0198-ItemStack-getMaxItemUseDuration.patch b/patches/server/0197-ItemStack-getMaxItemUseDuration.patch
similarity index 91%
rename from patches/server/0198-ItemStack-getMaxItemUseDuration.patch
rename to patches/server/0197-ItemStack-getMaxItemUseDuration.patch
index e81a524d20..a37f9cf78d 100644
--- a/patches/server/0198-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/server/0197-ItemStack-getMaxItemUseDuration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 7dd0c000fa7f363997178ffa6de7d39e17702348..ae7c3ad0597e5115b43458a91765a176f2d80227 100644
+index a05f01ca9a9bc88e414c8cf89c01c7e993e27dd2..07f011a968592ba5b38a0a2723189824ba5d0938 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -184,6 +184,13 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0199-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
similarity index 97%
rename from patches/server/0199-Implement-EntityTeleportEndGatewayEvent.patch
rename to patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
index e730b44490..09c4bebb01 100644
--- a/patches/server/0199-Implement-EntityTeleportEndGatewayEvent.patch
+++ b/patches/server/0198-Add-EntityTeleportEndGatewayEvent.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
-Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
+Subject: [PATCH] Add EntityTeleportEndGatewayEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
diff --git a/patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 89%
rename from patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
index ca3c8f8d69..071b12ee35 100644
--- a/patches/server/0200-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
+++ b/patches/server/0199-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 6594d501f51d18f5850999cceb9febfe206ec596..17ce05e7f9d2615be28a095ef6d3126885df8771 100644
+index 864854a677d6f498909b70c12babd190a8b1eb36..d85095117d7837e75640f0e447242b45e24cf00e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -278,6 +278,7 @@ public class Creeper extends Monster implements PowerableMob {
diff --git a/patches/server/0201-Fix-CraftEntity-hashCode.patch b/patches/server/0200-Fix-CraftEntity-hashCode.patch
similarity index 94%
rename from patches/server/0201-Fix-CraftEntity-hashCode.patch
rename to patches/server/0200-Fix-CraftEntity-hashCode.patch
index cb48492e74..a9def43722 100644
--- a/patches/server/0201-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0200-Fix-CraftEntity-hashCode.patch
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b96f65776155f57d599a0a0d06456c95088d38fb..594eeb83425787e160f8051f15c7cdf61a7bb090 100644
+index deb355b2188a49f818aaddad6c4ce60de94428e0..388c9db9d130071122e9f80749fb2eef05455408 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -499,14 +499,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0202-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0201-Configurable-LootPool-luck-formula.patch
similarity index 92%
rename from patches/server/0202-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to patches/server/0201-Configurable-LootPool-luck-formula.patch
index 20b7414cd7..6df631b746 100644
--- a/patches/server/0202-Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/patches/server/0201-Configurable-LootPool-luck-formula.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Jun 2018 00:30:32 -0400
-Subject: [PATCH] Configurable Alternative LootPool Luck Formula
+Subject: [PATCH] Configurable LootPool luck formula
 
 Rewrites the Vanilla luck application formula so that luck can be
 applied to items that do not have any quality defined.
@@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas.
 I would love to see this change in Vanilla, so Mojang please pull :)
 
 diff --git a/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java b/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
-index 6d5a2806345ff86e143e16ecedc2f1e8d80f5b85..d3de18b1f856a99aa4f2a556956af7e5511164bf 100644
+index 6d5a2806345ff86e143e16ecedc2f1e8d80f5b85..0cf437dd75b97b9ba39f5134ae2ae5f33b94f653 100644
 --- a/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
 +++ b/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java
 @@ -122,9 +122,35 @@ public abstract class LootPoolSingletonContainer extends LootPoolEntryContainer
@@ -44,7 +44,7 @@ index 6d5a2806345ff86e143e16ecedc2f1e8d80f5b85..d3de18b1f856a99aa4f2a556956af7e5
          @Override
          public int getWeight(float luck) {
 -            return Math.max(Mth.floor((float)LootPoolSingletonContainer.this.weight + (float)LootPoolSingletonContainer.this.quality * luck), 0);
-+            // Paper start - Offer an alternative loot formula to refactor how luck bonus applies
++            // Paper start - Configurable LootPool luck formula
 +            // SEE: https://luckformula.emc.gs for details and data
 +            if (LootPoolSingletonContainer.this.lastLuck != null && LootPoolSingletonContainer.this.lastLuck == luck) {
 +                return lastWeight;
@@ -72,7 +72,7 @@ index 6d5a2806345ff86e143e16ecedc2f1e8d80f5b85..d3de18b1f856a99aa4f2a556956af7e5
      }
 +    private Float lastLuck = null;
 +    private int lastWeight = 0;
-+    // Paper end
++    // Paper end - Configurable LootPool luck formula
  
      @FunctionalInterface
      protected interface EntryConstructor {
diff --git a/patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 88%
rename from patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch
rename to patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
index 46002fb1e9..ae45a45974 100644
--- a/patches/server/0203-Print-Error-details-when-failing-to-save-player-data.patch
+++ b/patches/server/0202-Print-Error-details-when-failing-to-save-player-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Print Error details when failing to save player data
 
 
 diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
-index 08f4cc47ec3aa4dd6980ba543219891a510b010b..b3a90d6ef0e17c236e0b3c46e2d0012671afdaa7 100644
+index 08f4cc47ec3aa4dd6980ba543219891a510b010b..63e187c65cb855031f286aad0d25ac4694f7a331 100644
 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
 @@ -47,7 +47,7 @@ public class PlayerDataStorage {
@@ -13,7 +13,7 @@ index 08f4cc47ec3aa4dd6980ba543219891a510b010b..b3a90d6ef0e17c236e0b3c46e2d00126
              Util.safeReplaceFile(path2, path1, path3);
          } catch (Exception exception) {
 -            PlayerDataStorage.LOGGER.warn("Failed to save player data for {}", player.getName().getString());
-+            PlayerDataStorage.LOGGER.warn("Failed to save player data for {}", player.getScoreboardName(), exception); // Paper
++            PlayerDataStorage.LOGGER.warn("Failed to save player data for {}", player.getScoreboardName(), exception); // Paper - Print exception
          }
  
      }
diff --git a/patches/server/0204-Make-shield-blocking-delay-configurable.patch b/patches/server/0203-Make-shield-blocking-delay-configurable.patch
similarity index 88%
rename from patches/server/0204-Make-shield-blocking-delay-configurable.patch
rename to patches/server/0203-Make-shield-blocking-delay-configurable.patch
index 50712d73a7..82e12bb8c2 100644
--- a/patches/server/0204-Make-shield-blocking-delay-configurable.patch
+++ b/patches/server/0203-Make-shield-blocking-delay-configurable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 39e02e922e67915c23ce4565eba33f656cbe81b6..dff2427e32b92a6deca0df81d0820353c5fc242a 100644
+index 39e02e922e67915c23ce4565eba33f656cbe81b6..0c0f8385a64e4b90dbd4e6363f3d0478a7f437e3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3808,12 +3808,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -13,13 +13,13 @@ index 39e02e922e67915c23ce4565eba33f656cbe81b6..dff2427e32b92a6deca0df81d0820353
              Item item = this.useItem.getItem();
  
 -            return item.getUseAnimation(this.useItem) != UseAnim.BLOCK ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= 5;
-+            return item.getUseAnimation(this.useItem) != UseAnim.BLOCK ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= getShieldBlockingDelay(); // Paper - shieldBlockingDelay
++            return item.getUseAnimation(this.useItem) != UseAnim.BLOCK ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= getShieldBlockingDelay(); // Paper - Make shield blocking delay configurable
          } else {
              return false;
          }
      }
  
-+    // Paper start
++    // Paper start - Make shield blocking delay configurable
 +    public int shieldBlockingDelay = this.level().paperConfig().misc.shieldBlockingDelay;
 +
 +    public int getShieldBlockingDelay() {
@@ -29,7 +29,7 @@ index 39e02e922e67915c23ce4565eba33f656cbe81b6..dff2427e32b92a6deca0df81d0820353
 +    public void setShieldBlockingDelay(int shieldBlockingDelay) {
 +        this.shieldBlockingDelay = shieldBlockingDelay;
 +    }
-+    // Paper end
++    // Paper end - Make shield blocking delay configurable
 +
      public boolean isSuppressingSlidingDownLadder() {
          return this.isShiftKeyDown();
diff --git a/patches/server/0205-Improve-EntityShootBowEvent.patch b/patches/server/0204-Improve-EntityShootBowEvent.patch
similarity index 94%
rename from patches/server/0205-Improve-EntityShootBowEvent.patch
rename to patches/server/0204-Improve-EntityShootBowEvent.patch
index eef1882378..9f5b75b9ea 100644
--- a/patches/server/0205-Improve-EntityShootBowEvent.patch
+++ b/patches/server/0204-Improve-EntityShootBowEvent.patch
@@ -22,14 +22,14 @@ index 8a668d36bafa5ba172b0ce510b46096ec2fd116a..dadb419a04b343d6ba59353c6caa1a50
              event.getProjectile().remove();
              return;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-index 421ed4daed9a61b9e9395538ff36606b196ca1f1..63fce7e3d9f59f36e29bc827a46396d73143bb8b 100644
+index 421ed4daed9a61b9e9395538ff36606b196ca1f1..fb84b35e34063075e69e00e430bc00e7c3b9d62c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 @@ -196,8 +196,18 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
          double d3 = Math.sqrt(d0 * d0 + d2 * d2);
  
          entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.level().getDifficulty().getId() * 4));
-+        // Paper start
++        // Paper start - EntityShootBowEvent
 +        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, target.getUsedItemHand(), 0.8F, true);
 +        if (event.isCancelled()) {
 +            event.getProjectile().remove();
@@ -39,7 +39,7 @@ index 421ed4daed9a61b9e9395538ff36606b196ca1f1..63fce7e3d9f59f36e29bc827a46396d7
 +        if (event.getProjectile() == entityarrow.getBukkitEntity()) {
 +            this.level().addFreshEntity(entityarrow);
 +        }
-+        // Paper end
++        // Paper end - EntityShootBowEvent
          this.playSound(SoundEvents.SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
 -        this.level().addFreshEntity(entityarrow);
      }
diff --git a/patches/server/0206-PlayerReadyArrowEvent.patch b/patches/server/0205-PlayerReadyArrowEvent.patch
similarity index 88%
rename from patches/server/0206-PlayerReadyArrowEvent.patch
rename to patches/server/0205-PlayerReadyArrowEvent.patch
index ff8b066018..6900915d22 100644
--- a/patches/server/0206-PlayerReadyArrowEvent.patch
+++ b/patches/server/0205-PlayerReadyArrowEvent.patch
@@ -7,14 +7,14 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 729c960a18a77b744eba0c9319cf5c2a9e84b707..45098aa460370669abdb3619fa4b1adef6fbf282 100644
+index 729c960a18a77b744eba0c9319cf5c2a9e84b707..695f241372eb0fe457cf91595520cbed9a5cdc3e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2177,18 +2177,29 @@ public abstract class Player extends LivingEntity {
          return ImmutableList.of(Pose.STANDING, Pose.CROUCHING, Pose.SWIMMING);
      }
  
-+    // Paper start
++    // Paper start - PlayerReadyArrowEvent
 +    protected boolean tryReadyArrow(ItemStack bow, ItemStack itemstack) {
 +        return !(this instanceof ServerPlayer) ||
 +                new com.destroystokyo.paper.event.player.PlayerReadyArrowEvent(
@@ -22,8 +22,8 @@ index 729c960a18a77b744eba0c9319cf5c2a9e84b707..45098aa460370669abdb3619fa4b1ade
 +                    org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(bow),
 +                    org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack)
 +                ).callEvent();
-+        // Paper end
 +    }
++    // Paper end - PlayerReadyArrowEvent
 +
      @Override
      public ItemStack getProjectile(ItemStack stack) {
@@ -31,14 +31,14 @@ index 729c960a18a77b744eba0c9319cf5c2a9e84b707..45098aa460370669abdb3619fa4b1ade
              return ItemStack.EMPTY;
          } else {
 -            Predicate<ItemStack> predicate = ((ProjectileWeaponItem) stack.getItem()).getSupportedHeldProjectiles();
-+            Predicate<ItemStack> predicate = ((ProjectileWeaponItem) stack.getItem()).getSupportedHeldProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper
++            Predicate<ItemStack> predicate = ((ProjectileWeaponItem) stack.getItem()).getSupportedHeldProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper - PlayerReadyArrowEvent
              ItemStack itemstack1 = ProjectileWeaponItem.getHeldProjectile(this, predicate);
  
              if (!itemstack1.isEmpty()) {
                  return itemstack1;
              } else {
 -                predicate = ((ProjectileWeaponItem) stack.getItem()).getAllSupportedProjectiles();
-+                predicate = ((ProjectileWeaponItem) stack.getItem()).getAllSupportedProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper
++                predicate = ((ProjectileWeaponItem) stack.getItem()).getAllSupportedProjectiles().and(item -> tryReadyArrow(stack, item)); // Paper - PlayerReadyArrowEvent
  
                  for (int i = 0; i < this.inventory.getContainerSize(); ++i) {
                      ItemStack itemstack2 = this.inventory.getItem(i);
diff --git a/patches/server/0207-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
similarity index 82%
rename from patches/server/0207-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
rename to patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
index 45c500df27..c0c612f8f1 100644
--- a/patches/server/0207-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch
+++ b/patches/server/0206-Add-EntityKnockbackByEntityEvent-and-EntityPushedByE.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
-Subject: [PATCH] Implement EntityKnockbackByEntityEvent and
+Subject: [PATCH] Add EntityKnockbackByEntityEvent and
  EntityPushedByEntityAttackEvent
 
 Co-authored-by: aerulion <aerulion@gmail.com>
@@ -9,7 +9,7 @@ Co-authored-by: aerulion <aerulion@gmail.com>
 This event is called when an entity receives knockback by another entity.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d66d30a016ac04d5f051e59ca168a6c2bb8794ab..dd4afab77500277b7697ca988e34b526d28d97c0 100644
+index d66d30a016ac04d5f051e59ca168a6c2bb8794ab..d9abd56d3802033bfd440f13640350b2fba017aa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1909,8 +1909,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -18,7 +18,7 @@ index d66d30a016ac04d5f051e59ca168a6c2bb8794ab..dd4afab77500277b7697ca988e34b526
      public void push(double deltaX, double deltaY, double deltaZ) {
 -        this.setDeltaMovement(this.getDeltaMovement().add(deltaX, deltaY, deltaZ));
 -        this.hasImpulse = true;
-+        // Paper start - call EntityPushedByEntityEvent
++        // Paper start - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
 +        this.push(deltaX, deltaY, deltaZ, null);
 +    }
 +
@@ -28,12 +28,12 @@ index d66d30a016ac04d5f051e59ca168a6c2bb8794ab..dd4afab77500277b7697ca988e34b526
 +            this.setDeltaMovement(this.getDeltaMovement().add(delta.getX(), delta.getY(), delta.getZ()));
 +            this.hasImpulse = true;
 +        }
-+        // Paper end - call EntityPushedByEntityEvent
++        // Paper end - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
      }
  
      protected void markHurt() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dff2427e32b92a6deca0df81d0820353c5fc242a..f17d6a208477daeb01b66b2894e871f4071cf3e8 100644
+index 0c0f8385a64e4b90dbd4e6363f3d0478a7f437e3..b8c4e7d81b20887e5a05b93a1bbe01e72ff55ba7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1513,7 +1513,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -41,7 +41,7 @@ index dff2427e32b92a6deca0df81d0820353c5fc242a..f17d6a208477daeb01b66b2894e871f4
                      }
  
 -                    this.knockback(0.4000000059604645D, d0, d1);
-+                    this.knockback(0.4000000059604645D, d0, d1, entity1); // Paper
++                    this.knockback(0.4000000059604645D, d0, d1, entity1); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
                      if (!flag) {
                          this.indicateDamage(d0, d1);
                      }
@@ -50,7 +50,7 @@ index dff2427e32b92a6deca0df81d0820353c5fc242a..f17d6a208477daeb01b66b2894e871f4
  
      protected void blockedByShield(LivingEntity target) {
 -        target.knockback(0.5D, target.getX() - this.getX(), target.getZ() - this.getZ());
-+        target.knockback(0.5D, target.getX() - this.getX(), target.getZ() - this.getZ(), this); // Paper
++        target.knockback(0.5D, target.getX() - this.getX(), target.getZ() - this.getZ(), this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
      }
  
      private boolean checkTotemDeathProtection(DamageSource source) {
@@ -58,11 +58,11 @@ index dff2427e32b92a6deca0df81d0820353c5fc242a..f17d6a208477daeb01b66b2894e871f4
      }
  
      public void knockback(double strength, double x, double z) {
-+        // Paper start - add knockbacking entity parameter
++        // Paper start - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
 +        this.knockback(strength, x, z, null);
 +    }
 +    public void knockback(double strength, double x, double z, Entity knockingBackEntity) {
-+        // Paper end - add knockbacking entity parameter
++        // Paper end - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
          strength *= 1.0D - this.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE);
          if (strength > 0.0D) {
              this.hasImpulse = true;
@@ -70,7 +70,7 @@ index dff2427e32b92a6deca0df81d0820353c5fc242a..f17d6a208477daeb01b66b2894e871f4
              Vec3 vec3d1 = (new Vec3(x, 0.0D, z)).normalize().scale(strength);
  
              this.setDeltaMovement(vec3d.x / 2.0D - vec3d1.x, this.onGround() ? Math.min(0.4D, vec3d.y / 2.0D + strength) : vec3d.y, vec3d.z / 2.0D - vec3d1.z);
-+            // Paper start - call EntityKnockbackByEntityEvent
++            // Paper start - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEventt
 +            Vec3 currentMovement = this.getDeltaMovement();
 +            org.bukkit.util.Vector delta = new org.bukkit.util.Vector(currentMovement.x - vec3d.x, currentMovement.y - vec3d.y, currentMovement.z - vec3d.z);
 +            // Restore old velocity to be able to access it in the event
@@ -78,12 +78,12 @@ index dff2427e32b92a6deca0df81d0820353c5fc242a..f17d6a208477daeb01b66b2894e871f4
 +            if (knockingBackEntity == null || new com.destroystokyo.paper.event.entity.EntityKnockbackByEntityEvent((org.bukkit.entity.LivingEntity) getBukkitEntity(), knockingBackEntity.getBukkitEntity(), (float) strength, delta).callEvent()) {
 +                this.setDeltaMovement(vec3d.x + delta.getX(), vec3d.y + delta.getY(), vec3d.z + delta.getZ());
 +            }
-+            // Paper end
++            // Paper end - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
          }
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index fbcf5ddb655e6d070f24d71bd076115739cf0254..a6b89a12471a8c7277b7a5aa50447ff275a667c6 100644
+index fa0e96fd884a0338b44f68506b1d3ee6c42f17b1..524f99eeefb1ab95d1752df2faea76837f2e3787 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1646,7 +1646,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -91,12 +91,12 @@ index fbcf5ddb655e6d070f24d71bd076115739cf0254..a6b89a12471a8c7277b7a5aa50447ff2
          if (flag) {
              if (f1 > 0.0F && target instanceof LivingEntity) {
 -                ((LivingEntity) target).knockback((double) (f1 * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
-+                ((LivingEntity) target).knockback((double) (f1 * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper
++                ((LivingEntity) target).knockback((double) (f1 * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
                  this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java b/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java
-index e319a46a21a94314c5d496820b1ac4879dcf56b9..4a3bcd988cf63452c4277ad55ba604ad43c8a623 100644
+index e319a46a21a94314c5d496820b1ac4879dcf56b9..4f78e7fbb7a082069b44f7b28f0048e856e5c773 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java
 @@ -77,7 +77,7 @@ public class RamTarget extends Behavior<Goat> {
@@ -104,12 +104,12 @@ index e319a46a21a94314c5d496820b1ac4879dcf56b9..4a3bcd988cf63452c4277ad55ba604ad
              float g = Mth.clamp(entity.getSpeed() * 1.65F, 0.2F, 3.0F) + f;
              float h = livingEntity.isDamageSourceBlocked(world.damageSources().mobAttack(entity)) ? 0.5F : 1.0F;
 -            livingEntity.knockback((double)(h * g) * this.getKnockbackForce.applyAsDouble(entity), this.ramDirection.x(), this.ramDirection.z());
-+            livingEntity.knockback((double)(h * g) * this.getKnockbackForce.applyAsDouble(entity), this.ramDirection.x(), this.ramDirection.z(), entity); // Paper
++            livingEntity.knockback((double)(h * g) * this.getKnockbackForce.applyAsDouble(entity), this.ramDirection.x(), this.ramDirection.z(), entity); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
              this.finishRam(world, entity);
              world.playSound((Player)null, entity, this.getImpactSound.apply(entity), SoundSource.NEUTRAL, 1.0F, 1.0F);
          } else if (this.hasRammedHornBreakingBlock(world, entity)) {
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java b/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java
-index 29cfd065f246bbd3d3c2a5bbd32c3f4813a02951..03ec02f9a2fb5abb5387cd0d83c9481d6cbb0bd2 100644
+index 29cfd065f246bbd3d3c2a5bbd32c3f4813a02951..771d798fa3b367043129f41101c65f13f0b466fa 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java
 @@ -68,7 +68,7 @@ public class SonicBoom extends Behavior<Warden> {
@@ -117,12 +117,12 @@ index 29cfd065f246bbd3d3c2a5bbd32c3f4813a02951..03ec02f9a2fb5abb5387cd0d83c9481d
                  double d = 0.5D * (1.0D - target.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE));
                  double e = 2.5D * (1.0D - target.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE));
 -                target.push(vec33.x() * e, vec33.y() * d, vec33.z() * e);
-+                target.push(vec33.x() * e, vec33.y() * d, vec33.z() * e, entity); // Paper
++                target.push(vec33.x() * e, vec33.y() * d, vec33.z() * e, entity); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
              });
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index f5ce6423b8146cc741023e15004fe9814a035da8..de27517e13ecb15865aaa83257eaffb41c3eecfc 100644
+index f5ce6423b8146cc741023e15004fe9814a035da8..666c62d796cae9a70516680e26196f7e02c53918 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -458,7 +458,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -130,12 +130,12 @@ index f5ce6423b8146cc741023e15004fe9814a035da8..de27517e13ecb15865aaa83257eaffb4
                  double d4 = Math.max(d2 * d2 + d3 * d3, 0.1D);
  
 -                entity.push(d2 / d4 * 4.0D, 0.20000000298023224D, d3 / d4 * 4.0D);
-+                entity.push(d2 / d4 * 4.0D, 0.20000000298023224D, d3 / d4 * 4.0D, this); // Paper
++                entity.push(d2 / d4 * 4.0D, 0.20000000298023224D, d3 / d4 * 4.0D, this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
                  if (!this.phaseManager.getCurrentPhase().isSitting() && ((LivingEntity) entity).getLastHurtByMobTimestamp() < entity.tickCount - 2) {
                      entity.hurt(this.damageSources().mobAttack(this), 5.0F);
                      this.doEnchantDamageEffects(this, entity);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 041f1650b853138e4286fe83a08d79d276054ce7..344e933311f5cdccb66069d486b111a003639dfe 100644
+index 041f1650b853138e4286fe83a08d79d276054ce7..aba20a4352d8983b01ab5d329187588f68d3e405 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -265,7 +265,7 @@ public class Ravager extends Raider {
@@ -143,12 +143,12 @@ index 041f1650b853138e4286fe83a08d79d276054ce7..344e933311f5cdccb66069d486b111a0
          double d2 = Math.max(d0 * d0 + d1 * d1, 0.001D);
  
 -        entity.push(d0 / d2 * 4.0D, 0.2D, d1 / d2 * 4.0D);
-+        entity.push(d0 / d2 * 4.0D, 0.2D, d1 / d2 * 4.0D, this); // Paper
++        entity.push(d0 / d2 * 4.0D, 0.2D, d1 / d2 * 4.0D, this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
      }
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java
-index 81003ce3f05c6be6f52a92b86a4721235f4ce12a..004382377ee364143a34287e7b6546ae1df4e88e 100644
+index 81003ce3f05c6be6f52a92b86a4721235f4ce12a..cae7e3e85c3b911f50f8a06badf695c3df2847e5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java
 @@ -40,7 +40,7 @@ public interface HoglinBase {
@@ -156,12 +156,12 @@ index 81003ce3f05c6be6f52a92b86a4721235f4ce12a..004382377ee364143a34287e7b6546ae
              Vec3 vec3 = (new Vec3(g, 0.0D, h)).normalize().scale(j).yRot(i);
              double k = f * (double)attacker.level().random.nextFloat() * 0.5D;
 -            target.push(vec3.x, k, vec3.z);
-+            target.push(vec3.x, k, vec3.z, attacker); // Paper
++            target.push(vec3.x, k, vec3.z, attacker); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
              target.hurtMarked = true;
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 45098aa460370669abdb3619fa4b1adef6fbf282..8d40021ce31d5f8fd8a5462a80e92fb919b4b162 100644
+index 695f241372eb0fe457cf91595520cbed9a5cdc3e..0704fad49e680d3274b23024497963c4d0ad353b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1285,9 +1285,9 @@ public abstract class Player extends LivingEntity {
@@ -169,10 +169,10 @@ index 45098aa460370669abdb3619fa4b1adef6fbf282..8d40021ce31d5f8fd8a5462a80e92fb9
                          if (i > 0) {
                              if (target instanceof LivingEntity) {
 -                                ((LivingEntity) target).knockback((double) ((float) i * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
-+                                ((LivingEntity) target).knockback((double) ((float) i * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper
++                                ((LivingEntity) target).knockback((double) ((float) i * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
                              } else {
 -                                target.push((double) (-Mth.sin(this.getYRot() * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (Mth.cos(this.getYRot() * 0.017453292F) * (float) i * 0.5F));
-+                                target.push((double) (-Mth.sin(this.getYRot() * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (Mth.cos(this.getYRot() * 0.017453292F) * (float) i * 0.5F), this); // Paper
++                                target.push((double) (-Mth.sin(this.getYRot() * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (Mth.cos(this.getYRot() * 0.017453292F) * (float) i * 0.5F), this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
                              }
  
                              this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
@@ -181,7 +181,7 @@ index 45098aa460370669abdb3619fa4b1adef6fbf282..8d40021ce31d5f8fd8a5462a80e92fb9
                                      // CraftBukkit start - Only apply knockback if the damage hits
                                      if (entityliving.hurt(this.damageSources().playerAttack(this).sweep(), f4)) {
 -                                    entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
-+                                    entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Pa
++                                    entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
                                      }
                                      // CraftBukkit end
                                  }
diff --git a/patches/server/0208-Expand-Explosions-API.patch b/patches/server/0207-Expand-Explosions-API.patch
similarity index 94%
rename from patches/server/0208-Expand-Explosions-API.patch
rename to patches/server/0207-Expand-Explosions-API.patch
index e75e2ea2fb..2deb0a4c31 100644
--- a/patches/server/0208-Expand-Explosions-API.patch
+++ b/patches/server/0207-Expand-Explosions-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 713bfbe76e3f888cd41e71256ec70af78e64121c..b1fe86645fa9e6f4398c8466cb3243154146f29f 100644
+index c8e13ea3bc256b112fa5fd916c0fb583322c081b..ed851ec919c18d724d3376e893eca09259ad9bf3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -719,6 +719,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0209-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0208-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from patches/server/0209-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to patches/server/0208-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/patches/server/0210-RangedEntity-API.patch b/patches/server/0209-RangedEntity-API.patch
similarity index 100%
rename from patches/server/0210-RangedEntity-API.patch
rename to patches/server/0209-RangedEntity-API.patch
diff --git a/patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 82%
rename from patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
index adc52710df..719410ac4b 100644
--- a/patches/server/0211-Add-config-to-disable-ender-dragon-legacy-check.patch
+++ b/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch
@@ -5,17 +5,17 @@ Subject: [PATCH] Add config to disable ender dragon legacy check
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index f310098b0a59fa5341198bb8282b23dfa4a7fc3a..e70273664b4a38ef4ba803c60409a24a07d5bed7 100644
+index f310098b0a59fa5341198bb8282b23dfa4a7fc3a..d6b6c83a6d660107956a28c16fde2260583722aa 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -106,6 +106,10 @@ public class EndDragonFight {
          this.ticksSinceLastPlayerScan = 21;
          this.skipArenaLoadedCheck = false;
          this.needsStateScanning = true;
-+        // Paper start
++        // Paper start - Add config to disable ender dragon legacy check
 +        this.needsStateScanning = world.paperConfig().entities.spawning.scanForLegacyEnderDragon;
 +        if (!this.needsStateScanning) this.dragonKilled = true;
-+        // Paper end
++        // Paper end - Add config to disable ender dragon legacy check
          this.level = world;
          this.origin = origin;
          this.validPlayer = EntitySelector.ENTITY_STILL_ALIVE.and(EntitySelector.withinDistance((double) origin.getX(), (double) (128 + origin.getY()), (double) origin.getZ(), 192.0D));
diff --git a/patches/server/0212-Implement-World.getEntity-UUID-API.patch b/patches/server/0211-Implement-World.getEntity-UUID-API.patch
similarity index 91%
rename from patches/server/0212-Implement-World.getEntity-UUID-API.patch
rename to patches/server/0211-Implement-World.getEntity-UUID-API.patch
index feaa3ef886..f4a8fff452 100644
--- a/patches/server/0212-Implement-World.getEntity-UUID-API.patch
+++ b/patches/server/0211-Implement-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b1fe86645fa9e6f4398c8466cb3243154146f29f..982231fcc788b99798e8361a53d77c4ed1920396 100644
+index ed851ec919c18d724d3376e893eca09259ad9bf3..fda8fd0d69a3889909e804798a49c19e2a9d49a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1048,6 +1048,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0213-InventoryCloseEvent-Reason-API.patch b/patches/server/0212-InventoryCloseEvent-Reason-API.patch
similarity index 86%
rename from patches/server/0213-InventoryCloseEvent-Reason-API.patch
rename to patches/server/0212-InventoryCloseEvent-Reason-API.patch
index 14c54c7388..3c1786bd0a 100644
--- a/patches/server/0213-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0212-InventoryCloseEvent-Reason-API.patch
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e96abf6afd434c104437e2461431f8b4c82c1d00..e91ce13c4dbea719e567018ace8908d2c7b51b30 100644
+index d5ff2037fd2756da1aac9660e65453913be172cd..0bb2ed82e8a3dffa9fd9d7aa41685dd50dafac0c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1474,7 +1474,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -15,7 +15,7 @@ index e96abf6afd434c104437e2461431f8b4c82c1d00..e91ce13c4dbea719e567018ace8908d2
              if (tileentity instanceof net.minecraft.world.Container) {
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) {
 -                    h.closeInventory();
-+                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
++                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper - Inventory close reason
                  }
              }
          }
@@ -24,12 +24,12 @@ index e96abf6afd434c104437e2461431f8b4c82c1d00..e91ce13c4dbea719e567018ace8908d2
              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())) {
 -                    h.closeInventory();
-+                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
++                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper - Inventory close reason
                  }
              }
              // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3014467f1c9159e04afd0bb816e02af6599f1f71..29f91654226ae349e310121c8fef20d9c1f6c183 100644
+index 3014467f1c9159e04afd0bb816e02af6599f1f71..e144adc6e5e2a195174ed7617c29993804ab87ff 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -692,7 +692,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 3014467f1c9159e04afd0bb816e02af6599f1f71..29f91654226ae349e310121c8fef20d9
          // Paper end
          if (!this.level().isClientSide && !this.containerMenu.stillValid(this)) {
 -            this.closeContainer();
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
++            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper - Inventory close reason
              this.containerMenu = this.inventoryMenu;
          }
  
@@ -46,7 +46,7 @@ index 3014467f1c9159e04afd0bb816e02af6599f1f71..29f91654226ae349e310121c8fef20d9
          // SPIGOT-943 - only call if they have an inventory open
          if (this.containerMenu != this.inventoryMenu) {
 -            this.closeContainer();
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DEATH); // Paper
++            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DEATH); // Paper - Inventory close reason
          }
  
          net.kyori.adventure.text.Component deathMessage = event.deathMessage() != null ? event.deathMessage() : net.kyori.adventure.text.Component.empty(); // Paper - Adventure
@@ -55,7 +55,7 @@ index 3014467f1c9159e04afd0bb816e02af6599f1f71..29f91654226ae349e310121c8fef20d9
          // CraftBukkit end
          if (this.containerMenu != this.inventoryMenu) {
 -            this.closeContainer();
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.OPEN_NEW); // Paper
++            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.OPEN_NEW); // Paper - Inventory close reason
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
@@ -64,18 +64,18 @@ index 3014467f1c9159e04afd0bb816e02af6599f1f71..29f91654226ae349e310121c8fef20d9
      @Override
      public void closeContainer() {
 -        CraftEventFactory.handleInventoryCloseEvent(this); // CraftBukkit
-+        // Paper start
++        // Paper start - Inventory close reason
 +        this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNKNOWN);
 +    }
 +    @Override
 +    public void closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
 +        CraftEventFactory.handleInventoryCloseEvent(this, reason); // CraftBukkit
-+        // Paper end
++        // Paper end - Inventory close reason
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
          this.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8fb792d88852e78fded9f7ae2da26a1d9d09c959..6f6fee0ad12c8a251f86be0fbef32c005e354ee3 100644
+index c1c9076be05cd4b0b19d16aabbf0320c2531cca1..d1c2dad79f6e265e184d374494b3f45414c5fafc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -219,6 +219,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -90,11 +90,11 @@ index 8fb792d88852e78fded9f7ae2da26a1d9d09c959..6f6fee0ad12c8a251f86be0fbef32c00
  
      @Override
      public void handleContainerClose(ServerboundContainerClosePacket packet) {
-+        // Paper start
++        // Paper start - Inventory close reason
 +        this.handleContainerClose(packet, InventoryCloseEvent.Reason.PLAYER);
 +    }
 +    public void handleContainerClose(ServerboundContainerClosePacket packet, InventoryCloseEvent.Reason reason) {
-+        // Paper end
++        // Paper end - Inventory close reason
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
  
          if (this.player.isImmobile()) return; // CraftBukkit
@@ -104,7 +104,7 @@ index 8fb792d88852e78fded9f7ae2da26a1d9d09c959..6f6fee0ad12c8a251f86be0fbef32c00
          this.player.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 782cc6d910efe5bc5498d0083afab42fad6c4fa2..49e3252d6af633d69bdf05ce71dc2a1b3d24f05a 100644
+index 782cc6d910efe5bc5498d0083afab42fad6c4fa2..b4643717c98193884a43089ec7a7e362b7153d20 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -518,7 +518,7 @@ public abstract class PlayerList {
@@ -112,12 +112,12 @@ index 782cc6d910efe5bc5498d0083afab42fad6c4fa2..49e3252d6af633d69bdf05ce71dc2a1b
          // See SPIGOT-5799, SPIGOT-6145
          if (entityplayer.containerMenu != entityplayer.inventoryMenu) {
 -            entityplayer.closeContainer();
-+            entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
++            entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper - Inventory close reason
          }
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 8d40021ce31d5f8fd8a5462a80e92fb919b4b162..0d8261e15a1a66df17727788c387dca8fbe2ae84 100644
+index 0704fad49e680d3274b23024497963c4d0ad353b..636c8d53e5c07f5d75881113b8cfb366a007a162 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -265,7 +265,7 @@ public abstract class Player extends LivingEntity {
@@ -125,7 +125,7 @@ index 8d40021ce31d5f8fd8a5462a80e92fb919b4b162..0d8261e15a1a66df17727788c387dca8
          super.tick();
          if (!this.level().isClientSide && this.containerMenu != null && !this.containerMenu.stillValid(this)) {
 -            this.closeContainer();
-+            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
++            this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper - Inventory close reason
              this.containerMenu = this.inventoryMenu;
          }
  
@@ -133,18 +133,18 @@ index 8d40021ce31d5f8fd8a5462a80e92fb919b4b162..0d8261e15a1a66df17727788c387dca8
  
      }
  
-+    // Paper start - unused code, but to keep signatures aligned
++    // Paper start - Inventory close reason; unused code, but to keep signatures aligned
 +    public void closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
 +        closeContainer();
 +        this.containerMenu = this.inventoryMenu;
 +    }
-+    // Paper end
++    // Paper end - Inventory close reason
 +
      public void closeContainer() {
          this.containerMenu = this.inventoryMenu;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index f0194d4431821638e43a0f1b12b39f668ad147d1..21e3070a9aab9b4d8d352655d0145c9921857c0e 100644
+index 092d2bfab7e8fd9840e853f09adc85311ab29046..af6f8d11f0384c353332f5c5bb0967e518deccbe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -376,7 +376,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -152,7 +152,7 @@ index f0194d4431821638e43a0f1b12b39f668ad147d1..21e3070a9aab9b4d8d352655d0145c99
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
              // fire INVENTORY_CLOSE if one already open
 -            ((ServerPlayer) this.getHandle()).connection.handleContainerClose(new ServerboundContainerClosePacket(this.getHandle().containerMenu.containerId));
-+            ((ServerPlayer) this.getHandle()).connection.handleContainerClose(new ServerboundContainerClosePacket(this.getHandle().containerMenu.containerId), org.bukkit.event.inventory.InventoryCloseEvent.Reason.OPEN_NEW); // Paper
++            ((ServerPlayer) this.getHandle()).connection.handleContainerClose(new ServerboundContainerClosePacket(this.getHandle().containerMenu.containerId), org.bukkit.event.inventory.InventoryCloseEvent.Reason.OPEN_NEW); // Paper - Inventory close reason
          }
          ServerPlayer player = (ServerPlayer) this.getHandle();
          AbstractContainerMenu container;
@@ -161,19 +161,19 @@ index f0194d4431821638e43a0f1b12b39f668ad147d1..21e3070a9aab9b4d8d352655d0145c99
      @Override
      public void closeInventory() {
 -        this.getHandle().closeContainer();
-+        // Paper start
++        // Paper start - Inventory close reason
 +        this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.PLUGIN);
      }
 +    @Override
 +    public void closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
 +        getHandle().closeContainer(reason);
 +    }
-+    // Paper end
++    // Paper end - Inventory close reason
  
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f929327522b98c12823ebbf94531c1c3681b1efa..701c8c8320f922c6227046d8275595279e5dba9a 100644
+index f929327522b98c12823ebbf94531c1c3681b1efa..f0392f2562ee2b65011da556dbe1a8369c5f954c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1194,7 +1194,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -181,12 +181,12 @@ index f929327522b98c12823ebbf94531c1c3681b1efa..701c8c8320f922c6227046d827559527
          // Close any foreign inventory
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
 -            this.getHandle().closeContainer();
-+            this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.TELEPORT); // Paper
++            this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.TELEPORT); // Paper - Inventory close reason
          }
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 73963d1e17fa09f17913a2b9fdce0845949e3bec..fc9cf505f32b7cd5f7785314ce16d71c9236b640 100644
+index 848bcabb5922c99ee78cb541c87b464cea032749..3ec8302c569ef923ddca3f9bfb3c506832fe7659 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1331,7 +1331,7 @@ public class CraftEventFactory {
@@ -194,7 +194,7 @@ index 73963d1e17fa09f17913a2b9fdce0845949e3bec..fc9cf505f32b7cd5f7785314ce16d71c
      public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) {
          if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
 -            player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId));
-+            player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper
++            player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper - Inventory close reason
          }
  
          CraftServer server = player.level().getCraftServer();
diff --git a/patches/server/0214-Vex-get-setSummoner-API.patch b/patches/server/0213-Vex-get-setSummoner-API.patch
similarity index 100%
rename from patches/server/0214-Vex-get-setSummoner-API.patch
rename to patches/server/0213-Vex-get-setSummoner-API.patch
diff --git a/patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 85%
rename from patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 6d2e9087f7..a36560f289 100644
--- a/patches/server/0215-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,14 +16,14 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6f6fee0ad12c8a251f86be0fbef32c005e354ee3..70c5255038f5db2a11d8248df59c310e8a1725d0 100644
+index d1c2dad79f6e265e184d374494b3f45414c5fafc..a00f68b058d6d7aa28ce34ad726c5b228e5c2e64 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2419,6 +2419,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                              }
  
                              if (event.isCancelled()) {
-+                            ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - Refresh player inventory
++                                ServerGamePacketListenerImpl.this.player.containerMenu.sendAllDataToRemote(); // Paper - Refresh player inventory
                                  return;
                              }
                              // CraftBukkit end
diff --git a/patches/server/0216-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0215-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
similarity index 100%
rename from patches/server/0216-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
rename to patches/server/0215-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch
diff --git a/patches/server/0217-add-more-information-to-Entity.toString.patch b/patches/server/0216-add-more-information-to-Entity.toString.patch
similarity index 90%
rename from patches/server/0217-add-more-information-to-Entity.toString.patch
rename to patches/server/0216-add-more-information-to-Entity.toString.patch
index 1b5b3946c0..2fc6c9f002 100644
--- a/patches/server/0217-add-more-information-to-Entity.toString.patch
+++ b/patches/server/0216-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d47ada5544478dcfcb49f6b437e634105397fdfe..17cae197f76e02491791c55554bd57592a30aa1d 100644
+index d9abd56d3802033bfd440f13640350b2fba017aa..ad2e61c7fd7906477e30e91c826d9ce4fb6bffc0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3202,7 +3202,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -14,7 +14,7 @@ index d47ada5544478dcfcb49f6b437e634105397fdfe..17cae197f76e02491791c55554bd5759
          String s = this.level() == null ? "~NULL~" : this.level().toString();
  
 -        return this.removalReason != null ? String.format(Locale.ROOT, "%s['%s'/%d, l='%s', x=%.2f, y=%.2f, z=%.2f, removed=%s]", this.getClass().getSimpleName(), this.getName().getString(), this.id, s, this.getX(), this.getY(), this.getZ(), this.removalReason) : String.format(Locale.ROOT, "%s['%s'/%d, l='%s', x=%.2f, y=%.2f, z=%.2f]", this.getClass().getSimpleName(), this.getName().getString(), this.id, s, this.getX(), this.getY(), this.getZ());
-+        return this.removalReason != null ? String.format(Locale.ROOT, "%s['%s'/%d, uuid='%s', l='%s', x=%.2f, y=%.2f, z=%.2f, cpos=%s, tl=%d, v=%b, removed=%s]", this.getClass().getSimpleName(), this.getName().getString(), this.id, this.uuid, s, this.getX(), this.getY(), this.getZ(), this.chunkPosition(), this.tickCount, this.valid, this.removalReason) : String.format(Locale.ROOT, "%s['%s'/%d, uuid='%s', l='%s', x=%.2f, y=%.2f, z=%.2f, cpos=%s, tl=%d, v=%b]", this.getClass().getSimpleName(), this.getName().getString(), this.id, this.uuid, s, this.getX(), this.getY(), this.getZ(), this.chunkPosition(), this.tickCount, this.valid);
++        return this.removalReason != null ? String.format(Locale.ROOT, "%s['%s'/%d, uuid='%s', l='%s', x=%.2f, y=%.2f, z=%.2f, cpos=%s, tl=%d, v=%b, removed=%s]", this.getClass().getSimpleName(), this.getName().getString(), this.id, this.uuid, s, this.getX(), this.getY(), this.getZ(), this.chunkPosition(), this.tickCount, this.valid, this.removalReason) : String.format(Locale.ROOT, "%s['%s'/%d, uuid='%s', l='%s', x=%.2f, y=%.2f, z=%.2f, cpos=%s, tl=%d, v=%b]", this.getClass().getSimpleName(), this.getName().getString(), this.id, this.uuid, s, this.getX(), this.getY(), this.getZ(), this.chunkPosition(), this.tickCount, this.valid); // Paper - add more info
      }
  
      public boolean isInvulnerableTo(DamageSource damageSource) {
diff --git a/patches/server/0218-EnderDragon-Events.patch b/patches/server/0217-EnderDragon-Events.patch
similarity index 83%
rename from patches/server/0218-EnderDragon-Events.patch
rename to patches/server/0217-EnderDragon-Events.patch
index 0559cac19b..2b7a35d8de 100644
--- a/patches/server/0218-EnderDragon-Events.patch
+++ b/patches/server/0217-EnderDragon-Events.patch
@@ -5,49 +5,49 @@ Subject: [PATCH] EnderDragon Events
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
-index f72ad2e7d0d5953c906d0d9f8adb9ba74d1841be..7b96cf748b69db98cb1bc3dc0430e39b9ffc93f2 100644
+index f72ad2e7d0d5953c906d0d9f8adb9ba74d1841be..bb8f50a47a88f4e4d440ae0b70a56e7f9c1467ca 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java
 @@ -83,7 +83,13 @@ public class DragonSittingFlamingPhase extends AbstractDragonSittingPhase {
              this.flame.setDuration(200);
              this.flame.setParticle(ParticleTypes.DRAGON_BREATH);
              this.flame.addEffect(new MobEffectInstance(MobEffects.HARM));
-+            if (new com.destroystokyo.paper.event.entity.EnderDragonFlameEvent((org.bukkit.entity.EnderDragon) this.dragon.getBukkitEntity(), (org.bukkit.entity.AreaEffectCloud) this.flame.getBukkitEntity()).callEvent()) { // Paper
++            if (new com.destroystokyo.paper.event.entity.EnderDragonFlameEvent((org.bukkit.entity.EnderDragon) this.dragon.getBukkitEntity(), (org.bukkit.entity.AreaEffectCloud) this.flame.getBukkitEntity()).callEvent()) { // Paper - EnderDragon Events
              this.dragon.level().addFreshEntity(this.flame);
-+            // Paper start
++            // Paper start - EnderDragon Events
 +            } else {
 +                this.end();
 +            }
-+            // Paper end
++            // Paper end - EnderDragon Events
          }
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
-index f54576f6450e24f574bfe7f4b8e2ad5d8c9f1ba3..a3456b35db4e938f91d6bc32d4d202a011bf13c4 100644
+index f54576f6450e24f574bfe7f4b8e2ad5d8c9f1ba3..9bf04f18d37356cdef1ef3a7f1e38a1801ad5713 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
 @@ -74,7 +74,9 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {
  
                          DragonFireball dragonFireball = new DragonFireball(this.dragon.level(), this.dragon, r, s, t);
                          dragonFireball.moveTo(o, p, q, 0.0F, 0.0F);
-+                        if (new com.destroystokyo.paper.event.entity.EnderDragonShootFireballEvent((org.bukkit.entity.EnderDragon) dragon.getBukkitEntity(), (org.bukkit.entity.DragonFireball) dragonFireball.getBukkitEntity()).callEvent()) // Paper
++                        if (new com.destroystokyo.paper.event.entity.EnderDragonShootFireballEvent((org.bukkit.entity.EnderDragon) dragon.getBukkitEntity(), (org.bukkit.entity.DragonFireball) dragonFireball.getBukkitEntity()).callEvent()) // Paper - EnderDragon Events
                          this.dragon.level().addFreshEntity(dragonFireball);
-+                        else dragonFireball.discard(); // Paper
++                        else dragonFireball.discard(); // Paper - EnderDragon Events
                          this.fireballCharge = 0;
                          if (this.currentPath != null) {
                              while(!this.currentPath.isDone()) {
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
-index 796a2a88134eee4021423fef132537a5e0680bc5..9652e3385ad10e5d825dd141f6be3522c596916d 100644
+index 796a2a88134eee4021423fef132537a5e0680bc5..61a36c4e97ee532e53eee4da00a9aa7e4b3438f5 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
 @@ -52,8 +52,10 @@ public class DragonFireball extends AbstractHurtingProjectile {
                      }
                  }
  
-+                if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), list.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) areaEffectCloud.getBukkitEntity()).callEvent()) { // Paper
++                if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), list.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) areaEffectCloud.getBukkitEntity()).callEvent()) { // Paper - EnderDragon Events
                  this.level().levelEvent(2006, this.blockPosition(), this.isSilent() ? -1 : 1);
                  this.level().addFreshEntity(areaEffectCloud);
-+                } else areaEffectCloud.discard(); // Paper
++                } else areaEffectCloud.discard(); // Paper - EnderDragon Events
                  this.discard();
              }
  
diff --git a/patches/server/0219-PlayerElytraBoostEvent.patch b/patches/server/0218-PlayerElytraBoostEvent.patch
similarity index 89%
rename from patches/server/0219-PlayerElytraBoostEvent.patch
rename to patches/server/0218-PlayerElytraBoostEvent.patch
index e99be47ba0..902f983c36 100644
--- a/patches/server/0219-PlayerElytraBoostEvent.patch
+++ b/patches/server/0218-PlayerElytraBoostEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerElytraBoostEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index 7c627d27300247db9122ab2081049345ef306073..f17e9c6c91c02e0d36f58851522a5d3e5e423121 100644
+index 7c627d27300247db9122ab2081049345ef306073..6e6c9477b70b0e1ab36bca9fa91806a283ebedd1 100644
 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 @@ -61,12 +61,19 @@ public class FireworkRocketItem extends Item {
@@ -14,7 +14,7 @@ index 7c627d27300247db9122ab2081049345ef306073..f17e9c6c91c02e0d36f58851522a5d3e
                  fireworkRocketEntity.spawningEntity = user.getUUID(); // Paper
 -                world.addFreshEntity(fireworkRocketEntity);
 -                if (!user.getAbilities().instabuild) {
-+                // Paper start
++                // Paper start - PlayerElytraBoostEvent
 +                com.destroystokyo.paper.event.player.PlayerElytraBoostEvent event = new com.destroystokyo.paper.event.player.PlayerElytraBoostEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Firework) fireworkRocketEntity.getBukkitEntity());
 +                if (event.callEvent() && world.addFreshEntity(fireworkRocketEntity)) {
 +                    user.awardStat(Stats.ITEM_USED.get(this));
@@ -23,11 +23,11 @@ index 7c627d27300247db9122ab2081049345ef306073..f17e9c6c91c02e0d36f58851522a5d3e
 +                    } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 +                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
 +                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+                    // Paper end
++                    // Paper end - PlayerElytraBoostEvent
                  }
  
 -                user.awardStat(Stats.ITEM_USED.get(this));
-+                // user.awardStat(Stats.ITEM_USED.get(this)); // Paper - move up
++                // user.awardStat(Stats.ITEM_USED.get(this)); // Paper - PlayerElytraBoostEvent; move up
              }
  
              return InteractionResultHolder.sidedSuccess(user.getItemInHand(hand), world.isClientSide());
diff --git a/patches/server/0220-PlayerLaunchProjectileEvent.patch b/patches/server/0219-PlayerLaunchProjectileEvent.patch
similarity index 84%
rename from patches/server/0220-PlayerLaunchProjectileEvent.patch
rename to patches/server/0219-PlayerLaunchProjectileEvent.patch
index f512b0ab72..5d9bed5608 100644
--- a/patches/server/0220-PlayerLaunchProjectileEvent.patch
+++ b/patches/server/0219-PlayerLaunchProjectileEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/EggItem.java b/src/main/java/net/minecraft/world/item/EggItem.java
-index 32b63407b943fb00d765dbf4e0eefb4b06f801b6..58cb992c5defec2f092755cbde661ff10f38bf9d 100644
+index 32b63407b943fb00d765dbf4e0eefb4b06f801b6..a3bd507793994e9cc87a956871a8afbb8ca9460d 100644
 --- a/src/main/java/net/minecraft/world/item/EggItem.java
 +++ b/src/main/java/net/minecraft/world/item/EggItem.java
 @@ -25,21 +25,33 @@ public class EggItem extends Item {
@@ -14,7 +14,7 @@ index 32b63407b943fb00d765dbf4e0eefb4b06f801b6..58cb992c5defec2f092755cbde661ff1
              entityegg.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
 -            // CraftBukkit start
 -            if (!world.addFreshEntity(entityegg)) {
-+            // Paper start
++            // Paper start - PlayerLaunchProjectileEvent
 +            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityegg.getBukkitEntity());
 +            if (event.callEvent() && world.addFreshEntity(entityegg)) {
 +                if (event.shouldConsume() && !user.getAbilities().instabuild) {
@@ -32,21 +32,21 @@ index 32b63407b943fb00d765dbf4e0eefb4b06f801b6..58cb992c5defec2f092755cbde661ff1
                  return InteractionResultHolder.fail(itemstack);
              }
 -            // CraftBukkit end
-+            // Paper end
++            // Paper end - PlayerLaunchProjectileEvent
          }
          world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.EGG_THROW, SoundSource.PLAYERS, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
  
-+        /* // Paper start - moved up
++        /* // Paper start - PlayerLaunchProjectileEvent; moved up
          user.awardStat(Stats.ITEM_USED.get(this));
          if (!user.getAbilities().instabuild) {
              itemstack.shrink(1);
          }
-+        */ // Paper end
++        */ // Paper end - PlayerLaunchProjectileEvent
  
          return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
      }
 diff --git a/src/main/java/net/minecraft/world/item/EnderpearlItem.java b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
-index c7d4745aed77b23562cde7c68b8870fa239428d4..749ab72edc0d2e9c6f1161415ab8d59d3d6ca976 100644
+index c7d4745aed77b23562cde7c68b8870fa239428d4..8c8cf8705107c95d9a4eab28b5845ae13c4ffb3c 100644
 --- a/src/main/java/net/minecraft/world/item/EnderpearlItem.java
 +++ b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
 @@ -25,7 +25,20 @@ public class EnderpearlItem extends Item {
@@ -54,8 +54,8 @@ index c7d4745aed77b23562cde7c68b8870fa239428d4..749ab72edc0d2e9c6f1161415ab8d59d
              entityenderpearl.setItem(itemstack);
              entityenderpearl.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
 -            if (!world.addFreshEntity(entityenderpearl)) {
-+            // Paper start
-+                com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityenderpearl.getBukkitEntity());
++            // Paper start - PlayerLaunchProjectileEvent
++            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityenderpearl.getBukkitEntity());
 +            if (event.callEvent() && world.addFreshEntity(entityenderpearl)) {
 +                if (event.shouldConsume() && !user.getAbilities().instabuild) {
 +                    itemstack.shrink(1);
@@ -67,7 +67,7 @@ index c7d4745aed77b23562cde7c68b8870fa239428d4..749ab72edc0d2e9c6f1161415ab8d59d
 +                user.awardStat(Stats.ITEM_USED.get(this));
 +                user.getCooldowns().addCooldown(this, 20);
 +            } else {
-+                // Paper end
++                // Paper end - PlayerLaunchProjectileEvent
                  if (user instanceof net.minecraft.server.level.ServerPlayer) {
                      ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
                  }
@@ -75,7 +75,7 @@ index c7d4745aed77b23562cde7c68b8870fa239428d4..749ab72edc0d2e9c6f1161415ab8d59d
              }
          }
  
-+        /* // Paper start - moved up
++        /* // Paper start - PlayerLaunchProjectileEvent; moved up
          world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
          user.getCooldowns().addCooldown(this, 20);
          // CraftBukkit end
@@ -83,12 +83,12 @@ index c7d4745aed77b23562cde7c68b8870fa239428d4..749ab72edc0d2e9c6f1161415ab8d59d
          if (!user.getAbilities().instabuild) {
              itemstack.shrink(1);
          }
-+        */ // Paper end - moved up
++        */ // Paper end - PlayerLaunchProjectileEvent; moved up
  
          return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
      }
 diff --git a/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java b/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
-index 72dfb7b652f515bf9df201d524a851ab56706544..b80bedb5f27b474d7f66e9e1cc38ca3b692fc92b 100644
+index 72dfb7b652f515bf9df201d524a851ab56706544..39fe6734c8dcd34c563e33e717937bbd91882e1e 100644
 --- a/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
 +++ b/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
 @@ -22,18 +22,37 @@ public class ExperienceBottleItem extends Item {
@@ -96,13 +96,13 @@ index 72dfb7b652f515bf9df201d524a851ab56706544..b80bedb5f27b474d7f66e9e1cc38ca3b
      public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
          ItemStack itemStack = user.getItemInHand(hand);
 -        world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
-+        // world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); // Paper - moved down
++        // world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); // Paper - PlayerLaunchProjectileEvent; moved down
          if (!world.isClientSide) {
              ThrownExperienceBottle thrownExperienceBottle = new ThrownExperienceBottle(world, user);
              thrownExperienceBottle.setItem(itemStack);
              thrownExperienceBottle.shootFromRotation(user, user.getXRot(), user.getYRot(), -20.0F, 0.7F, 1.0F);
 -            world.addFreshEntity(thrownExperienceBottle);
-+            // Paper start
++            // Paper start - PlayerLaunchProjectileEvent
 +            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Projectile) thrownExperienceBottle.getBukkitEntity());
 +            if (event.callEvent() && world.addFreshEntity(thrownExperienceBottle)) {
 +                if (event.shouldConsume() && !user.getAbilities().instabuild) {
@@ -119,20 +119,20 @@ index 72dfb7b652f515bf9df201d524a851ab56706544..b80bedb5f27b474d7f66e9e1cc38ca3b
 +                }
 +                return InteractionResultHolder.fail(itemStack);
 +            }
-+            // Paper end
++            // Paper end - PlayerLaunchProjectileEvent
          }
  
-+        /* // Paper start - moved up
++        /* // Paper start - PlayerLaunchProjectileEvent; moved up
          user.awardStat(Stats.ITEM_USED.get(this));
          if (!user.getAbilities().instabuild) {
              itemStack.shrink(1);
          }
-+        */ // Paper end
++        */ // Paper end - PlayerLaunchProjectileEvent
  
          return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
      }
 diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
-index f17e9c6c91c02e0d36f58851522a5d3e5e423121..82b0bda3e35ec2157a477e1a17b2b46baadc97d9 100644
+index 6e6c9477b70b0e1ab36bca9fa91806a283ebedd1..0821c06a4c66edc8fcee09fc192335a588d2944b 100644
 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
 @@ -47,8 +47,12 @@ public class FireworkRocketItem extends Item {
@@ -146,30 +146,30 @@ index f17e9c6c91c02e0d36f58851522a5d3e5e423121..82b0bda3e35ec2157a477e1a17b2b46b
 +            if (!event.callEvent() || !level.addFreshEntity(fireworkRocketEntity)) return InteractionResult.PASS;
 +            if (event.shouldConsume() && !context.getPlayer().getAbilities().instabuild) itemStack.shrink(1);
 +            else if (context.getPlayer() instanceof net.minecraft.server.level.ServerPlayer) ((net.minecraft.server.level.ServerPlayer) context.getPlayer()).getBukkitEntity().updateInventory();
-+            // Paper end
++            // Paper end - PlayerLaunchProjectileEvent
          }
  
          return InteractionResult.sidedSuccess(level.isClientSide);
 diff --git a/src/main/java/net/minecraft/world/item/LingeringPotionItem.java b/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
-index 04370590e6c8051ad17f937576b4cd88f6afb5d9..95ee59a831bdbf7364d917e7169d736fecf76076 100644
+index 04370590e6c8051ad17f937576b4cd88f6afb5d9..8526251e45899499bc4d9b6254fa1b190a3843d8 100644
 --- a/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
 +++ b/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
 @@ -23,7 +23,12 @@ public class LingeringPotionItem extends ThrowablePotionItem {
  
      @Override
      public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
-+        // Paper start
++        // Paper start - PlayerLaunchProjectileEvent
 +        InteractionResultHolder<ItemStack> wrapper = super.use(world, user, hand);
 +        if (wrapper.getResult() != net.minecraft.world.InteractionResult.FAIL) {
          world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.LINGERING_POTION_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
 -        return super.use(world, user, hand);
 +        }
 +        return wrapper;
-+        // Paper end
++        // Paper end - PlayerLaunchProjectileEvent
      }
  }
 diff --git a/src/main/java/net/minecraft/world/item/SnowballItem.java b/src/main/java/net/minecraft/world/item/SnowballItem.java
-index d60e57e84f7d66e1858ab50ac33777feedf1c54d..ef3f90a5bcdd7b9815a4053cff166f9d2552f55d 100644
+index d60e57e84f7d66e1858ab50ac33777feedf1c54d..bc8186a5bc3a98b35fad570729dd4ba52efab238 100644
 --- a/src/main/java/net/minecraft/world/item/SnowballItem.java
 +++ b/src/main/java/net/minecraft/world/item/SnowballItem.java
 @@ -26,18 +26,26 @@ public class SnowballItem extends Item {
@@ -178,28 +178,28 @@ index d60e57e84f7d66e1858ab50ac33777feedf1c54d..ef3f90a5bcdd7b9815a4053cff166f9d
              entitysnowball.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
 -            if (world.addFreshEntity(entitysnowball)) {
 -                if (!user.getAbilities().instabuild) {
-+            // Paper start
++            // Paper start - PlayerLaunchProjectileEvent
 +            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entitysnowball.getBukkitEntity());
 +            if (event.callEvent() && world.addFreshEntity(entitysnowball)) {
 +                user.awardStat(Stats.ITEM_USED.get(this));
 +                if (event.shouldConsume() && !user.getAbilities().instabuild) {
-+                    // Paper end
++                    // Paper end - PlayerLaunchProjectileEvent
                      itemstack.shrink(1);
-+                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {  // Paper
-+                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();  // Paper
++                } else if (user instanceof net.minecraft.server.level.ServerPlayer) {  // Paper - PlayerLaunchProjectileEvent
++                    ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();  // Paper - PlayerLaunchProjectileEvent
                  }
  
                  world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.SNOWBALL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
 -            } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
 -                ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
-+            } else { // Paper
-+                if (user instanceof net.minecraft.server.level.ServerPlayer) ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory(); // Paper
-+                return InteractionResultHolder.fail(itemstack); // Paper
++            } else { // Paper - PlayerLaunchProjectileEvent
++                if (user instanceof net.minecraft.server.level.ServerPlayer) ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory(); // Paper - PlayerLaunchProjectileEvent
++                return InteractionResultHolder.fail(itemstack); // Paper - PlayerLaunchProjectileEvent
              }
          }
          // CraftBukkit end
  
-+        /* // Paper tart - moved up
++        /* // Paper start - PlayerLaunchProjectileEvent; moved up
          user.awardStat(Stats.ITEM_USED.get(this));
          // CraftBukkit start - moved up
          /*
@@ -207,30 +207,30 @@ index d60e57e84f7d66e1858ab50ac33777feedf1c54d..ef3f90a5bcdd7b9815a4053cff166f9d
              itemstack.shrink(1);
          }
          */
-+        // Paper end
++        // Paper end - PlayerLaunchProjectileEvent
  
          return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
      }
 diff --git a/src/main/java/net/minecraft/world/item/SplashPotionItem.java b/src/main/java/net/minecraft/world/item/SplashPotionItem.java
-index 317e20052bcac9118e1adeb619bedaacc6fcd690..ece19f30064e9f59d4df077683e1f894455a84b7 100644
+index 317e20052bcac9118e1adeb619bedaacc6fcd690..3bd127780091c6bb9ec17c88f0cf57b0b8f37e11 100644
 --- a/src/main/java/net/minecraft/world/item/SplashPotionItem.java
 +++ b/src/main/java/net/minecraft/world/item/SplashPotionItem.java
 @@ -14,7 +14,12 @@ public class SplashPotionItem extends ThrowablePotionItem {
  
      @Override
      public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
-+        // Paper start
++        // Paper start - PlayerLaunchProjectileEvent
 +        InteractionResultHolder<ItemStack> wrapper = super.use(world, user, hand);
 +        if (wrapper.getResult() != net.minecraft.world.InteractionResult.FAIL) {
          world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.SPLASH_POTION_THROW, SoundSource.PLAYERS, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
 -        return super.use(world, user, hand);
 +        }
 +        return wrapper;
-+        // Paper end
++        // Paper end - PlayerLaunchProjectileEvent
      }
  }
 diff --git a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
-index 0673f62f25532955f3552b64f122e644d42027e4..de5bdceb4c8578fb972a2fd5ee0dfdae509e46dc 100644
+index 0673f62f25532955f3552b64f122e644d42027e4..f47f793c62a919fb65c081ddb82d597a978d3b20 100644
 --- a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
 +++ b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
 @@ -19,13 +19,31 @@ public class ThrowablePotionItem extends PotionItem {
@@ -238,7 +238,7 @@ index 0673f62f25532955f3552b64f122e644d42027e4..de5bdceb4c8578fb972a2fd5ee0dfdae
              thrownPotion.setItem(itemStack);
              thrownPotion.shootFromRotation(user, user.getXRot(), user.getYRot(), -20.0F, 0.5F, 1.0F);
 -            world.addFreshEntity(thrownPotion);
-+            // Paper start
++            // Paper start - PlayerLaunchProjectileEvent
 +            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Projectile) thrownPotion.getBukkitEntity());
 +            if (event.callEvent() && world.addFreshEntity(thrownPotion)) {
 +                if (event.shouldConsume() && !user.getAbilities().instabuild) {
@@ -254,10 +254,10 @@ index 0673f62f25532955f3552b64f122e644d42027e4..de5bdceb4c8578fb972a2fd5ee0dfdae
 +                }
 +                return InteractionResultHolder.fail(itemStack);
 +            }
-+            // Paper end
++            // Paper end - PlayerLaunchProjectileEvent
          }
  
-+        /* // Paper start - moved up
++        /* // Paper start - PlayerLaunchProjectileEvent; moved up
          user.awardStat(Stats.ITEM_USED.get(this));
          if (!user.getAbilities().instabuild) {
              itemStack.shrink(1);
@@ -267,7 +267,7 @@ index 0673f62f25532955f3552b64f122e644d42027e4..de5bdceb4c8578fb972a2fd5ee0dfdae
          return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
      }
 diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index 2ccbba4775d7550c5c7277aee9cab9ff7d665693..5fab851b319847035fb1eefd0ab999de3ccc2cd8 100644
+index 2ccbba4775d7550c5c7277aee9cab9ff7d665693..fa876ddf54780728e7f3ecfe02aa8a16b8ef6f8d 100644
 --- a/src/main/java/net/minecraft/world/item/TridentItem.java
 +++ b/src/main/java/net/minecraft/world/item/TridentItem.java
 @@ -83,21 +83,26 @@ public class TridentItem extends Item implements Vanishable {
@@ -275,27 +275,27 @@ index 2ccbba4775d7550c5c7277aee9cab9ff7d665693..5fab851b319847035fb1eefd0ab999de
  
                              // CraftBukkit start
 -                            if (!world.addFreshEntity(entitythrowntrident)) {
-+                            // Paper start
++                            // Paper start - PlayerLaunchProjectileEvent
 +                            com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), (org.bukkit.entity.Projectile) entitythrowntrident.getBukkitEntity());
 +                            if (!event.callEvent() || !world.addFreshEntity(entitythrowntrident)) {
-+                                // Paper end
++                                // Paper end - PlayerLaunchProjectileEvent
                                  if (entityhuman instanceof net.minecraft.server.level.ServerPlayer) {
                                      ((net.minecraft.server.level.ServerPlayer) entityhuman).getBukkitEntity().updateInventory();
                                  }
                                  return;
                              }
  
-+                            if (event.shouldConsume()) { // Paper
++                            if (event.shouldConsume()) { // Paper - PlayerLaunchProjectileEvent
                              stack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
                                  entityhuman1.broadcastBreakEvent(user.getUsedItemHand());
                              });
-+                            } // Paper
++                            } // Paper - PlayerLaunchProjectileEvent
                              entitythrowntrident.pickupItemStack = stack.copy(); // SPIGOT-4511 update since damage call moved
                              // CraftBukkit end
  
                              world.playSound((Player) null, (Entity) entitythrowntrident, SoundEvents.TRIDENT_THROW, SoundSource.PLAYERS, 1.0F, 1.0F);
 -                            if (!entityhuman.getAbilities().instabuild) {
-+                            if (event.shouldConsume() && !entityhuman.getAbilities().instabuild) { // Paper
++                            if (event.shouldConsume() && !entityhuman.getAbilities().instabuild) { // Paper - PlayerLaunchProjectileEvent
                                  entityhuman.getInventory().removeItem(stack);
                              }
                              // CraftBukkit start - SPIGOT-5458 also need in this branch :(
diff --git a/patches/server/0221-Improve-BlockPosition-inlining.patch b/patches/server/0220-Improve-BlockPosition-inlining.patch
similarity index 83%
rename from patches/server/0221-Improve-BlockPosition-inlining.patch
rename to patches/server/0220-Improve-BlockPosition-inlining.patch
index 208af75831..74cbf3248a 100644
--- a/patches/server/0221-Improve-BlockPosition-inlining.patch
+++ b/patches/server/0220-Improve-BlockPosition-inlining.patch
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index 40950db0c242c65dfd4de247c86249354d12108f..e87ef99260bff134529e00b9a75381cecaec01a4 100644
+index 40950db0c242c65dfd4de247c86249354d12108f..6d760fa1dbd13a66bff4695edc28f4ab4b3e44a3 100644
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
 @@ -44,7 +44,7 @@ public class Vec3i implements Comparable<Vec3i> {
@@ -29,7 +29,7 @@ index 40950db0c242c65dfd4de247c86249354d12108f..e87ef99260bff134529e00b9a75381ce
  
      @Override
 -    public boolean equals(Object object) {
-+    public final boolean equals(Object object) { // Paper
++    public final boolean equals(Object object) { // Paper - Perf: Final for inline
          if (this == object) {
              return true;
          } else if (!(object instanceof Vec3i)) {
@@ -38,7 +38,7 @@ index 40950db0c242c65dfd4de247c86249354d12108f..e87ef99260bff134529e00b9a75381ce
  
      @Override
 -    public int hashCode() {
-+    public final int hashCode() { // Paper
++    public final int hashCode() { // Paper - Perf: Final for inline
          return (this.getY() + this.getZ() * 31) * 31 + this.getX();
      }
  
@@ -47,17 +47,17 @@ index 40950db0c242c65dfd4de247c86249354d12108f..e87ef99260bff134529e00b9a75381ce
      }
  
 -    public int getX() {
-+    public final int getX() { // Paper
++    public final int getX() { // Paper - Perf: Final for inline
          return this.x;
      }
  
 -    public int getY() {
-+    public final int getY() { // Paper
++    public final int getY() { // Paper - Perf: Final for inline
          return this.y;
      }
  
 -    public int getZ() {
-+    public final int getZ() { // Paper
++    public final int getZ() { // Paper - Perf: Final for inline
          return this.z;
      }
  
diff --git a/patches/server/0222-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 78%
rename from patches/server/0222-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index a182766f7f..98ed62ea67 100644
--- a/patches/server/0222-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/patches/server/0221-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -5,32 +5,32 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index d04d0b9cbf91beb57da7e37e72f8e7c98cf6cf4c..aff1b2195d2f187739394886d4c0bdbf0cb306b4 100644
+index d04d0b9cbf91beb57da7e37e72f8e7c98cf6cf4c..e6e3a7ae08f7346ccbce02b9d36239485133e93a 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -337,6 +337,7 @@ public class ArmorStand extends LivingEntity {
  
      @Override
      protected void pushEntities() {
-+        if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper
++        if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper - Option to prevent armor stands from doing entity lookups
          List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS);
          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 dfdbe171509cc4098e8a14bd8bb65a3a2a44354c..fa504824948c42b7feeca50b407f1f07b2b1a73e 100644
+index 4c48be9f98d75758e582e37ba45d0e8c5737adeb..d7dfbd198e16533aab8db3ee64daf26996380331 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -854,6 +854,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              // Paper end
          }
      }
-+    // Paper start - Prevent armor stands from doing entity lookups
++    // Paper start - Option to prevent armor stands from doing entity lookups
 +    @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;
 +        return LevelAccessor.super.noCollision(entity, box);
 +    }
-+    // Paper end
++    // Paper end - Option to prevent armor stands from doing entity lookups
  
      public boolean shouldTickDeath(Entity entity) {
          return true;
diff --git a/patches/server/0223-Vanished-players-don-t-have-rights.patch b/patches/server/0222-Vanished-players-don-t-have-rights.patch
similarity index 97%
rename from patches/server/0223-Vanished-players-don-t-have-rights.patch
rename to patches/server/0222-Vanished-players-don-t-have-rights.patch
index 144ab07769..17673a4ced 100644
--- a/patches/server/0223-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0222-Vanished-players-don-t-have-rights.patch
@@ -39,7 +39,7 @@ index a6638e626600e4304a973497a39e3fac52203b16..c19069f65a9ecbc9000ea4333417a2df
  
          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 4fead0be6e8b754d0bafa1a988207fb8829b9180..30c69940c331f12dfe732052fcd917ea9231362f 100644
+index d7dfbd198e16533aab8db3ee64daf26996380331..09f2bee26387641191ae7ee3b863ca4ae2106cb4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -276,6 +276,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -89,7 +89,7 @@ index 4fead0be6e8b754d0bafa1a988207fb8829b9180..30c69940c331f12dfe732052fcd917ea
      public boolean isClientSide() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0b847125f67e19e6f0bdc6d0f2fcc8c5ad720fe9..712c92120d2d4b8188b47141e6f0252ad57e66d8 100644
+index 3ec8302c569ef923ddca3f9bfb3c506832fe7659..b297f6eb25192079e8e388d034d4e3ede8d5ab37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1368,6 +1368,14 @@ public class CraftEventFactory {
diff --git a/patches/server/0224-Allow-disabling-armor-stand-ticking.patch b/patches/server/0223-Allow-disabling-armor-stand-ticking.patch
similarity index 98%
rename from patches/server/0224-Allow-disabling-armor-stand-ticking.patch
rename to patches/server/0223-Allow-disabling-armor-stand-ticking.patch
index 994e7fb60e..9d074fefe4 100644
--- a/patches/server/0224-Allow-disabling-armor-stand-ticking.patch
+++ b/patches/server/0223-Allow-disabling-armor-stand-ticking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armor stand ticking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index aff1b2195d2f187739394886d4c0bdbf0cb306b4..5ed648502268e9c4564b5a4984b68b499aeffeb9 100644
+index e6e3a7ae08f7346ccbce02b9d36239485133e93a..ecce8036e58a9ed1408e110e75980bf77c18779a 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -93,9 +93,16 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0225-SkeletonHorse-Additions.patch b/patches/server/0224-SkeletonHorse-Additions.patch
similarity index 100%
rename from patches/server/0225-SkeletonHorse-Additions.patch
rename to patches/server/0224-SkeletonHorse-Additions.patch
diff --git a/patches/server/0226-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0225-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from patches/server/0226-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to patches/server/0225-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/patches/server/0227-Expand-ArmorStand-API.patch b/patches/server/0226-Expand-ArmorStand-API.patch
similarity index 100%
rename from patches/server/0227-Expand-ArmorStand-API.patch
rename to patches/server/0226-Expand-ArmorStand-API.patch
diff --git a/patches/server/0228-AnvilDamageEvent.patch b/patches/server/0227-AnvilDamageEvent.patch
similarity index 100%
rename from patches/server/0228-AnvilDamageEvent.patch
rename to patches/server/0227-AnvilDamageEvent.patch
diff --git a/patches/server/0229-Add-TNTPrimeEvent.patch b/patches/server/0228-Add-TNTPrimeEvent.patch
similarity index 98%
rename from patches/server/0229-Add-TNTPrimeEvent.patch
rename to patches/server/0228-Add-TNTPrimeEvent.patch
index c58d9df2c7..cf06010066 100644
--- a/patches/server/0229-Add-TNTPrimeEvent.patch
+++ b/patches/server/0228-Add-TNTPrimeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add TNTPrimeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index de27517e13ecb15865aaa83257eaffb41c3eecfc..29683f0236163e5630d771d9409be0c23574a467 100644
+index 666c62d796cae9a70516680e26196f7e02c53918..290d97437e9c593816b4f4c4e738c268be616dc0 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -558,6 +558,11 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0229-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch
rename to patches/server/0229-Break-up-and-make-tab-spam-limits-configurable.patch
index 809ea276c8..8ebb5cb69e 100644
--- a/patches/server/0230-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0229-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
 plugins doing unsafe things.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e6b4111ba32906d1b3705b8a2cc06a07956e2891..3cb5bd145a4a719943e9fe4bc40ff7420abdd46d 100644
+index a00f68b058d6d7aa28ce34ad726c5b228e5c2e64..222e9ab6fa6a40f7846451cee256d3dbbac54fde 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -257,6 +257,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0231-Fix-NBT-type-issues.patch b/patches/server/0230-Fix-NBT-type-issues.patch
similarity index 95%
rename from patches/server/0231-Fix-NBT-type-issues.patch
rename to patches/server/0230-Fix-NBT-type-issues.patch
index 427a4ad15a..b33019a3b7 100644
--- a/patches/server/0231-Fix-NBT-type-issues.patch
+++ b/patches/server/0230-Fix-NBT-type-issues.patch
@@ -8,7 +8,7 @@ Addresses two issues:
 - Allay duplication cooldown is saved and exposed as a long, but loaded as an int
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 7eb84b1aad4f031ad17a461d174b23c213014995..cab5636fe6be9ee7f23ffbd5a399d2aeea1cd538 100644
+index 4973cd6eeda0b484999c8a81d188b01f0fd08cac..5685951b71a8b81c7a71fd93b099b276d535b401 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 @@ -295,7 +295,7 @@ public class ExperienceOrb extends Entity {
diff --git a/patches/server/0232-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0231-Remove-unnecessary-itemmeta-handling.patch
similarity index 93%
rename from patches/server/0232-Remove-unnecessary-itemmeta-handling.patch
rename to patches/server/0231-Remove-unnecessary-itemmeta-handling.patch
index 1a6228aac5..19a56b5c05 100644
--- a/patches/server/0232-Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/0231-Remove-unnecessary-itemmeta-handling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary itemmeta handling
 
 
 diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
-index 7dcd8d4e4886e1d35adbc604eafabccb5550f1b4..a5bcad412fb1ac3b6a3eee3f4618dc6c1ca66936 100644
+index b9dd91927cb259789ad71b2241024c5fa2586d57..b863249ff7e13cf4939c8961601f0564c62fd661 100644
 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
 @@ -649,7 +649,7 @@ public class FriendlyByteBuf extends ByteBuf {
diff --git a/patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0232-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 95%
rename from patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to patches/server/0232-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index 28ff4b9a12..542702aaab 100644
--- a/patches/server/0233-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/patches/server/0232-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -26,7 +26,7 @@ index c9e3e104cd051a38e367653dc6c4f969665fc250..45ee0cd242271883412284625230822d
  
      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 536f1380ae3387ac4d062fe2f8b934a8d49905fb..5538e810ef0a68f00043d4e750eb735300d50664 100644
+index 0bb2ed82e8a3dffa9fd9d7aa41685dd50dafac0c..8168a9a3f2b166775a531e7f834710669845d0ae 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1436,6 +1436,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -43,7 +43,7 @@ index 536f1380ae3387ac4d062fe2f8b934a8d49905fb..5538e810ef0a68f00043d4e750eb7353
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bebbbf9a0bca8ab94dd269d19ebf55622a3c2ef8..a906fda4d5d92054f5c0cea4a8167cdb29287cc3 100644
+index ad2e61c7fd7906477e30e91c826d9ce4fb6bffc0..bbb6abd5a51a0ffef41f2ee38eb6d7a21d1c6c23 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -241,6 +241,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0233-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from patches/server/0234-Add-Early-Warning-Feature-to-WatchDog.patch
rename to patches/server/0233-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0234-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0234-Use-ConcurrentHashMap-in-JsonList.patch
index 660fa842c2..118f8ba7bb 100644
--- a/patches/server/0235-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0234-Use-ConcurrentHashMap-in-JsonList.patch
@@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s
 The point of this is readability, but does have a side-benefit of a small microptimization
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 49e3252d6af633d69bdf05ce71dc2a1b3d24f05a..6a3961350030e63b27512261402f675c3cd78485 100644
+index b4643717c98193884a43089ec7a7e362b7153d20..af26a2b45cba7083f3bd7ddbbfde5bcfb30f1907 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -634,7 +634,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0236-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0235-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0236-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0235-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0237-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0236-Ability-to-get-block-entities-from-a-chunk-without-s.patch
similarity index 100%
rename from patches/server/0237-Ability-to-get-block-entities-from-a-chunk-without-s.patch
rename to patches/server/0236-Ability-to-get-block-entities-from-a-chunk-without-s.patch
diff --git a/patches/server/0238-Optimize-BlockPosition-helper-methods.patch b/patches/server/0237-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0238-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0237-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0239-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0238-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
similarity index 100%
rename from patches/server/0239-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
rename to patches/server/0238-Restore-vanilla-default-mob-spawn-range-and-water-an.patch
diff --git a/patches/server/0240-Slime-Pathfinder-Events.patch b/patches/server/0239-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0240-Slime-Pathfinder-Events.patch
rename to patches/server/0239-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0241-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0240-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from patches/server/0241-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0240-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/patches/server/0242-Optimize-CraftBlockData-Creation.patch b/patches/server/0241-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0242-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0241-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0243-Optimize-MappedRegistry.patch b/patches/server/0242-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0243-Optimize-MappedRegistry.patch
rename to patches/server/0242-Optimize-MappedRegistry.patch
diff --git a/patches/server/0244-Add-PhantomPreSpawnEvent.patch b/patches/server/0243-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0244-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0243-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0245-Add-More-Creeper-API.patch b/patches/server/0244-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0245-Add-More-Creeper-API.patch
rename to patches/server/0244-Add-More-Creeper-API.patch
diff --git a/patches/server/0246-Inventory-removeItemAnySlot.patch b/patches/server/0245-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0246-Inventory-removeItemAnySlot.patch
rename to patches/server/0245-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0246-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 92%
rename from patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0246-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index 3aab1cd47d..a05de3dd4c 100644
--- a/patches/server/0247-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/patches/server/0246-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 982231fcc788b99798e8361a53d77c4ed1920396..717718111a98733401669428fb4c39db979114b3 100644
+index fda8fd0d69a3889909e804798a49c19e2a9d49a6..5f65a43c45058bc4ea204623da82ef6befe8d5b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -403,7 +403,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0247-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 93%
rename from patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0247-Add-ray-tracing-methods-to-LivingEntity.patch
index 40d27eb849..01cb214d56 100644
--- a/patches/server/0248-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/patches/server/0247-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,14 +5,13 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f17d6a208477daeb01b66b2894e871f4071cf3e8..486f22469c3cf7ce302c10072da3f96aa3be0ef3 100644
+index b8c4e7d81b20887e5a05b93a1bbe01e72ff55ba7..5461121145c3cbe10f9ae492885c5aa0977b9049 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3829,6 +3829,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3829,6 +3829,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
-     // Paper start
-+
+     // Paper start - Make shield blocking delay configurable
 +    public HitResult getRayTrace(int maxDistance, ClipContext.Fluid fluidCollisionOption) {
 +        if (maxDistance < 1 || maxDistance > 120) {
 +            throw new IllegalArgumentException("maxDistance must be between 1-120");
diff --git a/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0248-Expose-attack-cooldown-methods-for-Player.patch
similarity index 92%
rename from patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0248-Expose-attack-cooldown-methods-for-Player.patch
index c5862b8e74..fe6c952b0b 100644
--- a/patches/server/0249-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0248-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 17016f1ce89555ba10ea96368f5a1d195679a5d4..b6e4fbfdaa46a36e155870190252233eca99d456 100644
+index f0392f2562ee2b65011da556dbe1a8369c5f954c..bebda561ce6fbb6a9dd750852934ca27a04aa034 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2871,6 +2871,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0250-Improve-death-events.patch b/patches/server/0249-Improve-death-events.patch
similarity index 97%
rename from patches/server/0250-Improve-death-events.patch
rename to patches/server/0249-Improve-death-events.patch
index 5a98b8f160..e1bc6ccabd 100644
--- a/patches/server/0250-Improve-death-events.patch
+++ b/patches/server/0249-Improve-death-events.patch
@@ -19,7 +19,7 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou
 public net.minecraft.world.entity.LivingEntity getSoundVolume()F
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0100aafc999cadcfa7a904a812355502379c418d..b2864db793e8d764cf06229d7868fcf80247f938 100644
+index e144adc6e5e2a195174ed7617c29993804ab87ff..b3ad3b459e0ad6db37cde0c7de481202f928ea64 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -248,6 +248,10 @@ public class ServerPlayer extends Player {
@@ -80,7 +80,7 @@ index 0100aafc999cadcfa7a904a812355502379c418d..b2864db793e8d764cf06229d7868fcf8
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 486f22469c3cf7ce302c10072da3f96aa3be0ef3..4df479842f482a8a6a5979c204b6882cd3603e93 100644
+index 5461121145c3cbe10f9ae492885c5aa0977b9049..9808a03ed37708bec0f9c32bd2f1e4cb6afa2551 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -259,6 +259,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -235,7 +235,7 @@ index 486f22469c3cf7ce302c10072da3f96aa3be0ef3..4df479842f482a8a6a5979c204b6882c
      // CraftBukkit start
      public int getExpReward() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index a6b89a12471a8c7277b7a5aa50447ff275a667c6..efef5df4cf720058c0b07ef795cfa6a567113811 100644
+index 524f99eeefb1ab95d1752df2faea76837f2e3787..40becb18c6afae979875b684c1816e84970babb5 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1075,7 +1075,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -311,7 +311,7 @@ index bb399f775a5530a01f59332848c8ab9b8eceb2b5..14edfe103e61024b569f33de0b6608f3
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 948ba97e318506dad96e59121297b5bf8340d2e6..810bead2f19de70786027b190137f743a0c40ee7 100644
+index ecce8036e58a9ed1408e110e75980bf77c18779a..ddd512e1d7608ec051fb5adf6ec2c6bbb93f5a9d 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -492,8 +492,10 @@ public class ArmorStand extends LivingEntity {
@@ -402,7 +402,7 @@ index 948ba97e318506dad96e59121297b5bf8340d2e6..810bead2f19de70786027b190137f743
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bd6ac69d97ec1c12bf73e9ef07d39a484a39aad1..ce73a8c652cf95bae62808fc27db2ab852691fd8 100644
+index bebda561ce6fbb6a9dd750852934ca27a04aa034..07076f9216fe904fe0f1f018b7e3862d5aab1398 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2408,7 +2408,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -422,7 +422,7 @@ index bd6ac69d97ec1c12bf73e9ef07d39a484a39aad1..ce73a8c652cf95bae62808fc27db2ab8
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5c81eb10e92142d8d4907751edc8c01659d2c62e..10c701eb269b02c763d32c6a0be8fe7b843805c5 100644
+index b297f6eb25192079e8e388d034d4e3ede8d5ab37..3bd92edf2f4e7a63a07bd2bbae002f99484a9069 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -890,9 +890,16 @@ public class CraftEventFactory {
diff --git a/patches/server/0251-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0250-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0251-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0250-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0252-Mob-Pathfinding-API.patch b/patches/server/0251-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0252-Mob-Pathfinding-API.patch
rename to patches/server/0251-Mob-Pathfinding-API.patch
diff --git a/patches/server/0253-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/0252-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/server/0253-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/server/0252-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.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 98%
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
index c56e635c34..7f21373d4d 100644
--- a/patches/server/0254-Prevent-various-interactions-from-causing-chunk-load.patch
+++ b/patches/server/0253-Prevent-various-interactions-from-causing-chunk-load.patch
@@ -40,7 +40,7 @@ index e3d070d46729c023d594699619a4b3f8658edbce..5580a396a56c6e0f364a5368985ee99b
          return ichunkaccess == null ? false : ichunkaccess.getBlockState(pos).is(this.blockToRemove) && ichunkaccess.getBlockState(pos.above()).isAir() && ichunkaccess.getBlockState(pos.above(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 5c620989acaff4fdb842944ea2d8ae331699a2b4..a859f02074c698c68713568ed99089e33f38ccca 100644
+index 259ba77dcbc8ed5f7e4015a6683799cc4604dfb8..d259d7b8f7380763e3976f5f20bc01f06ce6901c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -517,7 +517,8 @@ public class EnderMan extends Monster implements NeutralMob {
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 94%
rename from patches/server/0258-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0257-Configurable-connection-throttle-kick-message.patch
index 2e44ed6b6d..07b0dea431 100644
--- a/patches/server/0258-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0257-Configurable-connection-throttle-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 203fc53142bb0c9b6e2d1876fe8dfbe33c42af99..e8cf9eafe0908bc9b716d9b6ead97828a43413ec 100644
+index e68020588ed81fc14ef53a429e5bc86f7685235d..21aafb1ea51769659462d722aa318460b37cbc1c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -51,7 +51,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
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-Hook-into-CB-plugin-rewrites.patch b/patches/server/0259-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0260-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0259-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0261-PreSpawnerSpawnEvent.patch b/patches/server/0260-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0261-PreSpawnerSpawnEvent.patch
rename to patches/server/0260-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0262-Add-LivingEntity-getTargetEntity.patch b/patches/server/0261-Add-LivingEntity-getTargetEntity.patch
similarity index 97%
rename from patches/server/0262-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0261-Add-LivingEntity-getTargetEntity.patch
index 1935f0091e..51a61c458d 100644
--- a/patches/server/0262-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/server/0261-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4df479842f482a8a6a5979c204b6882cd3603e93..0085d4727e9bd1c6f451666e6012b8abcd74d129 100644
+index 9808a03ed37708bec0f9c32bd2f1e4cb6afa2551..ab55d44e505fd50dae0000ce5a999f52f916103f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable;
@@ -16,7 +16,7 @@ index 4df479842f482a8a6a5979c204b6882cd3603e93..0085d4727e9bd1c6f451666e6012b8ab
  import net.minecraft.world.phys.HitResult;
  import net.minecraft.world.phys.Vec3;
  import net.minecraft.world.scores.PlayerTeam;
-@@ -3891,6 +3892,38 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3890,6 +3891,38 @@ public abstract class LivingEntity extends Entity implements Attackable {
          return this.level().clip(raytrace);
      }
  
diff --git a/patches/server/0263-Add-sun-related-API.patch b/patches/server/0262-Add-sun-related-API.patch
similarity index 88%
rename from patches/server/0263-Add-sun-related-API.patch
rename to patches/server/0262-Add-sun-related-API.patch
index d9ec0a0d43..f675d68b26 100644
--- a/patches/server/0263-Add-sun-related-API.patch
+++ b/patches/server/0262-Add-sun-related-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add sun related API
 public net.minecraft.world.entity.Mob isSunBurnTick()Z
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 717718111a98733401669428fb4c39db979114b3..fbbad4c209618d1e5994cb5609d29f4bc9c9905c 100644
+index 5f65a43c45058bc4ea204623da82ef6befe8d5b7..5e25cbee42dbd27c97b4732d70225e54a296b80e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -695,6 +695,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -25,7 +25,7 @@ index 717718111a98733401669428fb4c39db979114b3..fbbad4c209618d1e5994cb5609d29f4b
      public long getGameTime() {
          return this.world.levelData.getGameTime();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index c2acbf533b5f3aebe4837512f694fe25abee65d6..74843d1fa344497d35f05d0b04f650edd1e0f3a1 100644
+index 018884ced888fcd03d2fb17b3620f8e6125e67da..0ad9885f939bcb50026d50ed78b970a44772ceb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -93,4 +93,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0264-Catch-JsonParseException-in-entity-and-block-entity-.patch b/patches/server/0263-Catch-JsonParseException-in-entity-and-block-entity-.patch
similarity index 100%
rename from patches/server/0264-Catch-JsonParseException-in-entity-and-block-entity-.patch
rename to patches/server/0263-Catch-JsonParseException-in-entity-and-block-entity-.patch
diff --git a/patches/server/0265-Turtle-API.patch b/patches/server/0264-Turtle-API.patch
similarity index 100%
rename from patches/server/0265-Turtle-API.patch
rename to patches/server/0264-Turtle-API.patch
diff --git a/patches/server/0266-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 96%
rename from patches/server/0266-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch
index 3f4102d445..beb6453634 100644
--- a/patches/server/0266-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch
@@ -19,7 +19,7 @@ spectate the target entity.
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6795bfdbdbd4e548c394e02a0e121b26facab8ea..e4d773356ae8b310908f502d12bab08dc6862e40 100644
+index b3ad3b459e0ad6db37cde0c7de481202f928ea64..6624fd85fc8b5efc22b71f7aa665bd8f62aad7ed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2085,6 +2085,21 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0267-Add-more-Witch-API.patch b/patches/server/0266-Add-more-Witch-API.patch
similarity index 98%
rename from patches/server/0267-Add-more-Witch-API.patch
rename to patches/server/0266-Add-more-Witch-API.patch
index c644efe98f..f33788b471 100644
--- a/patches/server/0267-Add-more-Witch-API.patch
+++ b/patches/server/0266-Add-more-Witch-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add more Witch API
 public net.minecraft.world.entity.monster.Witch usingTime
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index ca24b592273208e61e0e0ba59b7e5a3c11ebf952..580dff41d746d9591f718081d9dfe4ac77e7eeaa 100644
+index f45b46e30e1ad0516c5b380e476bc7dacb91391a..02386e7eabc6669296ce35158fa35a3c88c6b563 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -160,21 +160,10 @@ public class Witch extends Raider implements RangedAttackMob {
diff --git a/patches/server/0268-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0267-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0268-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0267-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0269-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0268-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 98%
rename from patches/server/0269-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0268-Add-option-to-prevent-players-from-moving-into-unloa.patch
index e8f1192827..ef155970a6 100644
--- a/patches/server/0269-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0268-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index dd2ae4c0e4dad3f7c246357a9b45c832a091a576..6b9a53b244f5eca443697d01cc5938d85be4b99f 100644
+index 222e9ab6fa6a40f7846451cee256d3dbbac54fde..91791fffa52dae34e6ab5e786bce7d0c6d077b73 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -475,9 +475,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0270-Reset-players-airTicks-on-respawn.patch b/patches/server/0269-Reset-players-airTicks-on-respawn.patch
similarity index 90%
rename from patches/server/0270-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0269-Reset-players-airTicks-on-respawn.patch
index a99785c81d..8dbbcde710 100644
--- a/patches/server/0270-Reset-players-airTicks-on-respawn.patch
+++ b/patches/server/0269-Reset-players-airTicks-on-respawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e4d773356ae8b310908f502d12bab08dc6862e40..2119ad9a167ef50f912e8408702f310a61e1527e 100644
+index 6624fd85fc8b5efc22b71f7aa665bd8f62aad7ed..4b163b9f6f6abc89ed62291e8df80d987bdc46e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2560,6 +2560,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0271-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0270-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0271-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0270-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0272-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0271-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0272-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0271-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0273-Optimize-World-Time-Updates.patch b/patches/server/0272-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0273-Optimize-World-Time-Updates.patch
rename to patches/server/0272-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0274-Restore-custom-InventoryHolder-support.patch b/patches/server/0273-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0274-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0273-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0275-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0274-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0275-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0274-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0276-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0275-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 98%
rename from patches/server/0276-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0275-Don-t-allow-digging-into-unloaded-chunks.patch
index 5ed89e343a..ec54330504 100644
--- a/patches/server/0276-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0275-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,7 +59,7 @@ index e3b7441d875b55ffce295c948f3dc867be09e042..32327f639b3cc10444ad122fb3405174
  
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6b9a53b244f5eca443697d01cc5938d85be4b99f..b04323c2e8697c2b406bb861b25aa5b0f7032557 100644
+index 91791fffa52dae34e6ab5e786bce7d0c6d077b73..944bb7bf990dbd7198496a45c1babe8ad01e8eee 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1592,6 +1592,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0277-Make-the-default-permission-message-configurable.patch b/patches/server/0276-Make-the-default-permission-message-configurable.patch
similarity index 95%
rename from patches/server/0277-Make-the-default-permission-message-configurable.patch
rename to patches/server/0276-Make-the-default-permission-message-configurable.patch
index 3165fc1ca9..c94d157ac7 100644
--- a/patches/server/0277-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0276-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 0dd48e4098191c8b6e29945d62bc473e9f3a1e77..ae51993e0de706cb62c96795ca9de766
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ed5eafd7d555b4500c8dd70e17401e0f453266dd..04ff773b84eb8870d77b09e25ab72e5a887774d4 100644
+index f90361a27c067d0d8a92fd6af930a0d453b4c2a7..25d059f802a4bdcb7076bca8fa8a587e5de065bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2807,6 +2807,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0278-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0277-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0278-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0277-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0279-force-entity-dismount-during-teleportation.patch b/patches/server/0278-force-entity-dismount-during-teleportation.patch
similarity index 95%
rename from patches/server/0279-force-entity-dismount-during-teleportation.patch
rename to patches/server/0278-force-entity-dismount-during-teleportation.patch
index 6a7d014e2a..974887a1fd 100644
--- a/patches/server/0279-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0278-force-entity-dismount-during-teleportation.patch
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a906fda4d5d92054f5c0cea4a8167cdb29287cc3..6f37e4fbadb287d9c099d1cc535c941aaabe1d54 100644
+index bbb6abd5a51a0ffef41f2ee38eb6d7a21d1c6c23..4b9cb1c85ed17250f145e815d5c40cf09b34e4d2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2605,11 +2605,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -72,7 +72,7 @@ index a906fda4d5d92054f5c0cea4a8167cdb29287cc3..6f37e4fbadb287d9c099d1cc535c941a
              if (this.valid) {
                  Bukkit.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0085d4727e9bd1c6f451666e6012b8abcd74d129..9e3571220ba3eef5fa950ddd83af13ff45ae38ae 100644
+index ab55d44e505fd50dae0000ce5a999f52f916103f..0290302c2b49b9fb262f8675f90010715fe53c50 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3471,9 +3471,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -93,7 +93,7 @@ index 0085d4727e9bd1c6f451666e6012b8abcd74d129..9e3571220ba3eef5fa950ddd83af13ff
              this.dismountVehicle(entity);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0d8261e15a1a66df17727788c387dca8fbe2ae84..76a3e38a49d6ea8cf01604be4da12ad4e4fa3da4 100644
+index 636c8d53e5c07f5d75881113b8cfb366a007a162..18394311d9d0bed5fa1ac09182947375380c7670 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1149,7 +1149,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0280-Add-more-Zombie-API.patch b/patches/server/0279-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0280-Add-more-Zombie-API.patch
rename to patches/server/0279-Add-more-Zombie-API.patch
diff --git a/patches/server/0281-Book-Size-Limits.patch b/patches/server/0280-Book-Size-Limits.patch
similarity index 96%
rename from patches/server/0281-Book-Size-Limits.patch
rename to patches/server/0280-Book-Size-Limits.patch
index 1ff2a7c517..d14c8dd2aa 100644
--- a/patches/server/0281-Book-Size-Limits.patch
+++ b/patches/server/0280-Book-Size-Limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits
 Puts some limits on the size of books.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e0954ab93e4b528595fc3be40a30e2e6775bc4a2..2ee2e497f716f54dc8cd3d9b906d7bc2b7106448 100644
+index 944bb7bf990dbd7198496a45c1babe8ad01e8eee..592493efdd799c76c753de825126c4f7b04a3179 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1026,6 +1026,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0282-Add-PlayerConnectionCloseEvent.patch b/patches/server/0281-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from patches/server/0282-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0281-Add-PlayerConnectionCloseEvent.patch
index 73a6fc8133..db512740f6 100644
--- a/patches/server/0282-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0281-Add-PlayerConnectionCloseEvent.patch
@@ -38,7 +38,7 @@ public net.minecraft.server.network.ServerLoginPacketListenerImpl$State
 public net.minecraft.server.network.ServerLoginPacketListenerImpl state
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 6fcbf8205e1852d5193a42bfe1154f62ab01e7ad..8870d97194e1389ca747b74b092b1f8fb9090fb0 100644
+index 090a130676de3ab458df6bd1e08f0b755a3f685a..c521e2eab937f90085c4f1a98aab13d46720a07b 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -644,6 +644,26 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0283-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0282-Replace-OfflinePlayer-getLastPlayed.patch
similarity index 96%
rename from patches/server/0283-Replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0282-Replace-OfflinePlayer-getLastPlayed.patch
index 7fa91d0779..2b7af6707e 100644
--- a/patches/server/0283-Replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0282-Replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 54297045b5da66827426ae354883a9709d9cdefc..27f0fce3e5e5faec8f2717b5068cb23e2054ce8b 100644
+index 4b163b9f6f6abc89ed62291e8df80d987bdc46e3..0afa8c7c826bb01f8a1139ced76fa599d205e045 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -248,6 +248,7 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 54297045b5da66827426ae354883a9709d9cdefc..27f0fce3e5e5faec8f2717b5068cb23e
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6a3961350030e63b27512261402f675c3cd78485..154881ee9a837fea159246c6a826257bcf7a079a 100644
+index af26a2b45cba7083f3bd7ddbbfde5bcfb30f1907..a1ab652fe6a838f8506c735815894ca16307264c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -179,6 +179,7 @@ public abstract class PlayerList {
@@ -106,7 +106,7 @@ index e8490a58dd4d9bc39a5bb2f9fc109526e031b971..5f590575f95eff8bf0cdcafde7dee0e3
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ce73a8c652cf95bae62808fc27db2ab852691fd8..9df9b465df75dd41eabd789e85ee841ed4be092c 100644
+index 07076f9216fe904fe0f1f018b7e3862d5aab1398..f7ec6a6822608c51129c4bb3247179cce16a39c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -191,6 +191,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0284-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0283-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 91%
rename from patches/server/0284-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0283-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
index 02430343ae..c61cf07b90 100644
--- a/patches/server/0284-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
+++ b/patches/server/0283-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 27f0fce3e5e5faec8f2717b5068cb23e2054ce8b..7c20af6a72603e46b4aec46a079101981eb59c08 100644
+index 0afa8c7c826bb01f8a1139ced76fa599d205e045..4b7aacb6abe20dbac735b8edc2ca3c10ed8bfbe6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1749,6 +1749,13 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0285-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0284-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
similarity index 92%
rename from patches/server/0285-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
rename to patches/server/0284-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
index 0227c4c45f..d80712d1b8 100644
--- a/patches/server/0285-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
+++ b/patches/server/0284-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch
@@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9df9b465df75dd41eabd789e85ee841ed4be092c..9cae7d8a77af303cb509c23efd5541a5e04f54a6 100644
+index f7ec6a6822608c51129c4bb3247179cce16a39c2..0f0956066203f1598997e54b89b23c500951009c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -247,8 +247,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0286-BlockDestroyEvent.patch b/patches/server/0285-BlockDestroyEvent.patch
similarity index 96%
rename from patches/server/0286-BlockDestroyEvent.patch
rename to patches/server/0285-BlockDestroyEvent.patch
index fbb7e12f5c..f9033b6bec 100644
--- a/patches/server/0286-BlockDestroyEvent.patch
+++ b/patches/server/0285-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 71c2f082091f452cfc74557cd599cf7f080b889b..5d6f45f7ff8f310bf78417aa9bcf8f106a1d80c6 100644
+index 09f2bee26387641191ae7ee3b863ca4ae2106cb4..942b27decf93713b00e28a6360e62c090caa5a01 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -31,6 +31,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0287-Async-command-map-building.patch b/patches/server/0286-Async-command-map-building.patch
similarity index 97%
rename from patches/server/0287-Async-command-map-building.patch
rename to patches/server/0286-Async-command-map-building.patch
index ec0668617e..3ab586b43b 100644
--- a/patches/server/0287-Async-command-map-building.patch
+++ b/patches/server/0286-Async-command-map-building.patch
@@ -53,7 +53,7 @@ index 5a1accff1a7dc2ab40224ec0952a287cd6099aee..2b722091920116ded43ff54c413d4dd4
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e6b029c8ee05c5e045a7d694a9e8616d6a1ea484..5f377267cc3c72e4d55c29f20ce3cd3eed0e5258 100644
+index bfcb155b1e8b04edfdbd26f4cc3bc2b4a7cbf5ea..06d70213a9f19bbd2a0f22a26af2dbb989bca5ce 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -926,6 +926,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0288-Brigadier-Mojang-API.patch b/patches/server/0287-Brigadier-Mojang-API.patch
similarity index 99%
rename from patches/server/0288-Brigadier-Mojang-API.patch
rename to patches/server/0287-Brigadier-Mojang-API.patch
index b4084aa763..7b8adfc7ac 100644
--- a/patches/server/0288-Brigadier-Mojang-API.patch
+++ b/patches/server/0287-Brigadier-Mojang-API.patch
@@ -131,7 +131,7 @@ index 2b722091920116ded43ff54c413d4dd47da65ed4..867f22bdeed5f1c3f063a5815a3477d1
  
              if (commandnode2.canUse(source)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2ee2e497f716f54dc8cd3d9b906d7bc2b7106448..715e80bbb683da9c13d57b6b0bca70342e67c294 100644
+index 592493efdd799c76c753de825126c4f7b04a3179..efa12d25cacd0b746ff8e689f35380bc310f5d75 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -740,8 +740,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0289-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0288-Improve-exact-choice-recipe-ingredients.patch
similarity index 100%
rename from patches/server/0289-Improve-exact-choice-recipe-ingredients.patch
rename to patches/server/0288-Improve-exact-choice-recipe-ingredients.patch
diff --git a/patches/server/0290-Limit-Client-Sign-length-more.patch b/patches/server/0289-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from patches/server/0290-Limit-Client-Sign-length-more.patch
rename to patches/server/0289-Limit-Client-Sign-length-more.patch
index 20872d5df3..fb127f4da0 100644
--- a/patches/server/0290-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0289-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 833fb2f340065a72903620f974e6ac71cc86f3f9..748321534eab7a8c35a85b4d4ab8020bd4623654 100644
+index efa12d25cacd0b746ff8e689f35380bc310f5d75..a191254fa3bd8cdf2cb5446c88c71ed0be6761e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -291,6 +291,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0291-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0290-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 89%
rename from patches/server/0291-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0290-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 0cf6c5d793..fcad8a5306 100644
--- a/patches/server/0291-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/patches/server/0290-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d3f57dfd5156a5df17a5a7a6e5fe51d8804fd38f..c9dbc32561ddd39b40ed42d8cc6550a904ac158e 100644
+index a1ab652fe6a838f8506c735815894ca16307264c..3748e7d8267f659cb4942e54efa7e993fa4a99b5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1157,6 +1157,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0292-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0291-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0292-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0291-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0293-Entity-getEntitySpawnReason.patch b/patches/server/0292-Entity-getEntitySpawnReason.patch
similarity index 96%
rename from patches/server/0293-Entity-getEntitySpawnReason.patch
rename to patches/server/0292-Entity-getEntitySpawnReason.patch
index 7a2fa22e3c..a5998f47b0 100644
--- a/patches/server/0293-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0292-Entity-getEntitySpawnReason.patch
@@ -22,7 +22,7 @@ index 2eddeb8d5239bbfeefbf4d3bd363f1ad083299b6..e2b44b8ddb8afc6e1f7dddadb434c226
              });
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5538e810ef0a68f00043d4e750eb735300d50664..8e3acfcdfac1cd67456acfbede2260b8f186df70 100644
+index 8168a9a3f2b166775a531e7f834710669845d0ae..4d468f34cfff2162928928d2e093502a2142189f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1442,6 +1442,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -34,7 +34,7 @@ index 5538e810ef0a68f00043d4e750eb735300d50664..8e3acfcdfac1cd67456acfbede2260b8
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8ca59ff8fee55358ec6f9a480a27b45859dccfaf..dd9b5fbd23a951b1e4b3cbf3ae0763b1f8462e2e 100644
+index 3748e7d8267f659cb4942e54efa7e993fa4a99b5..2670d20fce0e1c3e1930f3e4dc18c22b7cc1e0ec 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -223,6 +223,11 @@ public abstract class PlayerList {
@@ -59,7 +59,7 @@ index 8ca59ff8fee55358ec6f9a480a27b45859dccfaf..dd9b5fbd23a951b1e4b3cbf3ae0763b1
              });
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6f37e4fbadb287d9c099d1cc535c941aaabe1d54..eb353e7814544c11dbae8d12958cc26200e549a3 100644
+index 4b9cb1c85ed17250f145e815d5c40cf09b34e4d2..546f1ba9bb5e4c6135d8205d7421aeae0a3bbd89 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -237,6 +237,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0294-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0293-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 99%
rename from patches/server/0294-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0293-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index a1d5b6a357..baa14e577e 100644
--- a/patches/server/0294-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0293-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
@@ -28,7 +28,7 @@ and then catch exceptions and close if they fire.
 Part of this commit was authored by: Spottedleaf, sandtechnology
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 25881c890c643ce90bdcda6b094d912bafb0ed75..93d3f29b08c79479c27d3f39e6c799c705e69902 100644
+index c521e2eab937f90085c4f1a98aab13d46720a07b..c66fc75fb88c4f0a4273d69009a4e6defb0b29e9 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -84,7 +84,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0295-Fire-event-on-GS4-query.patch b/patches/server/0294-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0295-Fire-event-on-GS4-query.patch
rename to patches/server/0294-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0296-Add-PlayerPostRespawnEvent.patch b/patches/server/0295-Add-PlayerPostRespawnEvent.patch
similarity index 95%
rename from patches/server/0296-Add-PlayerPostRespawnEvent.patch
rename to patches/server/0295-Add-PlayerPostRespawnEvent.patch
index f338716912..d01259c01b 100644
--- a/patches/server/0296-Add-PlayerPostRespawnEvent.patch
+++ b/patches/server/0295-Add-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 63d793ee00b14a12d0dbad15bee579a330f1eb07..89bd3102898af0b178cbb7f8dbe041a05c5845f3 100644
+index 2670d20fce0e1c3e1930f3e4dc18c22b7cc1e0ec..81acbabe942de6f1716e384dc4e9cbd451f0a535 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -751,9 +751,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0297-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0296-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 94%
rename from patches/server/0297-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0296-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index a43c825a0e..0b46e05dd4 100644
--- a/patches/server/0297-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/patches/server/0296-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 18c9c7c2b0605bee2936fbb084108dd9791f7ebe..314ba941c72a50b479cb634f3337ded3e63a7622 100644
+index e06f4c5b36411dd545982d9f6e3691f89cb04ac5..37ae35b76dc9585c7eaf53dd66e016977ca8f45d 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -140,6 +140,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0298-Server-Tick-Events.patch b/patches/server/0297-Server-Tick-Events.patch
similarity index 94%
rename from patches/server/0298-Server-Tick-Events.patch
rename to patches/server/0297-Server-Tick-Events.patch
index 2b723b268a..346295f633 100644
--- a/patches/server/0298-Server-Tick-Events.patch
+++ b/patches/server/0297-Server-Tick-Events.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1353bc4ddee1bafb76efbe6867f8821acc12a708..609b22f03c60ade8c2c1c7a0b191c2e24526aadf 100644
+index 06d70213a9f19bbd2a0f22a26af2dbb989bca5ce..cef1554db34a1d917fa5c7bbccfe22efd93bebfd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1348,6 +1348,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0299-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0298-PlayerDeathEvent-getItemsToKeep.patch
similarity index 97%
rename from patches/server/0299-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0298-PlayerDeathEvent-getItemsToKeep.patch
index d89e385689..b80d6bc8de 100644
--- a/patches/server/0299-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0298-PlayerDeathEvent-getItemsToKeep.patch
@@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 public net.minecraft.world.entity.player.Inventory compartments
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8cc33c1b14668c085dbad1f3feabf7b602812471..5d491a5a885b00cad003538fc20720355c7f218a 100644
+index 4b7aacb6abe20dbac735b8edc2ca3c10ed8bfbe6..74967544779847f42a284c0c9c89ef6a6a3880fe 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -857,6 +857,46 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0300-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0299-Optimize-Captured-BlockEntity-Lookup.patch
similarity index 94%
rename from patches/server/0300-Optimize-Captured-BlockEntity-Lookup.patch
rename to patches/server/0299-Optimize-Captured-BlockEntity-Lookup.patch
index 419495dd06..d853854581 100644
--- a/patches/server/0300-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0299-Optimize-Captured-BlockEntity-Lookup.patch
@@ -10,7 +10,7 @@ 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 5d6f45f7ff8f310bf78417aa9bcf8f106a1d80c6..44290a845d15bfdd8ea87ff77e9016ece835d087 100644
+index 942b27decf93713b00e28a6360e62c090caa5a01..1b5b703350a5c3645658429b0cd5d8aa56f647fe 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -997,9 +997,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0301-Add-Heightmap-API.patch b/patches/server/0300-Add-Heightmap-API.patch
similarity index 95%
rename from patches/server/0301-Add-Heightmap-API.patch
rename to patches/server/0300-Add-Heightmap-API.patch
index 61a41e7fd1..6934730a45 100644
--- a/patches/server/0301-Add-Heightmap-API.patch
+++ b/patches/server/0300-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 620a10f404f44ebaf81fc3fcd8adc77540cd5ba1..cb8bb8b8730b43d02613c7e2ba240017e279a904 100644
+index 5e25cbee42dbd27c97b4732d70225e54a296b80e..c71a82ec42c7edd51979c9636205a931c56c6117 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -222,6 +222,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0302-Mob-Spawner-API-Enhancements.patch b/patches/server/0301-Mob-Spawner-API-Enhancements.patch
similarity index 98%
rename from patches/server/0302-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0301-Mob-Spawner-API-Enhancements.patch
index 55919a80ca..ec161f0ae5 100644
--- a/patches/server/0302-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0301-Mob-Spawner-API-Enhancements.patch
@@ -9,7 +9,7 @@ public net.minecraft.world.level.BaseSpawner delay(Lnet/minecraft/world/level/Le
 public net.minecraft.world.level.BaseSpawner setNextSpawnData(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/SpawnData;)V
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 231674f1483ad71630ac71ba92efc50f94a5659b..3b48d50bd3727647dc2d73cccc3fbd8a4f649715 100644
+index 0d04581b73a9daa91bbcb0ef0b28d601fc0e9599..f4e1a540243d1f699dd2ef407707af27517d9360 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -235,7 +235,13 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0303-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0302-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 91%
rename from patches/server/0303-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0302-Fix-CB-call-to-changed-postToMainThread-method.patch
index a7639ee7f3..c4625cebc1 100644
--- a/patches/server/0303-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0302-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index ca7e4d23f40db5d9404f7aab15e05b9af675e503..44aa178968c87fa72023a2c0f33c1a8123f3db72 100644
+index 494069d69d8d0f9f1b6700349310ec6d2031abdd..b68301f4cf650891140d3be6aebdc7ddf0d2a54f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -310,7 +310,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
diff --git a/patches/server/0304-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0303-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0304-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0303-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0305-Implement-CraftBlockSoundGroup.patch b/patches/server/0304-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0305-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0304-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0306-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0305-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 98%
rename from patches/server/0306-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0305-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index e697a61bd3..5102c023cc 100644
--- a/patches/server/0306-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0305-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -62,7 +62,7 @@ index cef1554db34a1d917fa5c7bbccfe22efd93bebfd..f92e4d6cfae684b5c8df6424d63a574c
          // this.updateMobSpawningFlags();
          worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals());
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8e3acfcdfac1cd67456acfbede2260b8f186df70..3e649c0b56de4b7e63c877ea14721fd5e70b51d3 100644
+index 4d468f34cfff2162928928d2e093502a2142189f..d2bf0cc0b5434a8f9ab84d9b12825c96531dfbe7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1879,12 +1879,84 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -190,7 +190,7 @@ index 4d2348df25410a0b5364eec066880326d6667dad..3754cda7e7731935893359d84f3ae061
          this.maxCount = i * i;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cb8bb8b8730b43d02613c7e2ba240017e279a904..af027128cc06f877f745296b2320e1bca29fd02b 100644
+index c71a82ec42c7edd51979c9636205a931c56c6117..0b7f3c3df526372e5c249ba3c1bb04343fe86e48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1407,15 +1407,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0307-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0306-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0307-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0306-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0308-Expose-the-internal-current-tick.patch b/patches/server/0307-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0308-Expose-the-internal-current-tick.patch
rename to patches/server/0307-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0309-Fix-World-isChunkGenerated-calls.patch b/patches/server/0308-Fix-World-isChunkGenerated-calls.patch
similarity index 99%
rename from patches/server/0309-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0308-Fix-World-isChunkGenerated-calls.patch
index 9d40d829a5..5fe36e4e67 100644
--- a/patches/server/0309-Fix-World-isChunkGenerated-calls.patch
+++ b/patches/server/0308-Fix-World-isChunkGenerated-calls.patch
@@ -156,7 +156,7 @@ index affd43308ac565066cefa799238e46b75a28b270..8563383d45f89ee01dd5df13af5bd0cf
              } catch (Throwable throwable) {
                  if (dataoutputstream != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index af027128cc06f877f745296b2320e1bca29fd02b..d4518b9c1338226a9a814d2512aaddbb76a42da8 100644
+index 0b7f3c3df526372e5c249ba3c1bb04343fe86e48..86f31b8356e1632537d34b39c105d01958eba23a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -310,9 +310,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0310-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0309-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0310-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0309-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0311-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0310-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0311-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0310-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0312-Configurable-projectile-relative-velocity.patch b/patches/server/0311-Configurable-projectile-relative-velocity.patch
similarity index 96%
rename from patches/server/0312-Configurable-projectile-relative-velocity.patch
rename to patches/server/0311-Configurable-projectile-relative-velocity.patch
index 2a3669dd8e..78be0464aa 100644
--- a/patches/server/0312-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0311-Configurable-projectile-relative-velocity.patch
@@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this
 server-internal fix makes this change future-proof.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 01a2c6c3ee4e1500b6ee9986943f84dbe8663860..444119c813af920eb25706341106f0fea27befa8 100644
+index 75f08dcce4ac923678bf8c1f25ca02b0efbab7c2..cd9ef09e2d975ab16a3b96b8662477b687d58a4f 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -173,7 +173,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
diff --git a/patches/server/0313-offset-item-frame-ticking.patch b/patches/server/0312-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0313-offset-item-frame-ticking.patch
rename to patches/server/0312-offset-item-frame-ticking.patch
diff --git a/patches/server/0314-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0313-Prevent-consuming-the-wrong-itemstack.patch
similarity index 96%
rename from patches/server/0314-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0313-Prevent-consuming-the-wrong-itemstack.patch
index a5a61f6c12..55aa853c3d 100644
--- a/patches/server/0314-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0313-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8e89eb11e8477c921b30840644b6c3ba9d18c3ef..f893b0a8fac50f83ed847281f8283b32c6415777 100644
+index 0290302c2b49b9fb262f8675f90010715fe53c50..9837ed5e3470b6bc563f466c958ca9c3978acdc9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3709,9 +3709,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0315-Dont-send-unnecessary-sign-update.patch b/patches/server/0314-Dont-send-unnecessary-sign-update.patch
similarity index 100%
rename from patches/server/0315-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0314-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0316-Add-option-to-disable-pillager-patrols.patch b/patches/server/0315-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0316-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0315-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0317-Flat-bedrock-generator-settings.patch b/patches/server/0316-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0317-Flat-bedrock-generator-settings.patch
rename to patches/server/0316-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0318-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0317-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0318-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0317-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0319-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0318-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0319-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0318-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0320-Duplicate-UUID-Resolve-Option.patch b/patches/server/0319-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0320-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0319-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0321-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0320-PlayerDeathEvent-shouldDropExperience.patch
similarity index 91%
rename from patches/server/0321-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0320-PlayerDeathEvent-shouldDropExperience.patch
index d084192630..f1fec154d0 100644
--- a/patches/server/0321-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0320-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5d491a5a885b00cad003538fc20720355c7f218a..a37174c76ca01a4c9831a63548b3161257c70f87 100644
+index 74967544779847f42a284c0c9c89ef6a6a3880fe..af75f20fff15f95aed238e3f6ae57182f4076d46 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -978,7 +978,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0322-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0321-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0322-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0321-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0323-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0322-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0323-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0322-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0324-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0323-Optimise-EntityGetter-getPlayerByUUID.patch
similarity index 94%
rename from patches/server/0324-Optimise-EntityGetter-getPlayerByUUID.patch
rename to patches/server/0323-Optimise-EntityGetter-getPlayerByUUID.patch
index b92dca5c8c..c3ee28c337 100644
--- a/patches/server/0324-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0323-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 3e649c0b56de4b7e63c877ea14721fd5e70b51d3..43ccc65c87e9c535057dd959c5a130dcf71d7d28 100644
+index d2bf0cc0b5434a8f9ab84d9b12825c96531dfbe7..b3e1ac038eba2153b3358f6d79861ee73b576fe8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -555,6 +555,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0325-Fix-items-not-falling-correctly.patch b/patches/server/0324-Fix-items-not-falling-correctly.patch
similarity index 96%
rename from patches/server/0325-Fix-items-not-falling-correctly.patch
rename to patches/server/0324-Fix-items-not-falling-correctly.patch
index 36ab49038d..0aa26ff6dd 100644
--- a/patches/server/0325-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0324-Fix-items-not-falling-correctly.patch
@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking Spigot's entity
 activation range check from an item's move method.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 314ba941c72a50b479cb634f3337ded3e63a7622..bbd0d161f27d0e061c14ad87990e44492bb7fe3d 100644
+index 37ae35b76dc9585c7eaf53dd66e016977ca8f45d..16c30342ac9ebf5cffa0bf23ab9700b6704a1ec0 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -168,7 +168,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0326-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0325-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0326-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0325-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0327-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0326-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0327-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0326-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0328-Entity-Activation-Range-2.0.patch b/patches/server/0327-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from patches/server/0328-Entity-Activation-Range-2.0.patch
rename to patches/server/0327-Entity-Activation-Range-2.0.patch
index 8b6fef0fc3..c81b7c9271 100644
--- a/patches/server/0328-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0327-Entity-Activation-Range-2.0.patch
@@ -18,7 +18,7 @@ public net.minecraft.world.entity.Entity isInsidePortal
 public net.minecraft.world.entity.LivingEntity jumping
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 43ccc65c87e9c535057dd959c5a130dcf71d7d28..dd034a7d7754c88b77731175f373e8c090e4a706 100644
+index b3e1ac038eba2153b3358f6d79861ee73b576fe8..5f6eca4e652ab96a8697e908d11a66e4eb551409 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;
@@ -112,7 +112,7 @@ index 43ccc65c87e9c535057dd959c5a130dcf71d7d28..dd034a7d7754c88b77731175f373e8c0
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index eb353e7814544c11dbae8d12958cc26200e549a3..9e028513eb3809100d7292e3327051cb27f4d07a 100644
+index 546f1ba9bb5e4c6135d8205d7421aeae0a3bbd89..31c1e5c5e0ccd1c7bd65e5f52121f0af444f73fa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -396,6 +396,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -148,7 +148,7 @@ index eb353e7814544c11dbae8d12958cc26200e549a3..9e028513eb3809100d7292e3327051cb
              movement = this.maybeBackOffFromEdge(movement, movementType);
              Vec3 vec3d1 = this.collide(movement);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 08bf4e4f108ae2eb87eb3b98e2b74d7d0f1d6a7c..3da1debb3ad884d9ba2f8ebea52643e8fcb3a747 100644
+index 40becb18c6afae979875b684c1816e84970babb5..321076a70653b5b499eb56ce3d9b2b0a4a8b92dc 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -221,6 +221,19 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -340,7 +340,7 @@ index b149e8bcac034bb3fc118a9adcb0de45e18ed5e9..fc35cfc9d045f3e5b6a50af1d0ba83b6
 +
  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 44290a845d15bfdd8ea87ff77e9016ece835d087..9a327f44e9dca303265906d6da379907344435f3 100644
+index 1b5b703350a5c3645658429b0cd5d8aa56f647fe..12d9bcbd37b7ef67f2b922a13da7dbc3ba9838c1 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -162,6 +162,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0329-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0328-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0329-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0328-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0330-Alternative-item-despawn-rate.patch b/patches/server/0329-Alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0330-Alternative-item-despawn-rate.patch
rename to patches/server/0329-Alternative-item-despawn-rate.patch
diff --git a/patches/server/0331-Tracking-Range-Improvements.patch b/patches/server/0330-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0331-Tracking-Range-Improvements.patch
rename to patches/server/0330-Tracking-Range-Improvements.patch
diff --git a/patches/server/0332-Fix-items-vanishing-through-end-portal.patch b/patches/server/0331-Fix-items-vanishing-through-end-portal.patch
similarity index 93%
rename from patches/server/0332-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0331-Fix-items-vanishing-through-end-portal.patch
index 8093b1ad5d..6e8cb44a2c 100644
--- a/patches/server/0332-Fix-items-vanishing-through-end-portal.patch
+++ b/patches/server/0331-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9e028513eb3809100d7292e3327051cb27f4d07a..96e0abe60d108dd61db79790962dd7b782830b57 100644
+index 31c1e5c5e0ccd1c7bd65e5f52121f0af444f73fa..2c8e2ed7199c33f5c4fe25faa9f60fa74982de35 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3410,6 +3410,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0333-Optional-per-player-mob-spawns.patch b/patches/server/0332-Optional-per-player-mob-spawns.patch
similarity index 98%
rename from patches/server/0333-Optional-per-player-mob-spawns.patch
rename to patches/server/0332-Optional-per-player-mob-spawns.patch
index 3207de9027..4566980134 100644
--- a/patches/server/0333-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0332-Optional-per-player-mob-spawns.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optional per player mob spawns
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 2130f15d92bab1d4e35a92a681ac34cd9c929ea9..8fdffba03688e9f2fd57a97343b66933a4aee9c6 100644
+index 279cb641b795b6f4ced545c3a09b61fde69c47d6..19f1432ae1405eee0ee56dec151e7d602816a943 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -288,6 +288,29 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -64,7 +64,7 @@ index 16028723b36c1ca3a3c5d1bf2a7c82d2b42a0be4..488f7e2f1ab0312673983d9079b4d7d9
  
                  this.lastSpawnState = spawnercreature_d;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5aef108c5b78cfc02af5c73b9bc03004fba33ca7..fff540886166a60b967cf14e93776e36dcbe1308 100644
+index af75f20fff15f95aed238e3f6ae57182f4076d46..f9f994f74ff2fc9024c51104eb9af536beb24943 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -253,6 +253,10 @@ public class ServerPlayer extends Player {
@@ -79,7 +79,7 @@ index 5aef108c5b78cfc02af5c73b9bc03004fba33ca7..fff540886166a60b967cf14e93776e36
      // CraftBukkit start
      public String displayName;
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index fe38079d69f3e9987ad5ab077ae09d05017a681a..4aa2a174400fe879501571c175d5ac4d09ac7de3 100644
+index a19c0e30ebcea8feff035a451ded567dfa86dfff..db22e35d19597488a08ba3cd710ced7da77f8b5e 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -70,6 +70,12 @@ public final class NaturalSpawner {
diff --git a/patches/server/0334-Anti-Xray.patch b/patches/server/0333-Anti-Xray.patch
similarity index 99%
rename from patches/server/0334-Anti-Xray.patch
rename to patches/server/0333-Anti-Xray.patch
index 17352b68c7..03e900e573 100644
--- a/patches/server/0334-Anti-Xray.patch
+++ b/patches/server/0333-Anti-Xray.patch
@@ -1104,7 +1104,7 @@ index 90ec22d35edb2874417bbea590e0d3c37ad93d64..fc230d835f9aa526a4b179d36d921f0f
  
      public ClientboundLevelChunkWithLightPacket(FriendlyByteBuf buf) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index dd034a7d7754c88b77731175f373e8c090e4a706..acb35d2df83ff2381f21611de358d50caee53f69 100644
+index 5f6eca4e652ab96a8697e908d11a66e4eb551409..9530ce54cfba964f7f27e5837797146af86e4ff7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -569,7 +569,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1155,7 +1155,7 @@ index 5de5209e04d631bd6a50e28e8d3abebf148252c1..19b3f4fa7678a038bf25efc2a8b46dda
          DebugPackets.sendPoiPacketsForChunk(world, chunkPos);
      }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f016d991b132775bacc961557f7e5ff78f2b52d1..473a14272e3c63e24a25fe1522aba9c0af829a2e 100644
+index 12d9bcbd37b7ef67f2b922a13da7dbc3ba9838c1..7cf24513f2e09c72742bdb0d7866103f983027b5 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -177,6 +177,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1571,7 +1571,7 @@ index 01fa200bc6911388ee3b0e700e82ad681e02fe4a..217fd2af254f7206cf4c1d7d7ad08384
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d4518b9c1338226a9a814d2512aaddbb76a42da8..729c3c273e2393674f30af1cfb0ab0dcf0fb3e20 100644
+index 86f31b8356e1632537d34b39c105d01958eba23a..9896ea05523f6fb75213c861c9cf3962976cce88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -421,11 +421,16 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0335-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0334-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0335-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0334-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0336-Improve-Block-breakNaturally-API.patch b/patches/server/0335-Improve-Block-breakNaturally-API.patch
similarity index 100%
rename from patches/server/0336-Improve-Block-breakNaturally-API.patch
rename to patches/server/0335-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0337-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0336-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from patches/server/0337-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0336-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0338-Add-debug-for-sync-chunk-loads.patch b/patches/server/0337-Add-debug-for-sync-chunk-loads.patch
similarity index 99%
rename from patches/server/0338-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0337-Add-debug-for-sync-chunk-loads.patch
index 9e35dd1fd4..857eb615f1 100644
--- a/patches/server/0338-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0337-Add-debug-for-sync-chunk-loads.patch
@@ -312,7 +312,7 @@ index 70f15e3af9e954483ab116500f84a9ee17f67ce4..56fe3f4edd15239533a1ae9287e86528
              chunkproviderserver_b.managedBlock(completablefuture::isDone);
                  io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug  // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index acb35d2df83ff2381f21611de358d50caee53f69..dbc13b7eccea5c97bcc6aa1ba0bd807aa34d6805 100644
+index 9530ce54cfba964f7f27e5837797146af86e4ff7..50bdb4596eecf04738817b46a125097bc1d3b45b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -648,6 +648,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0339-Improve-java-version-check.patch b/patches/server/0338-Improve-java-version-check.patch
similarity index 100%
rename from patches/server/0339-Improve-java-version-check.patch
rename to patches/server/0338-Improve-java-version-check.patch
diff --git a/patches/server/0340-Add-ThrownEggHatchEvent.patch b/patches/server/0339-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0340-Add-ThrownEggHatchEvent.patch
rename to patches/server/0339-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0341-Entity-Jump-API.patch b/patches/server/0340-Entity-Jump-API.patch
similarity index 95%
rename from patches/server/0341-Entity-Jump-API.patch
rename to patches/server/0340-Entity-Jump-API.patch
index d311a81f66..897985cc17 100644
--- a/patches/server/0341-Entity-Jump-API.patch
+++ b/patches/server/0340-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a3eac4dfe28bc55721d292e2f309b3467a3db140..5f7ed9de581ab52fd8e1c674eeaa550619a05d19 100644
+index 9837ed5e3470b6bc563f466c958ca9c3978acdc9..fa496424e48c73672605b2128ec2bd3a6be86889 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3283,8 +3283,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -34,7 +34,7 @@ index 3d947293d33407e5d24f8fba738ab872e1d890b6..48df7de02e0765bfe62ae1b8a4c00297
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 344e933311f5cdccb66069d486b111a003639dfe..c45a9b4d9a4894919c5c798ada80629493821c61 100644
+index aba20a4352d8983b01ab5d329187588f68d3e405..aac60e85cd6dba7d87f4a1663c2c62952521d112 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -167,7 +167,9 @@ public class Ravager extends Raider {
diff --git a/patches/server/0342-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0341-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 96%
rename from patches/server/0342-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0341-Add-option-to-nerf-pigmen-from-nether-portals.patch
index a11e280112..b2c02c4223 100644
--- a/patches/server/0342-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0341-Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 96e0abe60d108dd61db79790962dd7b782830b57..a5defe250dcc0ca7aa907fe9a6b373d73d893be8 100644
+index 2c8e2ed7199c33f5c4fe25faa9f60fa74982de35..9efddedbe5feebf2f91eb674a9224054dba6cff3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -398,6 +398,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0343-Make-the-GUI-graph-fancier.patch b/patches/server/0342-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0343-Make-the-GUI-graph-fancier.patch
rename to patches/server/0342-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0344-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0343-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 93%
rename from patches/server/0344-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0343-add-hand-to-BlockMultiPlaceEvent.patch
index e5078d1092..e9fd65e7c7 100644
--- a/patches/server/0344-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0343-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 7c92f9e4b39310da2f112b9c3dac0b9d0c6bcf24..502196b8e97f3de3399f5542e76e6dbbd044d3fd 100644
+index 3bd92edf2f4e7a63a07bd2bbae002f99484a9069..7e7427b9b5d44f1a5205011fa427f084bd34165c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -400,13 +400,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0345-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0344-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0345-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0344-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0346-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0345-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0346-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0345-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0347-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0346-Configurable-chance-of-villager-zombie-infection.patch
similarity index 95%
rename from patches/server/0347-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0346-Configurable-chance-of-villager-zombie-infection.patch
index e9b37e4a51..5f99615d8e 100644
--- a/patches/server/0347-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0346-Configurable-chance-of-villager-zombie-infection.patch
@@ -8,7 +8,7 @@ This allows you to solve an issue in vanilla behavior where:
 * On normal difficulty they will have a 50% of getting infected or dying.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index d4f72024c15d03f70a86f09714403ace6e26885a..a073637adbb7bb8fc49cf97da6c0b6e9792d8e16 100644
+index 37730675250f03ff6786992949813d67583610b3..ac4916a898af8c3584d84088b18e8b38b5eb6b13 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -452,12 +452,8 @@ public class Zombie extends Monster {
diff --git a/patches/server/0348-Optimise-Chunk-getFluid.patch b/patches/server/0347-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0348-Optimise-Chunk-getFluid.patch
rename to patches/server/0347-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0349-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0348-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0349-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0348-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0350-Add-tick-times-API-and-mspt-command.patch b/patches/server/0349-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/server/0350-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0349-Add-tick-times-API-and-mspt-command.patch
index 4a333224d6..172ec87dd0 100644
--- a/patches/server/0350-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0349-Add-tick-times-API-and-mspt-command.patch
@@ -125,7 +125,7 @@ index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7
  
      public static void registerCommands(final MinecraftServer server) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6407af497c719d0f6a4446192bed622af34d6bc6..7a6b3f50f4379a29a59b33db965a86ef4d5539b0 100644
+index f92e4d6cfae684b5c8df6424d63a574cb17ef6b7..5cb0f93bc7d4495e65674c22de2ebd8854c696fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -252,6 +252,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0351-Expose-MinecraftServer-isRunning.patch b/patches/server/0350-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0351-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0350-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0352-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0351-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/server/0352-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0351-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0353-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0352-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from patches/server/0353-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0352-Pillager-patrol-spawn-settings-and-per-player-option.patch
index de46a05353..d91e654ceb 100644
--- a/patches/server/0353-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0352-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per
 world and the world age for the start day.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 587205f8b5f6a9aedd5d54b940dcc89b3b9c0be8..56e176b2c79e45f2d68bf6b0e201bf65a96faa6c 100644
+index f9f994f74ff2fc9024c51104eb9af536beb24943..728cc9511c537cab93bdd716235b4fa0c27f29ef 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -249,6 +249,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0354-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0353-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 88%
rename from patches/server/0354-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0353-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index 9cb8e0b277..d5a1d9812a 100644
--- a/patches/server/0354-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0353-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 7bc90a4b0cbbb2251122038d374860ff02f5edee..5f4f993243f19f1e88b7f2bc5e40a6b2125fd819 100644
+index 907129b7ca0bb2b356502c84b86518e843cecfa2..3779e02083fb41e93248aed27a9214be88167e5a 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -24,7 +24,7 @@ index 7bc90a4b0cbbb2251122038d374860ff02f5edee..5f4f993243f19f1e88b7f2bc5e40a6b2
  
          System.exit(0); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
-index 3bf60f640aa9fa4cabd2b3e5d3931e8467b9df24..b939da2d6309c6d2b3d1ef089adf7cbf70865196 100644
+index 3bf60f640aa9fa4cabd2b3e5d3931e8467b9df24..8a493fa049dec741294098e3fee540a60f2accab 100644
 --- a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
 +++ b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java
 @@ -107,6 +107,14 @@ public class RconThread extends GenericThread {
@@ -38,7 +38,7 @@ index 3bf60f640aa9fa4cabd2b3e5d3931e8467b9df24..b939da2d6309c6d2b3d1ef089adf7cbf
 +            client.running = false;
 +        }
 +    }
-+    // Paper stop - don't wait for remote connections
++    // Paper end - don't wait for remote connections
  
      private void closeSocket(ServerSocket socket) {
          LOGGER.debug("closeSocket: {}", (Object)socket);
diff --git a/patches/server/0355-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0354-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 96%
rename from patches/server/0355-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0354-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index 30a38841ad..9c629a712d 100644
--- a/patches/server/0355-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0354-Do-not-allow-bees-to-load-chunks-for-beehives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not allow bees to load chunks for beehives
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index d9297c0b2934084a065af7d7c93af8d44c3de8e1..3f1502b489e6b3a371572abe3ac045313e8def5e 100644
+index 06e990b6957a4ef48c8778bbd175d3afddf52ca3..07ecc038a1000581335b8d18c094298f2f3b100f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -420,6 +420,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0356-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0355-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 97%
rename from patches/server/0356-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0355-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 5e250f8ba0..878ed023da 100644
--- a/patches/server/0356-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0355-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -25,7 +25,7 @@ index 19f1432ae1405eee0ee56dec151e7d602816a943..37e6b841b3c3d8720a1947065d4fada8
              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 dbc13b7eccea5c97bcc6aa1ba0bd807aa34d6805..a3669b4d5833003c98bcf62da89560452565a451 100644
+index 50bdb4596eecf04738817b46a125097bc1d3b45b..1b92cee2f51b844340d213ccfc78d1524a71c9dc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2496,7 +2496,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0357-Don-t-tick-dead-players.patch b/patches/server/0356-Don-t-tick-dead-players.patch
similarity index 91%
rename from patches/server/0357-Don-t-tick-dead-players.patch
rename to patches/server/0356-Don-t-tick-dead-players.patch
index 4f18178584..cb3f8a4849 100644
--- a/patches/server/0357-Don-t-tick-dead-players.patch
+++ b/patches/server/0356-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4c17ed82554311d2a3c9eab7bf58c79044f71664..daedb7b5ef086ccbf091274088170cf7eb331f91 100644
+index 728cc9511c537cab93bdd716235b4fa0c27f29ef..d70316c45bd657243d6c998723f6bb1324b6a880 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -732,7 +732,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0358-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0357-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 90%
rename from patches/server/0358-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0357-Dead-Player-s-shouldn-t-be-able-to-move.patch
index d5254786f8..c0d2a6c8aa 100644
--- a/patches/server/0358-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0357-Dead-Player-s-shouldn-t-be-able-to-move.patch
@@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing
 due to 1.15's new queue but processed while dead.
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 110c751dc108dbdc2fd9fdd25ca07df7acc723e5..4bac05cb48d81dc9776d90502b6f12285b92122b 100644
+index 18394311d9d0bed5fa1ac09182947375380c7670..ca7f6ffdbfc8c796c3a26108f281bef7af560f78 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1161,7 +1161,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0359-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0358-Optimize-Collision-to-not-load-chunks.patch
similarity index 97%
rename from patches/server/0359-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0358-Optimize-Collision-to-not-load-chunks.patch
index 25b1c57fc4..43cbe7752e 100644
--- a/patches/server/0359-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0358-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 89bd3102898af0b178cbb7f8dbe041a05c5845f3..aae54a44334ca4050b4bf939bdded7ac09d0a242 100644
+index 81acbabe942de6f1716e384dc4e9cbd451f0a535..37b53bfe58689f498a48ad5e0e59d98462ccdd7f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -820,6 +820,7 @@ public abstract class PlayerList {
@@ -26,7 +26,7 @@ index 89bd3102898af0b178cbb7f8dbe041a05c5845f3..aae54a44334ca4050b4bf939bdded7ac
              // CraftBukkit end
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7ca9b581e8719d47bdba2368fc9402ae8eb302c4..1e9819ea185b98a73992bde8c40150d4747ed436 100644
+index 9efddedbe5feebf2f91eb674a9224054dba6cff3..538931a474841e7efae505f5aeae58715108da1b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -240,6 +240,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0360-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0359-Don-t-move-existing-players-to-world-spawn.patch
similarity index 93%
rename from patches/server/0360-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0359-Don-t-move-existing-players-to-world-spawn.patch
index 0944cd0345..3aa8207691 100644
--- a/patches/server/0360-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0359-Don-t-move-existing-players-to-world-spawn.patch
@@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start.
 public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5397b7544470741d75fe3df350cd85ca87acd077..ed2d3b514087f8c2aeec64362ed677fe4494b339 100644
+index d70316c45bd657243d6c998723f6bb1324b6a880..5c3373863bd91682bd7facd3eb57580b33e160b7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -385,7 +385,7 @@ public class ServerPlayer extends Player {
@@ -35,7 +35,7 @@ index 5397b7544470741d75fe3df350cd85ca87acd077..ed2d3b514087f8c2aeec64362ed677fe
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index aae54a44334ca4050b4bf939bdded7ac09d0a242..89632b9848fddaaea12f149b50cb9e0b71a951b0 100644
+index 37b53bfe58689f498a48ad5e0e59d98462ccdd7f..201331acd9fae6af27f44c072379c48485b3be07 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -226,6 +226,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0361-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0360-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0361-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0360-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0362-Improved-Watchdog-Support.patch b/patches/server/0361-Improved-Watchdog-Support.patch
similarity index 99%
rename from patches/server/0362-Improved-Watchdog-Support.patch
rename to patches/server/0361-Improved-Watchdog-Support.patch
index 959eae7786..426ef801d8 100644
--- a/patches/server/0362-Improved-Watchdog-Support.patch
+++ b/patches/server/0361-Improved-Watchdog-Support.patch
@@ -263,7 +263,7 @@ index 3779e02083fb41e93248aed27a9214be88167e5a..0e2978b6e4f03932c4ebdf1309d20454
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5f81d6f61a3f887613aa10d905eb8ee8f3d843ba..06232d823c099cb1d827491a5cccc435ecae8ffe 100644
+index 201331acd9fae6af27f44c072379c48485b3be07..54a82f30fd8a4712bcf7ffeccab8ce3075f55f83 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -532,7 +532,7 @@ public abstract class PlayerList {
@@ -288,7 +288,7 @@ index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb89
          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a1982464d25dae5638f02375422a44204b47b9b3..b25c632c8b797c30e90beaf3cedbc13acc2103bb 100644
+index 7cf24513f2e09c72742bdb0d7866103f983027b5..43c5316fde139f92ebe9c0db38ccd8dad0402975 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -912,6 +912,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0363-Optimize-Pathfinding.patch b/patches/server/0362-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0363-Optimize-Pathfinding.patch
rename to patches/server/0362-Optimize-Pathfinding.patch
diff --git a/patches/server/0364-Reduce-Either-Optional-allocation.patch b/patches/server/0363-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0364-Reduce-Either-Optional-allocation.patch
rename to patches/server/0363-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0365-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0364-Reduce-memory-footprint-of-CompoundTag.patch
similarity index 100%
rename from patches/server/0365-Reduce-memory-footprint-of-CompoundTag.patch
rename to patches/server/0364-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0366-Prevent-opening-inventories-when-frozen.patch b/patches/server/0365-Prevent-opening-inventories-when-frozen.patch
similarity index 93%
rename from patches/server/0366-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0365-Prevent-opening-inventories-when-frozen.patch
index 0b9ec25c07..c800e18d24 100644
--- a/patches/server/0366-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0365-Prevent-opening-inventories-when-frozen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e8470f0cc918ae20caa9aa4de7a81edf31f2f556..f84be7bff9c054baf5ce0c0183ec986c7d30c352 100644
+index 5c3373863bd91682bd7facd3eb57580b33e160b7..cc2378916009f961fb70d5b4b1bd5bb6867de792 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -701,7 +701,7 @@ public class ServerPlayer extends Player {
@@ -14,7 +14,7 @@ index e8470f0cc918ae20caa9aa4de7a81edf31f2f556..f84be7bff9c054baf5ce0c0183ec986c
          // Paper end
 -        if (!this.level().isClientSide && !this.containerMenu.stillValid(this)) {
 +        if (!this.level().isClientSide && this.containerMenu != this.inventoryMenu && (this.isImmobile() || !this.containerMenu.stillValid(this))) { // Paper - Prevent opening inventories when frozen
-             this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
+             this.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper - Inventory close reason
              this.containerMenu = this.inventoryMenu;
          }
 @@ -1556,7 +1556,7 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index e8470f0cc918ae20caa9aa4de7a81edf31f2f556..f84be7bff9c054baf5ce0c0183ec986c
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 0d07501bb9e8721771f5c3fd099f022e41a54337..0effc7dfe2c1f2bad7bd00b6a615497d4aa0ba91 100644
+index af6f8d11f0384c353332f5c5bb0967e518deccbe..7afbecd29f0a729e32c5cd50cb03d5404ba03d75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -325,7 +325,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0367-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0366-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 96%
rename from patches/server/0367-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0366-Don-t-run-entity-collision-code-if-not-needed.patch
index 5351a728aa..dd36b88f5f 100644
--- a/patches/server/0367-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0366-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f9e2d3cba01fcf39bc29dc8b5b5879ddc3add0e5..cf946ea3367b7b7656343b48bf8140efc38d07a2 100644
+index fa496424e48c73672605b2128ec2bd3a6be86889..1782ffbf08d362b98d648c296f99fd2c49e4d8cf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3398,10 +3398,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0368-Implement-Player-Client-Options-API.patch b/patches/server/0367-Implement-Player-Client-Options-API.patch
similarity index 98%
rename from patches/server/0368-Implement-Player-Client-Options-API.patch
rename to patches/server/0367-Implement-Player-Client-Options-API.patch
index 385a131978..9ea0217536 100644
--- a/patches/server/0368-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0367-Implement-Player-Client-Options-API.patch
@@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f84be7bff9c054baf5ce0c0183ec986c7d30c352..cb137fe3aaa14fd4862baa0444bc62d818cf9509 100644
+index cc2378916009f961fb70d5b4b1bd5bb6867de792..4de3de5b195698cc804d73307a2483c83f48525e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -386,7 +386,7 @@ public class ServerPlayer extends Player {
@@ -136,7 +136,7 @@ index f84be7bff9c054baf5ce0c0183ec986c7d30c352..cb137fe3aaa14fd4862baa0444bc62d8
          this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9cae7d8a77af303cb509c23efd5541a5e04f54a6..49862c0338b84924003df85883760317d1ca7aec 100644
+index 0f0956066203f1598997e54b89b23c500951009c..e05d22471a80f5afba4634116aff9dcf636f2501 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -609,6 +609,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0369-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0368-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0369-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0368-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0370-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0369-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
similarity index 97%
rename from patches/server/0370-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
rename to patches/server/0369-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index ea8c91ddbe..e193b8f31e 100644
--- a/patches/server/0370-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0369-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -43,7 +43,7 @@ index 37e6b841b3c3d8720a1947065d4fada8c25ec2cf..2785619ed6d04e06a25bfbb2a7fbd99f
              EntityType<?> entitytypes = entity.getType();
              int i = entitytypes.clientTrackingRange() * 16;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3221fad96b077a31f6e22277c08e8a20c65afd7a..6ca90fdf844ee6aa1957e17a75a4c070de0381f2 100644
+index 4de3de5b195698cc804d73307a2483c83f48525e..c87e5dd12b5931f9d06bd70a3dd591882a5c1f17 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -271,6 +271,7 @@ public class ServerPlayer extends Player {
@@ -55,7 +55,7 @@ index 3221fad96b077a31f6e22277c08e8a20c65afd7a..6ca90fdf844ee6aa1957e17a75a4c070
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 06232d823c099cb1d827491a5cccc435ecae8ffe..9ad0a672f3a14c1e36a9f2275fa3e8d2131d543f 100644
+index 54a82f30fd8a4712bcf7ffeccab8ce3075f55f83..2af14ca8c9008da254ddef591f0aff9e4aba8cd5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -295,6 +295,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0371-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0370-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 97%
rename from patches/server/0371-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0370-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index a64379317f..c365472793 100644
--- a/patches/server/0371-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0370-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -10,7 +10,7 @@ Co-authored-by: Wyatt Childers <wchilders@nearce.com>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9ad0a672f3a14c1e36a9f2275fa3e8d2131d543f..82101511142c266c4374da10ab2561f4412300db 100644
+index 2af14ca8c9008da254ddef591f0aff9e4aba8cd5..805759ae7d92f690cea4c700c914769d39e3c0b6 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -194,7 +194,7 @@ public abstract class PlayerList {
@@ -87,7 +87,7 @@ index 9ad0a672f3a14c1e36a9f2275fa3e8d2131d543f..82101511142c266c4374da10ab2561f4
          }
          // Paper end - Entity#getEntitySpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index bf8ea784c032469c1b88a0cdc954d6e2de5bb3ec..7746d7fb7177885d97d95f065782ee23aa1dfe56 100644
+index 538931a474841e7efae505f5aeae58715108da1b..ee55a63edd38c9919d4dfdc8434ba80f697ba0c0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2336,27 +2336,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0372-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0371-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from patches/server/0372-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0371-Add-PlayerAttackEntityCooldownResetEvent.patch
index e25e7d2507..dc20899b7c 100644
--- a/patches/server/0372-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0371-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cf946ea3367b7b7656343b48bf8140efc38d07a2..d3bb5a6ee350043e7f5c173b9496c1d71b3957b1 100644
+index 1782ffbf08d362b98d648c296f99fd2c49e4d8cf..69f7cdb2c507ba45dc4a689d4f33c059a57907a1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2190,7 +2190,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0373-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0372-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 94%
rename from patches/server/0373-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0372-Don-t-fire-BlockFade-on-worldgen-threads.patch
index 833140ffaa..19015797ec 100644
--- a/patches/server/0373-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0372-Don-t-fire-BlockFade-on-worldgen-threads.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't fire BlockFade on worldgen threads
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 80e90bae3c05bbaf978a66629d9c4132c22efd1a..a447231db1362ebda706d6069a92be4ead196c21 100644
+index c214a8a72c3fa27eaadc458b10a610e0de7937ec..5e5d0e5b41b5ed90a5f0109b231d468bbc566ae7 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -108,6 +108,7 @@ public class FireBlock extends BaseFireBlock {
diff --git a/patches/server/0374-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0373-Add-phantom-creative-and-insomniac-controls.patch
similarity index 97%
rename from patches/server/0374-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0373-Add-phantom-creative-and-insomniac-controls.patch
index 5a377dbb7f..48cfa06f73 100644
--- a/patches/server/0374-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0373-Add-phantom-creative-and-insomniac-controls.patch
@@ -29,7 +29,7 @@ index 658393f451e46a93c5665fe3c580aa395ace68d1..ea980c2fdf01988ba25bffc7f8963d77
                              return true;
                          }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index 94ee9c399f59e0198b4d9bc2a4255e8b821bcd36..8c9caa324402568ce9f55e733f4d14430159347a 100644
+index 5d84bd022714f9726131d2e37d648c444052af9b..76982e0dbab0ecb6f7d4cd8a748af940492a31e7 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 @@ -49,7 +49,7 @@ public class PhantomSpawner implements CustomSpawner {
diff --git a/patches/server/0375-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0374-Fix-item-duplication-and-teleport-issues.patch
similarity index 96%
rename from patches/server/0375-Fix-item-duplication-and-teleport-issues.patch
rename to patches/server/0374-Fix-item-duplication-and-teleport-issues.patch
index 761f552a93..fab99ea432 100644
--- a/patches/server/0375-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0374-Fix-item-duplication-and-teleport-issues.patch
@@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the
 same item twice because the source was destroyed.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7746d7fb7177885d97d95f065782ee23aa1dfe56..5698555fe780ba96f190f67aa116940efdd993e2 100644
+index ee55a63edd38c9919d4dfdc8434ba80f697ba0c0..be9b96f6b725c53aec5c67c8387305d52da3acfd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2466,11 +2466,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -80,7 +80,7 @@ index 7746d7fb7177885d97d95f065782ee23aa1dfe56..5698555fe780ba96f190f67aa116940e
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4948a7d78ef1e96f325368430068576ce0b990ad..d4bf6c909939c23586acaa7338141aac880217b0 100644
+index 69f7cdb2c507ba45dc4a689d4f33c059a57907a1..4605978cad9cbaa8b55b12c26476f85471658c82 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1705,9 +1705,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -113,7 +113,7 @@ index 4948a7d78ef1e96f325368430068576ce0b990ad..d4bf6c909939c23586acaa7338141aac
          this.drops = new ArrayList<>();
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 810bead2f19de70786027b190137f743a0c40ee7..4f9afae94a4cbf28a532e889d441c63df50642d9 100644
+index ddd512e1d7608ec051fb5adf6ec2c6bbb93f5a9d..4e3cf19b83410f3bcacd953a600bf0bed6e45450 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -624,7 +624,7 @@ public class ArmorStand extends LivingEntity {
@@ -135,7 +135,7 @@ index 810bead2f19de70786027b190137f743a0c40ee7..4f9afae94a4cbf28a532e889d441c63d
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 502196b8e97f3de3399f5542e76e6dbbd044d3fd..5d28312a03f1571bb44c31f82e27288d02776a5a 100644
+index 7e7427b9b5d44f1a5205011fa427f084bd34165c..77e1ff2725e015b76f6919f3f51d5d56a1e484a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -893,6 +893,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0376-Villager-Restocks-API.patch b/patches/server/0375-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0376-Villager-Restocks-API.patch
rename to patches/server/0375-Villager-Restocks-API.patch
diff --git a/patches/server/0377-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0376-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 95%
rename from patches/server/0377-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0376-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 28e4d939a3..0fec460371 100644
--- a/patches/server/0377-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0376-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 00fa6126ca51b6ffdb46b59f07725ffdcca9f20a..18c8dc09b75dbaff13a3cf7ba8594c49ed168c45 100644
+index a191254fa3bd8cdf2cb5446c88c71ed0be6761e8..ebf436e8160c0a6ff064c2b279a47b272e3acb05 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -867,7 +867,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0378-Expose-game-version.patch b/patches/server/0377-Expose-game-version.patch
similarity index 100%
rename from patches/server/0378-Expose-game-version.patch
rename to patches/server/0377-Expose-game-version.patch
diff --git a/patches/server/0379-Optimize-Voxel-Shape-Merging.patch b/patches/server/0378-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0379-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0378-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0380-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0379-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from patches/server/0380-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0379-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 7a21f2b215..6960e94099 100644
--- a/patches/server/0380-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0379-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 787dc5702bce3b5171f834ad3177013ac684be72..01b616143562d41aeba7f1340e0affa21d0655b8 100644
+index 78e007b15699fc83a3fcc2e2767209387444f0e5..68b849321757493c64e874b5a2c5d5357a52d698 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -26,6 +26,7 @@ public class Main {
diff --git a/patches/server/0381-misc-debugging-dumps.patch b/patches/server/0380-misc-debugging-dumps.patch
similarity index 96%
rename from patches/server/0381-misc-debugging-dumps.patch
rename to patches/server/0380-misc-debugging-dumps.patch
index ac8206b2e8..721ee8807b 100644
--- a/patches/server/0381-misc-debugging-dumps.patch
+++ b/patches/server/0380-misc-debugging-dumps.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index b27256d251e5db5781197319f79f89cc7638c80b..043541d0c93ed7c06c2c01fe6065dd57dd4c0916 100644
+index 867f22bdeed5f1c3f063a5815a3477d143057152..5c4a89fc7388b8e6ca9ade03fd34a8da79ae0ad9 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -341,7 +341,7 @@ public class Commands {
@@ -42,7 +42,7 @@ index b27256d251e5db5781197319f79f89cc7638c80b..043541d0c93ed7c06c2c01fe6065dd57
                  StackTraceElement[] astacktraceelement = exception.getStackTrace();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3f33f6764665e79433226ebe495bf4cfa8100123..b61dd9730ed56fc0c1a10f9c4e0a9630bb668206 100644
+index 570c163e4a56206d1cf259ee1ffcb6f865f72b1c..1963cf2716879c6d193cbed8de9538094dda9b3d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -918,6 +918,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0382-Prevent-teleporting-dead-entities.patch b/patches/server/0381-Prevent-teleporting-dead-entities.patch
similarity index 93%
rename from patches/server/0382-Prevent-teleporting-dead-entities.patch
rename to patches/server/0381-Prevent-teleporting-dead-entities.patch
index 9f0181a6fe..9aa0324364 100644
--- a/patches/server/0382-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0381-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 18c8dc09b75dbaff13a3cf7ba8594c49ed168c45..f24a41f99ba1d5f3d938266c02bb31dd594d03f7 100644
+index ebf436e8160c0a6ff064c2b279a47b272e3acb05..4d5fc9123e13ad764a88c40f1be1205b6f6f102e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1545,6 +1545,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0383-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0382-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/0383-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0382-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0384-Implement-Mob-Goal-API.patch b/patches/server/0383-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0384-Implement-Mob-Goal-API.patch
rename to patches/server/0383-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0385-Add-villager-reputation-API.patch b/patches/server/0384-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0385-Add-villager-reputation-API.patch
rename to patches/server/0384-Add-villager-reputation-API.patch
diff --git a/patches/server/0386-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0385-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 96%
rename from patches/server/0386-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0385-Option-for-maximum-exp-value-when-merging-orbs.patch
index e5b269cb1d..de7f3bafaa 100644
--- a/patches/server/0386-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/patches/server/0385-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5d28312a03f1571bb44c31f82e27288d02776a5a..7fe49c85e3bebe460c7d61864ed3878ef8cd999f 100644
+index 77e1ff2725e015b76f6919f3f51d5d56a1e484a0..93213cbd9682505d679661d4fc506ae4b9c67eec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -702,16 +702,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0387-ExperienceOrbMergeEvent.patch b/patches/server/0386-ExperienceOrbMergeEvent.patch
similarity index 94%
rename from patches/server/0387-ExperienceOrbMergeEvent.patch
rename to patches/server/0386-ExperienceOrbMergeEvent.patch
index 2c5c905fa3..49e9d240ea 100644
--- a/patches/server/0387-ExperienceOrbMergeEvent.patch
+++ b/patches/server/0386-ExperienceOrbMergeEvent.patch
@@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 85cad0c7437642c72d806f59cb077db4056a4282..90b93b7139f9a11028b0d78b109b478b8052e982 100644
+index 93213cbd9682505d679661d4fc506ae4b9c67eec..64236f5f126998157bb7bbae40ed0cd1550281e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -711,7 +711,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0388-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0387-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0388-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0387-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0389-Potential-bed-API.patch b/patches/server/0388-Potential-bed-API.patch
similarity index 95%
rename from patches/server/0389-Potential-bed-API.patch
rename to patches/server/0388-Potential-bed-API.patch
index 951766026b..80f1d44702 100644
--- a/patches/server/0389-Potential-bed-API.patch
+++ b/patches/server/0388-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index fa585b6bf914362a7f9e55a20e78811519353608..dcc5947143dc39e8f629b29d3649174327783801 100644
+index 7afbecd29f0a729e32c5cd50cb03d5404ba03d75..fe050a077782fb023c49710eb2127250d5165484 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0390-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0389-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 96%
rename from patches/server/0390-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0389-Wait-for-Async-Tasks-during-shutdown.patch
index 61437d4f28..40dc5a4f64 100644
--- a/patches/server/0390-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0389-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b61dd9730ed56fc0c1a10f9c4e0a9630bb668206..e6271f1c0bb5a3debeb5bf2e33e02fb0f6af6976 100644
+index 1963cf2716879c6d193cbed8de9538094dda9b3d..9829f86520c4028a94f239fb4804fb0f2a2ac6fa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -958,6 +958,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0391-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0390-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from patches/server/0391-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0390-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0392-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0391-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 99%
rename from patches/server/0392-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0391-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 8c9fc93b34..9c31c335b1 100644
--- a/patches/server/0392-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0391-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -25,7 +25,7 @@ index b1fdfae75aeea78ca77987e40242bf498447bc08..cf81854facadaf3c1f860bcaaf69db46
  
                              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 b25c632c8b797c30e90beaf3cedbc13acc2103bb..286890f5a42cd2cade28ab0c5b9cdd48b6a33d37 100644
+index 43c5316fde139f92ebe9c0db38ccd8dad0402975..92f250b9cc965a433dc9b9de1f9bfeb2acf4363e 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -520,6 +520,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0393-Ensure-safe-gateway-teleport.patch b/patches/server/0392-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0393-Ensure-safe-gateway-teleport.patch
rename to patches/server/0392-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0394-Add-option-for-console-having-all-permissions.patch b/patches/server/0393-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0394-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0393-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0395-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0394-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0395-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0394-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0396-Maps-shouldn-t-load-chunks.patch b/patches/server/0395-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0396-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0395-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0397-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0396-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0397-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0396-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0398-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0397-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0398-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0397-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0399-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0398-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0399-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0398-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0400-Fix-sand-duping.patch b/patches/server/0399-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0400-Fix-sand-duping.patch
rename to patches/server/0399-Fix-sand-duping.patch
diff --git a/patches/server/0401-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0400-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0401-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0400-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0402-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0401-Prevent-position-desync-causing-tp-exploit.patch
similarity index 94%
rename from patches/server/0402-Prevent-position-desync-causing-tp-exploit.patch
rename to patches/server/0401-Prevent-position-desync-causing-tp-exploit.patch
index 4b15ef00c4..54aa3e2e8c 100644
--- a/patches/server/0402-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0401-Prevent-position-desync-causing-tp-exploit.patch
@@ -13,7 +13,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 93011db96b1b5e6d08022e8fc31715360f60b9ef..b0f546190f4e5985e2532bb3647856ebc5efb92f 100644
+index 4d5fc9123e13ad764a88c40f1be1205b6f6f102e..802602882a76fbb026c524225f74bb3780d219c0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1366,6 +1366,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0403-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0402-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0403-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0402-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0404-Improve-Arrow-API.patch b/patches/server/0403-Improve-Arrow-API.patch
similarity index 100%
rename from patches/server/0404-Improve-Arrow-API.patch
rename to patches/server/0403-Improve-Arrow-API.patch
diff --git a/patches/server/0405-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0404-Add-PlayerRecipeBookClickEvent.patch
similarity index 97%
rename from patches/server/0405-Add-PlayerRecipeBookClickEvent.patch
rename to patches/server/0404-Add-PlayerRecipeBookClickEvent.patch
index 413767fe54..d4141a1746 100644
--- a/patches/server/0405-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0404-Add-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b0f546190f4e5985e2532bb3647856ebc5efb92f..85392f2bc3e51aa03385ffaead73baec2580771b 100644
+index 802602882a76fbb026c524225f74bb3780d219c0..d244a20961e5e3e459bf2bc784014b3f963590ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2973,16 +2973,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0406-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0405-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from patches/server/0406-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0405-Use-distance-map-to-optimise-entity-tracker.patch
index e68776eb14..c3ef95a6a1 100644
--- a/patches/server/0406-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/patches/server/0405-Use-distance-map-to-optimise-entity-tracker.patch
@@ -236,7 +236,7 @@ index 2785619ed6d04e06a25bfbb2a7fbd99f81c1f858..bdda124f6cc89b8a7ed198fdf095aee5
              return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false;
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5698555fe780ba96f190f67aa116940efdd993e2..02d7282e5d5e1c1334fed55a86bc4c9837e9341f 100644
+index be9b96f6b725c53aec5c67c8387305d52da3acfd..f51453bd3018667aa491c9b64b6f9c4d5c703d7a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers;
diff --git a/patches/server/0407-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0406-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0407-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0406-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0408-Add-permission-for-command-blocks.patch b/patches/server/0407-Add-permission-for-command-blocks.patch
similarity index 97%
rename from patches/server/0408-Add-permission-for-command-blocks.patch
rename to patches/server/0407-Add-permission-for-command-blocks.patch
index 02e0abf29d..329cf1a7e0 100644
--- a/patches/server/0408-Add-permission-for-command-blocks.patch
+++ b/patches/server/0407-Add-permission-for-command-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for command blocks
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index b7e6d8441e8444c36919c126a8adeaeed02df08c..a9ede0d719e866655ab48fb5d0263c7d1bdcff60 100644
+index 3629f164f05cc2d33c76bb21cfe4598539aa08e0..5b951937511126d58665c5e2baf18186a7a8d325 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -399,7 +399,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index b7e6d8441e8444c36919c126a8adeaeed02df08c..a9ede0d719e866655ab48fb5d0263c7d
                  return false;
              } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ab167cbce4e8c3ee4d755b778bd7b92a8be917de..448cbe86cefdf779c7faae84748e04374f16162d 100644
+index d244a20961e5e3e459bf2bc784014b3f963590ea..56a664d7810e4c4b0f85d714e2b89014bb460fac 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -778,7 +778,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0409-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0408-Ensure-Entity-position-and-AABB-are-never-invalid.patch
similarity index 97%
rename from patches/server/0409-Ensure-Entity-position-and-AABB-are-never-invalid.patch
rename to patches/server/0408-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index 6626d0fcd4..605dcecccb 100644
--- a/patches/server/0409-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0408-Ensure-Entity-position-and-AABB-are-never-invalid.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid
 Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 02d7282e5d5e1c1334fed55a86bc4c9837e9341f..8209a273b0f4b07195fa20c5be6c80384eb582c2 100644
+index f51453bd3018667aa491c9b64b6f9c4d5c703d7a..e68a29eb0c81285039a1a980d8b9b83f0b1d022e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -727,8 +727,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0410-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0409-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 94%
rename from patches/server/0410-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0409-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 4b93808a2f..7c9c8be7fe 100644
--- a/patches/server/0410-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0409-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,7 +8,7 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 72dd2986c366a7840116b2426c4e2e6b807d0cfa..77f6b636c8e9935e51d54a47c0ac7a171aab2e60 100644
+index 9829f86520c4028a94f239fb4804fb0f2a2ac6fa..229f5c1d651d903e1c641e67661004a4ee010417 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -828,7 +828,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -63,7 +63,7 @@ index 997a96a21440ae72696d68f8031ece4ba487d3ef..3d8584929cee000ae7df10c5bd94f358
                  return Component.translatable("commands.difficulty.success", difficulty.getDisplayName());
              }, true);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 684e9e9d78f0d410176fa8b9c9d0fbfda6a156dc..6c009f7443eabce73ace587a9fc686c320f707a7 100644
+index ab84c4b098184370c8b63cbae687116a7b077cf5..09956f69b63844d67aeab1339ae65910fc8eb8bf 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -325,7 +325,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -76,7 +76,7 @@ index 684e9e9d78f0d410176fa8b9c9d0fbfda6a156dc..6c009f7443eabce73ace587a9fc686c3
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b48a663d73ded1633f85819b3c754cf6b60064e3..65b3a2c9acd0d2f1b990d9059ed319bc50d899b9 100644
+index c87e5dd12b5931f9d06bd70a3dd591882a5c1f17..241c16b8df5128f2c88ed2f9e9c51d7f7b8420b4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1209,7 +1209,7 @@ public class ServerPlayer extends Player {
@@ -89,7 +89,7 @@ index b48a663d73ded1633f85819b3c754cf6b60064e3..65b3a2c9acd0d2f1b990d9059ed319bc
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1f8818dd98b8d9b5eb278b5a0f3ea36971c641fa..c8a56234a4f2e0c045e7ba6cec9eb8127f03255f 100644
+index 56a664d7810e4c4b0f85d714e2b89014bb460fac..75073ab08a90bd0ce8afc54634e7d61d50650742 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3176,7 +3176,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -117,7 +117,7 @@ index c2cafdacde4edef8674b96fd8614a47b6af4b64b..71da3ebf372b63119fadbe2412aa02dc
              for (SpawnCategory spawnCategory : SpawnCategory.values()) {
                  if (CraftSpawnCategory.isValidForLimits(spawnCategory)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 729c3c273e2393674f30af1cfb0ab0dcf0fb3e20..c74d14e6a78b103fe2bffa8d69b5e7e20215781c 100644
+index 9896ea05523f6fb75213c861c9cf3962976cce88..85bc6dbfe71d841b4ed1ed912d3fe19d994a17f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1158,7 +1158,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0411-Paper-dumpitem-command.patch b/patches/server/0410-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0411-Paper-dumpitem-command.patch
rename to patches/server/0410-Paper-dumpitem-command.patch
diff --git a/patches/server/0412-Improve-Legacy-Component-serialization-size.patch b/patches/server/0411-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0412-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0411-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0413-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0412-Optimize-Bit-Operations-by-inlining.patch
similarity index 99%
rename from patches/server/0413-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0412-Optimize-Bit-Operations-by-inlining.patch
index d03caf7d57..8544e7a4ec 100644
--- a/patches/server/0413-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/0412-Optimize-Bit-Operations-by-inlining.patch
@@ -7,7 +7,7 @@ Inline bit operations and reduce instruction count to make these hot
 operations faster
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index ef5f897164136767e9c6dd61b76c2a1dedd4f350..46aeeaade74bde10472e209df61a75adc4461eeb 100644
+index 3b3d81886d50ee6510ff366e11817a578c645089..50ba9e57d60df7308f7445540b3f412a0edf6065 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -37,15 +37,16 @@ public class BlockPos extends Vec3i {
diff --git a/patches/server/0414-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0413-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from patches/server/0414-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0413-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 6421c34237..6068e39f2a 100644
--- a/patches/server/0414-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0413-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -44,7 +44,7 @@ index 71da3ebf372b63119fadbe2412aa02dce61086b4..a25cc6f7d91100b98996d9f07fff3c62
          this.printSaveWarning = false;
          this.console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c74d14e6a78b103fe2bffa8d69b5e7e20215781c..95f3b5d9293077e2933b0a0a91bfeb43b6efc6fe 100644
+index 85bc6dbfe71d841b4ed1ed912d3fe19d994a17f0..2d6ef62205ff5a4da72e718f9b33d955a58d805f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -282,7 +282,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0415-incremental-chunk-and-player-saving.patch b/patches/server/0414-incremental-chunk-and-player-saving.patch
similarity index 96%
rename from patches/server/0415-incremental-chunk-and-player-saving.patch
rename to patches/server/0414-incremental-chunk-and-player-saving.patch
index 59dbfc7403..d4c3970f98 100644
--- a/patches/server/0415-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0414-incremental-chunk-and-player-saving.patch
@@ -76,7 +76,7 @@ index 56fe3f4edd15239533a1ae9287e86528b3296bdc..a35957eef3f6ab2dcfebc01eaa9bea1b
      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 a3669b4d5833003c98bcf62da89560452565a451..28128e432c3d0a312f9a757c54c9a707c51bc210 100644
+index 1b92cee2f51b844340d213ccfc78d1524a71c9dc..d9d4a8df764bce67ee13a542e0b21a5ec7fd8ca7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1301,6 +1301,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -118,7 +118,7 @@ index a3669b4d5833003c98bcf62da89560452565a451..28128e432c3d0a312f9a757c54c9a707
          // Paper start - rewrite chunk system - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d3193e318f233bdfd9788e96011ab6d07354c0e2..ddded87b125c6584f4112fa6b55f3e03c634dfe3 100644
+index 241c16b8df5128f2c88ed2f9e9c51d7f7b8420b4..9b3425857342f4c75ae23aee922d792977aa8c4e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -190,6 +190,7 @@ import org.bukkit.inventory.MainHand;
@@ -130,7 +130,7 @@ index d3193e318f233bdfd9788e96011ab6d07354c0e2..ddded87b125c6584f4112fa6b55f3e03
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      private static final int FLY_STAT_RECORDING_SPEED = 25;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 82101511142c266c4374da10ab2561f4412300db..1a7ff072171f7b8f983f813a090fee07a45f62ef 100644
+index 805759ae7d92f690cea4c700c914769d39e3c0b6..ca0e6c8e27f998a078e6f60a3cad67ddda7706c7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -552,6 +552,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0416-Support-old-UUID-format-for-NBT.patch b/patches/server/0415-Support-old-UUID-format-for-NBT.patch
similarity index 96%
rename from patches/server/0416-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0415-Support-old-UUID-format-for-NBT.patch
index 5c61b24ac5..590d6d62e6 100644
--- a/patches/server/0416-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0415-Support-old-UUID-format-for-NBT.patch
@@ -8,7 +8,7 @@ We have stored UUID in plenty of places that did not get DFU'd
 So just look for old format and load it if it exists.
 
 diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
-index 135530bc9d7ecd0348ace6474f4ca6d2e1bad283..22106323902ceb4fc58a95918c754234a581f7a1 100644
+index 2c760084cd1b84a1f2c4f6a6db8d396a1b3c5395..eea9866aecb7189455319d83561fcef35a777d7a 100644
 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java
 +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
 @@ -237,6 +237,12 @@ public class CompoundTag implements Tag {
diff --git a/patches/server/0417-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0416-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 97%
rename from patches/server/0417-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0416-Convert-legacy-attributes-in-Item-Meta.patch
index c501b0e487..396f8e90c1 100644
--- a/patches/server/0417-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0416-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,7 +30,7 @@ index d4dba8c733c7560e5108b8d239b52e593f8debec..ea48f1119a940056c37d1d203437bfbf
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index df7a93208a2a0720fc3cd33f84cace38814c18e1..8230eb49ae61e3b1e51db7a7734a35844673bb11 100644
+index 1ecea757fffb480af0d27c3326093d79cb93c73b..6a3a8c4cc09a045134a7c3751b33f2763e5a4953 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -485,7 +485,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0418-Remove-streams-from-hot-code.patch b/patches/server/0417-Remove-streams-from-hot-code.patch
similarity index 99%
rename from patches/server/0418-Remove-streams-from-hot-code.patch
rename to patches/server/0417-Remove-streams-from-hot-code.patch
index 8be147a9f9..cbf894f942 100644
--- a/patches/server/0418-Remove-streams-from-hot-code.patch
+++ b/patches/server/0417-Remove-streams-from-hot-code.patch
@@ -106,7 +106,7 @@ index 419eadbe31b86b7192fd7a63268d547705e7c7ce..281b5cf91135984a37ad013614c910f7
      }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-index 76dffb2705e5207db96895f82f1c7c5638f817c6..7321ca0b2ae1443b57b9389f80a237225afa45ca 100644
+index f1e717dc8320a00c0cc0ff53d97b74e7c1e109fe..2240fc6d5ba9530fcd62d6b560c17a275d4f164a 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
 @@ -61,8 +61,22 @@ public class GossipContainer {
diff --git a/patches/server/0419-Support-components-in-ItemMeta.patch b/patches/server/0418-Support-components-in-ItemMeta.patch
similarity index 97%
rename from patches/server/0419-Support-components-in-ItemMeta.patch
rename to patches/server/0418-Support-components-in-ItemMeta.patch
index 1f59c07004..1a69417723 100644
--- a/patches/server/0419-Support-components-in-ItemMeta.patch
+++ b/patches/server/0418-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 8230eb49ae61e3b1e51db7a7734a35844673bb11..59d42dc66f23fc354a7ae4232beee42f1831645f 100644
+index 6a3a8c4cc09a045134a7c3751b33f2763e5a4953..ad3a289af7922bfc8d503eb1da93db72b31a03f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -879,11 +879,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0420-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0419-Improve-fix-EntityTargetLivingEntityEvent.patch
similarity index 100%
rename from patches/server/0420-Improve-fix-EntityTargetLivingEntityEvent.patch
rename to patches/server/0419-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0421-Add-entity-liquid-API.patch b/patches/server/0420-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0421-Add-entity-liquid-API.patch
rename to patches/server/0420-Add-entity-liquid-API.patch
diff --git a/patches/server/0422-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0421-Update-itemstack-legacy-name-and-lore.patch
similarity index 97%
rename from patches/server/0422-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0421-Update-itemstack-legacy-name-and-lore.patch
index 1ff492bba8..18dbfa4f6e 100644
--- a/patches/server/0422-Update-itemstack-legacy-name-and-lore.patch
+++ b/patches/server/0421-Update-itemstack-legacy-name-and-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0c4727f383313762893b0a7af7bdeb746c80861a..0e700a9530cbf883a9037621794a601c0386a387 100644
+index 9b9504ca32d8cc7c037e0a96f2d8aa03d5c5495d..556d8d395df3660ec7923c6814bc281c5fce442f 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -195,6 +195,44 @@ public final class ItemStack {
diff --git a/patches/server/0423-Add-PrepareResultEvent.patch b/patches/server/0422-Add-PrepareResultEvent.patch
similarity index 97%
rename from patches/server/0423-Add-PrepareResultEvent.patch
rename to patches/server/0422-Add-PrepareResultEvent.patch
index 2b9f34e9b6..cedd5ef5fb 100644
--- a/patches/server/0423-Add-PrepareResultEvent.patch
+++ b/patches/server/0422-Add-PrepareResultEvent.patch
@@ -8,7 +8,7 @@ Adds a new event for all crafting stations that generate a result slot item
 Anvil, Grindstone and Smithing now extend this event
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index e97953e3dad164862d7e2f86bd86a6eff5b80ae2..8e0da4fb2a8f62156e953e0c71a82306d29c5fc4 100644
+index 878d3c3089635a515fa7f54c956159a1bb6ce29b..cab3e0ba471c93764b5949ad68a0f2cce4d00099 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 @@ -338,6 +338,7 @@ public class AnvilMenu extends ItemCombinerMenu {
@@ -94,7 +94,7 @@ index 9c2fe69ced7a46bbd8b0fbe10fa67d0a39b0f375..e40d9dbdbe5359c38af6d764d01c9be4
  
      private void setupRecipeList(Container input, ItemStack stack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 90b93b7139f9a11028b0d78b109b478b8052e982..0e920a0b413c2322832416ef4a2aa661eaae1a89 100644
+index 64236f5f126998157bb7bbae40ed0cd1550281e5..8ac093866aec59b4e031b953d4c3c3af66733812 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1714,26 +1714,53 @@ public class CraftEventFactory {
@@ -140,7 +140,7 @@ index 90b93b7139f9a11028b0d78b109b478b8052e982..0e920a0b413c2322832416ef4a2aa661
 +    }
 +    // Paper end - Add PrepareResultEvent
 +
-+    // Paper start - support specific overrides for prepare result
++    // Paper start - Add PrepareResultEvent
 +    public static void callPrepareResultEvent(AbstractContainerMenu container, int resultSlot) {
 +        com.destroystokyo.paper.event.inventory.PrepareResultEvent event;
 +        InventoryView view = container.getBukkitView();
diff --git a/patches/server/0424-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0423-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 91%
rename from patches/server/0424-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0423-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index a754802b35..2110cd04e4 100644
--- a/patches/server/0424-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0423-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d4bf6c909939c23586acaa7338141aac880217b0..87b010d5b0ce405e64092638108e4d64ad15339b 100644
+index 4605978cad9cbaa8b55b12c26476f85471658c82..be239cce5b4d326da46bcf63394d1bc03f2a9bb6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3510,7 +3510,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0425-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0424-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0425-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0424-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0426-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0425-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 94%
rename from patches/server/0426-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0425-Thread-Safe-Vanilla-Command-permission-checking.patch
index 2d4faf3292..b6cc617e9f 100644
--- a/patches/server/0426-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0425-Thread-Safe-Vanilla-Command-permission-checking.patch
@@ -9,7 +9,7 @@ to race conditions.
 Plus, .canUse we want to be safe for async anyways.
 
 diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
-index 3384501f83d445f45aa8233e98c7597daa67b8ef..bd12d372a04172504b3664a8136e534ca1b1712d 100644
+index d8142624f9f3a5909e7cc5665f1629a1a67dd302..b02fb15c98ab873fa78635d7a23706ddff8cc94d 100644
 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
 @@ -75,10 +75,10 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
@@ -26,7 +26,7 @@ index 3384501f83d445f45aa8233e98c7597daa67b8ef..bd12d372a04172504b3664a8136e534c
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index c772fa3b7a1276b0b41c45c6e0f5584b9c3a90cd..55c394fb00d0c7caee3a06720c37f04db571fe93 100644
+index 8e0ea79a41136b697f5e58b5cd71f6a9bc3cab73..de7d11baf17d1b6c3d5fb3402d38052f3a28c246 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -64,7 +64,7 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
diff --git a/patches/server/0427-Fix-SPIGOT-5989.patch b/patches/server/0426-Fix-SPIGOT-5989.patch
similarity index 97%
rename from patches/server/0427-Fix-SPIGOT-5989.patch
rename to patches/server/0426-Fix-SPIGOT-5989.patch
index 49d252ccf2..d666fe055e 100644
--- a/patches/server/0427-Fix-SPIGOT-5989.patch
+++ b/patches/server/0426-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3751ed19b63c3ddf76aa0f28454b6d4976d0d6b4..43188d6720a20f0809b4eabe9be49a8e88d1f9bb 100644
+index ca0e6c8e27f998a078e6f60a3cad67ddda7706c7..f68691542e57da7866253c43251c10235ebc57a0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -806,6 +806,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0428-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0427-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 97%
rename from patches/server/0428-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0427-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index 8b4feeff45..727c238f0f 100644
--- a/patches/server/0428-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0427-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index b60003f2542e469edf9e856873a1b325686ac31c..6170ff19f44a93e99c6aece6ed456a6af912efbb 100644
+index 0c9f6443663bc567a181393b13311a909602f4a4..a32449f5bfc88b251022064b6f9f5cc0d368fbca 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -175,8 +175,17 @@ public class Main {
diff --git a/patches/server/0429-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0428-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 89%
rename from patches/server/0429-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0428-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index de07acbef2..9c908c8e37 100644
--- a/patches/server/0429-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0428-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 6170ff19f44a93e99c6aece6ed456a6af912efbb..1c64c81980739bbf09b71e1d1dd6d86dbf924e0d 100644
+index a32449f5bfc88b251022064b6f9f5cc0d368fbca..7c8af0b369457098afb726fefb5087dbf159cb66 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -175,6 +175,7 @@ public class Main {
diff --git a/patches/server/0430-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0429-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0430-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0429-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0431-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0430-Optimize-NetworkManager-Exception-Handling.patch
similarity index 79%
rename from patches/server/0431-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0430-Optimize-NetworkManager-Exception-Handling.patch
index e369586f76..d1999714a1 100644
--- a/patches/server/0431-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0430-Optimize-NetworkManager-Exception-Handling.patch
@@ -5,31 +5,31 @@ Subject: [PATCH] Optimize NetworkManager Exception Handling
 
 
 diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java
-index ac1aa37329bd4d411964ea34ea8147f6db945b9a..cc96aeebfe96fabc399ba8772a488e48b504e65d 100644
+index ac1aa37329bd4d411964ea34ea8147f6db945b9a..0ed8d5691a5562a944b68f385b97ef814c2380e1 100644
 --- a/src/main/java/net/minecraft/network/ConnectionProtocol.java
 +++ b/src/main/java/net/minecraft/network/ConnectionProtocol.java
 @@ -341,6 +341,7 @@ public enum ConnectionProtocol {
  
          @Nullable
          public Packet<?> createPacket(int id, FriendlyByteBuf buf) {
-+            if (id < 0 || id >= this.idToDeserializer.size()) return null; // Paper - Perf: Optmize exception handling
++            if (id < 0 || id >= this.idToDeserializer.size()) return null; // Paper - Perf: Optimize exception handling
              Function<FriendlyByteBuf, ? extends Packet<? super T>> function = this.idToDeserializer.get(id);
              return function != null ? function.apply(buf) : null;
          }
 diff --git a/src/main/java/net/minecraft/network/Varint21FrameDecoder.java b/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
-index 00c170a16a57f41f881c6b282cba474ce485b34c..e3c30a096aee3ae0df933647a0c3079e3ae02868 100644
+index 00c170a16a57f41f881c6b282cba474ce485b34c..137b9a088c82ce6813bf8a80468675bb4992ce53 100644
 --- a/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
 +++ b/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
 @@ -39,6 +39,12 @@ public class Varint21FrameDecoder extends ByteToMessageDecoder {
      }
  
      protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list) {
-+        // Paper start - Perf: Optmize exception handling; if channel is not active just discard the packet
++        // Paper start - Perf: Optimize exception handling; if channel is not active just discard the packet
 +        if (!channelHandlerContext.channel().isActive()) {
 +            byteBuf.skipBytes(byteBuf.readableBytes());
 +            return;
 +        }
-+        // Paper end - Perf: Optmize exception handling
++        // Paper end - Perf: Optimize exception handling
          byteBuf.markReaderIndex();
          this.helperBuf.clear();
          if (!copyVarint(byteBuf, this.helperBuf)) {
diff --git a/patches/server/0432-Fix-some-rails-connecting-improperly.patch b/patches/server/0431-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0432-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0431-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0433-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0432-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0433-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0432-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0434-Brand-support.patch b/patches/server/0433-Brand-support.patch
similarity index 96%
rename from patches/server/0434-Brand-support.patch
rename to patches/server/0433-Brand-support.patch
index 1676a6348e..40b4914f13 100644
--- a/patches/server/0434-Brand-support.patch
+++ b/patches/server/0433-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fddbd703071ec93d6e3a9ecc1ff17b3e74eb8986..1635cd4a6e03005c1cdfce82bf3ffa657c3c25ed 100644
+index 9b3425857342f4c75ae23aee922d792977aa8c4e..07b711193d58625f3b3017e1b2ecb9dc07cc51a5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
@@ -57,7 +57,7 @@ index b68301f4cf650891140d3be6aebdc7ddf0d2a54f..f453b3023b713877b286e61d3c60b0b3
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 49862c0338b84924003df85883760317d1ca7aec..e4068c64363a0769df7a01fbf8b04ac17df042fc 100644
+index e05d22471a80f5afba4634116aff9dcf636f2501..878744936f1d2c7bc3ad13bf29d422cc31d0f8d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3030,6 +3030,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0435-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0434-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0435-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0434-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0436-Don-t-require-FACING-data.patch b/patches/server/0435-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0436-Don-t-require-FACING-data.patch
rename to patches/server/0435-Don-t-require-FACING-data.patch
diff --git a/patches/server/0437-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0436-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 93%
rename from patches/server/0437-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0436-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index ba3350d577..38b19523e1 100644
--- a/patches/server/0437-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0436-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 28128e432c3d0a312f9a757c54c9a707c51bc210..27977796215779f6412e618c4b439d756a5bef98 100644
+index d9d4a8df764bce67ee13a542e0b21a5ec7fd8ca7..489db5b6cf82c518806dbabc43ec18fca7e672c4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2014,9 +2014,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index 28128e432c3d0a312f9a757c54c9a707c51bc210..27977796215779f6412e618c4b439d75
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 95f3b5d9293077e2933b0a0a91bfeb43b6efc6fe..d6d49854eede2b9005725969c6c062168c4b2fce 100644
+index 2d6ef62205ff5a4da72e718f9b33d955a58d805f..bbae63fb0a5f3f61c25f8348b72b1f20dcece00a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -262,12 +262,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0438-Add-moon-phase-API.patch b/patches/server/0437-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0438-Add-moon-phase-API.patch
rename to patches/server/0437-Add-moon-phase-API.patch
diff --git a/patches/server/0439-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0438-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0439-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0438-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0440-Prevent-headless-pistons-from-being-created.patch b/patches/server/0439-Prevent-headless-pistons-from-being-created.patch
similarity index 95%
rename from patches/server/0440-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0439-Prevent-headless-pistons-from-being-created.patch
index fcf861a341..280e6fc1c3 100644
--- a/patches/server/0440-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0439-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index b7cf13fe4a0af243c0e76d75439b28d5018dadb9..6a6dd85da2832ba81643031a2e962daf5c27a697 100644
+index cf81854facadaf3c1f860bcaaf69db463a31b0c9..299583b1eb72cfdb4771ba0755fd71f2135484c1 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -206,6 +206,15 @@ public class Explosion {
diff --git a/patches/server/0441-Add-BellRingEvent.patch b/patches/server/0440-Add-BellRingEvent.patch
similarity index 93%
rename from patches/server/0441-Add-BellRingEvent.patch
rename to patches/server/0440-Add-BellRingEvent.patch
index 35d5f6fb9c..02c07c5c36 100644
--- a/patches/server/0441-Add-BellRingEvent.patch
+++ b/patches/server/0440-Add-BellRingEvent.patch
@@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index afccfcab4c1682c47bffe7e3c10a9ec60092e8a0..6595c82741d5d7596fae982ac44461ae9086c064 100644
+index d147f545e80695fc30b458da640f66c7ab809cce..d51af2830fd347d5e55f5fa788df0e5b8481248c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -366,10 +366,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0442-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0441-Add-zombie-targets-turtle-egg-config.patch
similarity index 91%
rename from patches/server/0442-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0441-Add-zombie-targets-turtle-egg-config.patch
index 51a33c890c..f3294d3a33 100644
--- a/patches/server/0442-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0441-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 79634693899f50e34ffe0898f75e5b31fd11ab53..4208f11e031ea8891d22e2da9e513108f0e2d9f3 100644
+index ac4916a898af8c3584d84088b18e8b38b5eb6b13..47f8e5ecadf79fa66db0248ef23eab1e6524f108 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -109,7 +109,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0443-Buffer-joins-to-world.patch b/patches/server/0442-Buffer-joins-to-world.patch
similarity index 95%
rename from patches/server/0443-Buffer-joins-to-world.patch
rename to patches/server/0442-Buffer-joins-to-world.patch
index b1d8c716aa..e51227cf32 100644
--- a/patches/server/0443-Buffer-joins-to-world.patch
+++ b/patches/server/0442-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 38650109c1d2683a27da5788dc6013d8d0db26ad..337010178db21cb71fde1a5a7b263bf3609a7f4c 100644
+index b99dbe3878df8f67a6920195088c00a01289a79f..19df0fa85080897a36bdbffa8fcef0991dbdd191 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -498,14 +498,29 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0444-Eigencraft-redstone-implementation.patch b/patches/server/0443-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0444-Eigencraft-redstone-implementation.patch
rename to patches/server/0443-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0445-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0444-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0445-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0444-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0446-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0445-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 96%
rename from patches/server/0446-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0445-PortalCreateEvent-needs-to-know-its-entity.patch
index dad05459bf..0881951f2b 100644
--- a/patches/server/0446-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0445-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index c5e36e7e96902fc0e8e9bb409907c6424cf223bd..761a46c21aaddcd43b4c33f477658605648127e9 100644
+index 556d8d395df3660ec7923c6814bc281c5fce442f..b4f2b75960674e81c8189dc908523c56ae2e5079 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -478,7 +478,7 @@ public final class ItemStack {
@@ -52,7 +52,7 @@ index e707553bbddf84bc48ec7186da00c3eb0632946d..91400c16b8bd8953265bf37ec1cd34ac
  
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 8fce3ad36a6ee8166f4abd9e0e369b641d487af9..0006aec00ab708b1906fbb87d79a9506397c9226 100644
+index 5e5d0e5b41b5ed90a5f0109b231d468bbc566ae7..b1e9ea9ece5ef8ecbe2ed919fda8e1153724dc93 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -14,6 +14,7 @@ import net.minecraft.server.level.ServerLevel;
@@ -79,7 +79,7 @@ index 8fce3ad36a6ee8166f4abd9e0e369b641d487af9..0006aec00ab708b1906fbb87d79a9506
  
      private static int getFireTickDelay(RandomSource random) {
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 79ff216e473ebc4bf7ab3ade42b0fa224f7e4c19..b144bf37fc4ee93b77d4bbef750b2531ebfef813 100644
+index 2d1062d2b0412180cc08765ecf9b0a071983c06a..d1d00b9a078ee1f5a6c5dd51c2f0409d12c85c26 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -43,6 +43,7 @@ import net.minecraft.world.item.DyeColor;
diff --git a/patches/server/0447-Add-more-Evoker-API.patch b/patches/server/0446-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0447-Add-more-Evoker-API.patch
rename to patches/server/0446-Add-more-Evoker-API.patch
diff --git a/patches/server/0448-Add-methods-to-get-translation-keys.patch b/patches/server/0447-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0448-Add-methods-to-get-translation-keys.patch
rename to patches/server/0447-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0449-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0448-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0449-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0448-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0450-Cache-block-data-strings.patch b/patches/server/0449-Cache-block-data-strings.patch
similarity index 97%
rename from patches/server/0450-Cache-block-data-strings.patch
rename to patches/server/0449-Cache-block-data-strings.patch
index 1dcf3e688e..0f2424d33d 100644
--- a/patches/server/0450-Cache-block-data-strings.patch
+++ b/patches/server/0449-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1b67fbad7c14186e70919946938a512950077635..eb77196548f5cac77d0814f3523c35074d57fd6c 100644
+index 08e3f07c4547f8fa7b571ecef7436ba1fbee578a..2600be3ec00a1ba8cff5f03c8e3f7a06a05bbeaf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2134,6 +2134,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0451-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0450-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 96%
rename from patches/server/0451-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0450-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index dbf056ab57..28de9a6d2c 100644
--- a/patches/server/0451-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0450-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
 Cancel any pending motion when teleported.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index be5ae2ddc28edb2b0316d57bfa49c37fb502220a..3f43a90d6aa774bf6def858289606054236e229b 100644
+index 75073ab08a90bd0ce8afc54634e7d61d50650742..4c9a5b53d5b170593c759de1d5dc3c411d9d50b2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -657,7 +657,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -31,7 +31,7 @@ index be5ae2ddc28edb2b0316d57bfa49c37fb502220a..3f43a90d6aa774bf6def858289606054
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8209a273b0f4b07195fa20c5be6c80384eb582c2..fa40fff50ae07a0a040b50c0c04d4d7a2bf46b8d 100644
+index e68a29eb0c81285039a1a980d8b9b83f0b1d022e..522b5575e7e465ccf235fad7d2e87c92074312bd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -162,6 +162,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0452-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0451-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 95%
rename from patches/server/0452-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0451-Add-additional-open-container-api-to-HumanEntity.patch
index 0c392ad75b..857657780a 100644
--- a/patches/server/0452-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0451-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index dcc5947143dc39e8f629b29d3649174327783801..6d67df9ae039c7e803c3fe6207e59923bd7be218 100644
+index fe050a077782fb023c49710eb2127250d5165484..93644aefd2e6c97eca2735812b2b7b4bd039cfb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -461,6 +461,70 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -78,4 +78,4 @@ index dcc5947143dc39e8f629b29d3649174327783801..6d67df9ae039c7e803c3fe6207e59923
 +
      @Override
      public void closeInventory() {
-         // Paper start
+         // Paper start - Inventory close reason
diff --git a/patches/server/0453-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0452-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0453-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0452-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0454-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0453-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 96%
rename from patches/server/0454-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0453-Extend-block-drop-capture-to-capture-all-items-added.patch
index a4beee9d33..f6c24355d9 100644
--- a/patches/server/0454-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0453-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 27977796215779f6412e618c4b439d756a5bef98..1db813af2f6e1bce404fc24f31a18de3e0717247 100644
+index 489db5b6cf82c518806dbabc43ec18fca7e672c4..7227d29c6ecf77b026c84e06a3c605926e1f7e5e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1512,6 +1512,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0455-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0454-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 94%
rename from patches/server/0455-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0454-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index c114cf9398..ba65c24e8f 100644
--- a/patches/server/0455-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0454-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fa40fff50ae07a0a040b50c0c04d4d7a2bf46b8d..f2a1719f18913dca5a6985537c5181af6c8e2bfe 100644
+index 522b5575e7e465ccf235fad7d2e87c92074312bd..6ee2dc0ef43ffa89b2692adc01b3fd6090f5cbf6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4507,4 +4507,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0456-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0455-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0456-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0455-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0457-Entity-isTicking.patch b/patches/server/0456-Entity-isTicking.patch
similarity index 94%
rename from patches/server/0457-Entity-isTicking.patch
rename to patches/server/0456-Entity-isTicking.patch
index 5b8f7576d6..06affcb103 100644
--- a/patches/server/0457-Entity-isTicking.patch
+++ b/patches/server/0456-Entity-isTicking.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f2a1719f18913dca5a6985537c5181af6c8e2bfe..79a1f55dcdb3186b4ab3e628ac652abf362a8cab 100644
+index 6ee2dc0ef43ffa89b2692adc01b3fd6090f5cbf6..c359ba2c20a5f1a63a8342ba593ba51dc8daa905 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4512,5 +4512,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0458-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0457-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 94%
rename from patches/server/0458-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0457-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 753a6c1741..6698fe0dc4 100644
--- a/patches/server/0458-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0457-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eb77196548f5cac77d0814f3523c35074d57fd6c..7d08e0750db1653685d31f1595593943c65770a1 100644
+index 2600be3ec00a1ba8cff5f03c8e3f7a06a05bbeaf..bb2de4fafa5a21c7dbf71dbad4bd01d0e6ece36f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2217,13 +2217,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0459-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0458-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0459-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0458-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0460-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0459-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 92%
rename from patches/server/0460-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0459-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index 1cc49e3cac..150b197347 100644
--- a/patches/server/0460-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0459-Reset-Ender-Crystals-on-Dragon-Spawn.patch
@@ -11,7 +11,7 @@ This ensures the crystals/pillars are in expected state when the dragon spawns.
 See #3522
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index e70273664b4a38ef4ba803c60409a24a07d5bed7..359438ba07b48bb7bf7079f026485bb13d2c3ac2 100644
+index d6b6c83a6d660107956a28c16fde2260583722aa..43f9635cfb3b1f57774ec0e33e0909d08a01db91 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -472,6 +472,7 @@ public class EndDragonFight {
diff --git a/patches/server/0461-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0460-Fix-for-large-move-vectors-crashing-server.patch
similarity index 98%
rename from patches/server/0461-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0460-Fix-for-large-move-vectors-crashing-server.patch
index 8bddcc9380..ea1b925edf 100644
--- a/patches/server/0461-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0460-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server
 Check movement distance also based on current position.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0a2f711b7feba83b39c042df71b3dc6546601ed8..6e1bfe5342e23a0dd97dfbc06a43bf77dfab23cc 100644
+index 4c9a5b53d5b170593c759de1d5dc3c411d9d50b2..da28ef2db1b96a79ffae87518b8c77647f3f13df 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -473,9 +473,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0462-Optimise-getType-calls.patch b/patches/server/0461-Optimise-getType-calls.patch
similarity index 98%
rename from patches/server/0462-Optimise-getType-calls.patch
rename to patches/server/0461-Optimise-getType-calls.patch
index af6462b4f4..3ae56f539f 100644
--- a/patches/server/0462-Optimise-getType-calls.patch
+++ b/patches/server/0461-Optimise-getType-calls.patch
@@ -66,7 +66,7 @@ index 8e5279abccdd074d565f246420b2b12b81189b67..928a301627134b49915b0ceaeabb7dc3
  
      public void setFlag(int flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index bbf58089dd5de3e38a236bb662ea3e139d159161..5a18ca08fe9e2b26bc9e5a01c7afed365e02a1b7 100644
+index d95f56356a8d1fc82f548d93038bd81c57f46f9e..a9a69191895ba2f66b133c162d1b31b1dfc73101 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -61,7 +61,7 @@ public class CraftBlockData implements BlockData {
diff --git a/patches/server/0463-Villager-resetOffers.patch b/patches/server/0462-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0463-Villager-resetOffers.patch
rename to patches/server/0462-Villager-resetOffers.patch
diff --git a/patches/server/0464-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0463-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 93%
rename from patches/server/0464-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0463-Retain-block-place-order-when-capturing-blockstates.patch
index 75f0afffe4..4b8e75e708 100644
--- a/patches/server/0464-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0463-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 286890f5a42cd2cade28ab0c5b9cdd48b6a33d37..4de1b09f4aa43ebefbae20014ec044bdd95bd191 100644
+index 92f250b9cc965a433dc9b9de1f9bfeb2acf4363e..15021a6791a5f76c3bb55e88a32b41d0c0ebaf58 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -159,7 +159,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0465-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0464-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0465-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0464-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0466-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0465-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0466-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0465-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0467-Fix-bell-block-entity-memory-leak.patch b/patches/server/0466-Fix-bell-block-entity-memory-leak.patch
similarity index 100%
rename from patches/server/0467-Fix-bell-block-entity-memory-leak.patch
rename to patches/server/0466-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0468-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0467-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0468-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0467-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0469-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0468-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0469-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0468-Add-getOfflinePlayerIfCached-String.patch
index 6f4af765a5..c075932416 100644
--- a/patches/server/0469-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0468-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 776b3d4d165303715e70c44689bb556541cb7582..8617abb738f311e2f7141ec98799f6cc8b4c6cf5 100644
+index a25cc6f7d91100b98996d9f07fff3c62018ddf86..f80846c1940d6a094c5980a451016a9214d594fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1909,6 +1909,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0470-Add-ignore-discounts-API.patch b/patches/server/0469-Add-ignore-discounts-API.patch
similarity index 99%
rename from patches/server/0470-Add-ignore-discounts-API.patch
rename to patches/server/0469-Add-ignore-discounts-API.patch
index 6e28c282b0..df58110026 100644
--- a/patches/server/0470-Add-ignore-discounts-API.patch
+++ b/patches/server/0469-Add-ignore-discounts-API.patch
@@ -25,7 +25,7 @@ index c0aa370367856a159412dd141f683b7d51e11c8b..b33fa26d6e3cf8999fb24137069d0a41
                  int k = (int) Math.floor(d0 * (double) merchantrecipe1.getBaseCostA().getCount());
  
 diff --git a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
-index 1d755d04515f20dbd69931084b4cc894e52d35c9..4cedc095bc9d1d119e2b1ae54969007ced788877 100644
+index 7da5c4a45f8fd46fedd4386e0faac57445475e3a..02feea12c998f37098b72becf6bfaf6b27d155de 100644
 --- a/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
 +++ b/src/main/java/net/minecraft/world/item/trading/MerchantOffer.java
 @@ -19,6 +19,7 @@ public class MerchantOffer {
diff --git a/patches/server/0471-Toggle-for-removing-existing-dragon.patch b/patches/server/0470-Toggle-for-removing-existing-dragon.patch
similarity index 92%
rename from patches/server/0471-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0470-Toggle-for-removing-existing-dragon.patch
index d68e4f0906..3ee5c38ad8 100644
--- a/patches/server/0471-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0470-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 7be3405a93fbb9f43075983825d1ac9299cbe7b9..23fa0f0683874fb43b1160a27e05646282bb66e1 100644
+index 43f9635cfb3b1f57774ec0e33e0909d08a01db91..65fb65a9a6037b007c3659f1d1a32ef31097824a 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -209,7 +209,7 @@ public class EndDragonFight {
diff --git a/patches/server/0472-Fix-client-lag-on-advancement-loading.patch b/patches/server/0471-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0472-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0471-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0473-Item-no-age-no-player-pickup.patch b/patches/server/0472-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0473-Item-no-age-no-player-pickup.patch
rename to patches/server/0472-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0474-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0473-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0474-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0473-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0475-Beacon-API-custom-effect-ranges.patch b/patches/server/0474-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0475-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0474-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0476-Add-API-for-quit-reason.patch b/patches/server/0475-Add-API-for-quit-reason.patch
similarity index 93%
rename from patches/server/0476-Add-API-for-quit-reason.patch
rename to patches/server/0475-Add-API-for-quit-reason.patch
index 988800c80a..ef9b5bf746 100644
--- a/patches/server/0476-Add-API-for-quit-reason.patch
+++ b/patches/server/0475-Add-API-for-quit-reason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 337010178db21cb71fde1a5a7b263bf3609a7f4c..0bc07a1748a5a979c6f6404c620331c3bbdb401f 100644
+index 19df0fa85080897a36bdbffa8fcef0991dbdd191..751d24a29cf3797234adbb1eb3b64b7fb261b24e 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -183,12 +183,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -25,7 +25,7 @@ index 337010178db21cb71fde1a5a7b263bf3609a7f4c..0bc07a1748a5a979c6f6404c620331c3
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1635cd4a6e03005c1cdfce82bf3ffa657c3c25ed..ea38d4eb1b4f98ba230ce44deedfd5cb2065edac 100644
+index 07b711193d58625f3b3017e1b2ecb9dc07cc51a5..94ddc704114af810a3f9c858863e10b5a2b87edd 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
@@ -49,11 +49,11 @@ index f453b3023b713877b286e61d3c60b0b3cfce2cdd..825b8f541fe3f5e4cb53f465232c1939
              this.connection.disconnect(ichatbasecomponent);
          }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a50c8728f6ece2ab1f08cacb64cf98790b8a6871..1639c7dda7a4eb29cff489b49590152029d89ea3 100644
+index f68691542e57da7866253c43251c10235ebc57a0..fdfa2fe6a2564a963dfabff3f9a49ca26c71d2be 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -579,7 +579,7 @@ public abstract class PlayerList {
-             entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
+             entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper - Inventory close reason
          }
  
 -        PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : io.papermc.paper.adventure.PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure
diff --git a/patches/server/0477-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0476-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0477-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0476-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0478-Expose-world-spawn-angle.patch b/patches/server/0477-Expose-world-spawn-angle.patch
similarity index 91%
rename from patches/server/0478-Expose-world-spawn-angle.patch
rename to patches/server/0477-Expose-world-spawn-angle.patch
index c454e5988f..a4e4c3ef85 100644
--- a/patches/server/0478-Expose-world-spawn-angle.patch
+++ b/patches/server/0477-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 35d9aae5ae0618e6509a3d452e0609326e2737c0..f81ca5918b43eb9ac74925988abcd0cfc65fe3d3 100644
+index fdfa2fe6a2564a963dfabff3f9a49ca26c71d2be..711956432c421d812b5e0d37834ce4cd276cea06 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -849,7 +849,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0479-Add-Destroy-Speed-API.patch b/patches/server/0478-Add-Destroy-Speed-API.patch
similarity index 93%
rename from patches/server/0479-Add-Destroy-Speed-API.patch
rename to patches/server/0478-Add-Destroy-Speed-API.patch
index 21dcb0d34a..c14becf505 100644
--- a/patches/server/0479-Add-Destroy-Speed-API.patch
+++ b/patches/server/0478-Add-Destroy-Speed-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index 5a18ca08fe9e2b26bc9e5a01c7afed365e02a1b7..f75455bf199258fa7097daf777d28ff672039fa2 100644
+index a9a69191895ba2f66b133c162d1b31b1dfc73101..20dcbea3bb06e637a88d81ed09138b57797e270f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -703,4 +703,19 @@ public class CraftBlockData implements BlockData {
diff --git a/patches/server/0480-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0479-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 93%
rename from patches/server/0480-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0479-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index 8ac0f729ad..af3c8f43f2 100644
--- a/patches/server/0480-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0479-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e4068c64363a0769df7a01fbf8b04ac17df042fc..ba30c5e17a294cee9f408fdd4e31849c0e5d28ed 100644
+index 878744936f1d2c7bc3ad13bf29d422cc31d0f8d4..bbe18e0342ad68c844f095d3b6413929adc18ab5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2593,7 +2593,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0481-Add-LivingEntity-clearActiveItem.patch b/patches/server/0480-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0481-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0480-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0482-Add-PlayerItemCooldownEvent.patch b/patches/server/0481-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0482-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0481-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0483-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0482-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0483-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0482-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0484-More-lightning-API.patch b/patches/server/0483-More-lightning-API.patch
similarity index 100%
rename from patches/server/0484-More-lightning-API.patch
rename to patches/server/0483-More-lightning-API.patch
diff --git a/patches/server/0485-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0484-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 96%
rename from patches/server/0485-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0484-Climbing-should-not-bypass-cramming-gamerule.patch
index ed9695b64c..f5a8e23a0f 100644
--- a/patches/server/0485-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0484-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 79a1f55dcdb3186b4ab3e628ac652abf362a8cab..d5d006756270025e16c1ab75062ece9b8ae384b1 100644
+index c359ba2c20a5f1a63a8342ba593ba51dc8daa905..b7a0fb1d6500d0a0d6734726484b04a084ce757c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2063,6 +2063,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -44,7 +44,7 @@ index c9c7833755af3c7bef1d40f2ca425cbec59efa68..75cdddbfbbc4c0c521194dde27ba5f5d
              } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 87b010d5b0ce405e64092638108e4d64ad15339b..0568dd1a885f06f7fd85419a8ec7429c7fec8aba 100644
+index be239cce5b4d326da46bcf63394d1bc03f2a9bb6..f4050168502e714f530c249d4730525c06958f6b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3426,7 +3426,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -116,7 +116,7 @@ index 6b7453281e32aae20778f26b4098df418401c45b..8fc65fd7347340a89dba0b9839497aad
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 4f9afae94a4cbf28a532e889d441c63df50642d9..e29d1801f15c4c5680b683783e97a7aae3da753e 100644
+index 4e3cf19b83410f3bcacd953a600bf0bed6e45450..e3412f9dd86dddd241bea8f6dcaeed77a7e67f08 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -343,7 +343,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0486-Add-missing-default-perms-for-commands.patch b/patches/server/0485-Add-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0486-Add-missing-default-perms-for-commands.patch
rename to patches/server/0485-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0487-Add-PlayerShearBlockEvent.patch b/patches/server/0486-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0487-Add-PlayerShearBlockEvent.patch
rename to patches/server/0486-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0488-Limit-recipe-packets.patch b/patches/server/0487-Limit-recipe-packets.patch
similarity index 96%
rename from patches/server/0488-Limit-recipe-packets.patch
rename to patches/server/0487-Limit-recipe-packets.patch
index 707685d4a1..ad49c3d49c 100644
--- a/patches/server/0488-Limit-recipe-packets.patch
+++ b/patches/server/0487-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 56aa8de4bdfbf7a26d9838b2a557458ce40b9d01..f6413041358cf52e51efeaac88d13030258fa678 100644
+index da28ef2db1b96a79ffae87518b8c77647f3f13df..1f51d1e6fb85a73ed6c046a5dd32c27b43f9d63b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -258,6 +258,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0489-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0488-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0489-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0488-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0490-Player-Chunk-Load-Unload-Events.patch b/patches/server/0489-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0490-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0489-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0491-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0490-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0491-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0490-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0492-Expose-LivingEntity-hurt-direction.patch b/patches/server/0491-Expose-LivingEntity-hurt-direction.patch
similarity index 92%
rename from patches/server/0492-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0491-Expose-LivingEntity-hurt-direction.patch
index 998fc4558c..896e176539 100644
--- a/patches/server/0492-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0491-Expose-LivingEntity-hurt-direction.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4bac05cb48d81dc9776d90502b6f12285b92122b..2957b3929c1e92af1b1a2636b83b757a0fbc789d 100644
+index ca7f6ffdbfc8c796c3a26108f281bef7af560f78..07e15c65bf52725b6f63c89ae421afd3d95ffd87 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -178,7 +178,7 @@ public abstract class Player extends LivingEntity {
@@ -18,7 +18,7 @@ index 4bac05cb48d81dc9776d90502b6f12285b92122b..2957b3929c1e92af1b1a2636b83b757a
      public boolean affectsSpawning = true;
      // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 6d67df9ae039c7e803c3fe6207e59923bd7be218..cdbd8d7d1c23809a7345f0c3b0c7f9356be47900 100644
+index 93644aefd2e6c97eca2735812b2b7b4bd039cfb5..40f848d117c1a4f4fc2f11861c5f142071d56977 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -126,6 +126,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0493-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0492-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 91%
rename from patches/server/0493-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0492-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index bc839e262d..21f0a261e4 100644
--- a/patches/server/0493-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0492-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6595c82741d5d7596fae982ac44461ae9086c064..5b047c46a4d3f0c7aca7ceb562f8e429e4f498fc 100644
+index d51af2830fd347d5e55f5fa788df0e5b8481248c..650ff96dc5d2b690520d2f2eb91d25bdf182e22e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -301,6 +301,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0494-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0493-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
similarity index 93%
rename from patches/server/0494-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
rename to patches/server/0493-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 6d784edade..50044a8342 100644
--- a/patches/server/0494-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0493-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix crash from invalid ingredient lists in
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 66b7a2c9a7dc18a98bf2c3aac863a10cbc3ae9f9..1ec236f6c141c28a26658f6a0c43df4ab2ec2f7a 100644
+index ddc002f269527201724457c0b820788200441e0c..9bc5a9592cabe087effc03e5347ea1d75794960b 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -261,7 +261,11 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
diff --git a/patches/server/0495-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0494-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 99%
rename from patches/server/0495-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0494-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 88bac3edc6..23c6573d82 100644
--- a/patches/server/0495-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0494-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerTradeEvent and PlayerPurchaseEvent
 Co-authored-by: Alexander <protonull@protonmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 1ec236f6c141c28a26658f6a0c43df4ab2ec2f7a..c3b100b8d1068b2a77a344de7fcd205a1c36e5a7 100644
+index 9bc5a9592cabe087effc03e5347ea1d75794960b..4e6c2f6b2e54a4c126e9a026b9cad05ce835ad66 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -137,11 +137,24 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
diff --git a/patches/server/0496-Add-TargetHitEvent.patch b/patches/server/0495-Add-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0496-Add-TargetHitEvent.patch
rename to patches/server/0495-Add-TargetHitEvent.patch
diff --git a/patches/server/0497-MC-4-Fix-item-position-desync.patch b/patches/server/0496-MC-4-Fix-item-position-desync.patch
similarity index 96%
rename from patches/server/0497-MC-4-Fix-item-position-desync.patch
rename to patches/server/0496-MC-4-Fix-item-position-desync.patch
index 0d7cd7df68..ad0abd54ba 100644
--- a/patches/server/0497-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0496-MC-4-Fix-item-position-desync.patch
@@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..3c4ac79c094dc2fff7de94150a34b7bf
  
      public Vec3 decode(long x, long y, long z) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d5d006756270025e16c1ab75062ece9b8ae384b1..c81f7a4637dd5c83c5527b1052fb58a6055e5b09 100644
+index b7a0fb1d6500d0a0d6734726484b04a084ce757c..7472e3aba473afe474ec0928d3cd1166bb59d0b2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4283,6 +4283,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0498-Additional-Block-Material-API.patch b/patches/server/0497-Additional-Block-Material-API.patch
similarity index 100%
rename from patches/server/0498-Additional-Block-Material-API.patch
rename to patches/server/0497-Additional-Block-Material-API.patch
diff --git a/patches/server/0499-Fix-harming-potion-dupe.patch b/patches/server/0498-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0499-Fix-harming-potion-dupe.patch
rename to patches/server/0498-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0500-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0499-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/server/0500-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/server/0499-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0501-Cache-burn-durations.patch b/patches/server/0500-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0501-Cache-burn-durations.patch
rename to patches/server/0500-Cache-burn-durations.patch
diff --git a/patches/server/0502-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0501-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0502-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0501-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0503-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0502-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0503-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0502-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0504-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0503-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0504-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0503-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0505-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0504-Fix-interact-event-not-being-called-sometimes.patch
similarity index 97%
rename from patches/server/0505-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0504-Fix-interact-event-not-being-called-sometimes.patch
index f031bbf69f..f2c474f444 100644
--- a/patches/server/0505-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0504-Fix-interact-event-not-being-called-sometimes.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes
 Co-authored-by: Moulberry <james.jenour@protonmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a3715ab0d5f7ae33ba64e69b391e12a00b2e59e9..54ca7e759897c054127e8532b9df62dca33b8e9d 100644
+index 1f51d1e6fb85a73ed6c046a5dd32c27b43f9d63b..e27395ff1b8e4546877c42f1df5ba836c11cdb6e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1760,7 +1760,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0506-Zombie-API-breaking-doors.patch b/patches/server/0505-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0506-Zombie-API-breaking-doors.patch
rename to patches/server/0505-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0507-Fix-nerfed-slime-when-splitting.patch b/patches/server/0506-Fix-nerfed-slime-when-splitting.patch
similarity index 90%
rename from patches/server/0507-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0506-Fix-nerfed-slime-when-splitting.patch
index 387c55135a..400295b015 100644
--- a/patches/server/0507-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0506-Fix-nerfed-slime-when-splitting.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix nerfed slime when splitting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index fa014c04cc51a55345a1c50098f486161051741d..a89dec53d68579271d2a259e1a53537262bd0df6 100644
+index ca3bf718336ef02d379c0ec670f62fafb1600153..3752ff83c91be55e8a5e7c81b75409d64a8aafde 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -243,6 +243,7 @@ public class Slime extends Mob implements Enemy {
diff --git a/patches/server/0508-Add-EntityLoadCrossbowEvent.patch b/patches/server/0507-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0508-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0507-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0509-Add-WorldGameRuleChangeEvent.patch b/patches/server/0508-Add-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from patches/server/0509-Add-WorldGameRuleChangeEvent.patch
rename to patches/server/0508-Add-WorldGameRuleChangeEvent.patch
index 7780bdbe4f..78f64f78ba 100644
--- a/patches/server/0509-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0508-Add-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 334001cb749600c973c82391e1c11f0e40bd2dfb..f3cdf1fa7731eb7bb1cb89aa6a37204d
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6a6bdc23767d4b0413352eda860f3fd3076f492e..a99d7a75ce12ffb49a6489044db74d18080b2b35 100644
+index bbae63fb0a5f3f61c25f8348b72b1f20dcece00a..f62cec4122b384603ae5d3ad6f6134eff2d703fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1930,8 +1930,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0510-Add-ServerResourcesReloadedEvent.patch b/patches/server/0509-Add-ServerResourcesReloadedEvent.patch
similarity index 97%
rename from patches/server/0510-Add-ServerResourcesReloadedEvent.patch
rename to patches/server/0509-Add-ServerResourcesReloadedEvent.patch
index 06aa0254ca..5eb5aa8de0 100644
--- a/patches/server/0510-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0509-Add-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7d08e0750db1653685d31f1595593943c65770a1..7dfc7a01f2604cb9a5e305a689ecfdeea35f7a31 100644
+index bb2de4fafa5a21c7dbf71dbad4bd01d0e6ece36f..563dc53b10389f106f310d9c9ecfe33f7e701553 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2094,7 +2094,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0511-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0510-Add-world-settings-for-mobs-picking-up-loot.patch
similarity index 96%
rename from patches/server/0511-Add-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0510-Add-world-settings-for-mobs-picking-up-loot.patch
index 2f9929da44..5bb61a51bf 100644
--- a/patches/server/0511-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0510-Add-world-settings-for-mobs-picking-up-loot.patch
@@ -18,7 +18,7 @@ index dadb419a04b343d6ba59353c6caa1a50aa07b67f..117d466e1b4f545f6fd5006c3822c558
              LocalDate localdate = LocalDate.now();
              int i = localdate.get(ChronoField.DAY_OF_MONTH);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index c82730d52f2ec6cb4a5e17fa512be6497f3ab6dc..c635ca601a4f4a3c0684ab3b6c3a568c6b5515f7 100644
+index 47f8e5ecadf79fa66db0248ef23eab1e6524f108..5f4b25d69c31f21936376a39db60992db2e71b00 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -507,7 +507,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0512-Add-BlockFailedDispenseEvent.patch b/patches/server/0511-Add-BlockFailedDispenseEvent.patch
similarity index 96%
rename from patches/server/0512-Add-BlockFailedDispenseEvent.patch
rename to patches/server/0511-Add-BlockFailedDispenseEvent.patch
index 45d06c5125..5cf7a34385 100644
--- a/patches/server/0512-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0511-Add-BlockFailedDispenseEvent.patch
@@ -32,7 +32,7 @@ index 913ed110d8402d377152753325901eb7f3ac82d6..1d13f8a1009d6eda351c697052d499d5
              } else {
                  ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5b047c46a4d3f0c7aca7ceb562f8e429e4f498fc..5bd9efcf3bedf71a19674251271b9b72c39df444 100644
+index 650ff96dc5d2b690520d2f2eb91d25bdf182e22e..fd7e23b015ee99f7024759b31ad71b66a5b04d07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2040,4 +2040,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0513-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0512-Add-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0513-Add-PlayerLecternPageChangeEvent.patch
rename to patches/server/0512-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0514-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0513-Add-PlayerLoomPatternSelectEvent.patch
similarity index 96%
rename from patches/server/0514-Add-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0513-Add-PlayerLoomPatternSelectEvent.patch
index 11a0aa196d..62b156c72a 100644
--- a/patches/server/0514-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0513-Add-PlayerLoomPatternSelectEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerLoomPatternSelectEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-index 757ee83a0ec5d381eb328f31f3bef636a9b72d57..aee37b2fc205cef98d2ff0f42e9cba0a6de6bf45 100644
+index a98157f600837898dd8ef12671c4bb713e30f30c..b8440f2cd7ca46c243407ae1ba8f8c7adab4ecd4 100644
 --- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
 @@ -173,8 +173,35 @@ public class LoomMenu extends AbstractContainerMenu {
diff --git a/patches/server/0515-Configurable-door-breaking-difficulty.patch b/patches/server/0514-Configurable-door-breaking-difficulty.patch
similarity index 95%
rename from patches/server/0515-Configurable-door-breaking-difficulty.patch
rename to patches/server/0514-Configurable-door-breaking-difficulty.patch
index a29c6a814b..6c7408a74e 100644
--- a/patches/server/0515-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0514-Configurable-door-breaking-difficulty.patch
@@ -23,7 +23,7 @@ index 9fec5823d99d1ae8e41d9e21f7ddb8b8e94bf887..a6af5ac9d09834940d3dd4c80b16450b
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index c635ca601a4f4a3c0684ab3b6c3a568c6b5515f7..359319846c5f9c25e5e2b019777fd938165fd312 100644
+index 5f4b25d69c31f21936376a39db60992db2e71b00..5d0e587941253a051839ac7fa877bb3bc887f6b5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -100,7 +100,7 @@ public class Zombie extends Monster {
diff --git a/patches/server/0516-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0515-Empty-commands-shall-not-be-dispatched.patch
similarity index 89%
rename from patches/server/0516-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0515-Empty-commands-shall-not-be-dispatched.patch
index bf2b5b144d..c1753a8a97 100644
--- a/patches/server/0516-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0515-Empty-commands-shall-not-be-dispatched.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Empty commands shall not be dispatched
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 337ff2b3e8ea6f106656cf4bef029d81998e0e58..2de557a5ed91e2036a7f558cfca8b174cd534959 100644
+index 5c4a89fc7388b8e6ca9ade03fd34a8da79ae0ad9..f844f7ae935b55d254c422b702a8ca2a81119baa 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -287,6 +287,7 @@ public class Commands {
diff --git a/patches/server/0517-Remove-stale-POIs.patch b/patches/server/0516-Remove-stale-POIs.patch
similarity index 92%
rename from patches/server/0517-Remove-stale-POIs.patch
rename to patches/server/0516-Remove-stale-POIs.patch
index d6d2592c24..24b52efc01 100644
--- a/patches/server/0517-Remove-stale-POIs.patch
+++ b/patches/server/0516-Remove-stale-POIs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1db813af2f6e1bce404fc24f31a18de3e0717247..a45b7a9c3e12236ba5103d4281c9b73997698a0d 100644
+index 7227d29c6ecf77b026c84e06a3c605926e1f7e5e..f059ba5cfc0a3e12ea4b1b3554d85170fe782fff 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2083,6 +2083,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0518-Fix-villager-boat-exploit.patch b/patches/server/0517-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0518-Fix-villager-boat-exploit.patch
rename to patches/server/0517-Fix-villager-boat-exploit.patch
index 2f2ca31e42..21017f52fb 100644
--- a/patches/server/0518-Fix-villager-boat-exploit.patch
+++ b/patches/server/0517-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d727e401b311eea832315cc681fa7d73886c3f99..617f8776797e07b5d2ad632b5e049b287984d504 100644
+index 711956432c421d812b5e0d37834ce4cd276cea06..c962a1f40a97ca210e36341d79a1db02be2b20b8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -604,6 +604,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0519-Add-sendOpLevel-API.patch b/patches/server/0518-Add-sendOpLevel-API.patch
similarity index 92%
rename from patches/server/0519-Add-sendOpLevel-API.patch
rename to patches/server/0518-Add-sendOpLevel-API.patch
index 3bf32f15f3..036fddc2eb 100644
--- a/patches/server/0519-Add-sendOpLevel-API.patch
+++ b/patches/server/0518-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 617f8776797e07b5d2ad632b5e049b287984d504..d80b05fb33d1f519923f8ef189ff9025335d9390 100644
+index c962a1f40a97ca210e36341d79a1db02be2b20b8..b1ef7d734c053f8a26da5258826dbc50af9c1162 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1103,6 +1103,11 @@ public abstract class PlayerList {
@@ -32,7 +32,7 @@ index 617f8776797e07b5d2ad632b5e049b287984d504..d80b05fb33d1f519923f8ef189ff9025
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ba30c5e17a294cee9f408fdd4e31849c0e5d28ed..298380e217f41f01d0818767a6d8f1da5a004037 100644
+index bbe18e0342ad68c844f095d3b6413929adc18ab5..8b23a8fbdc1db7043969ca0a36c59dffd92782d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -633,6 +633,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0520-TODO-Registry-Modification-API.patch b/patches/server/0519-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0520-TODO-Registry-Modification-API.patch
rename to patches/server/0519-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0521-Add-StructuresLocateEvent.patch b/patches/server/0520-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0521-Add-StructuresLocateEvent.patch
rename to patches/server/0520-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0522-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0521-Collision-option-for-requiring-a-player-participant.patch
similarity index 97%
rename from patches/server/0522-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0521-Collision-option-for-requiring-a-player-participant.patch
index 37c9dd08ee..52b9938680 100644
--- a/patches/server/0522-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0521-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c81f7a4637dd5c83c5527b1052fb58a6055e5b09..df23dd16ecca29a569f89ddf7d755ab88557ab50 100644
+index 7472e3aba473afe474ec0928d3cd1166bb59d0b2..b7a83aebbf0602a338a1510f678cf5037ff619b8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1933,6 +1933,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0523-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0522-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0523-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0522-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0524-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0523-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 92%
rename from patches/server/0524-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0523-Return-chat-component-with-empty-text-instead-of-thr.patch
index d569ec5f48..3204d5fe19 100644
--- a/patches/server/0524-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0523-Return-chat-component-with-empty-text-instead-of-thr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return chat component with empty text instead of throwing
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index c6ac55cdece9e2901e5d17a23408171c6c49ff69..d18c7ac003e8537b9bf389ad3ad58e80242ec502 100644
+index 1465dbc29fc34bfe6ebb53e95fa6a4cbf2127a6c..7d7b60a5c27a620b570dc5e72bb0b4c7963ca4d4 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -89,7 +89,12 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0525-Make-schedule-command-per-world.patch b/patches/server/0524-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0525-Make-schedule-command-per-world.patch
rename to patches/server/0524-Make-schedule-command-per-world.patch
diff --git a/patches/server/0526-Configurable-max-leash-distance.patch b/patches/server/0525-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0526-Configurable-max-leash-distance.patch
rename to patches/server/0525-Configurable-max-leash-distance.patch
diff --git a/patches/server/0527-Add-BlockPreDispenseEvent.patch b/patches/server/0526-Add-BlockPreDispenseEvent.patch
similarity index 95%
rename from patches/server/0527-Add-BlockPreDispenseEvent.patch
rename to patches/server/0526-Add-BlockPreDispenseEvent.patch
index c2ee9d8110..143cefb368 100644
--- a/patches/server/0527-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0526-Add-BlockPreDispenseEvent.patch
@@ -17,7 +17,7 @@ index 5593a0aa9e618071b6521b213dde0f628348c3dc..644e64850479cea20a98b8a65503ccf3
                      tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5bd9efcf3bedf71a19674251271b9b72c39df444..3fef79f0e3b8a05b11b77802b80acc8e5c584653 100644
+index fd7e23b015ee99f7024759b31ad71b66a5b04d07..5bc8991249520139c6646736bf210440922f24da 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2047,5 +2047,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0528-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0527-Add-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0528-Add-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0527-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0529-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0528-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 92%
rename from patches/server/0529-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0528-Add-toggle-for-always-placing-the-dragon-egg.patch
index 60fe38c25c..b5bb0c6268 100644
--- a/patches/server/0529-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0528-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 7741b27816636aaa48277b2fe14fd7b88cd3d78a..3c5e18a5d136917c65bbfe1311c881d1b8bbd164 100644
+index 65fb65a9a6037b007c3659f1d1a32ef31097824a..87a8a888536203070bcecc0f477e92e666df2c2a 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -407,7 +407,7 @@ public class EndDragonFight {
diff --git a/patches/server/0530-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0529-Add-PlayerStonecutterRecipeSelectEvent.patch
similarity index 97%
rename from patches/server/0530-Add-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0529-Add-PlayerStonecutterRecipeSelectEvent.patch
index 8a91e4983d..45b26a2f98 100644
--- a/patches/server/0530-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0529-Add-PlayerStonecutterRecipeSelectEvent.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerStonecutterRecipeSelectEvent
 Co-Authored-By: MiniDigger <admin@benndorf.dev>
 
 diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-index 70ecc3f673ebd56b65ad901e10f40c28368cbfac..a5763abd3137e993ec856874b8fe7ef82dd6f570 100644
+index e40d9dbdbe5359c38af6d764d01c9be422654aaa..4924993fab57bcf72a5d75cc2f7e6bed4f9f511c 100644
 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 @@ -63,7 +63,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
diff --git a/patches/server/0531-Expand-EntityUnleashEvent.patch b/patches/server/0530-Expand-EntityUnleashEvent.patch
similarity index 98%
rename from patches/server/0531-Expand-EntityUnleashEvent.patch
rename to patches/server/0530-Expand-EntityUnleashEvent.patch
index 7753ca31d7..d8f093006b 100644
--- a/patches/server/0531-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0530-Expand-EntityUnleashEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 3da1debb3ad884d9ba2f8ebea52643e8fcb3a747..c64c8efc7fcf77a78c7807bf8def32cbd748b84d 100644
+index 321076a70653b5b499eb56ce3d9b2b0a4a8b92dc..74004b78673e81218b44097eea89a79217e005a6 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1305,12 +1305,15 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -122,7 +122,7 @@ index 16784fcc853e23689a854e7dc6c03ed8182a164e..006aba8bbb34a0d45ef626a1d299e819
                              flag1 = true;
                          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3fef79f0e3b8a05b11b77802b80acc8e5c584653..8761bb7b61d322bc1e29d217631a9d2c70e5bcc4 100644
+index 5bc8991249520139c6646736bf210440922f24da..74d018a0184daf7535f315e65f54b5d2152ad58b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1637,8 +1637,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0532-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0531-Reset-shield-blocking-on-dimension-change.patch
similarity index 90%
rename from patches/server/0532-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0531-Reset-shield-blocking-on-dimension-change.patch
index 909fcb71e2..06243f3ecf 100644
--- a/patches/server/0532-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0531-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ff75234d76e4f6a939841c982a6fc3e33b36ea61..468d96f4b1e83d81fec8997557964931c7512a35 100644
+index 94ddc704114af810a3f9c858863e10b5a2b87edd..c9ac912c5cdd5d2aeb09154b224386fb73dfbc69 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1247,6 +1247,11 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0533-Add-DragonEggFormEvent.patch b/patches/server/0532-Add-DragonEggFormEvent.patch
similarity index 96%
rename from patches/server/0533-Add-DragonEggFormEvent.patch
rename to patches/server/0532-Add-DragonEggFormEvent.patch
index c2dce8ce18..c55507f8cd 100644
--- a/patches/server/0533-Add-DragonEggFormEvent.patch
+++ b/patches/server/0532-Add-DragonEggFormEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add DragonEggFormEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 3c5e18a5d136917c65bbfe1311c881d1b8bbd164..5ba7bf72f08980b1c16240a5376ad8c3c9379100 100644
+index 87a8a888536203070bcecc0f477e92e666df2c2a..5b14d63e7c354cd51d67ddc045cc86a0f7b36811 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -407,8 +407,22 @@ public class EndDragonFight {
diff --git a/patches/server/0534-Add-EntityMoveEvent.patch b/patches/server/0533-Add-EntityMoveEvent.patch
similarity index 95%
rename from patches/server/0534-Add-EntityMoveEvent.patch
rename to patches/server/0533-Add-EntityMoveEvent.patch
index 6b7f95d0d9..e6d6cec8ad 100644
--- a/patches/server/0534-Add-EntityMoveEvent.patch
+++ b/patches/server/0533-Add-EntityMoveEvent.patch
@@ -17,7 +17,7 @@ index 563dc53b10389f106f310d9c9ecfe33f7e701553..b0e0c955e9b5c92d4a8e8d55149d5e81
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index a45b7a9c3e12236ba5103d4281c9b73997698a0d..b7d227015abeaed324b6b28a7ff51f07c68e704c 100644
+index f059ba5cfc0a3e12ea4b1b3554d85170fe782fff..186a4ea81212ba9a0c928de3226dd25fac1f4252 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 {
@@ -29,7 +29,7 @@ index a45b7a9c3e12236ba5103d4281c9b73997698a0d..b7d227015abeaed324b6b28a7ff51f07
      @Override public LevelChunk getChunkIfLoaded(int x, int z) { // Paper - this was added in world too but keeping here for NMS ABI
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0568dd1a885f06f7fd85419a8ec7429c7fec8aba..37c348d5b31f806b418a29dc4f8eb0fa1c7d1a4c 100644
+index f4050168502e714f530c249d4730525c06958f6b..f0409e77e2bfb4463fce9f4cbbf1233589c102ea 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3361,6 +3361,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0535-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0534-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 92%
rename from patches/server/0535-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0534-added-option-to-disable-pathfinding-updates-on-block.patch
index f6373a5296..f60db1c081 100644
--- a/patches/server/0535-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0534-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b7d227015abeaed324b6b28a7ff51f07c68e704c..d6e8950af45578375b988158d98554c7d2f4f0a9 100644
+index 186a4ea81212ba9a0c928de3226dd25fac1f4252..b3d5d0dc5671f3c2bb41263ef52951da5c87ed74 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1657,6 +1657,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0536-Inline-shift-direction-fields.patch b/patches/server/0535-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0536-Inline-shift-direction-fields.patch
rename to patches/server/0535-Inline-shift-direction-fields.patch
diff --git a/patches/server/0537-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0536-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 95%
rename from patches/server/0537-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0536-Allow-adding-items-to-BlockDropItemEvent.patch
index 0d056ea3be..5305d7daab 100644
--- a/patches/server/0537-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0536-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8761bb7b61d322bc1e29d217631a9d2c70e5bcc4..4caddfe884748543f1153dbf066bb2d3f4cd78d4 100644
+index 74d018a0184daf7535f315e65f54b5d2152ad58b..2da51dc36e21e45ecc3cbbe357947f8359e538eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -450,13 +450,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0538-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0537-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0538-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0537-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0539-living-entity-allow-attribute-registration.patch b/patches/server/0538-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0539-living-entity-allow-attribute-registration.patch
rename to patches/server/0538-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0540-fix-dead-slime-setSize-invincibility.patch b/patches/server/0539-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0540-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0539-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0541-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0540-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0541-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0540-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0542-Expose-Tracked-Players.patch b/patches/server/0541-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0542-Expose-Tracked-Players.patch
rename to patches/server/0541-Expose-Tracked-Players.patch
diff --git a/patches/server/0543-Improve-ServerGUI.patch b/patches/server/0542-Improve-ServerGUI.patch
similarity index 99%
rename from patches/server/0543-Improve-ServerGUI.patch
rename to patches/server/0542-Improve-ServerGUI.patch
index b4986e4269..9d032f6712 100644
--- a/patches/server/0543-Improve-ServerGUI.patch
+++ b/patches/server/0542-Improve-ServerGUI.patch
@@ -39,7 +39,7 @@ index 48e0b8a50090735ac44d03bdff22010c60b0d7e5..066b9e4c4f0e7773548eda045cdd1ca8
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
-index 2e93eec8733c5b548a15269a322fe4dd1f189b7d..69b18e312db984eaffa8bae2439c88f73b872c53 100644
+index 2bbc57b4869caf690f53618d60359c5133ec62a8..c42a9949c4d37d45883867a54222a7ab33944b39 100644
 --- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 +++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
 @@ -59,6 +59,15 @@ public class MinecraftServerGui extends JComponent {
diff --git a/patches/server/0544-fix-converting-txt-to-json-file.patch b/patches/server/0543-fix-converting-txt-to-json-file.patch
similarity index 95%
rename from patches/server/0544-fix-converting-txt-to-json-file.patch
rename to patches/server/0543-fix-converting-txt-to-json-file.patch
index 4c5b8abd0b..9c650b7e73 100644
--- a/patches/server/0544-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0543-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..1c9cf5e1c4ee05724ffcdbd77a19bca1
          this.saveUserBanList();
          this.loadIpBanList();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 2d5e8d624b153f55e28d8a4e008dce11853179cf..f6da2fcc1709d0942ed8332b4f59c6b4131a0b78 100644
+index 09956f69b63844d67aeab1339ae65910fc8eb8bf..c2d11d89a94218cc84790df1b5b61e50db884801 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -199,6 +199,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -48,7 +48,7 @@ index 2d5e8d624b153f55e28d8a4e008dce11853179cf..f6da2fcc1709d0942ed8332b4f59c6b4
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d80b05fb33d1f519923f8ef189ff9025335d9390..95c2dfe3d37e1fb7673b03089e53caf5fdfc9c0e 100644
+index b1ef7d734c053f8a26da5258826dbc50af9c1162..298c5bece0e3bd992df8027d53ca6ada5b82d507 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -176,6 +176,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0545-Add-worldborder-events.patch b/patches/server/0544-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0545-Add-worldborder-events.patch
rename to patches/server/0544-Add-worldborder-events.patch
diff --git a/patches/server/0546-Add-PlayerNameEntityEvent.patch b/patches/server/0545-Add-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0546-Add-PlayerNameEntityEvent.patch
rename to patches/server/0545-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0547-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0546-Prevent-grindstones-from-overstacking-items.patch
similarity index 94%
rename from patches/server/0547-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0546-Prevent-grindstones-from-overstacking-items.patch
index 8762f5ed41..d98bb3f1c4 100644
--- a/patches/server/0547-Prevent-grindstones-from-overstacking-items.patch
+++ b/patches/server/0546-Prevent-grindstones-from-overstacking-items.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent grindstones from overstacking items
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 811d7415ae843347da374d73b4edfe89642d518a..0ebd139f2f51730c190570dc4abb5ff2f2ed2cfa 100644
+index 1783661f38a6f5fb655ea83953b9467bd91a1302..95ac3446fba1f37637c9700080de2e1ce7a3550a 100644
 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -198,13 +198,13 @@ public class GrindstoneMenu extends AbstractContainerMenu {
diff --git a/patches/server/0548-Add-recipe-to-cook-events.patch b/patches/server/0547-Add-recipe-to-cook-events.patch
similarity index 94%
rename from patches/server/0548-Add-recipe-to-cook-events.patch
rename to patches/server/0547-Add-recipe-to-cook-events.patch
index 8d7c982410..75eb9efb8b 100644
--- a/patches/server/0548-Add-recipe-to-cook-events.patch
+++ b/patches/server/0547-Add-recipe-to-cook-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add recipe to cook events
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 5c65be04ac88f1308eae6a8cde36d5f7e8aad879..14406c07dc505525ddcd257ca7e3779c1338eb05 100644
+index 8f7029e602300f68b3c8411caa2d9e0b1e8be62e..d975e80b6a7849bcbabf20bf12f7d63ab1a6335f 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -438,7 +438,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -18,7 +18,7 @@ index 5c65be04ac88f1308eae6a8cde36d5f7e8aad879..14406c07dc505525ddcd257ca7e3779c
  
              if (furnaceSmeltEvent.isCancelled()) {
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-index f706c787f7608f7440a5f5e05e7e9c4cb582368c..daeced350310020b99ab0244daf7f7a69c29b069 100644
+index 3a2afa6c1f6dfad7dc18d93b743cbea1eef0e4b8..5da0c6bf4f04448f640a11931b2cc5b91cf83f12 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 @@ -63,7 +63,10 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
diff --git a/patches/server/0549-Add-Block-isValidTool.patch b/patches/server/0548-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0549-Add-Block-isValidTool.patch
rename to patches/server/0548-Add-Block-isValidTool.patch
diff --git a/patches/server/0550-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0549-Allow-using-signs-inside-spawn-protection.patch
similarity index 95%
rename from patches/server/0550-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0549-Allow-using-signs-inside-spawn-protection.patch
index 847a7d4d24..4a1cbafca4 100644
--- a/patches/server/0550-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0549-Allow-using-signs-inside-spawn-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 54ca7e759897c054127e8532b9df62dca33b8e9d..07d15cceaf03b297356ea5fea80b81491de9c6f0 100644
+index e27395ff1b8e4546877c42f1df5ba836c11cdb6e..258855b702c6705ce78a32c20c665682ed65d3f2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1752,7 +1752,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0551-Expand-world-key-API.patch b/patches/server/0550-Expand-world-key-API.patch
similarity index 95%
rename from patches/server/0551-Expand-world-key-API.patch
rename to patches/server/0550-Expand-world-key-API.patch
index c343f5e349..c7a789fc26 100644
--- a/patches/server/0551-Expand-world-key-API.patch
+++ b/patches/server/0550-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index 0fb214ddd919b568da64541fd9b531c65caa5fad..9cd267f53505658d1c75187b662c4d9f
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8617abb738f311e2f7141ec98799f6cc8b4c6cf5..caa58d0a531a2541cff901e6eebeca0a74f5b3dd 100644
+index f80846c1940d6a094c5980a451016a9214d594fb..f192bd669e48865ae3ca7c79fd3c356d96556bd8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1137,9 +1137,15 @@ public final class CraftServer implements Server {
@@ -67,7 +67,7 @@ index 8617abb738f311e2f7141ec98799f6cc8b4c6cf5..caa58d0a531a2541cff901e6eebeca0a
          // Check if a World already exists with the UID.
          if (this.getWorld(world.getUID()) != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index bcf88a137616b83f3400afd18c6fe9f3b2b2db34..01b71837d1c1836b72216f97a09d43b13a875186 100644
+index f48702923beb6d99b23dfa2466396bf4d4e8fbc8..7629d3b375027ffe0656a21e4cb9315aabb62460 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -515,6 +515,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0552-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0551-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0552-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0551-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0553-Item-Rarity-API.patch b/patches/server/0552-Item-Rarity-API.patch
similarity index 96%
rename from patches/server/0553-Item-Rarity-API.patch
rename to patches/server/0552-Item-Rarity-API.patch
index ec2a02c6d8..1f69f50472 100644
--- a/patches/server/0553-Item-Rarity-API.patch
+++ b/patches/server/0552-Item-Rarity-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Item Rarity API
 public net.minecraft.world.item.Item rarity
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 01b71837d1c1836b72216f97a09d43b13a875186..5bb6735a2423c4fdffe6d0ef866fc15f0f552064 100644
+index 7629d3b375027ffe0656a21e4cb9315aabb62460..d714d420376d032d82ce6fc066fee3f775f0744d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -520,6 +520,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0553-Drop-carried-item-when-player-has-disconnected.patch
similarity index 93%
rename from patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0553-Drop-carried-item-when-player-has-disconnected.patch
index dc7dcd11a8..eeea2fbaff 100644
--- a/patches/server/0554-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0553-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 72b9c50024e82356491a3d35bf248223f3088b5c..5c63a7719b2a4a4bb2c64d460b007d2976cbdbf9 100644
+index 298c5bece0e3bd992df8027d53ca6ada5b82d507..c8cff0054c7f5eaab3143e828e463e7ad913cd92 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -597,6 +597,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0555-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0554-forced-whitelist-use-configurable-kick-message.patch
similarity index 92%
rename from patches/server/0555-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0554-forced-whitelist-use-configurable-kick-message.patch
index b9622a232c..b4788befbc 100644
--- a/patches/server/0555-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0554-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f89d2dc9ec8bfe0b401b96bffd59502bf903a24d..fbfe5d18a004225396f2d33084fb5073af2d9731 100644
+index b0e0c955e9b5c92d4a8e8d55149d5e8123011420..d99217292a094713287cd597c9d7c01f04b9c7c7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2233,7 +2233,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0556-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0555-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 91%
rename from patches/server/0556-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0555-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index b5c5c9d448..94029d841d 100644
--- a/patches/server/0556-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0555-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 07d15cceaf03b297356ea5fea80b81491de9c6f0..77aa411f79eb6617a7d53068d82533f3109ed903 100644
+index 258855b702c6705ce78a32c20c665682ed65d3f2..c81003c3642dafeb591d28b3bb1cf1a690b80937 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1187,7 +1187,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0557-Expose-protocol-version.patch b/patches/server/0556-Expose-protocol-version.patch
similarity index 91%
rename from patches/server/0557-Expose-protocol-version.patch
rename to patches/server/0556-Expose-protocol-version.patch
index 98a2a8529a..707f3fc177 100644
--- a/patches/server/0557-Expose-protocol-version.patch
+++ b/patches/server/0556-Expose-protocol-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 5bb6735a2423c4fdffe6d0ef866fc15f0f552064..5c29720a702ceceeb0ac1b0f136c599a16290242 100644
+index d714d420376d032d82ce6fc066fee3f775f0744d..24a19034ff30020db9ef817b91400dbf25f87599 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -534,6 +534,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0557-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 99%
rename from patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0557-Enhance-console-tab-completions-for-brigadier-comman.patch
index 84118c31b3..3a5ba6b744 100644
--- a/patches/server/0558-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0557-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index f6da2fcc1709d0942ed8332b4f59c6b4131a0b78..6d3468cc85b8eb7f44994f0c8365cb63e1cede0d 100644
+index c2d11d89a94218cc84790df1b5b61e50db884801..a380f1f289dec841f98c3c8f39d58d8fffff7b8c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0559-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0558-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 93%
rename from patches/server/0559-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0558-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index dd040dff42..204dc2c7ea 100644
--- a/patches/server/0559-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0558-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 51916ff6f45090cf5e2da6b12640c130533fc4d9..383c39ac381f9a86693abb7935b5b142b889d7be 100644
+index f0409e77e2bfb4463fce9f4cbbf1233589c102ea..1fd1d8abedeebf3f1d1e2465fa3792d404787c68 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3859,6 +3859,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0560-Add-bypass-host-check.patch b/patches/server/0559-Add-bypass-host-check.patch
similarity index 95%
rename from patches/server/0560-Add-bypass-host-check.patch
rename to patches/server/0559-Add-bypass-host-check.patch
index 8e53305847..3e482d71a9 100644
--- a/patches/server/0560-Add-bypass-host-check.patch
+++ b/patches/server/0559-Add-bypass-host-check.patch
@@ -8,7 +8,7 @@ Paper.bypassHostCheck
 Seriously, fix your firewalls. -.-
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 5d7f092e966d5b0496f48bd5c9d274157ac6d250..7fa8efd6b0cd7a7684d9bd4ff89d4955a69a8dd5 100644
+index 228359f13511262a0e4afeb9deff982ca0f46d9a..e694fd535212105e9229a6047002fdde93aede79 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -30,6 +30,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0561-Set-area-affect-cloud-rotation.patch b/patches/server/0560-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0561-Set-area-affect-cloud-rotation.patch
rename to patches/server/0560-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0562-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0561-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 90%
rename from patches/server/0562-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0561-add-isDeeplySleeping-to-HumanEntity.patch
index e632b7d55c..61a0d0fb11 100644
--- a/patches/server/0562-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0561-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index cdbd8d7d1c23809a7345f0c3b0c7f9356be47900..fd8d8b1e3583fe61b966f3550bd8e846b536b4e5 100644
+index 40f848d117c1a4f4fc2f11861c5f142071d56977..6e85e580d48622b4c90478b9afbc45b4445e86b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -133,6 +133,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0562-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 91%
rename from patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0562-add-consumeFuel-to-FurnaceBurnEvent.patch
index aa992bf879..bfdd2e8c45 100644
--- a/patches/server/0563-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0562-add-consumeFuel-to-FurnaceBurnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 97b8dc205fb22e17ab457e8d1f4d73a7b2f8cc47..b7760cc0f85b5db37d5a309aae3c26a00a65e32e 100644
+index d975e80b6a7849bcbabf20bf12f7d63ab1a6335f..c7ba7ac1a3869e4db1ef6b0350b3cab7f31a94c4 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -359,7 +359,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
diff --git a/patches/server/0564-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0563-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0564-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0563-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0565-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0564-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0565-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0564-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0566-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0565-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 93%
rename from patches/server/0566-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0565-fix-PlayerItemHeldEvent-firing-twice.patch
index 15b40972d5..0935be9b70 100644
--- a/patches/server/0566-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0565-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 77aa411f79eb6617a7d53068d82533f3109ed903..d5e002dd0d17f3c5087ace3440d5bf348cd40d5a 100644
+index c81003c3642dafeb591d28b3bb1cf1a690b80937..7dad8382910b405cdd3345454721f9b72921a7f4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1921,6 +1921,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0567-Add-PlayerDeepSleepEvent.patch b/patches/server/0566-Add-PlayerDeepSleepEvent.patch
similarity index 91%
rename from patches/server/0567-Add-PlayerDeepSleepEvent.patch
rename to patches/server/0566-Add-PlayerDeepSleepEvent.patch
index 1bb9060320..acf66e0c72 100644
--- a/patches/server/0567-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0566-Add-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2957b3929c1e92af1b1a2636b83b757a0fbc789d..482eaa28277eca1dbb25d1f3cf6c27328a8879de 100644
+index 07e15c65bf52725b6f63c89ae421afd3d95ffd87..617ede60a9e6634ae984a63ed4f32e845e5a571b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -248,6 +248,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0568-More-World-API.patch b/patches/server/0567-More-World-API.patch
similarity index 97%
rename from patches/server/0568-More-World-API.patch
rename to patches/server/0567-More-World-API.patch
index eb190ca0b7..6ab4109aac 100644
--- a/patches/server/0568-More-World-API.patch
+++ b/patches/server/0567-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b70239ff42f5c7f4754bae311385e4804891fd86..43d3c45cd7a178a4ca30e4c0c7fb1e7e21cd89f1 100644
+index f62cec4122b384603ae5d3ad6f6134eff2d703fe..d8e6dab184f2c049f777ebef87dbad141016580b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2176,6 +2176,53 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0569-Add-PlayerBedFailEnterEvent.patch b/patches/server/0568-Add-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0569-Add-PlayerBedFailEnterEvent.patch
rename to patches/server/0568-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0570-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0569-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 96%
rename from patches/server/0570-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0569-Implement-methods-to-convert-between-Component-and-B.patch
index 6acb1ecfa0..3659c401bb 100644
--- a/patches/server/0570-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0569-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d3e5235d4aa7240ba91bd40c3e1809e1fc1c4632..019dd5a66b883e6ac8d0f07abc2636768a373664 100644
+index a380f1f289dec841f98c3c8f39d58d8fffff7b8c..acca6ea4ddab9382c2511193cbd7cfe6771c733c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -210,6 +210,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0571-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0570-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
similarity index 95%
rename from patches/server/0571-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
rename to patches/server/0570-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 84b2615566..04cec82f15 100644
--- a/patches/server/0571-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0570-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 67584166891bf3e6a9b446d62d340bab265391ff..30a2b5f0d81552b1a78743516a7506f0a24bdc5e 100644
+index 7dad8382910b405cdd3345454721f9b72921a7f4..d64cbafda18cf6352a8d1347e4df0750df5bb0f0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2639,7 +2639,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -19,7 +19,7 @@ index 67584166891bf3e6a9b446d62d340bab265391ff..30a2b5f0d81552b1a78743516a7506f0
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6d9fcedd75f998c80734e03b88d0fc0214b762ec..90a5bbe75ab164abc97e882cc33a081b4a785c9c 100644
+index c8cff0054c7f5eaab3143e828e463e7ad913cd92..e27904551ca7f461026e62a2225c2607975a805f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -781,6 +781,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0572-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0571-Introduce-beacon-activation-deactivation-events.patch
similarity index 95%
rename from patches/server/0572-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0571-Introduce-beacon-activation-deactivation-events.patch
index d4053227a1..3a9a6e6ec5 100644
--- a/patches/server/0572-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0571-Introduce-beacon-activation-deactivation-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Introduce beacon activation/deactivation events
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 3a50fe20294048a1c818ae717a918bb1aed74dea..d3e2fd7fcfeec133a7baa0007c979c9e379c2f10 100644
+index 7205d0ea78af545108719c1373ba7946ede34ae6..83a5417d14e89c3e582e400543fe41f129bbbf3b 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -221,6 +221,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0573-Add-Channel-initialization-listeners.patch b/patches/server/0572-Add-Channel-initialization-listeners.patch
similarity index 98%
rename from patches/server/0573-Add-Channel-initialization-listeners.patch
rename to patches/server/0572-Add-Channel-initialization-listeners.patch
index 9ae80dfd00..79b5424dbb 100644
--- a/patches/server/0573-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0572-Add-Channel-initialization-listeners.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4
 +    COMPRESSION_DISABLED
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 2db208427447b94cdfdb22b38b6dc6697b1067bd..7e966e072476c085d41942a02a5f0f3ff1ac72bc 100644
+index 751d24a29cf3797234adbb1eb3b64b7fb261b24e..18228713d61cbc4b6fad881ace991e5e6c64e57d 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -717,6 +717,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0574-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0573-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0574-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0573-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0575-Add-more-WanderingTrader-API.patch b/patches/server/0574-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0575-Add-more-WanderingTrader-API.patch
rename to patches/server/0574-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0576-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0575-Add-EntityBlockStorage-clearEntities.patch
similarity index 94%
rename from patches/server/0576-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0575-Add-EntityBlockStorage-clearEntities.patch
index 2d4e55a930..35a0f1cab5 100644
--- a/patches/server/0576-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0575-Add-EntityBlockStorage-clearEntities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityBlockStorage#clearEntities()
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 5f2042d565974a5509aec8f744e091fe7c576c98..6c42f7e7fbd776a59fbd5aa3723752a130d3090f 100644
+index 949eda8e743df7ab83f18f15471a33e538aecdc5..d36373cb1fda4d4f2b41dd181306ea697a2fe7a8 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -139,6 +139,11 @@ public class BeehiveBlockEntity extends BlockEntity {
diff --git a/patches/server/0577-Entity-load-save-limit-per-chunk.patch b/patches/server/0576-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0577-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0576-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0578-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0577-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0578-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0577-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0579-Inventory-close.patch b/patches/server/0578-Inventory-close.patch
similarity index 100%
rename from patches/server/0579-Inventory-close.patch
rename to patches/server/0578-Inventory-close.patch
diff --git a/patches/server/0580-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0579-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0580-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0579-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0581-Add-basic-Datapack-API.patch b/patches/server/0580-Add-basic-Datapack-API.patch
similarity index 98%
rename from patches/server/0581-Add-basic-Datapack-API.patch
rename to patches/server/0580-Add-basic-Datapack-API.patch
index 068de223c9..bdb8a7c4ba 100644
--- a/patches/server/0581-Add-basic-Datapack-API.patch
+++ b/patches/server/0580-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index caa58d0a531a2541cff901e6eebeca0a74f5b3dd..565beb65968b3f7e187f3e5b59aa08e9ac34f2a0 100644
+index f192bd669e48865ae3ca7c79fd3c356d96556bd8..05868e37b03ac912ac902b105f3956f9351b1209 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -301,6 +301,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0582-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0581-Add-environment-variable-to-disable-server-gui.patch
similarity index 90%
rename from patches/server/0582-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0581-Add-environment-variable-to-disable-server-gui.patch
index 0a4e816455..691761d142 100644
--- a/patches/server/0582-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0581-Add-environment-variable-to-disable-server-gui.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add environment variable to disable server gui
 
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 1c64c81980739bbf09b71e1d1dd6d86dbf924e0d..bea88fee71f0233839ea240cb8fcfb70228e986e 100644
+index 7c8af0b369457098afb726fefb5087dbf159cb66..1cad3585ca122a465572b16d4ecbb7231e87c7de 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -326,6 +326,7 @@ public class Main {
diff --git a/patches/server/0583-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0582-Expand-PlayerGameModeChangeEvent.patch
similarity index 96%
rename from patches/server/0583-Expand-PlayerGameModeChangeEvent.patch
rename to patches/server/0582-Expand-PlayerGameModeChangeEvent.patch
index 41be876057..68f1f5ab96 100644
--- a/patches/server/0583-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0582-Expand-PlayerGameModeChangeEvent.patch
@@ -45,7 +45,7 @@ index aee8618e27b893b72931e925724dd683d2e6d2aa..f7c9127346261d83413ca03a1cdaa849
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8184aaff18d2372ae1de0fe1c53e63e1e6e3b2b0..68f6bb415d4b9624f147dc641543bce56bbbca09 100644
+index c9ac912c5cdd5d2aeb09154b224386fb73dfbc69..9f67542726e2b147564c4085e3b1a3cb6b6cba93 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1989,8 +1989,16 @@ public class ServerPlayer extends Player {
@@ -94,7 +94,7 @@ index 8184aaff18d2372ae1de0fe1c53e63e1e6e3b2b0..68f6bb415d4b9624f147dc641543bce5
      }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 49d29e4b3395d2ebea1ed13338f26c7cfbaa5f72..d04669c1d2434c1dbc617777b769e9004359f208 100644
+index 60c18af9253607bc51ecb9d23c23e652a9ba36e9..066e7e420b8eaa9733532a893855bcab14c22d0e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -73,21 +73,28 @@ public class ServerPlayerGameMode {
@@ -131,7 +131,7 @@ index 49d29e4b3395d2ebea1ed13338f26c7cfbaa5f72..d04669c1d2434c1dbc617777b769e900
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5c54f56a350def1c4c7180c05e853fe10d687f74..f1a684e8af0b05c68ccb16cdb9c0e236d1a5834a 100644
+index d64cbafda18cf6352a8d1347e4df0750df5bb0f0..dac6952492d0eaf6a83034f50dd7b6b7be5ab462 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2648,7 +2648,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -144,7 +144,7 @@ index 5c54f56a350def1c4c7180c05e853fe10d687f74..f1a684e8af0b05c68ccb16cdb9c0e236
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 298380e217f41f01d0818767a6d8f1da5a004037..b602c6dfece70580971baedd638e465e8e25bd02 100644
+index 8b23a8fbdc1db7043969ca0a36c59dffd92782d3..44a63ead4c00e82254de8d41a3711cf3e1c4f083 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1559,7 +1559,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0584-ItemStack-repair-check-API.patch b/patches/server/0583-ItemStack-repair-check-API.patch
similarity index 97%
rename from patches/server/0584-ItemStack-repair-check-API.patch
rename to patches/server/0583-ItemStack-repair-check-API.patch
index cbd86fa511..ea0bb0f0ae 100644
--- a/patches/server/0584-ItemStack-repair-check-API.patch
+++ b/patches/server/0583-ItemStack-repair-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 5c29720a702ceceeb0ac1b0f136c599a16290242..df3414179413cc7d2161ad9572777ded60324749 100644
+index 24a19034ff30020db9ef817b91400dbf25f87599..c0b9bc288b7ce65a5eafe2a75c120de0855a705b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -535,6 +535,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0585-More-Enchantment-API.patch b/patches/server/0584-More-Enchantment-API.patch
similarity index 98%
rename from patches/server/0585-More-Enchantment-API.patch
rename to patches/server/0584-More-Enchantment-API.patch
index 4c6a71ac3c..37ecbf7300 100644
--- a/patches/server/0585-More-Enchantment-API.patch
+++ b/patches/server/0584-More-Enchantment-API.patch
@@ -78,7 +78,7 @@ index 92922e8eef7fa4638a01f3cefc4c46a1451e40e7..92465b2a9f1483be76004c9f80a1fe15
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index d3f97ba1b03e050b10553ea536bc26a7bfc5b976..2ae8f8e092841f00c28efffc6516b8ec5981675c 100644
+index f874712c1569a30c825c1a904a3bcfbe1085200b..706c4b962837f0b881e7603ea736d364370ff36a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -952,5 +952,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0586-Move-range-check-for-block-placing-up.patch b/patches/server/0585-Move-range-check-for-block-placing-up.patch
similarity index 92%
rename from patches/server/0586-Move-range-check-for-block-placing-up.patch
rename to patches/server/0585-Move-range-check-for-block-placing-up.patch
index 313354cd90..2b62c07aaa 100644
--- a/patches/server/0586-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0585-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6a32c25dbef4d8d8b9db96a69ac8c6baf1d640a6..a16cd74540eca9aed47afe53af518335fcf92f33 100644
+index dac6952492d0eaf6a83034f50dd7b6b7be5ab462..e68ecbc56e05b088dddaf38368e5a4b6bd6a2b51 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1738,6 +1738,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0587-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0586-Fix-and-optimise-world-force-upgrading.patch
similarity index 99%
rename from patches/server/0587-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0586-Fix-and-optimise-world-force-upgrading.patch
index d04e1c7952..ac253f3a9b 100644
--- a/patches/server/0587-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0586-Fix-and-optimise-world-force-upgrading.patch
@@ -298,7 +298,7 @@ index d99217292a094713287cd597c9d7c01f04b9c7c7..748a5d8add76d4533fae2647c6e2439f
  
              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 4de1b09f4aa43ebefbae20014ec044bdd95bd191..a19d4d091c738daf80ed9b7c95d149c84180ba9e 100644
+index 15021a6791a5f76c3bb55e88a32b41d0c0ebaf58..c253fea302d86b4b91aa814f26082a678786608a 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -186,6 +186,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0588-Add-Mob-lookAt-API.patch b/patches/server/0587-Add-Mob-lookAt-API.patch
similarity index 97%
rename from patches/server/0588-Add-Mob-lookAt-API.patch
rename to patches/server/0587-Add-Mob-lookAt-API.patch
index 1215b07374..ddfa31827a 100644
--- a/patches/server/0588-Add-Mob-lookAt-API.patch
+++ b/patches/server/0587-Add-Mob-lookAt-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob#lookAt API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 74843d1fa344497d35f05d0b04f650edd1e0f3a1..6152f4d3d58f4b598d5bd92dbd7c5428c5ff8bc5 100644
+index 0ad9885f939bcb50026d50ed78b970a44772ceb8..fc83dde12957e575a4f1d4bee73c320bab95606f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -99,5 +99,53 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0589-Add-Unix-domain-socket-support.patch b/patches/server/0588-Add-Unix-domain-socket-support.patch
similarity index 96%
rename from patches/server/0589-Add-Unix-domain-socket-support.patch
rename to patches/server/0588-Add-Unix-domain-socket-support.patch
index 6f98ed7836..87ab600a7e 100644
--- a/patches/server/0589-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0588-Add-Unix-domain-socket-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Unix domain socket support
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c89430f2274473be72ebaf2243517092f8b93899..373b39ffefd57d0e737705c748ef13e450446405 100644
+index acca6ea4ddab9382c2511193cbd7cfe6771c733c..01535fc66fbf5fb99ee5705eb6db9b6552ba79b9 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -87,7 +87,7 @@ index 4414b12218a5693fecaa8c1e7c7676a58bcad324..c0ae3ccf4ddf14a4967c86548ec7305c
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a16cd74540eca9aed47afe53af518335fcf92f33..8b45e0fa29cd4bfb31e3d19df876da38567899f6 100644
+index e68ecbc56e05b088dddaf38368e5a4b6bd6a2b51..f97d5e0703d9ccb01f0614e4a410b1c9e2785388 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2471,6 +2471,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -103,7 +103,7 @@ index a16cd74540eca9aed47afe53af518335fcf92f33..8b45e0fa29cd4bfb31e3d19df876da38
      }
      // Spigot End
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 7fa8efd6b0cd7a7684d9bd4ff89d4955a69a8dd5..6a3be2fe851e14f2c9f8b38ad8d27fe36b5240d3 100644
+index e694fd535212105e9229a6047002fdde93aede79..a0b655f23176b034d302ea12261f7aac1176213d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -45,6 +45,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0590-Add-EntityInsideBlockEvent.patch b/patches/server/0589-Add-EntityInsideBlockEvent.patch
similarity index 98%
rename from patches/server/0590-Add-EntityInsideBlockEvent.patch
rename to patches/server/0589-Add-EntityInsideBlockEvent.patch
index adbefe7eae..97313bf8a3 100644
--- a/patches/server/0590-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0589-Add-EntityInsideBlockEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityInsideBlockEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
-index 0e56fbe8836020a0e36c0b6df01ae82d0aa8cf38..450f87ea7f4c5ef3b26a3c75bc7c8bd08a982075 100644
+index 91400c16b8bd8953265bf37ec1cd34ac95133e32..118403953629b405b9db78de1bf684b31289c499 100644
 --- a/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BaseFireBlock.java
 @@ -124,6 +124,7 @@ public abstract class BaseFireBlock extends Block {
@@ -101,7 +101,7 @@ index a7809bb2a468c7ad7ef7ba795afd93dd2a63cadc..aa029bee9839497e48ff639e286a0242
              world.destroyBlock(pos, true, entity);
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
-index 8eff69cb70ba094f9dcc0849f0436d4a3498fceb..9de6503f20396601a270e6eb0b66c40187fca690 100644
+index 17242c24d73c9ffb1c976a45925f85d1aa9e96b3..57e542d5c8b887acecedf76c08c8d4379d712c0f 100644
 --- a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
 @@ -51,6 +51,7 @@ public class DetectorRailBlock extends BaseRailBlock {
@@ -185,7 +185,7 @@ index 64247c3a81273277b95656885c78eca3e883ef13..18ca086e28f4295cb9303919222d7c8a
              // CraftBukkit start
              if (entity.mayInteract(world, pos)) {
 diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index 4e52e92846428b0d01635b90f3480b4a2c13a0b4..e6b762c70cbc08b20fc225b7731abd19c626369c 100644
+index 2a8f97d97ae7f268da920b5e3b9719743fa9a8e0..1b5cc5d6aa0b4313da980ce175c54145852d0db0 100644
 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
 @@ -90,6 +90,7 @@ public class NetherPortalBlock extends Block {
diff --git a/patches/server/0591-Attributes-API-for-item-defaults.patch b/patches/server/0590-Attributes-API-for-item-defaults.patch
similarity index 94%
rename from patches/server/0591-Attributes-API-for-item-defaults.patch
rename to patches/server/0590-Attributes-API-for-item-defaults.patch
index 0ffe27c99d..8c86dbc96b 100644
--- a/patches/server/0591-Attributes-API-for-item-defaults.patch
+++ b/patches/server/0590-Attributes-API-for-item-defaults.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index df3414179413cc7d2161ad9572777ded60324749..78778f010b458a8ca011ef636c2ce5f45feafa85 100644
+index c0b9bc288b7ce65a5eafe2a75c120de0855a705b..833e66adf24a80e6ba30eff7b6abbb0f613bfb0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -543,6 +543,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0592-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0591-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 97%
rename from patches/server/0592-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0591-Add-cause-to-Weather-ThunderChangeEvents.patch
index 51ca6281d8..ed480599ee 100644
--- a/patches/server/0592-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0591-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d6e8950af45578375b988158d98554c7d2f4f0a9..52fb8c8bb41b90c8c6f30551858fd496956cd41c 100644
+index b3d5d0dc5671f3c2bb41263ef52951da5c87ed74..41c11a6fa0d99d6c66bac35f6c9578d39f6d34ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -667,8 +667,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -95,7 +95,7 @@ index f5ac36fa54f3d3b39de103c95abb9ca3adfe8dda..59ba982dc96ce47e47399514e8f74d2b
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d240d9f5b558146c2de293a258914fd543975ca2..4ade6ad05a864e8065eb37a707dfbec392abd096 100644
+index d8e6dab184f2c049f777ebef87dbad141016580b..a2625d439fbed368a196ce71d77b8f3f1b141326 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1243,7 +1243,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0593-More-Lidded-Block-API.patch b/patches/server/0592-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0593-More-Lidded-Block-API.patch
rename to patches/server/0592-More-Lidded-Block-API.patch
diff --git a/patches/server/0594-Limit-item-frame-cursors-on-maps.patch b/patches/server/0593-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0594-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0593-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0595-Add-PlayerKickEvent-causes.patch b/patches/server/0594-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0595-Add-PlayerKickEvent-causes.patch
rename to patches/server/0594-Add-PlayerKickEvent-causes.patch
index 4152287106..5aa71148a3 100644
--- a/patches/server/0595-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0594-Add-PlayerKickEvent-causes.patch
@@ -209,7 +209,7 @@ index 825b8f541fe3f5e4cb53f465232c19398b8e66ab..3049377685ee4fe75f0c4b68eab39a91
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f6fea364fb32a337c322d2514d2c2436cb4e01c5..0c9707f8484f67ef7e70e55cb53550240b32b713 100644
+index f97d5e0703d9ccb01f0614e4a410b1c9e2785388..846a9595857d5e6faa0b9dbc566b52d41efaa9ed 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -342,7 +342,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -437,7 +437,7 @@ index f6fea364fb32a337c322d2514d2c2436cb4e01c5..0c9707f8484f67ef7e70e55cb5355024
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 777b2566767104103e3c6313a602e45730e5c4d9..a7f3963d2e1a9a6d3a5060be6c6694fc518b4f0f 100644
+index e27904551ca7f461026e62a2225c2607975a805f..c12ad5eabb7be2648f1a0314855664466b8665b0 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -684,7 +684,7 @@ public abstract class PlayerList {
@@ -491,7 +491,7 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b602c6dfece70580971baedd638e465e8e25bd02..c1e35f2a37b7078e484669d4bbb411df118e6d34 100644
+index 44a63ead4c00e82254de8d41a3711cf3e1c4f083..b4980d4f99aae9b2ab9d408e77e50bc50ca2d450 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -591,7 +591,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0596-Add-PufferFishStateChangeEvent.patch b/patches/server/0595-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0596-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0595-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0597-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0596-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0597-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0596-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0598-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0597-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0598-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0597-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0599-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0598-Add-option-to-fix-items-merging-through-walls.patch
similarity index 93%
rename from patches/server/0599-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0598-Add-option-to-fix-items-merging-through-walls.patch
index 2a731447f7..5675e044ec 100644
--- a/patches/server/0599-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0598-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 36ccb7701cc5f6648940256b62321034eff964c6..fc14a2eb464675f8fb0bff916992687adb4e3d25 100644
+index ffbeea768cbb09b6f828ef1a9394c9fe50e99914..c865456d58cf7c2077ac452b6a1e3db2b84047ef 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -276,6 +276,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0600-Add-BellRevealRaiderEvent.patch b/patches/server/0599-Add-BellRevealRaiderEvent.patch
similarity index 95%
rename from patches/server/0600-Add-BellRevealRaiderEvent.patch
rename to patches/server/0599-Add-BellRevealRaiderEvent.patch
index e2e0f2f576..b48704e5f5 100644
--- a/patches/server/0600-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0599-Add-BellRevealRaiderEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BellRevealRaiderEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
-index b446d6549922f3dabaaa05793d8ee3eb45566ac3..f692421ae50c07ffdcdd521b328ad950bdfaccb2 100644
+index d21f7e9712ac2d9088ce19d415e4ba7863d8cebf..aee8401e72228d0bbf89b940715f405353093585 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BellBlockEntity.java
 @@ -156,7 +156,7 @@ public class BellBlockEntity extends BlockEntity {
diff --git a/patches/server/0601-Fix-invulnerable-end-crystals.patch b/patches/server/0600-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0601-Fix-invulnerable-end-crystals.patch
rename to patches/server/0600-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0602-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0601-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0602-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0601-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0603-Fix-dangerous-end-portal-logic.patch b/patches/server/0602-Fix-dangerous-end-portal-logic.patch
similarity index 97%
rename from patches/server/0603-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0602-Fix-dangerous-end-portal-logic.patch
index e2eaf3938c..989ffee4c2 100644
--- a/patches/server/0603-Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/0602-Fix-dangerous-end-portal-logic.patch
@@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was
 designed to happen in the first place.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index df23dd16ecca29a569f89ddf7d755ab88557ab50..6c3cbfa88a0d8e48fadb85dd52d2678567243ee8 100644
+index b7a83aebbf0602a338a1510f678cf5037ff619b8..421da47d0de7d9a7ac2d8134487b642f7f59f98c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -491,6 +491,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0604-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0603-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0604-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0603-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0605-Make-item-validations-configurable.patch b/patches/server/0604-Make-item-validations-configurable.patch
similarity index 97%
rename from patches/server/0605-Make-item-validations-configurable.patch
rename to patches/server/0604-Make-item-validations-configurable.patch
index 29c71c0040..0cd64973b3 100644
--- a/patches/server/0605-Make-item-validations-configurable.patch
+++ b/patches/server/0604-Make-item-validations-configurable.patch
@@ -32,7 +32,7 @@ index 5e01357208fe52c1d270c68cb19029ea0f4057bb..6d85237b21650edf1d2dc71abaf0edbe
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 59d42dc66f23fc354a7ae4232beee42f1831645f..b7c0c9a40dac3e828f880ef928ca34206a898cb9 100644
+index ad3a289af7922bfc8d503eb1da93db72b31a03f6..8af7ef1c12a7826e607b15f1376311e9d38e7f31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -362,7 +362,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0606-Line-Of-Sight-Changes.patch b/patches/server/0605-Line-Of-Sight-Changes.patch
similarity index 95%
rename from patches/server/0606-Line-Of-Sight-Changes.patch
rename to patches/server/0605-Line-Of-Sight-Changes.patch
index 5748754b5c..4f7c11f540 100644
--- a/patches/server/0606-Line-Of-Sight-Changes.patch
+++ b/patches/server/0605-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 383c39ac381f9a86693abb7935b5b142b889d7be..e0524231da219dc4c7857ef7b39d4d018fa96ab2 100644
+index 1fd1d8abedeebf3f1d1e2465fa3792d404787c68..d3d2e971b36b5a240b598015edeb1166672fec89 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3606,7 +3606,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -45,7 +45,7 @@ index 9cd267f53505658d1c75187b662c4d9f68cd6bae..5f4958d28b6d79fe9e589e4794d9a7e8
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2ae8f8e092841f00c28efffc6516b8ec5981675c..1d94e8276b49de47cdd7570774c7bb13f757d966 100644
+index 706c4b962837f0b881e7603ea736d364370ff36a..7ff701f2421ca766cc35580f1c93b24f8c843f10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -586,6 +586,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0607-add-per-world-spawn-limits.patch b/patches/server/0606-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0607-add-per-world-spawn-limits.patch
rename to patches/server/0606-add-per-world-spawn-limits.patch
index 6feaced1d0..d6f7381f12 100644
--- a/patches/server/0607-add-per-world-spawn-limits.patch
+++ b/patches/server/0606-add-per-world-spawn-limits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add per world spawn limits
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c0d02f7d714f7116b34b5a735b5520cf3a5a4587..d6b402d0bae4d16932e059f1da59ac4523d974b8 100644
+index a2625d439fbed368a196ce71d77b8f3f1b141326..36bc006924599b8270c95e41e80dc51ad0262f61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -215,6 +215,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0608-Fix-potions-splash-events.patch b/patches/server/0607-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0608-Fix-potions-splash-events.patch
rename to patches/server/0607-Fix-potions-splash-events.patch
diff --git a/patches/server/0609-Add-more-LimitedRegion-API.patch b/patches/server/0608-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0609-Add-more-LimitedRegion-API.patch
rename to patches/server/0608-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0610-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0609-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 89%
rename from patches/server/0610-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0609-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 43a209bfc8..66ac32f567 100644
--- a/patches/server/0610-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0609-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ce9555b3ccb3c3caa85e549e05e471230ee27680..592f8a1277cba26bf07623782bf85110e959be8c 100644
+index 9f67542726e2b147564c4085e3b1a3cb6b6cba93..f3bca38d1529a3acbd8d99237efd75c2dee774a2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2391,7 +2391,7 @@ public class ServerPlayer extends Player {
@@ -18,7 +18,7 @@ index ce9555b3ccb3c3caa85e549e05e471230ee27680..592f8a1277cba26bf07623782bf85110
  
                  this.awardStat(Stats.DROP);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 482eaa28277eca1dbb25d1f3cf6c27328a8879de..00c40d6b61a293786ead2dd66daa6d213a341b23 100644
+index 617ede60a9e6634ae984a63ed4f32e845e5a571b..322c8c437b4c5fa4a9db038736f24da24d45d646 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -725,6 +725,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0611-Missing-Entity-API.patch b/patches/server/0610-Missing-Entity-API.patch
similarity index 99%
rename from patches/server/0611-Missing-Entity-API.patch
rename to patches/server/0610-Missing-Entity-API.patch
index af2725df07..6f246f2306 100644
--- a/patches/server/0611-Missing-Entity-API.patch
+++ b/patches/server/0610-Missing-Entity-API.patch
@@ -121,7 +121,7 @@ index 39ed3ca76d6b64ef3917280ec822721cc02afada..86b437836cb4b1f6e8ca9acd5f1f93b9
          this.leader = null;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index c6235be64d6fb234734dd816052695ac44aea3ae..c534589762b1361bae7c446dfec8dbbf542485fb 100644
+index 07ecc038a1000581335b8d18c094298f2f3b100f..91ea960ba223bae42655c581b9b6c0981f333c9b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -553,11 +553,13 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -212,7 +212,7 @@ index 71a08510a928d4570822282bb31f14013ec3834a..4aeab90e778629c355189dfe79c39c4b
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index a13a1725356ca4430f1f0a6d121fc08679de62db..7a990fb47f39da00026d3005d5bb11d3abd14026 100644
+index 8fc65fd7347340a89dba0b9839497aadfcc67d79..56cc6ecf7f95687db7c7c062b4ee979bfe49844b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 @@ -695,6 +695,15 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -282,7 +282,7 @@ index 14b09adeb9222600c24f3fb846ea8aee467952e6..8241dbf7591b2f56b25cdc3ce9009c71
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index a859f02074c698c68713568ed99089e33f38ccca..6d29fef4de10c4b75be591046ff1f8e3c24bb9bb 100644
+index d259d7b8f7380763e3976f5f20bc01f06ce6901c..2a8ed27101ff78542db120ff183ff33276fb832a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -457,6 +457,16 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -841,7 +841,7 @@ index 17f5684cba9d3ed22d9925d1951520cc4751dfe2..3a3563a1bdbc0d84d973b3a04b50b78b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 6152f4d3d58f4b598d5bd92dbd7c5428c5ff8bc5..a5d3845acc607f640dace05a85f0089611c7d23a 100644
+index fc83dde12957e575a4f1d4bee73c320bab95606f..ae430c36ed433e337dd92f197f1717fbf00ac0e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -148,4 +148,16 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@@ -1237,7 +1237,7 @@ index 1cfbe9c476f4a254edf3edf4b70696bbaba78558..e9ec3455eabc473e104b5342a615a38c
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
-index e2a0c11867abee6add8775259c54f2052de7b1ad..fd968881eeec6dc5bdf90decc23a2bfc619c410d 100644
+index e2a0c11867abee6add8775259c54f2052de7b1ad..3aa23d9f22d5cd22231293fd7d1ca4cb79eb7cb3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
 @@ -60,13 +60,20 @@ public class CraftVillagerZombie extends CraftZombie implements ZombieVillager {
@@ -1250,7 +1250,7 @@ index e2a0c11867abee6add8775259c54f2052de7b1ad..fd968881eeec6dc5bdf90decc23a2bfc
 +
 +    @Override
 +    public void setConversionTime(int time, boolean broadcastEntityEvent) {
-+    // Paper stop - missing entity behaviour api - converting without entity event
++    // Paper end - missing entity behaviour api - converting without entity event
          if (time < 0) {
              this.getHandle().villagerConversionTime = -1;
              this.getHandle().getEntityData().set(net.minecraft.world.entity.monster.ZombieVillager.DATA_CONVERTING_ID, false);
diff --git a/patches/server/0612-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0611-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 92%
rename from patches/server/0612-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0611-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 1b9070b0da..8c8bc235d1 100644
--- a/patches/server/0612-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0611-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 69f3278b55d6e3778aa9bad6be10870964db5bf9..1502961f7be651e608759f13be8e143c0df12ab5 100644
+index 846a9595857d5e6faa0b9dbc566b52d41efaa9ed..2a24a9c95c3701ff11aadaab45c47c60fde7bcab 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1096,7 +1096,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0613-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0612-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0613-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0612-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0614-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0613-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 94%
rename from patches/server/0614-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0613-Use-getChunkIfLoadedImmediately-in-places.patch
index c329d37f04..bd83e1eeff 100644
--- a/patches/server/0614-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0613-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 52fb8c8bb41b90c8c6f30551858fd496956cd41c..9eb5d6623c10ad88ca0deb7bd92a0cc085aa78b7 100644
+index 41c11a6fa0d99d6c66bac35f6c9578d39f6d34ad..813acbb57271e6568d35f2cbf9a637c44603aa95 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -224,7 +224,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -21,7 +21,7 @@ index 52fb8c8bb41b90c8c6f30551858fd496956cd41c..9eb5d6623c10ad88ca0deb7bd92a0cc0
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a19d4d091c738daf80ed9b7c95d149c84180ba9e..4b0bba18ba997f9dc3f0bd6e67af3538106891dc 100644
+index c253fea302d86b4b91aa814f26082a678786608a..d538dc2f15b3b1553109df99f50457ee79732e43 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -203,6 +203,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0615-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0614-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 98%
rename from patches/server/0615-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0614-Fix-commands-from-signs-not-firing-command-events.patch
index d2492dc891..5303dcde05 100644
--- a/patches/server/0615-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0614-Fix-commands-from-signs-not-firing-command-events.patch
@@ -58,7 +58,7 @@ index 0000000000000000000000000000000000000000..01a2bc1feec808790bb93618ce46adb9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 1a54db9f8b2fb3071e79ec26c49242b528b8cd9e..393e6e5fb2c901cdf369cfe5bcde454dee2b1b0d 100644
+index 9939cad5af2d7873f188f18978029663a8d785de..c79a80428961b0941d4f6ed31d641cbf0e6a7203 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -273,7 +273,17 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0616-Add-PlayerArmSwingEvent.patch b/patches/server/0615-Add-PlayerArmSwingEvent.patch
similarity index 93%
rename from patches/server/0616-Add-PlayerArmSwingEvent.patch
rename to patches/server/0615-Add-PlayerArmSwingEvent.patch
index 6ddfa486f1..c399b1534e 100644
--- a/patches/server/0616-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0615-Add-PlayerArmSwingEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 60be2ae945514aaec70a2350df2044df53ed3224..c477c6c47d6b707fcee671152bfb516eeea2cebd 100644
+index 2a24a9c95c3701ff11aadaab45c47c60fde7bcab..b4d3420c58fcc03c624c5d2e2f73ac911ce00f0d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2328,7 +2328,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0617-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0616-Fix-kick-event-leave-message-not-being-sent.patch
similarity index 96%
rename from patches/server/0617-Fix-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0616-Fix-kick-event-leave-message-not-being-sent.patch
index 1e7706bbb1..34c5fb92d7 100644
--- a/patches/server/0617-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0616-Fix-kick-event-leave-message-not-being-sent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 61d439af863603c669c45f38045dbad9068f285a..ade79a794a7485e0141a430d62236daf1e566b21 100644
+index f3bca38d1529a3acbd8d99237efd75c2dee774a2..08f675754e7ac5574cdd4e6c3dab7a5a9890c457 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -273,7 +273,6 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index 3049377685ee4fe75f0c4b68eab39a916ac20785..f5f2d65d2e02b0d79352585d9d4ef588
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5dfebe60caa47af3bab4a667ca5d0b6438367161..fe8ba3890d5b21273aca68777de56d7f7f644c0d 100644
+index b4d3420c58fcc03c624c5d2e2f73ac911ce00f0d..bc3c72f66050460affcaeec272d4bbe3f49a4e73 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1882,6 +1882,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -96,7 +96,7 @@ index 5dfebe60caa47af3bab4a667ca5d0b6438367161..fe8ba3890d5b21273aca68777de56d7f
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0f04b29ff000c0b0f0692eecf26675f5520d9e07..3f8f7d7db41b73d0d449b653d3ba55a097c00566 100644
+index c12ad5eabb7be2648f1a0314855664466b8665b0..c143b9eb97920945ea36c8f0f36db6086961746c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -570,6 +570,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0618-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0617-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 97%
rename from patches/server/0618-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0617-Add-config-for-mobs-immune-to-default-effects.patch
index a96216dd14..8cd0fcdc37 100644
--- a/patches/server/0618-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0617-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e0524231da219dc4c7857ef7b39d4d018fa96ab2..6518d7972f7902b3f7b65d7e5f6629491b531f22 100644
+index d3d2e971b36b5a240b598015edeb1166672fec89..8673e4eff6bd66b5cdf0fc6101aa9ff9c226dbfe 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0619-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0618-Don-t-apply-cramming-damage-to-players.patch
similarity index 94%
rename from patches/server/0619-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0618-Don-t-apply-cramming-damage-to-players.patch
index 6d554a71a1..d969fc1f43 100644
--- a/patches/server/0619-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0618-Don-t-apply-cramming-damage-to-players.patch
@@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed,
 For those who really want it a config option is provided.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c9842d0641b43c10b857ccc89f90b167150f359d..68c9e9e6185abdff5b7239002f4005417079c083 100644
+index 08f675754e7ac5574cdd4e6c3dab7a5a9890c457..6284e567d5247b18dba06bc9525c877882fe8d88 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,6 +95,7 @@ import net.minecraft.util.Mth;
diff --git a/patches/server/0620-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0619-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0620-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0619-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0621-Add-missing-forceDrop-toggles.patch b/patches/server/0620-Add-missing-forceDrop-toggles.patch
similarity index 98%
rename from patches/server/0621-Add-missing-forceDrop-toggles.patch
rename to patches/server/0620-Add-missing-forceDrop-toggles.patch
index 4435a4ef01..4df953f191 100644
--- a/patches/server/0621-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0620-Add-missing-forceDrop-toggles.patch
@@ -19,7 +19,7 @@ index 012586360a48369dad243dbb8892579a1dbcca90..edeb1899996e53d276d7481e8eddee65
  
              }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 27e1ed14f2ae4f7922c7c3bc1ac21156bafcb0ba..eb61d539fcf15dfc51b3ea52c232a0c7ef4f1ca9 100644
+index 48df7de02e0765bfe62ae1b8a4c0029743430221..11694f103ebc522c2ad6eb6d494d39cc31ea3107 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -534,7 +534,9 @@ public class Panda extends Animal {
diff --git a/patches/server/0622-Stinger-API.patch b/patches/server/0621-Stinger-API.patch
similarity index 100%
rename from patches/server/0622-Stinger-API.patch
rename to patches/server/0621-Stinger-API.patch
diff --git a/patches/server/0623-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0622-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 95%
rename from patches/server/0623-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0622-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
index d2553b1897..926fba2c7f 100644
--- a/patches/server/0623-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
+++ b/patches/server/0622-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix incosistency issue with empty map items in CB
 
 
 diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
-index d4b4da03dcd98336a15eaa045d6b0ce361b15b76..797415866a7f182d804f6b8e57ceb07a6ac2a20a 100644
+index f643d3c06bd8fc37f6c571a19d5691694b0ce8d3..d8dd99ec8bf7444c5a3c426db3a9c13e334dc0ff 100644
 --- a/src/main/java/net/minecraft/world/item/MapItem.java
 +++ b/src/main/java/net/minecraft/world/item/MapItem.java
 @@ -69,7 +69,7 @@ public class MapItem extends ComplexItem {
diff --git a/patches/server/0624-Add-System.out-err-catcher.patch b/patches/server/0623-Add-System.out-err-catcher.patch
similarity index 98%
rename from patches/server/0624-Add-System.out-err-catcher.patch
rename to patches/server/0623-Add-System.out-err-catcher.patch
index 046d8fa2ab..a3cbc7f6c2 100644
--- a/patches/server/0624-Add-System.out-err-catcher.patch
+++ b/patches/server/0623-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b28212bbf7678d73282d160bfeb0d246e93a8492..f4b1d6ed1e1065e6be175b7b68e29517ebfa2da8 100644
+index 08d43545262e2be74566c270f3dd2c600b773616..775e40dc356406cf289807abb83cda5ca186563f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -303,6 +303,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0625-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0624-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0625-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0624-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0626-Improve-boat-collision-performance.patch b/patches/server/0625-Improve-boat-collision-performance.patch
similarity index 95%
rename from patches/server/0626-Improve-boat-collision-performance.patch
rename to patches/server/0625-Improve-boat-collision-performance.patch
index 698493e81a..18d0eec230 100644
--- a/patches/server/0626-Improve-boat-collision-performance.patch
+++ b/patches/server/0625-Improve-boat-collision-performance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve boat collision performance
 
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 90f5e7d36719dc9b464dd6ba0335da035bab29d3..006a7876a0c8e1180dada6694992f596948be53b 100644
+index 765e4bc00a0526aab6e263dae7233f63f7f31498..eb80741b313daab36dcfeb1079eb0fbb19614904 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -121,6 +121,7 @@ public class Util {
@@ -17,7 +17,7 @@ index 90f5e7d36719dc9b464dd6ba0335da035bab29d3..006a7876a0c8e1180dada6694992f596
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cfac6c239189c322fba11c86230f3ad34e0eae67..0292ca014fd8319fe9f5e7a1465ee5c112ef6515 100644
+index 8673e4eff6bd66b5cdf0fc6101aa9ff9c226dbfe..36ffb7f61e2e29a67c069336f251172130dda207 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1413,7 +1413,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0627-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0626-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 93%
rename from patches/server/0627-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0626-Prevent-AFK-kick-while-watching-end-credits.patch
index 3247d8d77b..607a60728c 100644
--- a/patches/server/0627-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0626-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d3d1195522e50b00663b274f68fae1cc5ed9d021..a1cb119e52005e09138930f5a07f919015402424 100644
+index bc3c72f66050460affcaeec272d4bbe3f49a4e73..0e92cf3206b6b694f6dca5c244ec30826ba4db9e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -390,7 +390,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0628-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0627-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0628-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0627-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0629-Add-PlayerSetSpawnEvent.patch b/patches/server/0628-Add-PlayerSetSpawnEvent.patch
similarity index 97%
rename from patches/server/0629-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0628-Add-PlayerSetSpawnEvent.patch
index 9fbf8b329f..2dfc85f43b 100644
--- a/patches/server/0629-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0628-Add-PlayerSetSpawnEvent.patch
@@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 68c9e9e6185abdff5b7239002f4005417079c083..36e01f491565e70601464d957143c21aba17dfa1 100644
+index 6284e567d5247b18dba06bc9525c877882fe8d88..1951cecbd2ffe70077f0894cab4697ecbc2369c3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1356,7 +1356,7 @@ public class ServerPlayer extends Player {
@@ -154,7 +154,7 @@ index 68c9e9e6185abdff5b7239002f4005417079c083..36e01f491565e70601464d957143c21a
  
      public SectionPos getLastSectionPos() {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2a1b64e5d30cde7b2b2696a6cf5f3163071ab2d6..1bbcae2411205799b00dba7ee82c3ceb461289cf 100644
+index c143b9eb97920945ea36c8f0f36db6086961746c..6e56b55329e31682d3052949110762e8f9fc96da 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -872,7 +872,7 @@ public abstract class PlayerList {
@@ -187,7 +187,7 @@ index ecaa7f0b2bf795f16187f11fa27f6d5d435ccbfe..acd5ec218b8d4c096f44ae2eec1379ee
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f1b52cccb8bb82def47c6dee8a63d51a095c112b..4475a59e867b0e2f64cdac41911af0e7fe721ad2 100644
+index b4980d4f99aae9b2ab9d408e77e50bc50ca2d450..149906e1ab9d1cf2d186fbe4a47ac258d7802dee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1318,9 +1318,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0630-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0629-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0630-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0629-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0631-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0630-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0631-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0630-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0632-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0631-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0632-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0631-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0633-Add-EntityDamageItemEvent.patch b/patches/server/0632-Add-EntityDamageItemEvent.patch
similarity index 97%
rename from patches/server/0633-Add-EntityDamageItemEvent.patch
rename to patches/server/0632-Add-EntityDamageItemEvent.patch
index b98f07d51d..66964564a3 100644
--- a/patches/server/0633-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0632-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 761a46c21aaddcd43b4c33f477658605648127e9..f23c1695840553ae14e49310b3708a801b5a0f8d 100644
+index b4f2b75960674e81c8189dc908523c56ae2e5079..4624fc8eb4a5e71d7874d25ca0a25975f65a6919 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -622,7 +622,7 @@ public final class ItemStack {
diff --git a/patches/server/0634-Optimize-indirect-passenger-iteration.patch b/patches/server/0633-Optimize-indirect-passenger-iteration.patch
similarity index 96%
rename from patches/server/0634-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0633-Optimize-indirect-passenger-iteration.patch
index d37ac5dd2c..2b01ec35e7 100644
--- a/patches/server/0634-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0633-Optimize-indirect-passenger-iteration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6c3cbfa88a0d8e48fadb85dd52d2678567243ee8..c24baad4eabcb538a3b30970364632a28a80e06b 100644
+index 421da47d0de7d9a7ac2d8134487b642f7f59f98c..2fe7c03eea6cff2b44fb887711168871b5f487bd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3923,20 +3923,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0635-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0634-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0635-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0634-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0636-Clear-bucket-NBT-after-dispense.patch b/patches/server/0635-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0636-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0635-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0637-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0636-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0637-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0636-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0638-Add-BlockBreakBlockEvent.patch b/patches/server/0637-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0638-Add-BlockBreakBlockEvent.patch
rename to patches/server/0637-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0639-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0638-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0639-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0638-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0640-More-CommandBlock-API.patch b/patches/server/0639-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0640-More-CommandBlock-API.patch
rename to patches/server/0639-More-CommandBlock-API.patch
diff --git a/patches/server/0641-Add-missing-team-sidebar-display-slots.patch b/patches/server/0640-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0641-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0640-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0642-Add-back-EntityPortalExitEvent.patch b/patches/server/0641-Add-back-EntityPortalExitEvent.patch
similarity index 97%
rename from patches/server/0642-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0641-Add-back-EntityPortalExitEvent.patch
index 02d6197f1c..5e4b6f65c9 100644
--- a/patches/server/0642-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0641-Add-back-EntityPortalExitEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c24baad4eabcb538a3b30970364632a28a80e06b..a151f56038ab605116bf576a24e7baf10cc414e8 100644
+index 2fe7c03eea6cff2b44fb887711168871b5f487bd..ef5782537ac65ebe113046c4e292a27b1e24510a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3372,6 +3372,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0643-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0642-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 94%
rename from patches/server/0643-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0642-Add-methods-to-find-targets-for-lightning-strikes.patch
index 66feb07413..74272e17b0 100644
--- a/patches/server/0643-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0642-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -7,7 +7,7 @@ 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 9eb5d6623c10ad88ca0deb7bd92a0cc085aa78b7..249e7cfbb877a0a625ccde306994442669e257e7 100644
+index 813acbb57271e6568d35f2cbf9a637c44603aa95..290c9e34e945ce316908fa7e0dee0bb51bf3ef18 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -993,6 +993,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -31,7 +31,7 @@ index 9eb5d6623c10ad88ca0deb7bd92a0cc085aa78b7..249e7cfbb877a0a625ccde3069944426
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index dbd39858661773fcfb8e22fc984525b9de133c9f..9d80c0c312990a3eb6cc9819eb926157df98cc9c 100644
+index 36bc006924599b8270c95e41e80dc51ad0262f61..e3f790c50881f5b0d47ff1b68912d5e85c9b91f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0644-Get-entity-default-attributes.patch b/patches/server/0643-Get-entity-default-attributes.patch
similarity index 98%
rename from patches/server/0644-Get-entity-default-attributes.patch
rename to patches/server/0643-Get-entity-default-attributes.patch
index 0bd7acf63f..a496ab0535 100644
--- a/patches/server/0644-Get-entity-default-attributes.patch
+++ b/patches/server/0643-Get-entity-default-attributes.patch
@@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..68044b8439c302114240d0ae4da93ab3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 78778f010b458a8ca011ef636c2ce5f45feafa85..bff45bb3e7e8157070a56ddffe983953e7938f3b 100644
+index 833e66adf24a80e6ba30eff7b6abbb0f613bfb0d..ef6bf5026a8b5bbd65968faa33401bd98f10fe4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -560,6 +560,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0645-Left-handed-API.patch b/patches/server/0644-Left-handed-API.patch
similarity index 90%
rename from patches/server/0645-Left-handed-API.patch
rename to patches/server/0644-Left-handed-API.patch
index 41836756f3..d59098ccdf 100644
--- a/patches/server/0645-Left-handed-API.patch
+++ b/patches/server/0644-Left-handed-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Left handed API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index a5d3845acc607f640dace05a85f0089611c7d23a..b8d16e2e91e3bf1c004f887bf37e5502938fdd1d 100644
+index ae430c36ed433e337dd92f197f1717fbf00ac0e1..ad293ad9d5dcd7836a4fa29b4b687346e3ae516c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -147,6 +147,16 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0646-Add-more-advancement-API.patch b/patches/server/0645-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0646-Add-more-advancement-API.patch
rename to patches/server/0645-Add-more-advancement-API.patch
diff --git a/patches/server/0647-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0646-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0647-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0646-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0648-Add-critical-damage-API.patch b/patches/server/0647-Add-critical-damage-API.patch
similarity index 97%
rename from patches/server/0648-Add-critical-damage-API.patch
rename to patches/server/0647-Add-critical-damage-API.patch
index 05c26d3cc0..d905b8772d 100644
--- a/patches/server/0648-Add-critical-damage-API.patch
+++ b/patches/server/0647-Add-critical-damage-API.patch
@@ -28,7 +28,7 @@ index df8c88bfa749e02f633350446101dcce05db7ac1..ed1277fad60992344b94f8a939febaca
 +    // Paper end - add critical damage API
  }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 00c40d6b61a293786ead2dd66daa6d213a341b23..e90bfeca52d74d147616773640517995d98e19bc 100644
+index 322c8c437b4c5fa4a9db038736f24da24d45d646..30b603284e5fbc48ba7bc3cc6a69b8a4b94851a1 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1263,7 +1263,7 @@ public abstract class Player extends LivingEntity {
@@ -55,7 +55,7 @@ index 00c40d6b61a293786ead2dd66daa6d213a341b23..e90bfeca52d74d147616773640517995
                                      // CraftBukkit start - Only apply knockback if the damage hits
 -                                    if (entityliving.hurt(this.damageSources().playerAttack(this).sweep(), f4)) {
 +                                    if (entityliving.hurt(this.damageSources().playerAttack(this).sweep().critical(flag2), f4)) { // Paper - add critical damage API
-                                     entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Pa
+                                     entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper - Add EntityKnockbackByEntityEvent and EntityPushedByEntityAttackEvent
                                      }
                                      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
@@ -71,7 +71,7 @@ index 004c130fc03dc01ef75fabdb4ef1ef711e33cb95..ae4319c2532855315bc45995a39d7eb9
          int k = entity.getRemainingFireTicks();
          boolean flag1 = entity.getType().is(EntityTypeTags.DEFLECTS_ARROWS);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8a7c90014beb5e044abc1fd6f8832bb3c78ffb12..1894fddf867df210d041307d72118eacde9fe5cb 100644
+index 2da51dc36e21e45ecc3cbbe357947f8359e538eb..6423af82fbae4267d06229fde2390bfb5569137a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1043,7 +1043,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0649-Fix-issues-with-mob-conversion.patch b/patches/server/0648-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0649-Fix-issues-with-mob-conversion.patch
rename to patches/server/0648-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0650-Add-isCollidable-methods-to-various-places.patch b/patches/server/0649-Add-isCollidable-methods-to-various-places.patch
similarity index 96%
rename from patches/server/0650-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0649-Add-isCollidable-methods-to-various-places.patch
index 9623c46599..2f54e71398 100644
--- a/patches/server/0650-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0649-Add-isCollidable-methods-to-various-places.patch
@@ -39,7 +39,7 @@ index 928a301627134b49915b0ceaeabb7dc350605dc2..08716e757b2e100f7bc47a046f02db66
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index bff45bb3e7e8157070a56ddffe983953e7938f3b..580b6c134743c35d9eb1d98a2d038d1c8f10054c 100644
+index ef6bf5026a8b5bbd65968faa33401bd98f10fe4c..df57a3be211017e2ba7bd28571adaea59d0be969 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -572,6 +572,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0651-Goat-ram-API.patch b/patches/server/0650-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0651-Goat-ram-API.patch
rename to patches/server/0650-Goat-ram-API.patch
diff --git a/patches/server/0652-Add-API-for-resetting-a-single-score.patch b/patches/server/0651-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0652-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0651-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0653-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0652-Add-Raw-Byte-Entity-Serialization.patch
similarity index 98%
rename from patches/server/0653-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0652-Add-Raw-Byte-Entity-Serialization.patch
index 2291299aaf..3bf88af036 100644
--- a/patches/server/0653-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0652-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a151f56038ab605116bf576a24e7baf10cc414e8..42eb530571c9f7854888e7f3f6a63ef10dba1b4e 100644
+index ef5782537ac65ebe113046c4e292a27b1e24510a..66df50658958c7ad799fbe9d2cdb676a90d8bb4e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2158,6 +2158,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0654-Vanilla-command-permission-fixes.patch b/patches/server/0653-Vanilla-command-permission-fixes.patch
similarity index 97%
rename from patches/server/0654-Vanilla-command-permission-fixes.patch
rename to patches/server/0653-Vanilla-command-permission-fixes.patch
index 5c126666ab..c033d07434 100644
--- a/patches/server/0654-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0653-Vanilla-command-permission-fixes.patch
@@ -33,7 +33,7 @@ index 899008b2980d13f1be6280cd8cb959c53a29bebf..d5f7da3502575f6847f3c22ab0e94284
      private RedirectModifier<S> modifier = null;
      private boolean forks;
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 565685d0f41311bc2281d11ee9d751bf4d4c93a3..2bad211edde8b494cae726915a332217ae232855 100644
+index 7802e72152628d1e853e5494ec1061fe01fefa5f..e20f4e896b8c059b2d614e74d0c38e418936db6c 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -257,6 +257,13 @@ public class Commands {
diff --git a/patches/server/0655-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0654-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 86%
rename from patches/server/0655-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0654-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 620d79337a..3868e7c916 100644
--- a/patches/server/0655-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0654-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/
 state desync POV because the TE is getting unloaded anyways.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 249e7cfbb877a0a625ccde306994442669e257e7..2b4afc35c9e57977972fe0ddab0ae753f13d8828 100644
+index 290c9e34e945ce316908fa7e0dee0bb51bf3ef18..705c427097477cad2d75f0f1d7ee06f3311e759b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1558,9 +1558,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -20,15 +20,15 @@ index 249e7cfbb877a0a625ccde306994442669e257e7..2b4afc35c9e57977972fe0ddab0ae753
 +                // chests for example can apply physics to the world
 +                // so instead we just change the active container and call the event
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((net.minecraft.world.Container) tileentity).getViewers())) {
--                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
-+                    ((org.bukkit.craftbukkit.entity.CraftHumanEntity)h).getHandle().closeUnloadedInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
+-                    h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper - Inventory close reason
++                    ((org.bukkit.craftbukkit.entity.CraftHumanEntity) h).getHandle().closeUnloadedInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper - Inventory close reason
                  }
 +                // Paper end - this area looks like it can load chunks, change the behavior
              }
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 09ee06b89f2bda0245c2858ffc19a5893494d24a..f01965be7ae893de26dbf0d57887cd66e71418f6 100644
+index 1951cecbd2ffe70077f0894cab4697ecbc2369c3..8d657cdb516b6b439b29100c48cccd5b27178fe9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1630,6 +1630,18 @@ public class ServerPlayer extends Player {
@@ -51,13 +51,13 @@ index 09ee06b89f2bda0245c2858ffc19a5893494d24a..f01965be7ae893de26dbf0d57887cd66
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 09e1790f3370f723d8da83097bec433c68eec87d..b90db32be29b198376e696506e1c3ea4cd67c301 100644
+index 30b603284e5fbc48ba7bc3cc6a69b8a4b94851a1..80caada014bae0571a5aa6aa67d9bb87f89db17f 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -508,6 +508,11 @@ public abstract class Player extends LivingEntity {
          this.containerMenu = this.inventoryMenu;
      }
-     // Paper end
+     // Paper end - Inventory close reason
 +    // Paper start - special close for unloaded inventory
 +    public void closeUnloadedInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason reason) {
 +        this.containerMenu = this.inventoryMenu;
diff --git a/patches/server/0656-Fix-GameProfileCache-concurrency.patch b/patches/server/0655-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0656-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0655-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0657-Improve-and-expand-AsyncCatcher.patch b/patches/server/0656-Improve-and-expand-AsyncCatcher.patch
similarity index 97%
rename from patches/server/0657-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0656-Improve-and-expand-AsyncCatcher.patch
index 7c1452f4d8..54bb833e5e 100644
--- a/patches/server/0657-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0656-Improve-and-expand-AsyncCatcher.patch
@@ -17,7 +17,7 @@ Async catch modifications to critical entity state
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f111ab02d91e936284fc183969117c172127a000..db12ed933d09090f45ff2aa1045d2990901b27a2 100644
+index 0e92cf3206b6b694f6dca5c244ec30826ba4db9e..4a6a8de70c65ecae0a53df69881326b9b953b9e8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1570,6 +1570,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -29,7 +29,7 @@ index f111ab02d91e936284fc183969117c172127a000..db12ed933d09090f45ff2aa1045d2990
          if (player.isRemoved()) {
              LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName());
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 48d5f1522e1bfda886e1791055bbddab510d464b..93c9fae42a1115f4442e8633946dc0ebde4606bb 100644
+index 36ffb7f61e2e29a67c069336f251172130dda207..dfc62f5cfad3e0e0f5f25c614055426bbfcd5327 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1118,7 +1118,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -166,7 +166,7 @@ index bbbf6dd8e566ecdca8794e3b03765fe7e426a2bd..66ab901956ca394c251c420338643d39
                  PersistentEntitySectionManager.LOGGER.warn("Entity {} wasn't found in section {} (destroying due to {})", new Object[]{this.entity, SectionPos.of(this.currentSectionKey), reason});
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9fd6e12aedc670fcb3523e8093e922bf385723d7..189c0ab39f56e7a6d92aa6ee24f29a232b446cdf 100644
+index e3f790c50881f5b0d47ff1b68912d5e85c9b91f9..00b7ce38044ac08133d06472efc6eb92b56efad2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1803,6 +1803,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0658-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0657-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 98%
rename from patches/server/0658-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0657-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 85903424e3..481332ab26 100644
--- a/patches/server/0658-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0657-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -257,7 +257,7 @@ index 0000000000000000000000000000000000000000..d3b39d88a72ca25057fd8574d32f28db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 4aa2a174400fe879501571c175d5ac4d09ac7de3..6fbd136f4bbfa34ef88a7743c63a542ed0cc2c02 100644
+index db22e35d19597488a08ba3cd710ced7da77f8b5e..a9b452be0454082f7d62f19fbac574113ed2db64 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -190,6 +190,16 @@ public final class NaturalSpawner {
@@ -294,7 +294,7 @@ index 775e40dc356406cf289807abb83cda5ca186563f..b603541d56c7cee7aff8d3448d18c76c
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 189c0ab39f56e7a6d92aa6ee24f29a232b446cdf..3dc6f7f376f845ec36663d147a2e08ecc077700a 100644
+index 00b7ce38044ac08133d06472efc6eb92b56efad2..3e25f22ffd656cded58634049d48f19d97694496 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1761,9 +1761,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0659-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0658-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0659-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0658-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0660-Optimise-general-POI-access.patch b/patches/server/0659-Optimise-general-POI-access.patch
similarity index 99%
rename from patches/server/0660-Optimise-general-POI-access.patch
rename to patches/server/0659-Optimise-general-POI-access.patch
index 332786d627..a92e0b7659 100644
--- a/patches/server/0660-Optimise-general-POI-access.patch
+++ b/patches/server/0659-Optimise-general-POI-access.patch
@@ -996,7 +996,7 @@ index 54db563d80bbabd87a2be6f5ead92b482ac07b10..4aac1979cf57300825a999c876fcf24d
              return Optional.empty();
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
-index 08325c055b04355089d75031522c7b74d83c6cca..42212d4533ce25d1cfcf4c58f1fc88791d546cff 100644
+index f610ece91a04bd321fdd75814a7b40e622c2bd1e..21822f334a54b7270ea43fa6d3d0829ac0f9f6b9 100644
 --- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
 +++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
 @@ -51,18 +51,39 @@ public class PortalForcer {
diff --git a/patches/server/0661-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0660-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0661-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0660-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0662-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0661-Manually-inline-methods-in-BlockPosition.patch
similarity index 92%
rename from patches/server/0662-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0661-Manually-inline-methods-in-BlockPosition.patch
index 77789c472c..e07cb082f4 100644
--- a/patches/server/0662-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0661-Manually-inline-methods-in-BlockPosition.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Manually inline methods in BlockPosition
 
 
 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 2e5678554313d0e14d2d855a24c71acce1e1a155..0e75ee7dbb601b795cdbf6079992b4dbfc3cd4ce 100644
+index 50ba9e57d60df7308f7445540b3f412a0edf6065..e17fa30966dea2836fb791becd032fc7d5cc2611 100644
 --- a/src/main/java/net/minecraft/core/BlockPos.java
 +++ b/src/main/java/net/minecraft/core/BlockPos.java
 @@ -515,9 +515,9 @@ public class BlockPos extends Vec3i {
@@ -45,7 +45,7 @@ index 2e5678554313d0e14d2d855a24c71acce1e1a155..0e75ee7dbb601b795cdbf6079992b4db
          }
  
 diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
-index e87ef99260bff134529e00b9a75381cecaec01a4..f14cc137fc0a56495487d64542074b31746b965a 100644
+index 6d760fa1dbd13a66bff4695edc28f4ab4b3e44a3..beadef19ee136c27601f0d116a86967344c2e403 100644
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
 @@ -19,9 +19,9 @@ public class Vec3i implements Comparable<Vec3i> {
diff --git a/patches/server/0663-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0662-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0663-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0662-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0664-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0663-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 94%
rename from patches/server/0664-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0663-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index bdb1dc3be3..8eed2d2795 100644
--- a/patches/server/0664-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0663-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
@@ -10,7 +10,7 @@ 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 4b0bba18ba997f9dc3f0bd6e67af3538106891dc..87edfd96ec2ae00971711b46304134b89e6572a0 100644
+index d538dc2f15b3b1553109df99f50457ee79732e43..d0470e78b55d5973d9adbf4dd1496ccad4035243 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -457,6 +457,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0665-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0664-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 93%
rename from patches/server/0665-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0664-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 16b343c84c..8a47c1cb53 100644
--- a/patches/server/0665-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0664-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
@@ -8,7 +8,7 @@ Lighting is purged on update anyways, so let's not add more
 into the conversion process
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
-index e4b3a70ff9f906a10f2ba3c07642193ca3269db7..7f7c05c498dfe11842a0c35d6e8c2c428cf7647b 100644
+index af8a8e85742497e8dac7a59a3cd5938e09580e45..cccc3741227402b24c76d31a339d01323610b9f0 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java
 @@ -51,6 +51,7 @@ public class ChunkStorage implements AutoCloseable {
diff --git a/patches/server/0666-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0665-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 100%
rename from patches/server/0666-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
rename to patches/server/0665-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0667-Time-scoreboard-search.patch b/patches/server/0666-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0667-Time-scoreboard-search.patch
rename to patches/server/0666-Time-scoreboard-search.patch
diff --git a/patches/server/0668-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0667-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0668-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0667-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0669-Execute-chunk-tasks-mid-tick.patch b/patches/server/0668-Execute-chunk-tasks-mid-tick.patch
similarity index 97%
rename from patches/server/0669-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0668-Execute-chunk-tasks-mid-tick.patch
index dc5d7301c5..918a696628 100644
--- a/patches/server/0669-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0668-Execute-chunk-tasks-mid-tick.patch
@@ -123,7 +123,7 @@ index a35957eef3f6ab2dcfebc01eaa9bea1b249599e2..32129fdd5b2542a0acb828fb843fa4e4
                      }
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 2b4afc35c9e57977972fe0ddab0ae753f13d8828..0280f81406eb248d41673d2e3ae1a317357b32cd 100644
+index 705c427097477cad2d75f0f1d7ee06f3311e759b..ec64866f695dbc62dfedf6c1de5abb130edd9cfa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -216,6 +216,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -151,7 +151,7 @@ index 2b4afc35c9e57977972fe0ddab0ae753f13d8828..0280f81406eb248d41673d2e3ae1a317
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 87edfd96ec2ae00971711b46304134b89e6572a0..817e9df60e6524625780683b4260d4f8b62e00b3 100644
+index d0470e78b55d5973d9adbf4dd1496ccad4035243..34156fb87cfcd453b11a13a466239a7d56383000 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -926,6 +926,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0670-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0669-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0670-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0669-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0671-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0670-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0671-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0670-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0672-Optimise-random-block-ticking.patch b/patches/server/0671-Optimise-random-block-ticking.patch
similarity index 99%
rename from patches/server/0672-Optimise-random-block-ticking.patch
rename to patches/server/0671-Optimise-random-block-ticking.patch
index 23c72bf758..d94de95efe 100644
--- a/patches/server/0672-Optimise-random-block-ticking.patch
+++ b/patches/server/0671-Optimise-random-block-ticking.patch
@@ -90,7 +90,7 @@ 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 0280f81406eb248d41673d2e3ae1a317357b32cd..bc887fd2788f1c56ed3b8a10ad15cfc23f065138 100644
+index ec64866f695dbc62dfedf6c1de5abb130edd9cfa..15b11c48e78318d382e88c3dba322ede537ec005 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -855,6 +855,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -324,7 +324,7 @@ index 6bbcdd34fb89ea5774e825de8f9a588552716fc2..2a3f1d14a4b24a3219d191b4f2e97ed7
  
      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 817e9df60e6524625780683b4260d4f8b62e00b3..bf2376c484bfec238c4fe2a1298cf3f8ff824b38 100644
+index 34156fb87cfcd453b11a13a466239a7d56383000..4e51db012b4afc606734ab93c7ebc5101cabe6c6 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1397,10 +1397,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0673-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0672-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0673-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0672-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0674-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0673-Use-Velocity-compression-and-cipher-natives.patch
similarity index 99%
rename from patches/server/0674-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0673-Use-Velocity-compression-and-cipher-natives.patch
index 547a0d6619..0324925589 100644
--- a/patches/server/0674-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0673-Use-Velocity-compression-and-cipher-natives.patch
@@ -264,7 +264,7 @@ index 859af8c845bae9781a62fa4acae56c6e2d449e10..f67f59f287d9a5cdd685b6b56ed1daf3
          return this.threshold;
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 7e966e072476c085d41942a02a5f0f3ff1ac72bc..634b20f73d51141cb36115d2a0dda4c6d10cf266 100644
+index 18228713d61cbc4b6fad881ace991e5e6c64e57d..28adc086f7bc1b6f403e65c5db51b267c90f2f37 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -669,11 +669,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0675-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0674-Detail-more-information-in-watchdog-dumps.patch
similarity index 98%
rename from patches/server/0675-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0674-Detail-more-information-in-watchdog-dumps.patch
index 85c6a4609f..521520be63 100644
--- a/patches/server/0675-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0674-Detail-more-information-in-watchdog-dumps.patch
@@ -76,7 +76,7 @@ index 7de24c39b460e43d27839b3821e67213508ece81..7297bca9224c12d7ace0e1967340d994
              });
              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 bc887fd2788f1c56ed3b8a10ad15cfc23f065138..28e6af9e265c1d8328e8e80ec7e519e244caf297 100644
+index 15b11c48e78318d382e88c3dba322ede537ec005..0c60fa914310c7b6706e72cd3a61630873005102 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1239,7 +1239,26 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -122,7 +122,7 @@ index bc887fd2788f1c56ed3b8a10ad15cfc23f065138..28e6af9e265c1d8328e8e80ec7e519e2
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 42eb530571c9f7854888e7f3f6a63ef10dba1b4e..5682ec12d9a54979022978421dd8875a90ed9682 100644
+index 66df50658958c7ad799fbe9d2cdb676a90d8bb4e..d548a262515548808ffe075606ee2f2dba38740f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1030,7 +1030,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0676-Distance-manager-tick-timings.patch b/patches/server/0675-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0676-Distance-manager-tick-timings.patch
rename to patches/server/0675-Distance-manager-tick-timings.patch
diff --git a/patches/server/0677-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0676-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 90%
rename from patches/server/0677-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0676-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 7f1db1c715..0ae49a07a3 100644
--- a/patches/server/0677-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0676-Fix-merchant-inventory-not-closing-on-entity-removal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 28e6af9e265c1d8328e8e80ec7e519e244caf297..4f48e7ee15f381e0bcf71fc4c7d37daf2dd4f7fd 100644
+index 0c60fa914310c7b6706e72cd3a61630873005102..4b0d854ed9fc16ecbdfabca4192969aa1beeaa19 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2676,6 +2676,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,5 +18,5 @@ index 28e6af9e265c1d8328e8e80ec7e519e244caf297..4f48e7ee15f381e0bcf71fc4c7d37daf
 +                }
 +                // Paper end - Fix merchant inventory not closing on entity removal
                  for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
-                     h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper
+                     h.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.UNLOADED); // Paper - Inventory close reason
                  }
diff --git a/patches/server/0678-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0677-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0678-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0677-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0679-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0678-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 92%
rename from patches/server/0679-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0678-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index bc49646fe6..b6f183623e 100644
--- a/patches/server/0679-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0678-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5bc6b7298c253bd2ee1d5a16b8f237c824f8719a..f93d3a933fb980c3fdc1f136c79807ce8517a235 100644
+index 4a6a8de70c65ecae0a53df69881326b9b953b9e8..c84a8e6fc5f136b12bc542ec64a6686386bfe0cf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -733,6 +733,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0680-Add-packet-limiter-config.patch b/patches/server/0679-Add-packet-limiter-config.patch
similarity index 98%
rename from patches/server/0680-Add-packet-limiter-config.patch
rename to patches/server/0679-Add-packet-limiter-config.patch
index 591d54d5d9..7ed138c36f 100644
--- a/patches/server/0680-Add-packet-limiter-config.patch
+++ b/patches/server/0679-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index f4807a005442111909fa0a1cffa2decb85667a63..81fb880cdcd433bd692461b3d7b315f30d2747f7 100644
+index 5d73043dc9847ae195cef804fa0b0f4bf6db06f2..e18406b4172499b0cb116a45cd5a968ae3e3fdce 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -132,6 +132,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0681-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0680-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0681-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0680-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0682-Ensure-valid-vehicle-status.patch b/patches/server/0681-Ensure-valid-vehicle-status.patch
similarity index 91%
rename from patches/server/0682-Ensure-valid-vehicle-status.patch
rename to patches/server/0681-Ensure-valid-vehicle-status.patch
index 870a699ba3..f98873e291 100644
--- a/patches/server/0682-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0681-Ensure-valid-vehicle-status.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ca66a8ebb4ae2d3ee9cf88412bbb20d5f812d050..6571692d00f88947316454e2f10cac30e3756ac0 100644
+index 8d657cdb516b6b439b29100c48cccd5b27178fe9..5d30d67745ce3988f42457137f43b15b75a96a0c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -576,7 +576,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0683-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0682-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 92%
rename from patches/server/0683-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0682-Prevent-softlocked-end-exit-portal-generation.patch
index 71978b46d8..6c29d86324 100644
--- a/patches/server/0683-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0682-Prevent-softlocked-end-exit-portal-generation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent softlocked end exit portal generation
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index c29ccc66c95faba425acb0ca06af15e2783b4bae..02acd171f1d3d783b7cab56c69feca5325878fa8 100644
+index 5b14d63e7c354cd51d67ddc045cc86a0f7b36811..2d74efff30c93ba664cf8dbf20e47dcdbd767d3f 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -466,6 +466,11 @@ public class EndDragonFight {
diff --git a/patches/server/0684-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0683-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0684-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0683-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0685-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0684-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0685-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0684-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0686-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0685-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0686-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0685-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0687-Preserve-overstacked-loot.patch b/patches/server/0686-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0687-Preserve-overstacked-loot.patch
rename to patches/server/0686-Preserve-overstacked-loot.patch
diff --git a/patches/server/0688-Update-head-rotation-in-missing-places.patch b/patches/server/0687-Update-head-rotation-in-missing-places.patch
similarity index 93%
rename from patches/server/0688-Update-head-rotation-in-missing-places.patch
rename to patches/server/0687-Update-head-rotation-in-missing-places.patch
index 30130e3939..75018caea0 100644
--- a/patches/server/0688-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0687-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5682ec12d9a54979022978421dd8875a90ed9682..a6fc204fce8f44d772ff0f438c6d62850b0e224f 100644
+index d548a262515548808ffe075606ee2f2dba38740f..fe0f57dd69cb5477b64317ef940e3f748037d0e0 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1917,6 +1917,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0689-prevent-unintended-light-block-manipulation.patch b/patches/server/0688-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0689-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0688-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0690-Fix-CraftCriteria-defaults-map.patch b/patches/server/0689-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0690-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0689-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0691-Fix-upstreams-block-state-factories.patch b/patches/server/0690-Fix-upstreams-block-state-factories.patch
similarity index 99%
rename from patches/server/0691-Fix-upstreams-block-state-factories.patch
rename to patches/server/0690-Fix-upstreams-block-state-factories.patch
index 2d18a1e309..23a0382bf4 100644
--- a/patches/server/0691-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0690-Fix-upstreams-block-state-factories.patch
@@ -26,7 +26,7 @@ index d156f7cc71050f13b2feca00c52ca6b64572b60e..e3557f4c8cee7c88b3e352cd246078da
          if (state instanceof InventoryHolder) return (InventoryHolder) state;
          return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index f7f211b4f08a7f21a183078affd6f875aa30dd50..a8290624d8c5b19506f628d049984d2e59c4423c 100644
+index f1f6d85399db86ce7aee1fccde51d6259b427e7e..53d466bfa66573f178fd0e0247bcefc04902c38f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -13,7 +13,7 @@ import org.bukkit.persistence.PersistentDataContainer;
diff --git a/patches/server/0692-Configurable-feature-seeds.patch b/patches/server/0691-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0692-Configurable-feature-seeds.patch
rename to patches/server/0691-Configurable-feature-seeds.patch
diff --git a/patches/server/0693-Add-root-admin-user-detection.patch b/patches/server/0692-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0693-Add-root-admin-user-detection.patch
rename to patches/server/0692-Add-root-admin-user-detection.patch
index 04fc988ec4..61ae81963d 100644
--- a/patches/server/0693-Add-root-admin-user-detection.patch
+++ b/patches/server/0692-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3389fca10dac966b8ec61e5bb3ef3f78c3d1dc7f..753bec96a829a153dc54b5e1013359b86f1776b3 100644
+index 01535fc66fbf5fb99ee5705eb6db9b6552ba79b9..bb3acbe0ad049703245c51a92539376811365eb2 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0694-Always-allow-item-changing-in-Fireball.patch b/patches/server/0693-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0694-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0693-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0695-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0694-don-t-attempt-to-teleport-dead-entities.patch
similarity index 91%
rename from patches/server/0695-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0694-don-t-attempt-to-teleport-dead-entities.patch
index f0a2e3372e..9ad1287070 100644
--- a/patches/server/0695-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0694-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a6fc204fce8f44d772ff0f438c6d62850b0e224f..78034cef7c7555eb4f772a618662a8ef9d0b7083 100644
+index fe0f57dd69cb5477b64317ef940e3f748037d0e0..22d25fea0c995bf1509bb78d5f10e2b63eb484cb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -793,7 +793,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0696-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0695-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 94%
rename from patches/server/0696-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0695-Prevent-excessive-velocity-through-repeated-crits.patch
index 17cabbe4f0..0f925cea8f 100644
--- a/patches/server/0696-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0695-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b49ae2a36a426deb5ce393d854df762c5a256fbd..f601b043edb51afbd040b7ec72e00dcc7786d3da 100644
+index dfc62f5cfad3e0e0f5f25c614055426bbfcd5327..3fca4aad128195325d9d00433fae09f193f8f868 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2677,13 +2677,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0697-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0696-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 93%
rename from patches/server/0697-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0696-Remove-client-side-code-using-deprecated-for-removal.patch
index 727f2cdce9..c5c2fdc4f3 100644
--- a/patches/server/0697-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0696-Remove-client-side-code-using-deprecated-for-removal.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Remove client-side code using deprecated for removal
 Fixes warnings on build
 
 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
-index 006a7876a0c8e1180dada6694992f596948be53b..169edd91e25f3c1d27f8a9e2bca58a6143c8a891 100644
+index eb80741b313daab36dcfeb1079eb0fbb19614904..b40864e41e1506884fdefefbf3cf4833a8f706c3 100644
 --- a/src/main/java/net/minecraft/Util.java
 +++ b/src/main/java/net/minecraft/Util.java
 @@ -952,17 +952,7 @@ public class Util {
diff --git a/patches/server/0698-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0697-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0698-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0697-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0699-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0698-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 98%
rename from patches/server/0699-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0698-Prevent-sending-oversized-item-data-in-equipment-and.patch
index ee7e6297f1..5985cfea03 100644
--- a/patches/server/0699-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0698-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,7 +34,7 @@ index e0802f1cb73a80b08482832c2b269ac8485d5c1a..945a0317e9e49a159a1f42882a0a267a
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f601b043edb51afbd040b7ec72e00dcc7786d3da..de1e496c2cb75932dee84eb2b7532ad48340c504 100644
+index 3fca4aad128195325d9d00433fae09f193f8f868..c8592032106e1e355fa51428cde03ec3c4184953 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3188,7 +3188,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0700-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0699-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 97%
rename from patches/server/0700-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0699-Hide-unnecessary-itemmeta-from-clients.patch
index 11f579a459..b97231a3ba 100644
--- a/patches/server/0700-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0699-Hide-unnecessary-itemmeta-from-clients.patch
@@ -18,7 +18,7 @@ index 945a0317e9e49a159a1f42882a0a267a2141e86d..e9fd9590e90e58fd4c31985a704a4511
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index f93d3a933fb980c3fdc1f136c79807ce8517a235..643b98097bf77c55961cf1722faad6fb63504abd 100644
+index c84a8e6fc5f136b12bc542ec64a6686386bfe0cf..2c4da4f18a217269f17e281cf99a573e759a5d52 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2561,8 +2561,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -33,7 +33,7 @@ index f93d3a933fb980c3fdc1f136c79807ce8517a235..643b98097bf77c55961cf1722faad6fb
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e7d72a7495d07c793ce3f5110d476f1cc3ed4469..551100c72bd20d7ff224acf3750fe3dc9d73a483 100644
+index c8592032106e1e355fa51428cde03ec3c4184953..51e8cfeb21206793245b54379c5a14266d3e67bd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3190,7 +3190,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0701-Fix-Spigot-growth-modifiers.patch b/patches/server/0700-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0701-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0700-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0702-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0701-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0702-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0701-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0703-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0702-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0703-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0702-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0704-Optimize-HashMapPalette.patch b/patches/server/0703-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0704-Optimize-HashMapPalette.patch
rename to patches/server/0703-Optimize-HashMapPalette.patch
diff --git a/patches/server/0705-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0704-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from patches/server/0705-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0704-Allow-delegation-to-vanilla-chunk-gen.patch
index 1566d8e666..56b54104c8 100644
--- a/patches/server/0705-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0704-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9491eb5b47defd7949fe2e691d63d3767be1f337..ad0323b8db375134f6bbb9a6e944c822a994aa19 100644
+index b603541d56c7cee7aff8d3448d18c76cd72b63cb..4dc80d0cbd414cde8137d7030d7fe90d1fac424a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2459,6 +2459,88 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0706-Collision-optimisations.patch b/patches/server/0705-Collision-optimisations.patch
similarity index 99%
rename from patches/server/0706-Collision-optimisations.patch
rename to patches/server/0705-Collision-optimisations.patch
index c00b088fce..0fdbaa5dd5 100644
--- a/patches/server/0706-Collision-optimisations.patch
+++ b/patches/server/0705-Collision-optimisations.patch
@@ -2179,7 +2179,7 @@ index 073c717bb676b9e99aada00c349fb7eee91df1e7..2a9fc1f1dfc0c5894c1e74dad5a79ae9
      private Direction(int id, int idOpposite, int idHorizontal, String name, Direction.AxisDirection direction, Direction.Axis axis, Vec3i vector) {
          this.data3d = id;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 37132a52849c7618fe863b6f5349ee6154cf42ad..7cf66e10efede0cb55239e1a1b3862d85a917f3e 100644
+index 5d30d67745ce3988f42457137f43b15b75a96a0c..c76358e108a72297baf92b234d43145dde09e99f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -469,7 +469,7 @@ public class ServerPlayer extends Player {
@@ -2201,7 +2201,7 @@ index 37132a52849c7618fe863b6f5349ee6154cf42ad..7cf66e10efede0cb55239e1a1b3862d8
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1f14b904807d4b593b608c8dc7a97bd8c320eceb..0da976438be3de7b82e8b1e3ce06d01c00dc33f0 100644
+index 6e56b55329e31682d3052949110762e8f9fc96da..00f65551b82935a6b7b88cba4650404b9311f8f2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -909,7 +909,7 @@ public abstract class PlayerList {
@@ -2214,7 +2214,7 @@ index 1f14b904807d4b593b608c8dc7a97bd8c320eceb..0da976438be3de7b82e8b1e3ce06d01c
              entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ());
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 78034cef7c7555eb4f772a618662a8ef9d0b7083..515c948cce0066cfd6e292afd65ceefc320ed553 100644
+index 22d25fea0c995bf1509bb78d5f10e2b63eb484cb..696497771e607cd07bd8414deeffdd0f211a5ef6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1216,9 +1216,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2440,13 +2440,13 @@ index 78034cef7c7555eb4f772a618662a8ef9d0b7083..515c948cce0066cfd6e292afd65ceefc
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 5bda9612cbc7c233ad0195cb4e943de063130d00..81b54fd9f867666d688068d39344c7e19ed639c3 100644
+index e3412f9dd86dddd241bea8f6dcaeed77a7e67f08..92b4eecf7b8ce07334256a216d9caf241fa5363b 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -353,7 +353,7 @@ public class ArmorStand extends LivingEntity {
      @Override
      protected void pushEntities() {
-         if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper
+         if (!this.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return; // Paper - Option to prevent armor stands from doing entity lookups
 -        List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS);
 +        List<AbstractMinecart> list = this.level().getEntitiesOfClass(AbstractMinecart.class, this.getBoundingBox(), ArmorStand.RIDABLE_MINECARTS); // Paper - optimise collisions
          Iterator iterator = list.iterator();
@@ -2600,7 +2600,7 @@ index a25497eec004add7408a63b1a0f09e3fa443b324..9f892de55ab03367daed4c30cc44c9dd
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 38ad089c87bcc3f81998142e49edae4f4fad8ba9..8c363306b5dac302ab3c26a245aa4a768b304ed4 100644
+index 4e51db012b4afc606734ab93c7ebc5101cabe6c6..205323c8e643c77b7aefe588d5ee2f8b2b29ede4 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -299,6 +299,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -3002,7 +3002,7 @@ index 38ad089c87bcc3f81998142e49edae4f4fad8ba9..8c363306b5dac302ab3c26a245aa4a76
 +        return !io.papermc.paper.util.CollisionUtil.getEntityHardCollisions(this, entity, box, null, flags, null);
 +        // Paper end - optimise collisions
      }
-     // Paper end
+     // Paper end - Option to prevent armor stands from doing entity lookups
  
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
 index af62781cc96354c87aa63d4f03f9e25b81959081..6c4fd56956982eee743b4dea4e8b925891dd3b6f 100644
diff --git a/patches/server/0707-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0706-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 99%
rename from patches/server/0707-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0706-Optimise-collision-checking-in-player-move-packet-ha.patch
index a6d5db3ba1..a3ff14cfda 100644
--- a/patches/server/0707-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0706-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -8,7 +8,7 @@ Move collision logic to just the hasNewCollision call instead of getCubes + hasN
 CHECK ME
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 643b98097bf77c55961cf1722faad6fb63504abd..ffe050bed7096b147b327f3adb7d1d0d699bce7a 100644
+index 2c4da4f18a217269f17e281cf99a573e759a5d52..e6e9a2688a3d2f789831a9e095e555f784bd9c4a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -540,7 +540,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0708-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0707-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0708-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0707-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0709-Add-more-Campfire-API.patch b/patches/server/0708-Add-more-Campfire-API.patch
similarity index 98%
rename from patches/server/0709-Add-more-Campfire-API.patch
rename to patches/server/0708-Add-more-Campfire-API.patch
index 6f1d195e66..1133eb93bf 100644
--- a/patches/server/0709-Add-more-Campfire-API.patch
+++ b/patches/server/0708-Add-more-Campfire-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more Campfire API
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
-index daeced350310020b99ab0244daf7f7a69c29b069..6b4ced63bf489a02b1e11ab9b1dd768e2ea0861d 100644
+index 5da0c6bf4f04448f640a11931b2cc5b91cf83f12..9f7b49a6a50cb53d914c8f4b5132c035c5ab71da 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/CampfireBlockEntity.java
 @@ -42,6 +42,7 @@ public class CampfireBlockEntity extends BlockEntity implements Clearable {
diff --git a/patches/server/0710-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0709-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0710-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0709-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0711-Fix-tripwire-state-inconsistency.patch b/patches/server/0710-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0711-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0710-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0712-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0711-Forward-CraftEntity-in-teleport-command.patch
similarity index 95%
rename from patches/server/0712-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0711-Forward-CraftEntity-in-teleport-command.patch
index a1ad82d694..d63ed2b34c 100644
--- a/patches/server/0712-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0711-Forward-CraftEntity-in-teleport-command.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 515c948cce0066cfd6e292afd65ceefc320ed553..11e57b335150fcf9030e23a060f2608d97e09eb1 100644
+index 696497771e607cd07bd8414deeffdd0f211a5ef6..85c48c92987bd87ee5e8c0ffb8847447e7ba4b78 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3530,6 +3530,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0713-Improve-scoreboard-entries.patch b/patches/server/0712-Improve-scoreboard-entries.patch
similarity index 97%
rename from patches/server/0713-Improve-scoreboard-entries.patch
rename to patches/server/0712-Improve-scoreboard-entries.patch
index 6d866ae345..8acac86ce3 100644
--- a/patches/server/0713-Improve-scoreboard-entries.patch
+++ b/patches/server/0712-Improve-scoreboard-entries.patch
@@ -25,7 +25,7 @@ index da1e4496d78a2c1b258ff8bb316414cb8a662ba2..b36e5574c10e6d70a399e2ac0704fd4f
      public void unregister() {
          CraftScoreboard scoreboard = this.checkState();
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
-index fdb30a7e728798c59742b812ef28c5094d6093fc..e7d3637927e92c181ecc2e21a3456918afb30822 100644
+index c650fc3712de01184509a03f1d1b388859e163d7..253574890a9ed23d38a84680ba1eb221dc72b310 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
 @@ -235,6 +235,26 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
diff --git a/patches/server/0714-Entity-powdered-snow-API.patch b/patches/server/0713-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0714-Entity-powdered-snow-API.patch
rename to patches/server/0713-Entity-powdered-snow-API.patch
diff --git a/patches/server/0715-Add-API-for-item-entity-health.patch b/patches/server/0714-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0715-Add-API-for-item-entity-health.patch
rename to patches/server/0714-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0716-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0715-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0716-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0715-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0717-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0716-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0717-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0716-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0718-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0717-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0718-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0717-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0719-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0718-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0719-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0718-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0720-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0719-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0720-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0719-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0721-Fix-bees-aging-inside-hives.patch b/patches/server/0720-Fix-bees-aging-inside-hives.patch
similarity index 97%
rename from patches/server/0721-Fix-bees-aging-inside-hives.patch
rename to patches/server/0720-Fix-bees-aging-inside-hives.patch
index 10b750e853..528be5b54a 100644
--- a/patches/server/0721-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0720-Fix-bees-aging-inside-hives.patch
@@ -7,7 +7,7 @@ Fixes bees incorrectly being aged up due to upstream's
 resetting the ticks inside hive on a failed release
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 6c42f7e7fbd776a59fbd5aa3723752a130d3090f..560a6e7b7888a87011aa48d7c9a17949bf086f8d 100644
+index d36373cb1fda4d4f2b41dd181306ea697a2fe7a8..56b328c64bea0ffd51930d8ba15fb87a36e6d8a1 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -328,7 +328,7 @@ public class BeehiveBlockEntity extends BlockEntity {
diff --git a/patches/server/0722-Bucketable-API.patch b/patches/server/0721-Bucketable-API.patch
similarity index 100%
rename from patches/server/0722-Bucketable-API.patch
rename to patches/server/0721-Bucketable-API.patch
diff --git a/patches/server/0723-Validate-usernames.patch b/patches/server/0722-Validate-usernames.patch
similarity index 95%
rename from patches/server/0723-Validate-usernames.patch
rename to patches/server/0722-Validate-usernames.patch
index 2f1055b355..2c5507f00c 100644
--- a/patches/server/0723-Validate-usernames.patch
+++ b/patches/server/0722-Validate-usernames.patch
@@ -26,7 +26,7 @@ index 67c1cf5eb198079bd146a4a8ca0492b94cca788c..c03329267a2a97af32a0c2c9d7e94fa0
          GameProfile gameprofile = this.server.getSingleplayerProfile();
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5921b4c5c38354c4782783d0debddb8bf4e356c7..8364d86a75174d1b37cfbf6cf9dbc5ed952c432e 100644
+index 00f65551b82935a6b7b88cba4650404b9311f8f2..801b1f9b9b7dcdf4fe758e3a7a5800bf4b07d93b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -679,7 +679,7 @@ public abstract class PlayerList {
@@ -39,7 +39,7 @@ index 5921b4c5c38354c4782783d0debddb8bf4e356c7..8364d86a75174d1b37cfbf6cf9dbc5ed
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index c21b6e9b013c31342e1a47500f5262ddfb7cd6d0..f6ca517fbe3742381a932958e9893e32b81e390b 100644
+index 80caada014bae0571a5aa6aa67d9bb87f89db17f..61516fbc3cbfb3aa85895b4458b5319752149f73 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2340,9 +2340,23 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0724-Make-water-animal-spawn-height-configurable.patch b/patches/server/0723-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0724-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0723-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0725-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0724-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 96%
rename from patches/server/0725-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0724-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 93eaf6fd90..9a8d9831b9 100644
--- a/patches/server/0725-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0724-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0b0e415adafb5f614259291c1c501fa1b85ddb14..e6ad7c2b8eac76bcc2083b3921d45b83ecf2f875 100644
+index ec48aea4e352e8ee3ad8cda8ce8ec33daf49dae8..5329f98cd455e863a1eae9dc12d26146e492e730 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -596,7 +596,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 0b0e415adafb5f614259291c1c501fa1b85ddb14..e6ad7c2b8eac76bcc2083b3921d45b83
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ad0323b8db375134f6bbb9a6e944c822a994aa19..2b2bd85133886e2892ab681152114734773a1282 100644
+index 4dc80d0cbd414cde8137d7030d7fe90d1fac424a..11211d27a24266724043420a369ff9e2e77683eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1258,7 +1258,7 @@ public final class CraftServer implements Server {
@@ -31,7 +31,7 @@ index ad0323b8db375134f6bbb9a6e944c822a994aa19..2b2bd85133886e2892ab681152114734
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b49580716ff1dc85adcd466d1df9ce678a58546f..5c8b161559595071da52057dd5652a3447bca822 100644
+index 3e25f22ffd656cded58634049d48f19d97694496..94f722229432d5b88fc1ced115b0fbeb0eca5f57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -205,6 +205,29 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0726-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0725-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0726-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0725-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0727-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0726-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0727-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0726-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0728-Multiple-Entries-with-Scoreboards.patch b/patches/server/0727-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0728-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0727-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0729-Reset-placed-block-on-exception.patch b/patches/server/0728-Reset-placed-block-on-exception.patch
similarity index 96%
rename from patches/server/0729-Reset-placed-block-on-exception.patch
rename to patches/server/0728-Reset-placed-block-on-exception.patch
index cfe724425f..b6bf08780c 100644
--- a/patches/server/0729-Reset-placed-block-on-exception.patch
+++ b/patches/server/0728-Reset-placed-block-on-exception.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset placed block on exception
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index e68b7a1b03783e4f9de24c5ae8773fc359bd2d37..daf093518f1daf598c858cfaf48357255a1fb0cf 100644
+index c19069f65a9ecbc9000ea4333417a2df4ace1007..1ac739c92031e80c35e1af4417e6358346079580 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
 @@ -80,6 +80,7 @@ public class BlockItem extends Item {
diff --git a/patches/server/0730-Add-configurable-height-for-slime-spawn.patch b/patches/server/0729-Add-configurable-height-for-slime-spawn.patch
similarity index 96%
rename from patches/server/0730-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0729-Add-configurable-height-for-slime-spawn.patch
index 6a98e03ab7..f1b39baf2e 100644
--- a/patches/server/0730-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0729-Add-configurable-height-for-slime-spawn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable height for slime spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index a89dec53d68579271d2a259e1a53537262bd0df6..c3dc61f096c0c27c83c34e023994a65dc82706bc 100644
+index 3752ff83c91be55e8a5e7c81b75409d64a8aafde..2e59a32aa8afe45641a319b1a6c347ee944398a8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -336,7 +336,11 @@ public class Slime extends Mob implements Enemy {
diff --git a/patches/server/0731-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0730-Fix-xp-reward-for-baby-zombies.patch
similarity index 93%
rename from patches/server/0731-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0730-Fix-xp-reward-for-baby-zombies.patch
index 0ff008ba0c..4fa70dea18 100644
--- a/patches/server/0731-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0730-Fix-xp-reward-for-baby-zombies.patch
@@ -9,7 +9,7 @@ so this resets it after each call to
 Zombie#getExperienceReward
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index b31f6b267693c409d58eee688a3b79a1cf14e391..ab41bd0f1810207a83ed506d6d1aa0289508d09a 100644
+index 5d0e587941253a051839ac7fa877bb3bc887f6b5..3fa43be16cc8d35622c269db37875b4bd0a09405 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -175,11 +175,16 @@ public class Zombie extends Monster {
diff --git a/patches/server/0732-Multi-Block-Change-API-Implementation.patch b/patches/server/0731-Multi-Block-Change-API-Implementation.patch
similarity index 97%
rename from patches/server/0732-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0731-Multi-Block-Change-API-Implementation.patch
index 57d7b3202f..610c021b71 100644
--- a/patches/server/0732-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0731-Multi-Block-Change-API-Implementation.patch
@@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..ccdc2345465313991f065e1176b58fb7
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4475a59e867b0e2f64cdac41911af0e7fe721ad2..4a900f3026d9fffbf528c944871b8763f9807352 100644
+index 149906e1ab9d1cf2d186fbe4a47ac258d7802dee..8be0588680c55c19de4e3f0ecf17b96338c3c7b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -886,6 +886,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0733-Fix-NotePlayEvent.patch b/patches/server/0732-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0733-Fix-NotePlayEvent.patch
rename to patches/server/0732-Fix-NotePlayEvent.patch
diff --git a/patches/server/0734-Freeze-Tick-Lock-API.patch b/patches/server/0733-Freeze-Tick-Lock-API.patch
similarity index 95%
rename from patches/server/0734-Freeze-Tick-Lock-API.patch
rename to patches/server/0733-Freeze-Tick-Lock-API.patch
index 53d8e60863..c4b243ae5b 100644
--- a/patches/server/0734-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0733-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 11e57b335150fcf9030e23a060f2608d97e09eb1..811479660f7e6148b5448d3342a862aff36ec673 100644
+index 85c48c92987bd87ee5e8c0ffb8847447e7ba4b78..6c995ac8a40e61a29d685b5527807efa73375147 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -408,6 +408,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -46,7 +46,7 @@ index 11e57b335150fcf9030e23a060f2608d97e09eb1..811479660f7e6148b5448d3342a862af
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index abfb7dbd03f79bad00a3b713717987e12743c6f0..3de76ca462d65e18a5d60dab367e09b48bc5d5a7 100644
+index 51e8cfeb21206793245b54379c5a14266d3e67bd..c41153ad6025fe276326132f6cbfd3986f9c5c51 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3452,7 +3452,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0735-More-PotionEffectType-API.patch b/patches/server/0734-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0735-More-PotionEffectType-API.patch
rename to patches/server/0734-More-PotionEffectType-API.patch
diff --git a/patches/server/0736-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0735-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0736-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0735-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0737-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0736-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 98%
rename from patches/server/0737-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0736-API-for-creating-command-sender-which-forwards-feedb.patch
index c4ef08b5d4..38ab0a37e9 100644
--- a/patches/server/0737-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0736-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2b2bd85133886e2892ab681152114734773a1282..f6bba55b843acf4614b4403e78d944decc7ee7c0 100644
+index 11211d27a24266724043420a369ff9e2e77683eb..3bf600de4eb99bd33bc4cd20529e38002f22f1d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2110,6 +2110,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0738-Add-missing-structure-set-seed-configs.patch b/patches/server/0737-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0738-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0737-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0739-Implement-regenerateChunk.patch b/patches/server/0738-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0739-Implement-regenerateChunk.patch
rename to patches/server/0738-Implement-regenerateChunk.patch
index 407bd0a03b..24b04eadce 100644
--- a/patches/server/0739-Implement-regenerateChunk.patch
+++ b/patches/server/0738-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5c8b161559595071da52057dd5652a3447bca822..abc2a152a33805dfe30f0f657ec55c704cf3fa31 100644
+index 94f722229432d5b88fc1ced115b0fbeb0eca5f57..ba71ea08e1e2fa178366fdce1aa752fa12030ee6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -144,6 +144,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/server/0740-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0739-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 95%
rename from patches/server/0740-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0739-Fix-cancelled-powdered-snow-bucket-placement.patch
index c19dc00946..872f00bd93 100644
--- a/patches/server/0740-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0739-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 f23c1695840553ae14e49310b3708a801b5a0f8d..9a21a0aeff0da8e71ef8eea8bbfe3564409b986a 100644
+index 4624fc8eb4a5e71d7874d25ca0a25975f65a6919..750ffb60c6136fe9e1d56e402578e2a9978d2703 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -379,7 +379,7 @@ public final class ItemStack {
diff --git a/patches/server/0741-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0740-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 92%
rename from patches/server/0741-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0740-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 7c079022fd..10fb87ad32 100644
--- a/patches/server/0741-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0740-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f6bba55b843acf4614b4403e78d944decc7ee7c0..75728879da9d365e3a825b6639313375e5407290 100644
+index 3bf600de4eb99bd33bc4cd20529e38002f22f1d3..8257b94fc234b6d10c9120a8ba4de526c45e66b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2287,6 +2287,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0742-Add-GameEvent-tags.patch b/patches/server/0741-Add-GameEvent-tags.patch
similarity index 97%
rename from patches/server/0742-Add-GameEvent-tags.patch
rename to patches/server/0741-Add-GameEvent-tags.patch
index b78905aa51..58b00003dd 100644
--- a/patches/server/0742-Add-GameEvent-tags.patch
+++ b/patches/server/0741-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 75728879da9d365e3a825b6639313375e5407290..63c0ea96f67eb7a8a05fc63ecc50d49f19a0e444 100644
+index 8257b94fc234b6d10c9120a8ba4de526c45e66b1..1f70bd8267772a6f477caee4958a1cb271b30ee2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2708,6 +2708,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0743-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0742-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 94%
rename from patches/server/0743-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0742-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 7b522430ec..c99353017e 100644
--- a/patches/server/0743-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0742-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e6ad7c2b8eac76bcc2083b3921d45b83ecf2f875..d621320097f38d2339624852c59d47598b01603b 100644
+index 5329f98cd455e863a1eae9dc12d26146e492e730..2d41aaa651dfefff9968ccbfee693c4410ba0f4e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1416,6 +1416,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0744-Furnace-RecipesUsed-API.patch b/patches/server/0743-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0744-Furnace-RecipesUsed-API.patch
rename to patches/server/0743-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0745-Configurable-sculk-sensor-listener-range.patch b/patches/server/0744-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0745-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0744-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0746-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0745-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0746-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0745-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0747-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0746-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 96%
rename from patches/server/0747-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0746-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 6725dea7a3..0d41cd20ba 100644
--- a/patches/server/0747-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0746-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d621320097f38d2339624852c59d47598b01603b..d5ee1f01bbe38dffb91c12d0d60477cafea3b4bb 100644
+index 2d41aaa651dfefff9968ccbfee693c4410ba0f4e..5ec58c9eab4b790b68bb196d02c0818fc98ffaa4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -623,7 +623,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/patches/server/0748-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0747-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 92%
rename from patches/server/0748-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0747-Put-world-into-worldlist-before-initing-the-world.patch
index a4411396ba..81bf833801 100644
--- a/patches/server/0748-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0747-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,7 +7,7 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d5ee1f01bbe38dffb91c12d0d60477cafea3b4bb..a9060243cc9231af2b0e2783eb87131d458f4275 100644
+index 5ec58c9eab4b790b68bb196d02c0818fc98ffaa4..23d8734a234efeeeba6843719715305f88b67dd5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -635,9 +635,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -23,7 +23,7 @@ index d5ee1f01bbe38dffb91c12d0d60477cafea3b4bb..a9060243cc9231af2b0e2783eb87131d
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 63c0ea96f67eb7a8a05fc63ecc50d49f19a0e444..2049b78d91addb93ffd5322abf1621a91a25d468 100644
+index 1f70bd8267772a6f477caee4958a1cb271b30ee2..032fbe061a989c0e77ff6a78f11b09e20320ec7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1288,10 +1288,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0749-Fix-Entity-Position-Desync.patch b/patches/server/0748-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0749-Fix-Entity-Position-Desync.patch
rename to patches/server/0748-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0750-Custom-Potion-Mixes.patch b/patches/server/0749-Custom-Potion-Mixes.patch
similarity index 98%
rename from patches/server/0750-Custom-Potion-Mixes.patch
rename to patches/server/0749-Custom-Potion-Mixes.patch
index e7b64a38f8..02bc0e4666 100644
--- a/patches/server/0750-Custom-Potion-Mixes.patch
+++ b/patches/server/0749-Custom-Potion-Mixes.patch
@@ -32,7 +32,7 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a9060243cc9231af2b0e2783eb87131d458f4275..8f338bc3f6418eae5c25078d8938d449b1d688c6 100644
+index 23d8734a234efeeeba6843719715305f88b67dd5..ffd0e4326c0c4ddd18b0f09f9f3037b1eefd546f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2213,6 +2213,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -172,7 +172,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..bc01481ac5990ad1cfd1def5a16dd0ed
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2049b78d91addb93ffd5322abf1621a91a25d468..8a1583ce1f55d74e1516f62f730674bbadc4ed34 100644
+index 032fbe061a989c0e77ff6a78f11b09e20320ec7c..6cbf54f50538082a9027ec04de3337fe20bda452 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -304,6 +304,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0751-Force-close-world-loading-screen.patch b/patches/server/0750-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0751-Force-close-world-loading-screen.patch
rename to patches/server/0750-Force-close-world-loading-screen.patch
index 7988006f3a..8f451dcf0b 100644
--- a/patches/server/0751-Force-close-world-loading-screen.patch
+++ b/patches/server/0750-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d0be35600770a25b208ef72816798928847ff9ce..b9d1ee41775719050c14f172cf8fb308804d8097 100644
+index 801b1f9b9b7dcdf4fe758e3a7a5800bf4b07d93b..506d91df4dbcced7554db14b6efdf8697ea6805a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -398,6 +398,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0752-Fix-falling-block-spawn-methods.patch b/patches/server/0751-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0752-Fix-falling-block-spawn-methods.patch
rename to patches/server/0751-Fix-falling-block-spawn-methods.patch
index d434ed98a7..f96e1fe95b 100644
--- a/patches/server/0752-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0751-Fix-falling-block-spawn-methods.patch
@@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server
 public net.minecraft.world.entity.item.FallingBlockEntity <init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index abc2a152a33805dfe30f0f657ec55c704cf3fa31..cd7367672b91829d1ffef73e32062af730df7d95 100644
+index ba71ea08e1e2fa178366fdce1aa752fa12030ee6..a39f439716678611bc7daf943d29b4c330ab5acc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1453,7 +1453,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0753-Expose-furnace-minecart-push-values.patch b/patches/server/0752-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0753-Expose-furnace-minecart-push-values.patch
rename to patches/server/0752-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0754-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0753-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0754-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0753-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0755-More-Projectile-API.patch b/patches/server/0754-More-Projectile-API.patch
similarity index 99%
rename from patches/server/0755-More-Projectile-API.patch
rename to patches/server/0754-More-Projectile-API.patch
index 6b204f0fc1..0a909b85ae 100644
--- a/patches/server/0755-More-Projectile-API.patch
+++ b/patches/server/0754-More-Projectile-API.patch
@@ -509,7 +509,7 @@ index 20f9735c7cb76024e15dbdca7684f5c560876175..8a6af0db8e0aa0cffbf19584be747076
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 22125565e647f1eb0dd99493b2b33090a8335541..bd453bdcf44f94fea312b58282bb0e8c23ea7189 100644
+index 6423af82fbae4267d06229fde2390bfb5569137a..01fac95fde3c9b9d58e6a7ef7b35b48fe1c992ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -831,19 +831,19 @@ public class CraftEventFactory {
diff --git a/patches/server/0756-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0755-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0756-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0755-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0757-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0756-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 94%
rename from patches/server/0757-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0756-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 00860841de..b6efa41b2d 100644
--- a/patches/server/0757-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0756-Don-t-allow-vehicle-movement-from-players-while-tele.patch
@@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the
 regular player move packet.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index af43b1cf239a319f765058ff082485764528e01e..fb8b6fa69bf516bbaf50541e742e5375fc8c00ff 100644
+index e6e9a2688a3d2f789831a9e095e555f784bd9c4a..6842ccf68ab5ae2b2c093ea8ac34eeabc0f95770 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -465,6 +465,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0758-Implement-getComputedBiome-API.patch b/patches/server/0757-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0758-Implement-getComputedBiome-API.patch
rename to patches/server/0757-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0759-Make-some-itemstacks-nonnull.patch b/patches/server/0758-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0759-Make-some-itemstacks-nonnull.patch
rename to patches/server/0758-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0760-Implement-enchantWithLevels-API.patch b/patches/server/0759-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0760-Implement-enchantWithLevels-API.patch
rename to patches/server/0759-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0761-Fix-saving-in-unloadWorld.patch b/patches/server/0760-Fix-saving-in-unloadWorld.patch
similarity index 90%
rename from patches/server/0761-Fix-saving-in-unloadWorld.patch
rename to patches/server/0760-Fix-saving-in-unloadWorld.patch
index 769c10ebee..8de450b8cc 100644
--- a/patches/server/0761-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0760-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8a1583ce1f55d74e1516f62f730674bbadc4ed34..382e369aa6e5606abae431764e09c95078dfd8b8 100644
+index 6cbf54f50538082a9027ec04de3337fe20bda452..f4faa98285ab8cd675e84a5f5a02afb0c5cec599 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1336,7 +1336,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0762-Buffer-OOB-setBlock-calls.patch b/patches/server/0761-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0762-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0761-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0763-Add-TameableDeathMessageEvent.patch b/patches/server/0762-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0763-Add-TameableDeathMessageEvent.patch
rename to patches/server/0762-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0764-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0763-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 97%
rename from patches/server/0764-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0763-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 698d6aa543..a82a8f4727 100644
--- a/patches/server/0764-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0763-Fix-new-block-data-for-EntityChangeBlockEvent.patch
@@ -91,7 +91,7 @@ index 0a2c2b847dc516abf31870116056dbdbb22f31d9..45906d273e6d6ec20cf44b4d07efdac6
                                      }
                                      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 6d29fef4de10c4b75be591046ff1f8e3c24bb9bb..30627f330536b5c89b52452981f0a960b61e4268 100644
+index 2a8ed27101ff78542db120ff183ff33276fb832a..fed8a2519f6b20466f1986702baec2c0f7078dfe 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -580,7 +580,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -104,7 +104,7 @@ index 6d29fef4de10c4b75be591046ff1f8e3c24bb9bb..30627f330536b5c89b52452981f0a960
                  world.gameEvent(GameEvent.BLOCK_DESTROY, blockposition, GameEvent.Context.of(this.enderman, iblockdata));
                  this.enderman.setCarriedBlock(iblockdata.getBlock().defaultBlockState());
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index add3cd866452df727107e94fb2039bddebe909be..0c11d9bef8f0129c541e30ad057612e881703b24 100644
+index aac60e85cd6dba7d87f4a1663c2c62952521d112..151acc43c96b4545ce92d3d559d8e1591874b4b5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -158,7 +158,7 @@ public class Ravager extends Raider {
@@ -170,7 +170,7 @@ index bf0e05be3db1952b311e3eb9ab4881b12ee9dfd7..e59f9b83606da83f15924477ea2a2c4b
                  }
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/block/TntBlock.java b/src/main/java/net/minecraft/world/level/block/TntBlock.java
-index 443a8a8e2f0791a1455193cb125e1560f5d1edab..8eaf1eaf0f739a12baf6e3e9fe32c007eaba20ae 100644
+index ab53b42eec6eb57b373487e50066967042d6eb40..f8cff1f2825a8e428d8a99d0b1b58606a74a918a 100644
 --- a/src/main/java/net/minecraft/world/level/block/TntBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/TntBlock.java
 @@ -163,7 +163,7 @@ public class TntBlock extends Block {
@@ -196,7 +196,7 @@ index 61abbcfe97e3d3e3da5ee658672549d14594ad17..05e14322e519d1399e87beb532e1cc4a
              }
              // CraftBukkit end
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index de35569880efc2267e17c44b5011533fd348c2f3..b2f96da3405875eae5d4398d0dc3580108f561bd 100644
+index 01fac95fde3c9b9d58e6a7ef7b35b48fe1c992ed..269a3837becfe8eb56997276e840c7055e10e6eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1410,11 +1410,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0765-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0764-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 93%
rename from patches/server/0765-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0764-fix-player-loottables-running-when-mob-loot-gamerule.patch
index d2eae9e01e..84358c61a8 100644
--- a/patches/server/0765-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0764-fix-player-loottables-running-when-mob-loot-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0492704f7f365310d7ea930c30330a468a39c0de..fb46ba1b36c0a62dce022c86b742784828a31f2a 100644
+index c76358e108a72297baf92b234d43145dde09e99f..aba972c49d6044f5b72c98a2c4f99f6e3d531a91 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -924,12 +924,14 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0766-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0765-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 91%
rename from patches/server/0766-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0765-Ensure-entity-passenger-world-matches-ridden-entity.patch
index c3d21f2d7e..3a8db84ffb 100644
--- a/patches/server/0766-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0765-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity
 Bad plugins doing this would cause some obvious problems...
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 811479660f7e6148b5448d3342a862aff36ec673..f5cd50592244394c4186380a372a34733aa04c49 100644
+index 6c995ac8a40e61a29d685b5527807efa73375147..cef8f5473baab959471e108b81e418f6a668e8ac 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2846,7 +2846,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0767-cache-resource-keys.patch b/patches/server/0766-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0767-cache-resource-keys.patch
rename to patches/server/0766-cache-resource-keys.patch
diff --git a/patches/server/0768-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0767-Allow-changing-the-EnderDragon-podium.patch
similarity index 99%
rename from patches/server/0768-Allow-changing-the-EnderDragon-podium.patch
rename to patches/server/0767-Allow-changing-the-EnderDragon-podium.patch
index b85821e447..68a8615204 100644
--- a/patches/server/0768-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0767-Allow-changing-the-EnderDragon-podium.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow changing the EnderDragon podium
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 2ede6678a5fe6e1280ee4918b69302f483cc50ff..36893dac635f676ca447133a1bce32429347e4a5 100644
+index 290d97437e9c593816b4f4c4e738c268be616dc0..955d0ddb69c29de723b85c65f42b0274813aadac 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -103,6 +103,10 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0769-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0768-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0769-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0768-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0770-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0769-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0770-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0769-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0771-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0770-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 94%
rename from patches/server/0771-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0770-Prevent-tile-entity-copies-loading-chunks.patch
index a851952290..7e4fc60736 100644
--- a/patches/server/0771-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0770-Prevent-tile-entity-copies-loading-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 55f4dcaa58142f8710b54505d42f7f3e74bb7ce1..cae9c718ddd7b1f1978fe00d8adfbb5edef64ded 100644
+index 6842ccf68ab5ae2b2c093ea8ac34eeabc0f95770..985fdb70d4bc9fd6c08de83889108824facfd049 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3192,7 +3192,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0772-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0771-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 92%
rename from patches/server/0772-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0771-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 8187d4b8c3..f6ec1a2950 100644
--- a/patches/server/0772-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0771-Use-username-instead-of-display-name-in-PlayerList-g.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f173b0f4cd2cffc90a0f609cbc8bf29fdc1cf122..6e47d01db9e7f8519e560681922a0f15980d6acc 100644
+index 506d91df4dbcced7554db14b6efdf8697ea6805a..f22ca56e6acd56d894bd26d46133e835c7901b72 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1449,7 +1449,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0773-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0772-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 97%
rename from patches/server/0773-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0772-Pass-ServerLevel-for-gamerule-callbacks.patch
index 3a71f164e5..e384656b1c 100644
--- a/patches/server/0773-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0772-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3fb0d020493db8e5bde9f6fc76637c74b80fd791..0f562a8e0c5d4b2907174c9409977570869bd331 100644
+index bb3acbe0ad049703245c51a92539376811365eb2..30b9685963ffc620846c220d1fff3fda834f1ffa 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -18,7 +18,7 @@ index 3fb0d020493db8e5bde9f6fc76637c74b80fd791..0f562a8e0c5d4b2907174c9409977570
  
              if (dedicatedserverproperties.enableQuery) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cae9c718ddd7b1f1978fe00d8adfbb5edef64ded..4500a638c48c224dc38e0cfbc2f04e8bea0277ed 100644
+index 985fdb70d4bc9fd6c08de83889108824facfd049..79f791dbe8dced29b311ad50237da9bfec0fbb2f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2756,7 +2756,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -167,7 +167,7 @@ index f3cdf1fa7731eb7bb1cb89aa6a37204d81257cb0..0112ef51815c4fab38b95d5e917d335e
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f41d56da115c14d22d7256be6f16409fdf0e49cd..6b40538ecf9b42473114c3f2acfff5ff0bcf2167 100644
+index a39f439716678611bc7daf943d29b4c330ab5acc..499452383527844354b39b43fb2ea0853ba5478e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2038,7 +2038,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0774-Expand-PlayerItemDamageEvent.patch b/patches/server/0773-Expand-PlayerItemDamageEvent.patch
similarity index 93%
rename from patches/server/0774-Expand-PlayerItemDamageEvent.patch
rename to patches/server/0773-Expand-PlayerItemDamageEvent.patch
index b2968fc298..a549b4189c 100644
--- a/patches/server/0774-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0773-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 9a21a0aeff0da8e71ef8eea8bbfe3564409b986a..c134cf3f86b75de5ef66b23642624436cc934159 100644
+index 750ffb60c6136fe9e1d56e402578e2a9978d2703..23fec59b51c99c1f0ac19ffd6c84ffa8fc3caaac 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -638,10 +638,11 @@ public final class ItemStack {
diff --git a/patches/server/0775-WorldCreator-keepSpawnLoaded.patch b/patches/server/0774-WorldCreator-keepSpawnLoaded.patch
similarity index 94%
rename from patches/server/0775-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0774-WorldCreator-keepSpawnLoaded.patch
index 5f84a84054..fa5c412bf6 100644
--- a/patches/server/0775-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0774-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 382e369aa6e5606abae431764e09c95078dfd8b8..aaa31bdb80754d100f4f751ad4a8b4f8957cbaa3 100644
+index f4faa98285ab8cd675e84a5f5a02afb0c5cec599..eff4f3100b018bc6475a9307bfe9853cd69abd2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1283,7 +1283,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0776-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0775-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0776-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0775-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0777-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0776-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 94%
rename from patches/server/0777-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0776-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index 40f73296bd..bb631548bf 100644
--- a/patches/server/0777-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0776-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 2e80e2d80bc2ec981e47a42b9c30257898afa4ad..3574fe0ce7c161a13a78b66ab881463def8cc461 100644
+index 066e7e420b8eaa9733532a893855bcab14c22d0e..cfd09698025262f262489c4d024dc8b0013b542d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -423,12 +423,16 @@ public class ServerPlayerGameMode {
@@ -40,7 +40,7 @@ index 2e80e2d80bc2ec981e47a42b9c30257898afa4ad..3574fe0ce7c161a13a78b66ab881463d
                  return true;
                  // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
-index f82cd3677da96d3cf051c983d08a8ff302400b18..ed87664f513cf82c7bf8439672a656d0a57c1991 100644
+index 65d3311cfa251b0d3246413d0714acff7d31e844..a0ab721a01faccf216259c46e6d6f638426732c2 100644
 --- a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
 @@ -95,7 +95,7 @@ public class BeehiveBlock extends BaseEntityBlock {
diff --git a/patches/server/0778-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0777-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0778-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0777-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0779-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0778-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0779-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0778-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0780-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0779-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 96%
rename from patches/server/0780-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0779-fix-powder-snow-cauldrons-not-turning-to-water.patch
index d6e697f773..cfe6d93042 100644
--- a/patches/server/0780-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0779-fix-powder-snow-cauldrons-not-turning-to-water.patch
@@ -7,7 +7,7 @@ Powder snow cauldrons should turn to water when
 extinguishing an entity
 
 diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
-index 9c828328f5b8c1fe723437ed4a42cc1fe6a23d3d..5199ad9ca36ccd18eb2ff191feaf4331404049d2 100644
+index 542bc6be48d5c53eee988156e7aa6ecfccb51069..333cc37e4f3ca3ea95191dcaafda6be59ef79b96 100644
 --- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java
 @@ -69,7 +69,7 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock {
diff --git a/patches/server/0781-Add-PlayerStopUsingItemEvent.patch b/patches/server/0780-Add-PlayerStopUsingItemEvent.patch
similarity index 91%
rename from patches/server/0781-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0780-Add-PlayerStopUsingItemEvent.patch
index a59dc0b495..68ae540fef 100644
--- a/patches/server/0781-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0780-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9561bbe37c57f36edee9f77d69fff363db886b2d..dfdd9200bb9998ffd4631459d9be978480f76e83 100644
+index c41153ad6025fe276326132f6cbfd3986f9c5c51..35ea0d337684f8ff41142c1defc05121f1348ef7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -4025,6 +4025,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0782-Don-t-tick-markers.patch b/patches/server/0781-Don-t-tick-markers.patch
similarity index 97%
rename from patches/server/0782-Don-t-tick-markers.patch
rename to patches/server/0781-Don-t-tick-markers.patch
index ecbd39890d..32bb643d71 100644
--- a/patches/server/0782-Don-t-tick-markers.patch
+++ b/patches/server/0781-Don-t-tick-markers.patch
@@ -23,7 +23,7 @@ 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 4f48e7ee15f381e0bcf71fc4c7d37daf2dd4f7fd..6b798d81eeb226ce078dc867277ba80cb22c9d7d 100644
+index 4b0d854ed9fc16ecbdfabca4192969aa1beeaa19..0d5cdef130fb138c1b373ced129ccca245be4ec0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2585,6 +2585,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0783-Expand-FallingBlock-API.patch b/patches/server/0782-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0783-Expand-FallingBlock-API.patch
rename to patches/server/0782-Expand-FallingBlock-API.patch
diff --git a/patches/server/0784-Do-not-accept-invalid-client-settings.patch b/patches/server/0783-Do-not-accept-invalid-client-settings.patch
similarity index 94%
rename from patches/server/0784-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0783-Do-not-accept-invalid-client-settings.patch
index 46cef750c5..18f009fc3c 100644
--- a/patches/server/0784-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0783-Do-not-accept-invalid-client-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4500a638c48c224dc38e0cfbc2f04e8bea0277ed..2a603cd36fc98d9c80a6c7d9ea2be51cde369297 100644
+index 79f791dbe8dced29b311ad50237da9bfec0fbb2f..f98e289c90425864576dead48eacb21c00970dcc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3316,6 +3316,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0785-Add-support-for-Proxy-Protocol.patch b/patches/server/0784-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0785-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0784-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0786-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0785-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0786-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0785-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0787-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0786-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0787-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0786-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0788-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0787-Sanitize-sent-BlockEntity-NBT.patch
similarity index 96%
rename from patches/server/0788-Sanitize-sent-BlockEntity-NBT.patch
rename to patches/server/0787-Sanitize-sent-BlockEntity-NBT.patch
index c6db481373..d79abc0a00 100644
--- a/patches/server/0788-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0787-Sanitize-sent-BlockEntity-NBT.patch
@@ -18,7 +18,7 @@ index d79284a790569141c2ac8178d6ecc20b17cdd0d3..3944852921335c78a04a9dc301882ab5
  
      public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity) {
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
-index bf6cdc08367fc26716e7904162a21e63fecab3ed..51e24105facfe71ce9f2757c6c881a21b58dacfd 100644
+index 8ffb99aedaa57c1e96ddcc05143776b59c9700a3..998deae645b4497c3285bfba3260c636439f9ecf 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java
 @@ -186,6 +186,7 @@ public class ClientboundLevelChunkPacketData {
diff --git a/patches/server/0789-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0788-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0789-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0788-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0790-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0789-Prevent-entity-loading-causing-async-lookups.patch
similarity index 97%
rename from patches/server/0790-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0789-Prevent-entity-loading-causing-async-lookups.patch
index 75f49771d6..1d69022c7a 100644
--- a/patches/server/0790-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0789-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f5cd50592244394c4186380a372a34733aa04c49..125699e0d9c4e239e32a86376a059b28c2982713 100644
+index cef8f5473baab959471e108b81e418f6a668e8ac..2490da0e881e3514466bd44ba4f9336be67d603d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -802,6 +802,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0791-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0790-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0791-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0790-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0792-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0791-Add-Alternate-Current-redstone-implementation.patch
similarity index 99%
rename from patches/server/0792-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0791-Add-Alternate-Current-redstone-implementation.patch
index 8bc498bcb4..e7485866af 100644
--- a/patches/server/0792-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0791-Add-Alternate-Current-redstone-implementation.patch
@@ -2008,7 +2008,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 6b798d81eeb226ce078dc867277ba80cb22c9d7d..5c9083246fb7f49b9091ba7467d55b6dc7cd18f1 100644
+index 0d5cdef130fb138c1b373ced129ccca245be4ec0..88151659d6552d1678c202b8414476683807eafb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2034,7 +2034,7 @@ index 6b798d81eeb226ce078dc867277ba80cb22c9d7d..5c9083246fb7f49b9091ba7467d55b6d
  
          EntityCallbacks() {}
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 8c363306b5dac302ab3c26a245aa4a768b304ed4..8ad909802a107ff670e839915071a7d116099e1c 100644
+index 205323c8e643c77b7aefe588d5ee2f8b2b29ede4..17f8dc044619bfa055f67f12cd9a296504ac76ee 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1884,4 +1884,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0793-Dont-resent-entity-on-art-update.patch b/patches/server/0792-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0793-Dont-resent-entity-on-art-update.patch
rename to patches/server/0792-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0794-Add-WardenAngerChangeEvent.patch b/patches/server/0793-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0794-Add-WardenAngerChangeEvent.patch
rename to patches/server/0793-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0795-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0794-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 96%
rename from patches/server/0795-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0794-Add-option-for-strict-advancement-dimension-checks.patch
index 7901e28a13..1087bbd32e 100644
--- a/patches/server/0795-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0794-Add-option-for-strict-advancement-dimension-checks.patch
@@ -24,7 +24,7 @@ index 5f9cb2c7a2874e423087d04d3360af0364692b5c..428e0afef2cac9f2a19d8cfe8f2504dd
          } else {
              BlockPos blockPos = BlockPos.containing(x, y, z);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fb46ba1b36c0a62dce022c86b742784828a31f2a..c03ea45afb5537058cdeecc654184338b9aa0bd8 100644
+index aba972c49d6044f5b72c98a2c4f99f6e3d531a91..4cad73c9d53198dff598ae2cbc4ff0ea8fc9e828 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1321,6 +1321,12 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0796-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0795-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0796-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0795-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0797-Nameable-Banner-API.patch b/patches/server/0796-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0797-Nameable-Banner-API.patch
rename to patches/server/0796-Nameable-Banner-API.patch
diff --git a/patches/server/0798-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0797-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 95%
rename from patches/server/0798-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0797-Don-t-broadcast-messages-to-command-blocks.patch
index af775fb13c..c1d8ecd2f6 100644
--- a/patches/server/0798-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0797-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index c56f5173fda6b38c2dcaea196217f2f5a7d7c641..524b0f1086c01888fe0b76e180c40915
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5327445d9cced0b4e3875587d747f4f6a6cfbb07..3e84d684e113e42331aec4780144f62996b8841e 100644
+index 9c826cfb4f2e9336ae42d1b4ec1fbf2327021164..874387cce637c0adc3ded0f45f169c2c3b213d0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1873,7 +1873,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0799-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0798-Prevent-empty-items-from-being-added-to-world.patch
similarity index 93%
rename from patches/server/0799-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0798-Prevent-empty-items-from-being-added-to-world.patch
index 1a0a28f75a..e7db702bcc 100644
--- a/patches/server/0799-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0798-Prevent-empty-items-from-being-added-to-world.patch
@@ -7,7 +7,7 @@ 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 5c9083246fb7f49b9091ba7467d55b6dc7cd18f1..b82dc3d8558d18692769f7b9ee835a4eb4dd8253 100644
+index 88151659d6552d1678c202b8414476683807eafb..3d5e055e9ad5dff1ccc0836bd88bbacf09c02173 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1567,6 +1567,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0800-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0799-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0800-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0799-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0801-Add-Player-getFishHook.patch b/patches/server/0800-Add-Player-getFishHook.patch
similarity index 92%
rename from patches/server/0801-Add-Player-getFishHook.patch
rename to patches/server/0800-Add-Player-getFishHook.patch
index da9e9ebc91..d539d68f07 100644
--- a/patches/server/0801-Add-Player-getFishHook.patch
+++ b/patches/server/0800-Add-Player-getFishHook.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player#getFishHook
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index fd8d8b1e3583fe61b966f3550bd8e846b536b4e5..267863ff81a95d686b8db6cfee9256a2c5ad3f68 100644
+index 6e85e580d48622b4c90478b9afbc45b4445e86b0..2abbcbd393660de69fec567c3e31dbc774d93920 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -161,6 +161,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0802-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0801-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0802-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0801-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0803-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0802-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 98%
rename from patches/server/0803-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0802-Add-various-missing-EntityDropItemEvent-calls.patch
index 5f52f376f2..795c17a969 100644
--- a/patches/server/0803-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0802-Add-various-missing-EntityDropItemEvent-calls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 125699e0d9c4e239e32a86376a059b28c2982713..b9a1a7edb9f9aea0fa53cc3edfbc4522949f4093 100644
+index 2490da0e881e3514466bd44ba4f9336be67d603d..0d7d96af96eeb882e53938244ca57e0c439eb130 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2698,6 +2698,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0804-Fix-Bee-flower-NPE.patch b/patches/server/0803-Fix-Bee-flower-NPE.patch
similarity index 91%
rename from patches/server/0804-Fix-Bee-flower-NPE.patch
rename to patches/server/0803-Fix-Bee-flower-NPE.patch
index 7e9696d0ac..21a3d68e76 100644
--- a/patches/server/0804-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0803-Fix-Bee-flower-NPE.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Bee flower NPE
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index c534589762b1361bae7c446dfec8dbbf542485fb..a87a34b0c4c8e5d0cf079025c230b1434c919b54 100644
+index 91ea960ba223bae42655c581b9b6c0981f333c9b..f9521a6e115f0c975a7885b024c99eae300b63bf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -810,7 +810,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
diff --git a/patches/server/0805-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0804-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 92%
rename from patches/server/0805-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0804-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 75d3e8a365..6896c86ccb 100644
--- a/patches/server/0805-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0804-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2a603cd36fc98d9c80a6c7d9ea2be51cde369297..7342cc06b5b88f7dce5cd499a5aecd057463ec8f 100644
+index f98e289c90425864576dead48eacb21c00970dcc..a4db041d701a35d05f4b01886ff7ee04212c5d86 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2373,7 +2373,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0806-More-Teleport-API.patch b/patches/server/0805-More-Teleport-API.patch
similarity index 97%
rename from patches/server/0806-More-Teleport-API.patch
rename to patches/server/0805-More-Teleport-API.patch
index 351e548dad..6301505e12 100644
--- a/patches/server/0806-More-Teleport-API.patch
+++ b/patches/server/0805-More-Teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7342cc06b5b88f7dce5cd499a5aecd057463ec8f..e610c0209c65a7f8c645f3a626c662a78bd7382c 100644
+index a4db041d701a35d05f4b01886ff7ee04212c5d86..7a90ad5c707a01ae63662f94507fab312d415b85 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1632,11 +1632,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -72,7 +72,7 @@ index b7df71633527dce2e4f954caee249e3b31b82226..ee1dc74b2f48bf8d684562de895ab631
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1d43b01c96f00cb08c6e72d2f9496f2300da6634..0de707a3400d42249b49e8f1899879d7e361b2a8 100644
+index 8be0588680c55c19de4e3f0ecf17b96338c3c7b7..417c0d6942dd7e55629ba5926415a5274bde2dad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1207,13 +1207,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -211,7 +211,7 @@ index 1d43b01c96f00cb08c6e72d2f9496f2300da6634..0de707a3400d42249b49e8f1899879d7
          // Close any foreign inventory
 -        if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
 +        if (this.getHandle().containerMenu != this.getHandle().inventoryMenu && !allFlags.contains(io.papermc.paper.entity.TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY)) { // Paper
-             this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.TELEPORT); // Paper
+             this.getHandle().closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.TELEPORT); // Paper - Inventory close reason
          }
  
          // Check if the fromWorld and toWorld are the same.
diff --git a/patches/server/0807-Add-EntityPortalReadyEvent.patch b/patches/server/0806-Add-EntityPortalReadyEvent.patch
similarity index 95%
rename from patches/server/0807-Add-EntityPortalReadyEvent.patch
rename to patches/server/0806-Add-EntityPortalReadyEvent.patch
index f75955fb32..3404c37ff4 100644
--- a/patches/server/0807-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0806-Add-EntityPortalReadyEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b9a1a7edb9f9aea0fa53cc3edfbc4522949f4093..fc0f58560a53a783b9fabceee227bed3908bae89 100644
+index 0d7d96af96eeb882e53938244ca57e0c439eb130..4ac42a1cac859853f64fa5de3e709e7826d1f27f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3098,6 +3098,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0808-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0807-Don-t-use-level-random-in-entity-constructors.patch
similarity index 96%
rename from patches/server/0808-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0807-Don-t-use-level-random-in-entity-constructors.patch
index d587e0e603..c45ff812fb 100644
--- a/patches/server/0808-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0807-Don-t-use-level-random-in-entity-constructors.patch
@@ -9,7 +9,7 @@ should be supported. Some entities (for whatever
 reason) use the level's random in some places.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index fc14a2eb464675f8fb0bff916992687adb4e3d25..e19a0f1fac3dd04927f73f3d11a921ffc4608388 100644
+index c865456d58cf7c2077ac452b6a1e3db2b84047ef..13efea97d1836a48ef4c0e077a61571d9c171a0e 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -66,7 +66,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0809-Send-block-entities-after-destroy-prediction.patch b/patches/server/0808-Send-block-entities-after-destroy-prediction.patch
similarity index 98%
rename from patches/server/0809-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0808-Send-block-entities-after-destroy-prediction.patch
index 5160c09c53..04def1f820 100644
--- a/patches/server/0809-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0808-Send-block-entities-after-destroy-prediction.patch
@@ -57,7 +57,7 @@ index cfd09698025262f262489c4d024dc8b0013b542d..fc19c68c19d443be654a5600f633d3a7
              }
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5fa21ba5d9d3dffe525d0f11486bf82b71629c8a..18b365a1809b56e2a061cf32a274e43f76d3e02d 100644
+index 7a90ad5c707a01ae63662f94507fab312d415b85..dd1a969c6ac8ee08c9898703953dda88c7b4f97e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1778,8 +1778,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0810-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0809-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 96%
rename from patches/server/0810-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0809-Warn-on-plugins-accessing-faraway-chunks.patch
index db7aae3b68..be3a5623d1 100644
--- a/patches/server/0810-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0809-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -5,7 +5,7 @@ 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 8ad909802a107ff670e839915071a7d116099e1c..6a8e9a81b700caf87046580cc019efb2dbd07188 100644
+index 17f8dc044619bfa055f67f12cd9a296504ac76ee..b5815acea75cd70f65d9eb2b554b435c91be9994 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -812,7 +812,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -18,7 +18,7 @@ index 8ad909802a107ff670e839915071a7d116099e1c..6a8e9a81b700caf87046580cc019efb2
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bbcd28de0c05d56d7ed973c0e3ee455e976cdd18..9196e803b2cde66e288cb443639ad8750fef722c 100644
+index 499452383527844354b39b43fb2ea0853ba5478e..d4fae4420b96520b2e1f6db40141e5392559c6fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -312,9 +312,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0811-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0810-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/server/0811-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0810-Custom-Chat-Completion-Suggestions-API.patch
index 42d78c2ac6..1f20bc7a88 100644
--- a/patches/server/0811-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0810-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0de707a3400d42249b49e8f1899879d7e361b2a8..fe87c5ad1f206c71088342ca8f3865a0fdbdc2fb 100644
+index 417c0d6942dd7e55629ba5926415a5274bde2dad..434e3e92bd483de5a35e2f7c96f3c78c4e085239 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -647,6 +647,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0812-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0811-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0812-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0811-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0813-Collision-API.patch b/patches/server/0812-Collision-API.patch
similarity index 100%
rename from patches/server/0813-Collision-API.patch
rename to patches/server/0812-Collision-API.patch
diff --git a/patches/server/0814-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0813-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 92%
rename from patches/server/0814-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0813-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index b979460404..c042d58124 100644
--- a/patches/server/0814-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0813-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix suggest command message for brigadier syntax exceptions
 This is a bug accidentally introduced in upstream CB
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index cb1898f6daa79a0ac379a5caa7283a9155a70a15..34b1d9853dc44f9bba32421ad2c2e3ccff9daa29 100644
+index 4cec7e5b1086064650af50cc9b89da274c74bfd0..c1a80e0aa6692205f14d01b3c8c069e452101525 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -392,7 +392,7 @@ public class Commands {
diff --git a/patches/server/0815-Block-Ticking-API.patch b/patches/server/0814-Block-Ticking-API.patch
similarity index 95%
rename from patches/server/0815-Block-Ticking-API.patch
rename to patches/server/0814-Block-Ticking-API.patch
index 1e3e4cefc2..6387ad09be 100644
--- a/patches/server/0815-Block-Ticking-API.patch
+++ b/patches/server/0814-Block-Ticking-API.patch
@@ -31,7 +31,7 @@ index 6d10396347b69d9243ab902ecc68ede93fa17b7d..0a96b00a98227714ef99005e0a223765
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index f75455bf199258fa7097daf777d28ff672039fa2..ef4d45ebfe84467454a209501dad7db7fb316416 100644
+index 20dcbea3bb06e637a88d81ed09138b57797e270f..d5719d943946acd77dc9b26299c9f3d12d86062f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -718,4 +718,11 @@ public class CraftBlockData implements BlockData {
diff --git a/patches/server/0816-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0815-Add-Velocity-IP-Forwarding-Support.patch
similarity index 98%
rename from patches/server/0816-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0815-Add-Velocity-IP-Forwarding-Support.patch
index 6bcc358807..9db3935d77 100644
--- a/patches/server/0816-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0815-Add-Velocity-IP-Forwarding-Support.patch
@@ -106,7 +106,7 @@ index 0000000000000000000000000000000000000000..3c31ff3330c2e925e205c0c9ff4f0b83
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index d721c96b2b76209176f295896bff3bd03c241c4f..00c47942a3690df565bd0ea76b8abbf2dc50c4e2 100644
+index 30b9685963ffc620846c220d1fff3fda834f1ffa..6de6dad36203479677a29ad61e21bc369d4e5513 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -228,7 +228,7 @@ index c03329267a2a97af32a0c2c9d7e94fa00596e1cf..399786839bb9dbf96d2ecd654f999cb9
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3e84d684e113e42331aec4780144f62996b8841e..65daec67e955a7e1d36ffc1455ec561fb02d795a 100644
+index 874387cce637c0adc3ded0f45f169c2c3b213d0d..1b4837ddb216d66164a893f5a34c0505c6f1aab2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -803,7 +803,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0817-Add-NamespacedKey-biome-methods.patch b/patches/server/0816-Add-NamespacedKey-biome-methods.patch
similarity index 95%
rename from patches/server/0817-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0816-Add-NamespacedKey-biome-methods.patch
index 897f91ee26..7823841639 100644
--- a/patches/server/0817-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0816-Add-NamespacedKey-biome-methods.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4a5af85ebb573950c0c65d3a5f25b586173d16dd..7ebb0ef30bb0c613aae8b3899404010c6243e02a 100644
+index fd1ec07ada04de98d0a4f1ca4c93ec53771f88d7..0185faee3051c04b4924753ba56536e4e070476b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -601,6 +601,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0818-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0817-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 93%
rename from patches/server/0818-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0817-Fix-plugin-loggers-on-server-shutdown.patch
index 8584c59f5a..df7630d2fe 100644
--- a/patches/server/0818-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0817-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9a1c27bc7bee1f915675b82717dd82f6dd0f3ee6..bb8381c51bc6b37111b837710da7e1ccbca6df5d 100644
+index c3ce869eb8c53ba01f41840d050502ce94771253..ed9839ff23d0810912a6961979690c3fe9fc0e16 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1026,6 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -49,7 +49,7 @@ index 9a1c27bc7bee1f915675b82717dd82f6dd0f3ee6..bb8381c51bc6b37111b837710da7e1cc
          // Paper end - move final shutdown items here
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 37faa5ce82ae9ca2893250d86cc2eb21c00cc81f..39f361e2d3b31dc2587042df225132884a9156c0 100644
+index 68b849321757493c64e874b5a2c5d5357a52d698..5ad5b54e977af7dc86c2505f7ccdc77422adb33b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -18,6 +18,12 @@ public class Main {
diff --git a/patches/server/0819-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0818-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 93%
rename from patches/server/0819-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0818-Stop-large-look-changes-from-crashing-the-server.patch
index 94fa4c6c7f..ba3588d30d 100644
--- a/patches/server/0819-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0818-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dfdd9200bb9998ffd4631459d9be978480f76e83..a027d4b0769b7ee549dc25aac4a232fb1943e443 100644
+index 35ea0d337684f8ff41142c1defc05121f1348ef7..fd0af0cbcef59ff1c23e65a1e214fb9939a56a6e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3056,37 +3056,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -54,7 +54,7 @@ index dfdd9200bb9998ffd4631459d9be978480f76e83..a027d4b0769b7ee549dc25aac4a232fb
          this.level().getProfiler().pop();
          this.animStep += f2;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 444119c813af920eb25706341106f0fea27befa8..270dd1db56b187bffaedba9f2b86b3e46dda3152 100644
+index cd9ef09e2d975ab16a3b96b8662477b687d58a4f..d01570d7c3c8c4bd40cafc32d02774b789355460 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -259,13 +259,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
diff --git a/patches/server/0820-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0819-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 99%
rename from patches/server/0820-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0819-Fire-EntityChangeBlockEvent-in-more-places.patch
index e44a02f1da..168322884a 100644
--- a/patches/server/0820-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0819-Fire-EntityChangeBlockEvent-in-more-places.patch
@@ -147,7 +147,7 @@ index 78bdf7c0a058e84cafcd831c6d6f5123c0f168b0..e0cae3b6848af74fefc37a1e3183c501
                  CriteriaTriggers.ITEM_USED_ON_BLOCK.trigger((ServerPlayer)player, blockPos, itemStack);
              }
 diff --git a/src/main/java/net/minecraft/world/item/PotionItem.java b/src/main/java/net/minecraft/world/item/PotionItem.java
-index d7ef159cc44787558ba41964f57a79f048371e97..0a61a03c4aa9a66548896126b6f72c7a3474ba5a 100644
+index 5c62741e3a3854a7f674bfec49758f837f3bb9a0..b93ed2896ebeb8ec75eb3cfb717a740c97dd9622 100644
 --- a/src/main/java/net/minecraft/world/item/PotionItem.java
 +++ b/src/main/java/net/minecraft/world/item/PotionItem.java
 @@ -107,6 +107,12 @@ public class PotionItem extends Item {
diff --git a/patches/server/0821-Missing-eating-regain-reason.patch b/patches/server/0820-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0821-Missing-eating-regain-reason.patch
rename to patches/server/0820-Missing-eating-regain-reason.patch
diff --git a/patches/server/0822-Missing-effect-cause.patch b/patches/server/0821-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0822-Missing-effect-cause.patch
rename to patches/server/0821-Missing-effect-cause.patch
diff --git a/patches/server/0823-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0822-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0823-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0822-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0824-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0823-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 97%
rename from patches/server/0824-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0823-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 747d7487f6..a46b55a498 100644
--- a/patches/server/0824-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0823-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3e79a73e42875936e373f797dcde6a60a904a880..c95534156a9c6a9b612c478e396b8cc5a77f7b08 100644
+index 269664d3894835e5bafc39e65ee5245ae1d74d78..62e089f181b0e329e96c2157492a266f11f628c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -508,8 +508,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0825-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0824-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0825-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0824-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0826-Configurable-chat-thread-limit.patch b/patches/server/0825-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0826-Configurable-chat-thread-limit.patch
rename to patches/server/0825-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0827-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0826-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0827-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0826-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0828-fix-Jigsaw-block-kicking-user.patch b/patches/server/0827-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0828-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0827-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0829-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0828-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0829-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0828-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0830-Add-getDrops-to-BlockState.patch b/patches/server/0829-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0830-Add-getDrops-to-BlockState.patch
rename to patches/server/0829-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0831-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0830-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 99%
rename from patches/server/0831-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0830-Fix-a-bunch-of-vanilla-bugs.patch
index e8faff7cef..c8051b90c4 100644
--- a/patches/server/0831-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0830-Fix-a-bunch-of-vanilla-bugs.patch
@@ -126,7 +126,7 @@ index f761d600bb5d995a25ffbbe5469625508de1f8bc..7fa3066575fd8e762dcf5de59a333e15
          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 b82dc3d8558d18692769f7b9ee835a4eb4dd8253..bd37a2cb4c700566c72ada303138482f90d10742 100644
+index 3d5e055e9ad5dff1ccc0836bd88bbacf09c02173..4f121bf2e36d9d76bb4e7b3c379969105c12065e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1027,7 +1027,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -139,7 +139,7 @@ index b82dc3d8558d18692769f7b9ee835a4eb4dd8253..bd37a2cb4c700566c72ada303138482f
  
              if (!list.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1f5d86e6411fffddf70308f3fd3cb25275db1710..7a46b820c4f9354d2d07e9721bac25df3f043aa5 100644
+index 4cad73c9d53198dff598ae2cbc4ff0ea8fc9e828..5bfeb1d214817b425f89265375281395e326c101 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -468,14 +468,14 @@ public class ServerPlayer extends Player {
@@ -173,7 +173,7 @@ index fc19c68c19d443be654a5600f633d3a77f7069c1..9503511b28888e98ed65befdb95d0368
              this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit
              this.level.updateSleepingPlayerList();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index e1498e3c81fc3ed9e871fea3db5cfcccf45cac04..9822d70191512b263435a3761c683b6be4c7acf1 100644
+index f22ca56e6acd56d894bd26d46133e835c7901b72..d2d21ccc45381787698c84870537ba11ebb75127 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -711,8 +711,10 @@ public abstract class PlayerList {
diff --git a/patches/server/0832-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0831-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 94%
rename from patches/server/0832-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0831-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 19c93711aa..0b9ee9c5bf 100644
--- a/patches/server/0832-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0831-Remove-unnecessary-onTrackingStart-during-navigation.patch
@@ -5,7 +5,7 @@ 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 bd37a2cb4c700566c72ada303138482f90d10742..ec27d7e7248d8bf9e81db8a22923ff3af49324bb 100644
+index 4f121bf2e36d9d76bb4e7b3c379969105c12065e..f1f0056157d209ba5d987b6e09ce1fc020920fd9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2621,7 +2621,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0833-Fix-custom-piglin-loved-items.patch b/patches/server/0832-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0833-Fix-custom-piglin-loved-items.patch
rename to patches/server/0832-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0834-EntityPickupItemEvent-fixes.patch b/patches/server/0833-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0834-EntityPickupItemEvent-fixes.patch
rename to patches/server/0833-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0835-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0834-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 95%
rename from patches/server/0835-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0834-Correctly-handle-interactions-with-items-on-cooldown.patch
index 73e9357baa..ce63884072 100644
--- a/patches/server/0835-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0834-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 15f6bd2e61c02392e8383dc93d734990c8c7edca..6c415090035fdbba6e0e3533aa2f1c3b401ab9ff 100644
+index 9503511b28888e98ed65befdb95d03685ae9e5e1..870447743db05043f6d3c0f2a699310077529636 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -516,6 +516,7 @@ public class ServerPlayerGameMode {
@@ -30,7 +30,7 @@ index 15f6bd2e61c02392e8383dc93d734990c8c7edca..6c415090035fdbba6e0e3533aa2f1c3b
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b2f96da3405875eae5d4398d0dc3580108f561bd..38fc706dabbeb93959638deb22311e226a48a6ee 100644
+index 269a3837becfe8eb56997276e840c7055e10e6eb..fe855fd532e80a2d6b10053670dfb1b8fc009ac2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -543,7 +543,13 @@ public class CraftEventFactory {
diff --git a/patches/server/0836-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0835-Add-PlayerInventorySlotChangeEvent.patch
similarity index 95%
rename from patches/server/0836-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0835-Add-PlayerInventorySlotChangeEvent.patch
index 066ab1476e..fc01c1ca33 100644
--- a/patches/server/0836-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0835-Add-PlayerInventorySlotChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6251e68eff87a0b26d6123fdb658749e90fcfc42..6fd2e6b6400f8fc6e1cb82a25275c48fae5a18dc 100644
+index 5bfeb1d214817b425f89265375281395e326c101..cdd5c2fa44d114058391b78434e1cb268c40dc6e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -379,6 +379,25 @@ public class ServerPlayer extends Player {
@@ -35,7 +35,7 @@ index 6251e68eff87a0b26d6123fdb658749e90fcfc42..6fd2e6b6400f8fc6e1cb82a25275c48f
              @Override
              public void dataChanged(AbstractContainerMenu handler, int property, int value) {}
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index b22cf4636108794092d8e289368b72a10a16d3cd..2a73cdc6b347aa31a74c2372b0bdc7b00706004a 100644
+index 7d7b60a5c27a620b570dc5e72bb0b4c7963ca4d4..3e0de232b9f89887fd10e9bbe6de89dfe23e61ea 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -302,7 +302,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0837-Elder-Guardian-appearance-API.patch b/patches/server/0836-Elder-Guardian-appearance-API.patch
similarity index 90%
rename from patches/server/0837-Elder-Guardian-appearance-API.patch
rename to patches/server/0836-Elder-Guardian-appearance-API.patch
index 81d06d0601..6b3feb4446 100644
--- a/patches/server/0837-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0836-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 80856e4dc50bbcc3b210a6599f12a85f64865bba..c0ebd4c5714e6005b27af56512a07db22e28093e 100644
+index 434e3e92bd483de5a35e2f7c96f3c78c4e085239..a65284d453e2bb436db1ce12f008e7e98f84f9f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3189,6 +3189,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0838-Allow-changing-bed-s-occupied-property.patch b/patches/server/0837-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0838-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0837-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0839-Add-entity-knockback-API.patch b/patches/server/0838-Add-entity-knockback-API.patch
similarity index 91%
rename from patches/server/0839-Add-entity-knockback-API.patch
rename to patches/server/0838-Add-entity-knockback-API.patch
index fbc29ab409..d9d400dd3a 100644
--- a/patches/server/0839-Add-entity-knockback-API.patch
+++ b/patches/server/0838-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c95534156a9c6a9b612c478e396b8cc5a77f7b08..4a213c35b031d78c4ce2be181d78f36cb8f16c02 100644
+index 62e089f181b0e329e96c2157492a266f11f628c3..4b2ee2e1300203b2f3369cbf8ffcf1ad72153258 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1035,5 +1035,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0840-Detect-headless-JREs.patch b/patches/server/0839-Detect-headless-JREs.patch
similarity index 96%
rename from patches/server/0840-Detect-headless-JREs.patch
rename to patches/server/0839-Detect-headless-JREs.patch
index 5861f80bb1..637c75c82a 100644
--- a/patches/server/0840-Detect-headless-JREs.patch
+++ b/patches/server/0839-Detect-headless-JREs.patch
@@ -27,7 +27,7 @@ index 6bd0afddbcc461149dfe9a5c7a86fff6ea13a5f1..148d233f4f5278ff39eacdaa0f4f0e7d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index 7b996a1c24e66d87c95b9f075248eb1d72ad0476..e65546ab25b9dc814ea14aabfbae8f80017ab88b 100644
+index b0a0909fa9501dfacfbe70dc4118062d1154bd15..19009f0c1d572eebad6cce93f8cf56ca820fc33f 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -175,6 +175,18 @@ public class Main {
diff --git a/patches/server/0841-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0840-fix-entity-vehicle-collision-event-not-called.patch
similarity index 93%
rename from patches/server/0841-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0840-fix-entity-vehicle-collision-event-not-called.patch
index fb96955e57..9fe5a7cf02 100644
--- a/patches/server/0841-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0840-fix-entity-vehicle-collision-event-not-called.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix entity vehicle collision event not called
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 9780232286052d2cbbd604e71caf47dfb81fc1dc..dc421a0a6430583f1f0154e1dd689b80253f6e3d 100644
+index 9a6b6120c248a57d9dc86ca215146f6de980bd0d..d514ec1e4cbdc579c3a61533998437903afdc8b6 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 @@ -168,7 +168,15 @@ public abstract class AbstractMinecart extends VehicleEntity {
diff --git a/patches/server/0842-optimize-dirt-and-snow-spreading.patch b/patches/server/0841-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0842-optimize-dirt-and-snow-spreading.patch
rename to patches/server/0841-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/0843-Add-EntityToggleSitEvent.patch b/patches/server/0842-Add-EntityToggleSitEvent.patch
similarity index 98%
rename from patches/server/0843-Add-EntityToggleSitEvent.patch
rename to patches/server/0842-Add-EntityToggleSitEvent.patch
index f8933f4f78..71b347d012 100644
--- a/patches/server/0843-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0842-Add-EntityToggleSitEvent.patch
@@ -57,7 +57,7 @@ index 94bb69a7f5795e0fbee171433632b5c3bca3b902..287e52dc844c2a64dac74dad117b775f
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index eb61d539fcf15dfc51b3ea52c232a0c7ef4f1ca9..3a6483c29803acbbb9a5b4b49fae22de7575504f 100644
+index 11694f103ebc522c2ad6eb6d494d39cc31ea3107..f783fe169141d33e8569ec7f5d71985b74bdbcb6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -138,6 +138,7 @@ public class Panda extends Animal {
diff --git a/patches/server/0844-Add-fire-tick-delay-option.patch b/patches/server/0843-Add-fire-tick-delay-option.patch
similarity index 95%
rename from patches/server/0844-Add-fire-tick-delay-option.patch
rename to patches/server/0843-Add-fire-tick-delay-option.patch
index 9c65fa7731..6da077e53d 100644
--- a/patches/server/0844-Add-fire-tick-delay-option.patch
+++ b/patches/server/0843-Add-fire-tick-delay-option.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add fire-tick-delay option
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
-index 0006aec00ab708b1906fbb87d79a9506397c9226..f239755b7ca75de1cf5a194e49d8dbc5a44af6f8 100644
+index b1e9ea9ece5ef8ecbe2ed919fda8e1153724dc93..14817a0d760afc9edd6a97d51ace2348a8fcfbfa 100644
 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
 @@ -172,7 +172,7 @@ public class FireBlock extends BaseFireBlock {
diff --git a/patches/server/0845-Add-Moving-Piston-API.patch b/patches/server/0844-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0845-Add-Moving-Piston-API.patch
rename to patches/server/0844-Add-Moving-Piston-API.patch
diff --git a/patches/server/0846-Ignore-impossible-spawn-tick.patch b/patches/server/0845-Ignore-impossible-spawn-tick.patch
similarity index 90%
rename from patches/server/0846-Ignore-impossible-spawn-tick.patch
rename to patches/server/0845-Ignore-impossible-spawn-tick.patch
index cfdb9da989..9c98b51936 100644
--- a/patches/server/0846-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0845-Ignore-impossible-spawn-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ignore impossible spawn tick
 
 
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 9f677a695bdb8ebde457452e4b70c674e2016830..3aa4cb526f04a171ace0b95d18ecebc9a002470a 100644
+index b90c1e4e03f85dbfa7134bffd8da59330cea1e28..21b5765a12c5e4998870601e9665bd066a4ea471 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -82,6 +82,7 @@ public abstract class BaseSpawner {
diff --git a/patches/server/0847-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0846-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0847-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0846-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0848-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0847-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0848-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0847-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0849-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0848-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 95%
rename from patches/server/0849-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0848-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index 362f24728b..52bbf44364 100644
--- a/patches/server/0849-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0848-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fc0f58560a53a783b9fabceee227bed3908bae89..aa634b67ee3a0c473f5e6f6cb6adb0306350ce1c 100644
+index 4ac42a1cac859853f64fa5de3e709e7826d1f27f..888a8f5920083a24601d13123b6defd12b6b64d7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3377,6 +3377,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0850-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0849-Add-PrePlayerAttackEntityEvent.patch
similarity index 93%
rename from patches/server/0850-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0849-Add-PrePlayerAttackEntityEvent.patch
index ef0c58aa92..de0539fb9e 100644
--- a/patches/server/0850-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0849-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f6ca517fbe3742381a932958e9893e32b81e390b..618aaee0abebef15078c90859a7aa815288e655a 100644
+index 61516fbc3cbfb3aa85895b4458b5319752149f73..d72ea2f3d9528f79149791e34065ea1f299cd089 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1240,8 +1240,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0851-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0850-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 96%
rename from patches/server/0851-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0850-ensure-reset-EnderDragon-boss-event-name.patch
index 0c1a084b1c..56b3405307 100644
--- a/patches/server/0851-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0850-ensure-reset-EnderDragon-boss-event-name.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ensure reset EnderDragon boss event name
 Fix MC-257487
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 02acd171f1d3d783b7cab56c69feca5325878fa8..c298977ae1cac57524b21efcb908b846cbcff6b6 100644
+index 2d74efff30c93ba664cf8dbf20e47dcdbd767d3f..e2e2c9f168ae4651f8fa484f6f2a17ba25f99207 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -73,6 +73,7 @@ public class EndDragonFight {
diff --git a/patches/server/0852-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0851-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0852-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0851-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0853-Add-Player-Warden-Warning-API.patch b/patches/server/0852-Add-Player-Warden-Warning-API.patch
similarity index 95%
rename from patches/server/0853-Add-Player-Warden-Warning-API.patch
rename to patches/server/0852-Add-Player-Warden-Warning-API.patch
index 8b8ddd6d03..48462712ee 100644
--- a/patches/server/0853-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0852-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c0ebd4c5714e6005b27af56512a07db22e28093e..0dbb8d77b79ae2ae3aca4a96aeb92a981c07292a 100644
+index a65284d453e2bb436db1ce12f008e7e98f84f9f6..03b2df036d3618c1ff8291fbf70879aff4a65324 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3194,6 +3194,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0854-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0853-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 97%
rename from patches/server/0854-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0853-More-vanilla-friendly-methods-to-update-trades.patch
index 67411f0ade..0617aa53ad 100644
--- a/patches/server/0854-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0853-More-vanilla-friendly-methods-to-update-trades.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More vanilla friendly methods to update trades
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 363d1f469862c2e980624ff69f74be015c19412d..e12f1f11386fa723f62b51ed0cc5715c1812d2bf 100644
+index b33fa26d6e3cf8999fb24137069d0a4178f82caf..5c2010fb247462433bed6ae58d88a72c4e137ede 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -944,6 +944,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
diff --git a/patches/server/0855-Add-paper-dumplisteners-command.patch b/patches/server/0854-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0855-Add-paper-dumplisteners-command.patch
rename to patches/server/0854-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0856-check-global-player-list-where-appropriate.patch b/patches/server/0855-check-global-player-list-where-appropriate.patch
similarity index 96%
rename from patches/server/0856-check-global-player-list-where-appropriate.patch
rename to patches/server/0855-check-global-player-list-where-appropriate.patch
index 1643eb9ec7..8ce81166b6 100644
--- a/patches/server/0856-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0855-check-global-player-list-where-appropriate.patch
@@ -7,7 +7,7 @@ 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 ec27d7e7248d8bf9e81db8a22923ff3af49324bb..3c1a3a757cec89058ae9300be6902d3fe9342d25 100644
+index f1f0056157d209ba5d987b6e09ce1fc020920fd9..5b2de5cdac2440a4043c34525a0852067aa9371f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2744,4 +2744,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -24,7 +24,7 @@ index ec27d7e7248d8bf9e81db8a22923ff3af49324bb..3c1a3a757cec89058ae9300be6902d3f
 +    // Paper end - check global player list where appropriate
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7e0882411d7be80a432c05f2e1a8a192c36ccf63..7ca74c68ee81a46b5c71a454c754fd4e6ffae4bb 100644
+index fd0af0cbcef59ff1c23e65a1e214fb9939a56a6e..49fdc6d198cc7af31e6c1d1ba52c8adc0fae433f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3678,7 +3678,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0857-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0856-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0857-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0856-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0858-ItemStack-damage-API.patch b/patches/server/0857-ItemStack-damage-API.patch
similarity index 97%
rename from patches/server/0858-ItemStack-damage-API.patch
rename to patches/server/0857-ItemStack-damage-API.patch
index 3c21227751..98eb7e5cf6 100644
--- a/patches/server/0858-ItemStack-damage-API.patch
+++ b/patches/server/0857-ItemStack-damage-API.patch
@@ -11,7 +11,7 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4a213c35b031d78c4ce2be181d78f36cb8f16c02..9de132dc39f2af083b2f60d6344b9a9635c1de83 100644
+index 4b2ee2e1300203b2f3369cbf8ffcf1ad72153258..d12734b0c6b10ca8997a79e06fc9791abe0e9ed5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -1036,6 +1036,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0859-Friction-API.patch b/patches/server/0858-Friction-API.patch
similarity index 98%
rename from patches/server/0859-Friction-API.patch
rename to patches/server/0858-Friction-API.patch
index 1939ce5239..8b4f147d22 100644
--- a/patches/server/0859-Friction-API.patch
+++ b/patches/server/0858-Friction-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Friction API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f039ea2716efa3fabf041f75388c2c9b7f41948f..03beb4cf21d98d2b7439c5d548dc1dae51482d9b 100644
+index 49fdc6d198cc7af31e6c1d1ba52c8adc0fae433f..c13a7ae57c046832f65af11dc5efbc7b197b6f74 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -261,6 +261,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0860-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0859-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 97%
rename from patches/server/0860-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0859-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 3e5f525d0d..0d4f49bc51 100644
--- a/patches/server/0860-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0859-Ability-to-control-player-s-insomnia-and-phantoms.patch
@@ -29,7 +29,7 @@ index 75cdddbfbbc4c0c521194dde27ba5f5d17221842..b350d41a724048af06f9aa9bbef039d3
      private EntitySelector() {}
      // Paper start
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
-index 8c9caa324402568ce9f55e733f4d14430159347a..eab7b0c18389a6980c621c2a0a0879dca9b53121 100644
+index 76982e0dbab0ecb6f7d4cd8a748af940492a31e7..ed80960777b18faca2d6a99783e53daf5fa19e09 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
 @@ -33,13 +33,22 @@ public class PhantomSpawner implements CustomSpawner {
diff --git a/patches/server/0861-Fix-player-kick-on-shutdown.patch b/patches/server/0860-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0861-Fix-player-kick-on-shutdown.patch
rename to patches/server/0860-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0862-Sync-offhand-slot-in-menus.patch b/patches/server/0861-Sync-offhand-slot-in-menus.patch
similarity index 94%
rename from patches/server/0862-Sync-offhand-slot-in-menus.patch
rename to patches/server/0861-Sync-offhand-slot-in-menus.patch
index abb074b19f..b04cc1689c 100644
--- a/patches/server/0862-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0861-Sync-offhand-slot-in-menus.patch
@@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th
 by pressing the offhand swap item
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6fd2e6b6400f8fc6e1cb82a25275c48fae5a18dc..3abcb4470bbf8f83204532ff5f3f5e152866a9f0 100644
+index cdd5c2fa44d114058391b78434e1cb268c40dc6e..fb2ac7c4b9d938bc699ddc7475e2c3c3777cd056 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -348,6 +348,13 @@ public class ServerPlayer extends Player {
@@ -26,7 +26,7 @@ index 6fd2e6b6400f8fc6e1cb82a25275c48fae5a18dc..3abcb4470bbf8f83204532ff5f3f5e15
              public void sendSlotChange(AbstractContainerMenu handler, int slot, ItemStack stack) {
                  ServerPlayer.this.connection.send(new ClientboundContainerSetSlotPacket(handler.containerId, handler.incrementStateId(), slot, stack));
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index 2a73cdc6b347aa31a74c2372b0bdc7b00706004a..9eef711958443726249a75e6b4fac70a1714397e 100644
+index 3e0de232b9f89887fd10e9bbe6de89dfe23e61ea..cdd23fb468f30bff52fdf8555b6106f13d0f5552 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -200,6 +200,7 @@ public abstract class AbstractContainerMenu {
diff --git a/patches/server/0863-Player-Entity-Tracking-Events.patch b/patches/server/0862-Player-Entity-Tracking-Events.patch
similarity index 96%
rename from patches/server/0863-Player-Entity-Tracking-Events.patch
rename to patches/server/0862-Player-Entity-Tracking-Events.patch
index 005bab7fe4..58c861db20 100644
--- a/patches/server/0863-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0862-Player-Entity-Tracking-Events.patch
@@ -21,7 +21,7 @@ index 7fa3066575fd8e762dcf5de59a333e15044226e8..6ccd2a5a334c846850a9d064210f2d7f
                  } else if (this.seenBy.remove(player.connection)) {
                      this.serverEntity.removePairing(player);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index aa634b67ee3a0c473f5e6f6cb6adb0306350ce1c..df3bdb116ead1596c6f93d6e9eb45711fb9b5eb5 100644
+index 888a8f5920083a24601d13123b6defd12b6b64d7..c15c3e4da36c8804934c2c0b046aabd457be6855 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4104,7 +4104,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0864-Limit-pet-look-distance.patch b/patches/server/0863-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0864-Limit-pet-look-distance.patch
rename to patches/server/0863-Limit-pet-look-distance.patch
diff --git a/patches/server/0865-Properly-resend-entities.patch b/patches/server/0864-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0865-Properly-resend-entities.patch
rename to patches/server/0864-Properly-resend-entities.patch
index 7ca3f62502..c4448fc5bf 100644
--- a/patches/server/0865-Properly-resend-entities.patch
+++ b/patches/server/0864-Properly-resend-entities.patch
@@ -85,7 +85,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..ccb7d92b6c36b6225a2e640f8cea6c0d
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e14c4e09fbfcd19bd53fcc1560aae317587cee0f..903d04140739f6c1df58bdfcc6a3aa690b289d66 100644
+index dd1a969c6ac8ee08c9898703953dda88c7b4f97e..0fe7770fd4506980667e154c83d7024112cac26d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2653,7 +2653,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -98,7 +98,7 @@ index e14c4e09fbfcd19bd53fcc1560aae317587cee0f..903d04140739f6c1df58bdfcc6a3aa69
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b8213713b54e0bfaa0ddca41ec76f6840c0e1d20..7968ebbd3c56ff1b33491ffcfdab254f799ddeef 100644
+index d2d21ccc45381787698c84870537ba11ebb75127..a625091f59aadccae7fc40c94b620248bca125de 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -376,7 +376,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0866-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0865-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 95%
rename from patches/server/0866-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0865-Fixes-and-additions-to-the-SpawnReason-API.patch
index deab687e21..4398db1d19 100644
--- a/patches/server/0866-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0865-Fixes-and-additions-to-the-SpawnReason-API.patch
@@ -21,16 +21,16 @@ index 2fa2e5cada590c0f44a4735bcf20de51892f428b..3c4a57bc6159eac53fe37e817e765018
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
-index 9652e3385ad10e5d825dd141f6be3522c596916d..baea154a24d1b888af18b9b792db9edebe60ebc6 100644
+index 61a36c4e97ee532e53eee4da00a9aa7e4b3438f5..d3b4420e664fedf86d107e819056d2e20f9c0722 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java
 @@ -54,7 +54,7 @@ public class DragonFireball extends AbstractHurtingProjectile {
  
-                 if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), list.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) areaEffectCloud.getBukkitEntity()).callEvent()) { // Paper
+                 if (new com.destroystokyo.paper.event.entity.EnderDragonFireballHitEvent((org.bukkit.entity.DragonFireball) this.getBukkitEntity(), list.stream().map(LivingEntity::getBukkitLivingEntity).collect(java.util.stream.Collectors.toList()), (org.bukkit.entity.AreaEffectCloud) areaEffectCloud.getBukkitEntity()).callEvent()) { // Paper - EnderDragon Events
                  this.level().levelEvent(2006, this.blockPosition(), this.isSilent() ? -1 : 1);
 -                this.level().addFreshEntity(areaEffectCloud);
 +                this.level().addFreshEntity(areaEffectCloud, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.EXPLOSION); // Paper - use correct spawn reason
-                 } else areaEffectCloud.discard(); // Paper
+                 } else areaEffectCloud.discard(); // Paper - EnderDragon Events
                  this.discard();
              }
 diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java
diff --git a/patches/server/0867-fix-Instruments.patch b/patches/server/0866-fix-Instruments.patch
similarity index 96%
rename from patches/server/0867-fix-Instruments.patch
rename to patches/server/0866-fix-Instruments.patch
index ad87dc712d..c55f770244 100644
--- a/patches/server/0867-fix-Instruments.patch
+++ b/patches/server/0866-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0dbb8d77b79ae2ae3aca4a96aeb92a981c07292a..73019b008afaa88d2e068ed4e8f006dfb1dbaf5f 100644
+index 03b2df036d3618c1ff8291fbf70879aff4a65324..d2ddc69d94cd5d78563896015053364013bb151a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -724,7 +724,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0868-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0867-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 97%
rename from patches/server/0868-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0867-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 097481e10f..638f7e665c 100644
--- a/patches/server/0868-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0867-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve inlining for some hot BlockBehavior and FluidState
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
-index d91a82428a435a65bc55ad466ccebe91e0d905e0..88d7973e83ee828fa71d95924a9134935e80954d 100644
+index 100c2629f2746fc00435f60998dba70135637ef7..7fa2b2bc9d6e7eea8b18fd649c9220945d71a4ff 100644
 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
 @@ -1078,15 +1078,15 @@ public abstract class BlockBehaviour implements FeatureElement {
diff --git a/patches/server/0869-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0868-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0869-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0868-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0870-Add-BlockLockCheckEvent.patch b/patches/server/0869-Add-BlockLockCheckEvent.patch
similarity index 98%
rename from patches/server/0870-Add-BlockLockCheckEvent.patch
rename to patches/server/0869-Add-BlockLockCheckEvent.patch
index 72fd17bc24..07ffc14ac2 100644
--- a/patches/server/0870-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0869-Add-BlockLockCheckEvent.patch
@@ -56,7 +56,7 @@ index fce3a45d09a93ca68a3d49f2e666afa4c860d042..b8b4d74076fa5ed6eb3b2045384db77e
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
-index 1ef558bdd27e9b64413e64f0fa9c68a35f43c39d..c7b0590b742a57d524de41151fc08fc596097d9c 100644
+index 5ea2cad4031d69f0204e3094d9ac5d127ef2438c..44660b9f3d8ef6df42dc05e774a5804fdbfa5d14 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
 @@ -470,7 +470,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
diff --git a/patches/server/0871-Add-Sneaking-API-for-Entities.patch b/patches/server/0870-Add-Sneaking-API-for-Entities.patch
similarity index 91%
rename from patches/server/0871-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0870-Add-Sneaking-API-for-Entities.patch
index b3ade95727..116708204d 100644
--- a/patches/server/0871-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0870-Add-Sneaking-API-for-Entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 7cda23cf7400edcfa1436f6457edd7566cd42323..75d24e0d9f3c84f436d967415ee469e5969d3368 100644
+index 49e5a9fa95ebf4568eb875953f3032b8a7142080..35b6aa33b7715032686acdfd8e5b07d63729593b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -871,6 +871,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0872-Improve-logging-and-errors.patch b/patches/server/0871-Improve-logging-and-errors.patch
similarity index 98%
rename from patches/server/0872-Improve-logging-and-errors.patch
rename to patches/server/0871-Improve-logging-and-errors.patch
index 23e62762ad..f10cdbe3e8 100644
--- a/patches/server/0872-Improve-logging-and-errors.patch
+++ b/patches/server/0871-Improve-logging-and-errors.patch
@@ -40,7 +40,7 @@ index 536f0c496ce36ca3248fc6eeac9bbd77214a36f9..31718823250a1490b783f426fff65bf5
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d7dd28e73c3d4419766ad37b9c494b3ce2e2d21..332464e238ea49544f28306c1a4a8ed3f8381761 100644
+index 0fe7770fd4506980667e154c83d7024112cac26d..9b7da229e8dc8249b36e7ccf1e77997a146efb88 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3390,7 +3390,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0873-Improve-PortalEvents.patch b/patches/server/0872-Improve-PortalEvents.patch
similarity index 93%
rename from patches/server/0873-Improve-PortalEvents.patch
rename to patches/server/0872-Improve-PortalEvents.patch
index 6af7e83d12..c3be194782 100644
--- a/patches/server/0873-Improve-PortalEvents.patch
+++ b/patches/server/0872-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index df3bdb116ead1596c6f93d6e9eb45711fb9b5eb5..4c8369e968df8b2a809f9c6c2db6cc185104a385 100644
+index c15c3e4da36c8804934c2c0b046aabd457be6855..2777f71abf23be6748b0a80fe4dd64a89d38ffdb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3762,7 +3762,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0874-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0873-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0874-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0873-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0875-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0874-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 93%
rename from patches/server/0875-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0874-Add-missing-SpigotConfig-logCommands-check.patch
index 2ff3583856..f694ecb04d 100644
--- a/patches/server/0875-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0874-Add-missing-SpigotConfig-logCommands-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 332464e238ea49544f28306c1a4a8ed3f8381761..0a70260f8d01ebbf6d35f852461a1d7710bb4b1b 100644
+index 9b7da229e8dc8249b36e7ccf1e77997a146efb88..813f42c2f3925bd50f08b0a4f422bbff91e003e5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2134,7 +2134,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0876-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0875-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0876-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0875-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0877-Flying-Fall-Damage.patch b/patches/server/0876-Flying-Fall-Damage.patch
similarity index 92%
rename from patches/server/0877-Flying-Fall-Damage.patch
rename to patches/server/0876-Flying-Fall-Damage.patch
index 5be2b42d65..de70f746b5 100644
--- a/patches/server/0877-Flying-Fall-Damage.patch
+++ b/patches/server/0876-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 618aaee0abebef15078c90859a7aa815288e655a..f07b79cced4fa47dbb6b4aa75a384a2a08a53b03 100644
+index d72ea2f3d9528f79149791e34065ea1f299cd089..7562b8a0f0bc8e43b3c0b64c6d66786c2c93b5cd 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity {
@@ -26,7 +26,7 @@ index 618aaee0abebef15078c90859a7aa815288e655a..f07b79cced4fa47dbb6b4aa75a384a2a
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 73019b008afaa88d2e068ed4e8f006dfb1dbaf5f..6b2f69187ed85ba197fbcd04b22e6d81a1d15dbc 100644
+index d2ddc69d94cd5d78563896015053364013bb151a..1d4b098564ace12dac15506d9f192f6ed27ec864 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2472,6 +2472,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0878-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0877-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 98%
rename from patches/server/0878-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0877-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index e09b5ff99d..3d4a817cae 100644
--- a/patches/server/0878-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/server/0877-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
@@ -41,7 +41,7 @@ index 8bde8c581796ed11809b80b9a30a33df86116745..f339475185645f7be30963e4f980ce81
  
      public DamageSource outOfBorder() {
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 5a2e322d349340fa58f133c2034765f90319b2be..7bb8dc1f4697960cdc6bac0daec4b7a06a2dd7c4 100644
+index 299583b1eb72cfdb4771ba0755fd71f2135484c1..4d51baab29b1a913c3efef2cb4ab0cac6c8cf38a 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -368,7 +368,7 @@ public class Explosion {
@@ -130,7 +130,7 @@ index f81c0d07a5efc92942d8ab5c50a8260db033307d..8afc396c162d928902a9d9beb9f039b0
      // See BlockStateFactory#createBlockState(World, BlockPosition, IBlockData, TileEntity)
      private static CraftBlockState getBlockState(World world, BlockPos blockPosition, net.minecraft.world.level.block.state.BlockState blockData, BlockEntity tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 38fc706dabbeb93959638deb22311e226a48a6ee..f5a1ff50e8943d7ea75f8b8534b17f7788d094e2 100644
+index fe855fd532e80a2d6b10053670dfb1b8fc009ac2..019c333a477e6e5f90447110f39ba0e9591a56f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1045,7 +1045,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0879-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0878-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 91%
rename from patches/server/0879-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0878-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index a9ab51aafd..18f693331e 100644
--- a/patches/server/0879-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0878-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4c8369e968df8b2a809f9c6c2db6cc185104a385..cd28a4ca35d6fe29c51f19be6cc43795c91c0454 100644
+index 2777f71abf23be6748b0a80fe4dd64a89d38ffdb..511d4e3581ce3e525b6d8c1a7d3b2d10ceaca770 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1161,7 +1161,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0880-config-for-disabling-entity-tag-tags.patch b/patches/server/0879-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0880-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0879-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0881-Use-single-player-info-update-packet-on-join.patch b/patches/server/0880-Use-single-player-info-update-packet-on-join.patch
similarity index 94%
rename from patches/server/0881-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0880-Use-single-player-info-update-packet-on-join.patch
index 2ab5c52eb0..32a22c8803 100644
--- a/patches/server/0881-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0880-Use-single-player-info-update-packet-on-join.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b9d4e5e49088065a60087ee2587e7e25ca72f5db..ad086107f9be8da3816ab1d80576be0718dc0054 100644
+index 813f42c2f3925bd50f08b0a4f422bbff91e003e5..7fea36c86d5f11604aa910c84a26898519b61422 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3420,7 +3420,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -18,7 +18,7 @@ index b9d4e5e49088065a60087ee2587e7e25ca72f5db..ad086107f9be8da3816ab1d80576be07
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7968ebbd3c56ff1b33491ffcfdab254f799ddeef..09397946cb9fa82e20772ea981bdadbc6a5c93c7 100644
+index a625091f59aadccae7fc40c94b620248bca125de..f13bb3e384b45f8dd34b61de372c1068437a0f90 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -358,6 +358,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0882-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0881-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 95%
rename from patches/server/0882-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0881-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 082a9af27a..00d0733f65 100644
--- a/patches/server/0882-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0881-Correctly-shrink-items-during-EntityResurrectEvent.patch
@@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem
 of undying was found and the event was called uncancelled.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0e66212733665307840d10bd6ea049d45f674ddb..9f3b88a30e76d82f5e02f317a5f2676be44acaa9 100644
+index c13a7ae57c046832f65af11dc5efbc7b197b6f74..a0b7ab6a740992ff7b498effe16dc0c09a3b3f84 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1611,7 +1611,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0883-Win-Screen-API.patch b/patches/server/0882-Win-Screen-API.patch
similarity index 93%
rename from patches/server/0883-Win-Screen-API.patch
rename to patches/server/0882-Win-Screen-API.patch
index 837c6b728e..e699a45b6a 100644
--- a/patches/server/0883-Win-Screen-API.patch
+++ b/patches/server/0882-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6b2f69187ed85ba197fbcd04b22e6d81a1d15dbc..d42d2692c34660b82ef19d8eed60322b5fceece0 100644
+index 1d4b098564ace12dac15506d9f192f6ed27ec864..65bcc0b4a864c26a3167273230f642e0603c0702 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1226,6 +1226,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0884-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0883-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0884-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0883-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0885-Fix-force-opening-enchantment-tables.patch b/patches/server/0884-Fix-force-opening-enchantment-tables.patch
similarity index 94%
rename from patches/server/0885-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0884-Fix-force-opening-enchantment-tables.patch
index 7137782d6f..70439d1f0f 100644
--- a/patches/server/0885-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0884-Fix-force-opening-enchantment-tables.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 267863ff81a95d686b8db6cfee9256a2c5ad3f68..5e5fda690605f767b33f8225bffea98d23299fea 100644
+index 2abbcbd393660de69fec567c3e31dbc774d93920..10fad0ba0624fdb601de9cfb9dc82590bd8149ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -402,7 +402,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0886-Add-Entity-Body-Yaw-API.patch b/patches/server/0885-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0886-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0885-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0887-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0886-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0887-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0886-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0888-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0887-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 90%
rename from patches/server/0888-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0887-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 17954c83a3..6d30351d9c 100644
--- a/patches/server/0888-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0887-Update-the-flag-when-a-captured-block-state-is-outda.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update the flag when a captured block state is outdated
 
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 6a8e9a81b700caf87046580cc019efb2dbd07188..2afa2d7b5978cc8474228ff45b66d0d3fac7728a 100644
+index b5815acea75cd70f65d9eb2b554b435c91be9994..460b1c589d335e1c74cffc8d39fa1e4a1abd45c7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -922,6 +922,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0889-Add-EntityFertilizeEggEvent.patch b/patches/server/0888-Add-EntityFertilizeEggEvent.patch
similarity index 97%
rename from patches/server/0889-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0888-Add-EntityFertilizeEggEvent.patch
index 61a69b1a3f..3558b6dd4d 100644
--- a/patches/server/0889-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0888-Add-EntityFertilizeEggEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityFertilizeEggEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index f8c1dfc8e121a406955348a1ec00c264d73e73f7..d8056421249c8e75e96a55ec07dce84d2bba9c5c 100644
+index 2a3f1d14a4b24a3219d191b4f2e97ed7b061e006..f97bdfbd07db000845d3b791de64056c3c23f7ba 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -445,6 +445,10 @@ public class Turtle extends Animal {
@@ -69,7 +69,7 @@ index 0e85e3ab58d848b119212fa7d2eb4f92d3efe29b..0a5b953bd8c0c7f181da4090b950e9e6
          this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F);
          } // Paper - Call EntityDropItemEvent
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f5a1ff50e8943d7ea75f8b8534b17f7788d094e2..5b95d95c89b962315dd07afb2a426c01c77fc4ab 100644
+index 019c333a477e6e5f90447110f39ba0e9591a56f3..0d407f06866571f3d87891e1a22d7aef625b39db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2092,4 +2092,29 @@ public class CraftEventFactory {
diff --git a/patches/server/0890-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0889-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 94%
rename from patches/server/0890-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0889-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 4aea1758ef..39cf518fa6 100644
--- a/patches/server/0890-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0889-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix HumanEntity#drop not updating the client inv
 public net.minecraft.server.level.ServerPlayer containerSynchronizer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 5e5fda690605f767b33f8225bffea98d23299fea..897e693492bdf9293154535d5772929bc2b1a523 100644
+index 10fad0ba0624fdb601de9cfb9dc82590bd8149ce..94c2ea713e0614de570458f6b9c418a3d67d14b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -755,8 +755,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0891-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0890-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0891-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0890-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0892-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0891-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0892-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0891-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0893-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0892-Fix-advancement-triggers-for-entity-damage.patch
similarity index 97%
rename from patches/server/0893-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0892-Fix-advancement-triggers-for-entity-damage.patch
index 4b04d3a488..a1bff3ea41 100644
--- a/patches/server/0893-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0892-Fix-advancement-triggers-for-entity-damage.patch
@@ -23,7 +23,7 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a
  
              return !this.getResponse();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9f3b88a30e76d82f5e02f317a5f2676be44acaa9..202819877d5920e8d0429a8c1bf06af4b9af950f 100644
+index a0b7ab6a740992ff7b498effe16dc0c09a3b3f84..169590748b65c3160361ae41d124e7651871c7f0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2302,7 +2302,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0894-Fix-text-display-error-on-spawn.patch b/patches/server/0893-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0894-Fix-text-display-error-on-spawn.patch
rename to patches/server/0893-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0895-Fix-inventories-returning-null-Locations.patch b/patches/server/0894-Fix-inventories-returning-null-Locations.patch
similarity index 97%
rename from patches/server/0895-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0894-Fix-inventories-returning-null-Locations.patch
index ca5f09c8df..9cf8fcb0e6 100644
--- a/patches/server/0895-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0894-Fix-inventories-returning-null-Locations.patch
@@ -30,7 +30,7 @@ index d5eeb2fcb119b815213aeffb3811d4a843502e50..ff1aba1e69cfde633fd01724f1a8d0af
      }
  
 diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-index 0b1a0be964d799f1706c273092dc653fa04e8014..3c67132bd3c1e4886f7ba823fe330b019359ac9d 100644
+index de919d72e6e3ef160c7d22ca6a4e9f79a1fe493e..86199457586dc4d4f0d8ccaac812e8340aaac957 100644
 --- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
 @@ -51,6 +51,12 @@ public class BeaconMenu extends AbstractContainerMenu {
diff --git a/patches/server/0896-Add-Shearable-API.patch b/patches/server/0895-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0896-Add-Shearable-API.patch
rename to patches/server/0895-Add-Shearable-API.patch
diff --git a/patches/server/0897-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0896-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0897-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0896-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0898-Optimize-Hoppers.patch b/patches/server/0897-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0898-Optimize-Hoppers.patch
rename to patches/server/0897-Optimize-Hoppers.patch
index c7b7da2085..17aa94ac70 100644
--- a/patches/server/0898-Optimize-Hoppers.patch
+++ b/patches/server/0897-Optimize-Hoppers.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..5c42823726e70ce6c9d0121d07431548
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 44ca57d91c64a062c379de38c2a5af2d6fae1af3..e9ec17c4dfb44f6f562dedd20d123064492ef736 100644
+index ed9839ff23d0810912a6961979690c3fe9fc0e16..afc23f859188a6cda27a683babd551c250a748ef 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1672,6 +1672,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -62,7 +62,7 @@ index 44ca57d91c64a062c379de38c2a5af2d6fae1af3..e9ec17c4dfb44f6f562dedd20d123064
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index c134cf3f86b75de5ef66b23642624436cc934159..d62fffa3a7cb33600328d413a27ff1bf70298933 100644
+index 23fec59b51c99c1f0ac19ffd6c84ffa8fc3caaac..6d1986d4dfa4dd4f5988c6afa023f9bd518e1d4e 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -749,10 +749,16 @@ public final class ItemStack {
diff --git a/patches/server/0899-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0898-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 96%
rename from patches/server/0899-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0898-Fix-beehives-generating-from-using-bonemeal.patch
index f84aee22bc..d8bf63c062 100644
--- a/patches/server/0899-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0898-Fix-beehives-generating-from-using-bonemeal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix beehives generating from using bonemeal
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index d62fffa3a7cb33600328d413a27ff1bf70298933..63cd9cd79217a9bcedb6647e6f61d9bccc28d9f0 100644
+index 6d1986d4dfa4dd4f5988c6afa023f9bd518e1d4e..71d93daa527ae34b83138394fa79289c403a33d8 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -422,6 +422,7 @@ public final class ItemStack {
diff --git a/patches/server/0900-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0899-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 93%
rename from patches/server/0900-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0899-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index bedd123fea..576441539c 100644
--- a/patches/server/0900-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0899-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix crash relating to bad recipes in furnace-like tile
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index d493136283ae5100c0dc22f8da5f7e5b64fdc5f5..b39c6c91e088dbe2187ed7fd598076f41c53bd49 100644
+index d7beeac4a8e4a16221809663a5aa03389a759742..d04fc84eef11adb5ea64077f48794b6ed7fb3ada 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -643,6 +643,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
diff --git a/patches/server/0901-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0900-Treat-sequence-violations-like-they-should-be.patch
similarity index 92%
rename from patches/server/0901-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0900-Treat-sequence-violations-like-they-should-be.patch
index 033fb9eb64..3470210a4c 100644
--- a/patches/server/0901-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0900-Treat-sequence-violations-like-they-should-be.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8bcd8a7fa65e05ccef0a205319cad9e84b4341b5..166dbfb6a06ac69774ecfe2e8c0b0c6f22a44d19 100644
+index 7fea36c86d5f11604aa910c84a26898519b61422..ac126672d5fa58be8110c573abce5628f0532967 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2038,6 +2038,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0902-remove-duplicate-animate-packet-for-records.patch b/patches/server/0901-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0902-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0901-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0903-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0902-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 97%
rename from patches/server/0903-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0902-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 4714881433..937e6c80c1 100644
--- a/patches/server/0903-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0902-Prevent-causing-expired-keys-from-impacting-new-join.patch
@@ -24,7 +24,7 @@ index 0e54e8faa48751a651b953bec72543a94edf74bc..d43106eb89b14667e85cd6e8fa047d64
          UPDATE_GAME_MODE((serialized, buf) -> {
              serialized.gameMode = GameType.byId(buf.readVarInt());
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 166dbfb6a06ac69774ecfe2e8c0b0c6f22a44d19..253d37d7e8677e438d8463eee557682aade86a1e 100644
+index ac126672d5fa58be8110c573abce5628f0532967..91dbd137575c9191fcb48d561880f0b7a309334b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -287,6 +287,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0904-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0903-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 91%
rename from patches/server/0904-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0903-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 249a12dda7..1f17b1f7b1 100644
--- a/patches/server/0904-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0903-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
@@ -5,7 +5,7 @@ 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 3c1a3a757cec89058ae9300be6902d3fe9342d25..e8dc785913f5fd1238a73c2384d2abef0e9d2e4b 100644
+index 5b2de5cdac2440a4043c34525a0852067aa9371f..ab472d2e81c0756020ffb727db4b71aeb8d9d020 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1704,6 +1704,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/0905-Use-array-for-gamerule-storage.patch b/patches/server/0904-Use-array-for-gamerule-storage.patch
similarity index 97%
rename from patches/server/0905-Use-array-for-gamerule-storage.patch
rename to patches/server/0904-Use-array-for-gamerule-storage.patch
index 37b97e470a..1629a3b7cf 100644
--- a/patches/server/0905-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0904-Use-array-for-gamerule-storage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use array for gamerule storage
 
 
 diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index dd03426943dd380cefe12afe3e63c3180a22ec4f..afe91d02363bf7385d34447dda8960980ec48443 100644
+index 0112ef51815c4fab38b95d5e917d335eeaaa21cd..c246981987017a2f86c5d632929356855e2b5714 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
 @@ -114,6 +114,7 @@ public class GameRules {
diff --git a/patches/server/0906-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0905-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0906-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0905-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0907-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0906-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 91%
rename from patches/server/0907-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0906-Fix-demo-flag-not-enabling-demo-mode.patch
index 80f51e2120..588524d49e 100644
--- a/patches/server/0907-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0906-Fix-demo-flag-not-enabling-demo-mode.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix demo flag not enabling demo mode
 https://github.com/PaperMC/Paper/issues/9046
 
 diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
-index e65546ab25b9dc814ea14aabfbae8f80017ab88b..4a565321174d9230823a07cf37fb104f9f92245f 100644
+index 19009f0c1d572eebad6cce93f8cf56ca820fc33f..61840cfd64caba6595dfc99c91c76a195638d4ee 100644
 --- a/src/main/java/net/minecraft/server/Main.java
 +++ b/src/main/java/net/minecraft/server/Main.java
 @@ -333,7 +333,9 @@ public class Main {
diff --git a/patches/server/0908-Add-Mob-Experience-reward-API.patch b/patches/server/0907-Add-Mob-Experience-reward-API.patch
similarity index 89%
rename from patches/server/0908-Add-Mob-Experience-reward-API.patch
rename to patches/server/0907-Add-Mob-Experience-reward-API.patch
index f8e4f5e754..874d481524 100644
--- a/patches/server/0908-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0907-Add-Mob-Experience-reward-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Mob Experience reward API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index b8d16e2e91e3bf1c004f887bf37e5502938fdd1d..5f6a1fb323782816f706ccf7df922cb203238302 100644
+index ad293ad9d5dcd7836a4fa29b4b687346e3ae516c..31f62fbb54ec7b270fbd8afba7bd7c4bfafa09e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -170,4 +170,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
diff --git a/patches/server/0909-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0908-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0909-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0908-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0910-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0909-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 92%
rename from patches/server/0910-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0909-Fix-DamageCause-for-Falling-Blocks.patch
index 0bfd342e6f..82f43537bd 100644
--- a/patches/server/0910-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0909-Fix-DamageCause-for-Falling-Blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5b95d95c89b962315dd07afb2a426c01c77fc4ab..afa9b967aec163eea0359910bb682395401feaa4 100644
+index 0d407f06866571f3d87891e1a22d7aef625b39db..03ac6ae291945a31552956fc107a3854227e1151 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1085,6 +1085,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0911-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0910-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0911-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0910-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0912-More-accurate-isInOpenWater-impl.patch b/patches/server/0911-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0912-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0911-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0913-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0912-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0913-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0912-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0914-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0913-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 94%
rename from patches/server/0914-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0913-Optimise-recalcBlockCounts-for-empty-sections.patch
index 5918de4d55..2828d37eeb 100644
--- a/patches/server/0914-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0913-Optimise-recalcBlockCounts-for-empty-sections.patch
@@ -16,7 +16,7 @@ sections with a ZeroBitStorage data to to take ~20% of the process,
 now it takes <1%.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index b39fea80fcb83873b7e7085eaaf935e712f0ede7..9da74764a91bea7822c0444b48623b23e038d3f2 100644
+index 6d340a9b64ae900dfe84eeeaf7a39f7e7a139198..1a473187c22c4158959a3aae33a6823229c5b7a7 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 @@ -144,6 +144,7 @@ public class LevelChunkSection {
diff --git a/patches/server/0915-Expand-PlayerItemMendEvent.patch b/patches/server/0914-Expand-PlayerItemMendEvent.patch
similarity index 96%
rename from patches/server/0915-Expand-PlayerItemMendEvent.patch
rename to patches/server/0914-Expand-PlayerItemMendEvent.patch
index c53087c237..48868e0e00 100644
--- a/patches/server/0915-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0914-Expand-PlayerItemMendEvent.patch
@@ -33,7 +33,7 @@ index 5685951b71a8b81c7a71fd93b099b276d535b401..b37e13c5de1a0a22a3713d04b203afc6
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d42d2692c34660b82ef19d8eed60322b5fceece0..c21f3ca67672fffa0b2ae0a0e241932efbaedc8a 100644
+index 65bcc0b4a864c26a3167273230f642e0603c0702..c49d3448866caae8a2ceb51a45c3a056124f8f57 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1754,11 +1754,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -51,7 +51,7 @@ index d42d2692c34660b82ef19d8eed60322b5fceece0..c21f3ca67672fffa0b2ae0a0e241932e
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index afa9b967aec163eea0359910bb682395401feaa4..8e3799f0c778ae15169fadced83a84e6553a7bc0 100644
+index 03ac6ae291945a31552956fc107a3854227e1151..b0bcef03da4f4dfe41fb88b47bfec576af76f21b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1321,10 +1321,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0916-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0915-Refresh-ProjectileSource-for-projectiles.patch
similarity index 95%
rename from patches/server/0916-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0915-Refresh-ProjectileSource-for-projectiles.patch
index edd538ada4..2b9a9a63bd 100644
--- a/patches/server/0916-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0915-Refresh-ProjectileSource-for-projectiles.patch
@@ -14,7 +14,7 @@ clearing the owner.
 Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cd28a4ca35d6fe29c51f19be6cc43795c91c0454..b8205779022e56a0af10b02b52be77e035da1a6b 100644
+index 511d4e3581ce3e525b6d8c1a7d3b2d10ceaca770..5af4da94c5710fd6d58fecbc60ba432c94319fe3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -385,6 +385,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -26,7 +26,7 @@ index cd28a4ca35d6fe29c51f19be6cc43795c91c0454..b8205779022e56a0af10b02b52be77e0
      public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
      public boolean persistentInvisibility = false;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 270dd1db56b187bffaedba9f2b86b3e46dda3152..5b6d5c799cc8e601a01b6967917e15ba1e2db721 100644
+index d01570d7c3c8c4bd40cafc32d02774b789355460..d6c0488618cedfa6fe47375daca4c38a8f49ccbc 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -50,14 +50,31 @@ public abstract class Projectile extends Entity implements TraceableEntity {
diff --git a/patches/server/0917-Add-transient-modifier-API.patch b/patches/server/0916-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0917-Add-transient-modifier-API.patch
rename to patches/server/0916-Add-transient-modifier-API.patch
diff --git a/patches/server/0918-Fix-block-place-logic.patch b/patches/server/0917-Fix-block-place-logic.patch
similarity index 97%
rename from patches/server/0918-Fix-block-place-logic.patch
rename to patches/server/0917-Fix-block-place-logic.patch
index feb8adf581..750fc73db9 100644
--- a/patches/server/0918-Fix-block-place-logic.patch
+++ b/patches/server/0917-Fix-block-place-logic.patch
@@ -41,7 +41,7 @@ index 71d93daa527ae34b83138394fa79289c403a33d8..94cb7625c451df53de60783535ce0d58
                          }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2afa2d7b5978cc8474228ff45b66d0d3fac7728a..92e823a123129694a9db5f54659f8d14abebf9b1 100644
+index 460b1c589d335e1c74cffc8d39fa1e4a1abd45c7..4ffbf7b738445bed08d9f889c6d9b5cadbb2165c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1037,17 +1037,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0919-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0918-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 94%
rename from patches/server/0919-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0918-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 1b0f7c67c4..9871a477c8 100644
--- a/patches/server/0919-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0918-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 6070711b9825612fbc485d840ed3ed80cf912493..587167154b5528faea457485c0d38c0f48e8904a 100644
+index 94cb7625c451df53de60783535ce0d58b37e35bf..5f3512f58124e0664666eeee541a6a22c022f75a 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -544,7 +544,11 @@ public final class ItemStack {
diff --git a/patches/server/0920-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0919-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0920-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0919-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0921-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0920-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 89%
rename from patches/server/0921-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0920-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index c8c82e2a7e..15631f0f32 100644
--- a/patches/server/0921-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0920-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 65daec67e955a7e1d36ffc1455ec561fb02d795a..5f24bab8b21452e502af70a925ceeaecbedd4a6c 100644
+index 1b4837ddb216d66164a893f5a34c0505c6f1aab2..029b88ab23f9c1faa50fb4a367a56ede77008ea8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -352,7 +352,11 @@ public final class CraftServer implements Server {
@@ -17,7 +17,7 @@ index 65daec67e955a7e1d36ffc1455ec561fb02d795a..5f24bab8b21452e502af70a925ceeaec
 +        final YamlConfiguration commandsDefaults = YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/commands.yml"), Charsets.UTF_8));
 +        if (this.commandsConfiguration.contains("aliases")) commandsDefaults.set("aliases", null);
 +        this.commandsConfiguration.setDefaults(commandsDefaults);
-+        // Paper stop - don't enforce icanhasbukkit default if alias block exists
++        // Paper end - don't enforce icanhasbukkit default if alias block exists
          this.saveCommandsConfig();
  
          // Migrate aliases from old file and add previously implicit $1- to pass all arguments
diff --git a/patches/server/0922-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0921-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0922-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0921-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0923-Fix-sniffer-removeExploredLocation.patch b/patches/server/0922-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0923-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0922-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0924-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0923-Add-method-to-remove-all-active-potion-effects.patch
similarity index 91%
rename from patches/server/0924-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0923-Add-method-to-remove-all-active-potion-effects.patch
index 3152d18aa2..56ade4ed63 100644
--- a/patches/server/0924-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0923-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 33e977f87e06c4f022b913006c20ac53eb28f172..1f1ef68a9a449a4a90c284f34a397ab4b6d905f6 100644
+index 310ce32708601d95cda2647e101d02d48ccdbb77..4afc1c9d2a7638e84a55fe30932dc36db465c31a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -502,6 +502,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0925-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0924-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 91%
rename from patches/server/0925-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0924-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
index d14b29086f..e0a566756b 100644
--- a/patches/server/0925-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
+++ b/patches/server/0924-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Temp: Pre-init PlayerChunkLoaderData in order to prepopulate
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 39f361e2d3b31dc2587042df225132884a9156c0..16e73128115ef92adefbd7818fef3a4b9bcebad2 100644
+index 5ad5b54e977af7dc86c2505f7ccdc77422adb33b..62d9737a8d36d4863ffd7853ba290ef83c759687 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -368,6 +368,7 @@ public class Main {
diff --git a/patches/server/0926-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0925-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0926-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0925-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0927-Properly-cancel-usable-items.patch b/patches/server/0926-Properly-cancel-usable-items.patch
similarity index 92%
rename from patches/server/0927-Properly-cancel-usable-items.patch
rename to patches/server/0926-Properly-cancel-usable-items.patch
index ef9ac9fa17..a97f6e58dc 100644
--- a/patches/server/0927-Properly-cancel-usable-items.patch
+++ b/patches/server/0926-Properly-cancel-usable-items.patch
@@ -10,7 +10,7 @@ The underlying issue of this is that the client modifies their synced data value
 them in order for the client to reset their using item state.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index d0210fb4347cce1010499b9e2f7986e55ee9022c..4fdcff0ab2fb83cebbd05b00f5d6ed287cfc58ac 100644
+index 870447743db05043f6d3c0f2a699310077529636..84cc7d9b42cf8b2925ee433d87cb138d58a40fb3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -557,6 +557,7 @@ public class ServerPlayerGameMode {
@@ -34,7 +34,7 @@ index d0210fb4347cce1010499b9e2f7986e55ee9022c..4fdcff0ab2fb83cebbd05b00f5d6ed28
          return enuminteractionresult;
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 253d37d7e8677e438d8463eee557682aade86a1e..5d1a1b2abc62f15251d954e90e8e51dac184e8dd 100644
+index 91dbd137575c9191fcb48d561880f0b7a309334b..a9a8850b2ddb4b4326542c7efa3f263b1f532b86 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1950,6 +1950,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -46,7 +46,7 @@ index 253d37d7e8677e438d8463eee557682aade86a1e..5d1a1b2abc62f15251d954e90e8e51da
                  return;
              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 75ab201ecd32b1ff2cf84466ff6a2a2029134ca2..ec37b97abd1d47331b31fc9f6637ac59ee3e7f97 100644
+index 169590748b65c3160361ae41d124e7651871c7f0..629d38851558207f302e9baa0157218d7c8596d7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3814,6 +3814,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0928-Add-event-for-player-editing-sign.patch b/patches/server/0927-Add-event-for-player-editing-sign.patch
similarity index 98%
rename from patches/server/0928-Add-event-for-player-editing-sign.patch
rename to patches/server/0927-Add-event-for-player-editing-sign.patch
index 9eea1724fe..62a97be048 100644
--- a/patches/server/0928-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0927-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 587167154b5528faea457485c0d38c0f48e8904a..064b86c80e12af1e1e7f9b28484f51e9a3474e82 100644
+index 5f3512f58124e0664666eeee541a6a22c022f75a..5756ab17e721d5886ed669a0527e18769b8e1b8b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -523,7 +523,7 @@ public final class ItemStack {
diff --git a/patches/server/0929-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0928-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0929-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0928-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0930-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0929-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 97%
rename from patches/server/0930-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0929-Fix-cmd-permission-levels-for-command-blocks.patch
index 509c920615..588d49923f 100644
--- a/patches/server/0930-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0929-Fix-cmd-permission-levels-for-command-blocks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix cmd permission levels for command blocks
 
 
 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
-index e65d7980b7ebed60786bc31e2f8156fda3b59556..6978d0a9abc9cc5870ac5ee6308f2e9949b42fde 100644
+index 21c9b903e26f93b8d4e97f3e0d98e3b2e45857f9..623403c56d79e29421f340e97c05488efaf1893d 100644
 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
 +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
 @@ -204,10 +204,29 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
@@ -41,7 +41,7 @@ index e65d7980b7ebed60786bc31e2f8156fda3b59556..6978d0a9abc9cc5870ac5ee6308f2e99
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 34b1d9853dc44f9bba32421ad2c2e3ccff9daa29..c1907c3095f095be0ee08681f5aed587c962328c 100644
+index c1a80e0aa6692205f14d01b3c8c069e452101525..92e8aed5efd5c6f7f8baf44f4712209acd58cf83 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -296,16 +296,7 @@ public class Commands {
diff --git a/patches/server/0931-Add-option-to-disable-block-updates.patch b/patches/server/0930-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0931-Add-option-to-disable-block-updates.patch
rename to patches/server/0930-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0932-Call-missing-BlockDispenseEvent.patch b/patches/server/0931-Call-missing-BlockDispenseEvent.patch
similarity index 98%
rename from patches/server/0932-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0931-Call-missing-BlockDispenseEvent.patch
index d2414deee8..1dc0f4a812 100644
--- a/patches/server/0932-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0931-Call-missing-BlockDispenseEvent.patch
@@ -50,7 +50,7 @@ index a16fb04c014d3b2f3dac0610f8be81586d41c4e9..ad9eb752a2676c6acdba601b63a5fd16
                              for (int k = 0; k < 5; ++k) {
                                  worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8e3799f0c778ae15169fadced83a84e6553a7bc0..3f8195475fbad4d517d5417ece9555831377d1cc 100644
+index b0bcef03da4f4dfe41fb88b47bfec576af76f21b..203824f47c705e621377f69baf8296073835e6ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2098,6 +2098,32 @@ public class CraftEventFactory {
diff --git a/patches/server/0933-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0932-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 90%
rename from patches/server/0933-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0932-Don-t-load-chunks-for-supporting-block-checks.patch
index e731c10ccd..5a73ddb1a0 100644
--- a/patches/server/0933-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0932-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b8205779022e56a0af10b02b52be77e035da1a6b..3633138b67a3b92a4d7792bbc4387632015fcc3b 100644
+index 5af4da94c5710fd6d58fecbc60ba432c94319fe3..e88a8c86c9d68807bd5026c43a9363b3f1186390 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1361,7 +1361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0934-Optimize-player-lookups-for-beacons.patch b/patches/server/0933-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0934-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0933-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0935-Add-Sign-getInteractableSideFor.patch b/patches/server/0934-Add-Sign-getInteractableSideFor.patch
similarity index 96%
rename from patches/server/0935-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0934-Add-Sign-getInteractableSideFor.patch
index e03e64bf9b..a295746b04 100644
--- a/patches/server/0935-Add-Sign-getInteractableSideFor.patch
+++ b/patches/server/0934-Add-Sign-getInteractableSideFor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sign#getInteractableSideFor
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-index 393e6e5fb2c901cdf369cfe5bcde454dee2b1b0d..6a883c185eb7ae228cb767044f7395ef1d08ab28 100644
+index c79a80428961b0941d4f6ed31d641cbf0e6a7203..979a8f472f866130a3abb10f535df757eaa50c20 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 @@ -66,13 +66,18 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
diff --git a/patches/server/0936-Array-backed-synched-entity-data.patch b/patches/server/0935-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0936-Array-backed-synched-entity-data.patch
rename to patches/server/0935-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0937-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0936-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0937-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0936-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0938-Fix-BanList-API.patch b/patches/server/0937-Fix-BanList-API.patch
similarity index 99%
rename from patches/server/0938-Fix-BanList-API.patch
rename to patches/server/0937-Fix-BanList-API.patch
index 12638cd645..785adea805 100644
--- a/patches/server/0938-Fix-BanList-API.patch
+++ b/patches/server/0937-Fix-BanList-API.patch
@@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c21f3ca67672fffa0b2ae0a0e241932efbaedc8a..ce1ba360df24798ea3e45918b4a18c2944b53f95 100644
+index c49d3448866caae8a2ceb51a45c3a056124f8f57..5527f6745d4d721666c6fa78f33a56d8d7c3d3fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1652,23 +1652,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0939-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0938-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0939-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0938-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0940-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0939-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0940-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0939-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0941-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0940-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 96%
rename from patches/server/0941-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0940-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index f4fab00ad3..9214a4ff32 100644
--- a/patches/server/0941-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0940-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
@@ -19,7 +19,7 @@ index 594e82a09d21c39331c391f2aec5bc8d87649ea3..1c89f20debfad9807c90a21cc336d579
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
-index 5d199fe497bd852827d3d18fb7566a09e70331a3..8385eb1d60f377da94e3178ab506feefb43563fd 100644
+index a089f72695b5fb49c7918e89fd5015e8c3a3dd0e..d7bddedb19c10f62fd1f7d3128453ad706ed16be 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
 @@ -120,7 +120,7 @@ public class WanderingTraderSpawner implements CustomSpawner {
diff --git a/patches/server/0942-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0941-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 93%
rename from patches/server/0942-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0941-ExperienceOrb-should-call-EntitySpawnEvent.patch
index 7a1b5662c3..36bd074948 100644
--- a/patches/server/0942-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0941-ExperienceOrb-should-call-EntitySpawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4697d69180d7ef9eafe742948067001478cc934b..f8999d0b4cb068618cf196a9da9b8be793d30491 100644
+index 203824f47c705e621377f69baf8296073835e6ae..9af251585723ab963a16f0a0405276666e14ce2b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -734,7 +734,8 @@ public class CraftEventFactory {
diff --git a/patches/server/0943-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0942-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0943-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0942-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0944-Add-whitelist-events.patch b/patches/server/0943-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0944-Add-whitelist-events.patch
rename to patches/server/0943-Add-whitelist-events.patch
diff --git a/patches/server/0945-Implement-PlayerFailMoveEvent.patch b/patches/server/0944-Implement-PlayerFailMoveEvent.patch
similarity index 98%
rename from patches/server/0945-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0944-Implement-PlayerFailMoveEvent.patch
index 9e6d646310..5273159be3 100644
--- a/patches/server/0945-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0944-Implement-PlayerFailMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6db3b1258ce197e7d65ca8681464961635e72310..48016464d51f7f7322c1394b4e93693f798af7e6 100644
+index a9a8850b2ddb4b4326542c7efa3f263b1f532b86..0ea2e00372659174e9fd941428e30d1de49e63b5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1313,8 +1313,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0946-Folia-scheduler-and-owned-region-API.patch b/patches/server/0945-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0946-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0945-Folia-scheduler-and-owned-region-API.patch
index bab86433c4..76aeed293a 100644
--- a/patches/server/0946-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0945-Folia-scheduler-and-owned-region-API.patch
@@ -1173,7 +1173,7 @@ index afc23f859188a6cda27a683babd551c250a748ef..174f3dab7c7f02dd09d02dc8b4e69190
          this.profiler.push("commandFunctions");
          MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1a4c1a27a213f32e3b6566b86698ece0180f588b..a3202ca171f3489bfa2a3d6bab5e7150f7add386 100644
+index f13bb3e384b45f8dd34b61de372c1068437a0f90..c1827d7619e5b7d519d2f8b21641ac8b059720a7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -649,6 +649,7 @@ public abstract class PlayerList {
@@ -1185,7 +1185,7 @@ index 1a4c1a27a213f32e3b6566b86698ece0180f588b..a3202ca171f3489bfa2a3d6bab5e7150
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3633138b67a3b92a4d7792bbc4387632015fcc3b..955eaf4b542e0674ee419d93820689d65082ae80 100644
+index e88a8c86c9d68807bd5026c43a9363b3f1186390..617f96f0def49f9c0331963da01df8245046da66 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -248,11 +248,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0947-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0946-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0947-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0946-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0948-API-for-updating-recipes-on-clients.patch b/patches/server/0947-API-for-updating-recipes-on-clients.patch
similarity index 95%
rename from patches/server/0948-API-for-updating-recipes-on-clients.patch
rename to patches/server/0947-API-for-updating-recipes-on-clients.patch
index c9617e8d92..4dfcfc785b 100644
--- a/patches/server/0948-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0947-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 492ffa9eae3978dd352c68952e10b3c9c1e4aaa1..abab7ec6e0d96c7ab979d6285a35e326970e00fe 100644
+index c1827d7619e5b7d519d2f8b21641ac8b059720a7..ab750eb0f3520c4bc5f6d06ea095e0bf67d8bdf4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1545,6 +1545,13 @@ public abstract class PlayerList {
@@ -39,7 +39,7 @@ index 492ffa9eae3978dd352c68952e10b3c9c1e4aaa1..abab7ec6e0d96c7ab979d6285a35e326
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 78acd7d97608c4862f1d39e36785d3f396cd0019..37cac3fcb1d7cb5ca7725bc2447ed1603e2cec20 100644
+index 74b0a638c3f8098895c0855894d029f12fc55197..70e127a86d710278f525bf03164384e9735dac62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1129,6 +1129,18 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0949-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0948-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0949-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0948-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0950-Only-capture-actual-tree-growth.patch b/patches/server/0949-Only-capture-actual-tree-growth.patch
similarity index 98%
rename from patches/server/0950-Only-capture-actual-tree-growth.patch
rename to patches/server/0949-Only-capture-actual-tree-growth.patch
index 8ad69850e9..af54c5bc49 100644
--- a/patches/server/0950-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0949-Only-capture-actual-tree-growth.patch
@@ -29,7 +29,7 @@ index 5756ab17e721d5886ed669a0527e18769b8e1b8b..a33f22f03c54abed5fc24022a8b5f4af
                      }
                      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 92e823a123129694a9db5f54659f8d14abebf9b1..e6631ccf71dec785ab8decbf037e8bd622a7a613 100644
+index 4ffbf7b738445bed08d9f889c6d9b5cadbb2165c..1fd66fce58909b2001652f7d1d13028abee5fef7 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1897,4 +1897,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0951-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0950-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0951-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0950-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0952-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0951-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0952-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0951-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0953-Use-correct-seed-on-api-world-load.patch b/patches/server/0952-Use-correct-seed-on-api-world-load.patch
similarity index 91%
rename from patches/server/0953-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0952-Use-correct-seed-on-api-world-load.patch
index b3f9910d03..62df8c490c 100644
--- a/patches/server/0953-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0952-Use-correct-seed-on-api-world-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 37cac3fcb1d7cb5ca7725bc2447ed1603e2cec20..8c4021967c22deb60eab6a6fe8110b746c642e07 100644
+index 70e127a86d710278f525bf03164384e9735dac62..8f271c3dbd320cff7618b876e44cf566706643e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1347,7 +1347,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0954-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0953-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0954-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0953-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0955-Cache-map-ids-on-item-frames.patch b/patches/server/0954-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0955-Cache-map-ids-on-item-frames.patch
rename to patches/server/0954-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0956-Fix-custom-statistic-criteria-creation.patch b/patches/server/0955-Fix-custom-statistic-criteria-creation.patch
similarity index 93%
rename from patches/server/0956-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0955-Fix-custom-statistic-criteria-creation.patch
index 8811d3a725..cb796007fd 100644
--- a/patches/server/0956-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0955-Fix-custom-statistic-criteria-creation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix custom statistic criteria creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 7ebb0ef30bb0c613aae8b3899404010c6243e02a..da3f74ba0c84ad5a1447de72c9a90fdd88c254a7 100644
+index 0185faee3051c04b4924753ba56536e4e070476b..1cdcd673e67090b6ba3ec7b38bd062c0d8f7308a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -614,6 +614,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0957-Bandaid-fix-for-Effect.patch b/patches/server/0956-Bandaid-fix-for-Effect.patch
similarity index 97%
rename from patches/server/0957-Bandaid-fix-for-Effect.patch
rename to patches/server/0956-Bandaid-fix-for-Effect.patch
index fcd496e191..7c6ed5b0a3 100644
--- a/patches/server/0957-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0956-Bandaid-fix-for-Effect.patch
@@ -60,7 +60,7 @@ index a4519762175c68256b1f303daca8b9408ac182bb..457e9093adb99d31ffc7f061d8c858f9
          case COMPOSTER_FILL_ATTEMPT:
              datavalue = ((Boolean) data) ? 1 : 0;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cd2b1a0441d478f50a4d45159e506628dafaa9fc..dff7bfaef05290b07ca6cbfbdefb3fd02a1cf8f6 100644
+index d4fae4420b96520b2e1f6db40141e5392559c6fe..55330b6b5e52f67d7490a2932a0ac7ec0387f145 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1430,7 +1430,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -73,7 +73,7 @@ index cd2b1a0441d478f50a4d45159e506628dafaa9fc..dff7bfaef05290b07ca6cbfbdefb3fd0
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ce1ba360df24798ea3e45918b4a18c2944b53f95..f5066806e7d62cd17c73397b8fc7b5bbab3227ea 100644
+index 5527f6745d4d721666c6fa78f33a56d8d7c3d3fa..c6055020d279892d42c6869c71150849300ef34c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -873,7 +873,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0958-SculkCatalyst-bloom-API.patch b/patches/server/0957-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0958-SculkCatalyst-bloom-API.patch
rename to patches/server/0957-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0959-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0958-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0959-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0958-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0960-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0959-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 95%
rename from patches/server/0960-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0959-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 61b83892d6..48773be392 100644
--- a/patches/server/0960-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0959-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 2ef28c2506bb4490c04be35e71e0ebd17a2bee7c..198e1d360b2d76a2ec8bdcc3b1dc121a0d8430d4 100644
+index 6ccd2a5a334c846850a9d064210f2d7f1d311470..28ad811401cd46ec17fbec27b7e1111ead1d45e7 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -386,8 +386,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -61,7 +61,7 @@ index 32129fdd5b2542a0acb828fb843fa4e44533946c..dfecd5531862109cd89cfd8a041a8bee
                      spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true);
                  } else {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 1ff728159ba77145e14944a2fb453eab061ad01a..706af62b06c36d4bcc3fa1fea1dbf5dad0d53b54 100644
+index fb2ac7c4b9d938bc699ddc7475e2c3c3777cd056..ea76c2845965ceecce8a1c13f1a8454a088a5354 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -73,7 +73,7 @@ index 1ff728159ba77145e14944a2fb453eab061ad01a..706af62b06c36d4bcc3fa1fea1dbf5da
      // CraftBukkit start
      public String displayName;
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 6fbd136f4bbfa34ef88a7743c63a542ed0cc2c02..2d95450d664a60d11fdc962b0c85a9db7eb3363e 100644
+index a9b452be0454082f7d62f19fbac574113ed2db64..ba67c55cde0120786e6705fed96fab4b611c1c75 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -277,6 +277,11 @@ public final class NaturalSpawner {
diff --git a/patches/server/0961-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0960-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 96%
rename from patches/server/0961-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0960-Deprecate-and-replace-methods-with-old-StructureType.patch
index 91f2d5d235..b46aeb3155 100644
--- a/patches/server/0961-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0960-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8c4021967c22deb60eab6a6fe8110b746c642e07..eb617d659c701e512aac8a1ff822c147b69d3a3b 100644
+index 8f271c3dbd320cff7618b876e44cf566706643e7..4e0935274997bc4d2fb4119245c152d14993ac56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1951,6 +1951,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0962-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0961-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 95%
rename from patches/server/0962-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0961-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 46709db0a6..5d766e8a39 100644
--- a/patches/server/0962-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0961-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player
 requests tab-complete only commands.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 894eec92eaa993c0cb5335f780195e204a64ef2d..57e7a1d60ae3644fa33ed619e8fdb4441fc3f8ce 100644
+index 0ea2e00372659174e9fd941428e30d1de49e63b5..3e20918724125e7e60f880026bbc93e7cca06897 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -804,6 +804,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0963-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0962-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 99%
rename from patches/server/0963-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0962-Properly-handle-BlockBreakEvent-isDropItems.patch
index b72c2719b7..337ed7f3d2 100644
--- a/patches/server/0963-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0962-Properly-handle-BlockBreakEvent-isDropItems.patch
@@ -9,7 +9,7 @@ food consumption, turtle egg count decreases, ice to water
 conversions and beehive releases
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 7c781820b31864999f8057ec1484f1353eb4f1ff..14d8cab88eb40560635fc51c00db225dd209dc88 100644
+index 84cc7d9b42cf8b2925ee433d87cb138d58a40fb3..98ebffb4f0345aa06c1cfbd404f0884ecc523d69 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -433,8 +433,8 @@ public class ServerPlayerGameMode {
diff --git a/patches/server/0964-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0963-Fire-entity-death-event-for-ender-dragon.patch
similarity index 92%
rename from patches/server/0964-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0963-Fire-entity-death-event-for-ender-dragon.patch
index f0b8d82a3c..bc78e855ed 100644
--- a/patches/server/0964-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0963-Fire-entity-death-event-for-ender-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fire entity death event for ender dragon
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 36893dac635f676ca447133a1bce32429347e4a5..ce2d3387f5a812f6e074e0f46e2fd61e474f4734 100644
+index 955d0ddb69c29de723b85c65f42b0274813aadac..dd9800094b132954f0677eb6610fe27db4cec711 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -642,6 +642,15 @@ public class EnderDragon extends Mob implements Enemy {
diff --git a/patches/server/0965-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0964-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0965-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0964-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0966-Add-Listing-API-for-Player.patch b/patches/server/0965-Add-Listing-API-for-Player.patch
similarity index 98%
rename from patches/server/0966-Add-Listing-API-for-Player.patch
rename to patches/server/0965-Add-Listing-API-for-Player.patch
index 0460337eb9..f77a0da946 100644
--- a/patches/server/0966-Add-Listing-API-for-Player.patch
+++ b/patches/server/0965-Add-Listing-API-for-Player.patch
@@ -74,7 +74,7 @@ index d43106eb89b14667e85cd6e8fa047d64f2e8ec87..56eddd28429cf42c02d88b8bf79f8b61
  
      static class EntryBuilder {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index abab7ec6e0d96c7ab979d6285a35e326970e00fe..e6b84e4891927d79f993944ea4d3525c68c6c1b9 100644
+index ab750eb0f3520c4bc5f6d06ea095e0bf67d8bdf4..1c89b95ac40120ee970da0f06fd7fff36eb55e61 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -356,14 +356,22 @@ public abstract class PlayerList {
@@ -111,7 +111,7 @@ index abab7ec6e0d96c7ab979d6285a35e326970e00fe..e6b84e4891927d79f993944ea4d3525c
          // Paper end - Use single player info update packet on join
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f5066806e7d62cd17c73397b8fc7b5bbab3227ea..26a6a46ed8571193476676984559513c21b43293 100644
+index c6055020d279892d42c6869c71150849300ef34c..b0b18fcc2ec8769831860596823b362fe0fd9313 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -182,6 +182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0967-Configurable-Region-Compression-Format.patch b/patches/server/0966-Configurable-Region-Compression-Format.patch
similarity index 96%
rename from patches/server/0967-Configurable-Region-Compression-Format.patch
rename to patches/server/0966-Configurable-Region-Compression-Format.patch
index dad432ae9c..9a895f6dac 100644
--- a/patches/server/0967-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0966-Configurable-Region-Compression-Format.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Region Compression Format
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
-index f629d026a946103e6e846663b0e63a1c0b7b82c4..08b99905f4e57e8b88f8da9683305937c110e1e9 100644
+index 50de979a447171ab98de59bf25b6c82871d03543..0761096829e2afc5f8dd88b9a693874fc2f1bb8b 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
 @@ -424,11 +424,11 @@ public class RegionFile implements AutoCloseable {
diff --git a/patches/server/0968-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0967-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 92%
rename from patches/server/0968-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0967-Add-BlockFace-to-BlockDamageEvent.patch
index 6c4795fa83..3b4bca4118 100644
--- a/patches/server/0968-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0967-Add-BlockFace-to-BlockDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockFace to BlockDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 9b32f0951d99db42b75ee6303842f97811d1906c..27d22a6aef3f71179ea102062f1338cce5d46fea 100644
+index 98ebffb4f0345aa06c1cfbd404f0884ecc523d69..52764f0f5b42e3b7fd9624bc342e9927037880d2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -253,7 +253,7 @@ public class ServerPlayerGameMode {
@@ -18,7 +18,7 @@ index 9b32f0951d99db42b75ee6303842f97811d1906c..27d22a6aef3f71179ea102062f1338cc
                  if (blockEvent.isCancelled()) {
                      // Let the client know the block still exists
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index cf4e32d5199b15bd8d72e412982dfbecde183f91..92584ad04d35c021e1f16ca2338eafe9b07e8ff7 100644
+index 9af251585723ab963a16f0a0405276666e14ce2b..48dcf53304c52a39b60cd5b51e60bca42b7b04d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -649,13 +649,13 @@ public class CraftEventFactory {
diff --git a/patches/server/0969-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0968-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0969-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0968-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0970-Expand-Pose-API.patch b/patches/server/0969-Expand-Pose-API.patch
similarity index 95%
rename from patches/server/0970-Expand-Pose-API.patch
rename to patches/server/0969-Expand-Pose-API.patch
index 45c931d92a..8985b6b769 100644
--- a/patches/server/0970-Expand-Pose-API.patch
+++ b/patches/server/0969-Expand-Pose-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 955eaf4b542e0674ee419d93820689d65082ae80..39b1fe633a301d8cf948e5d63c2cf8a26a4b8854 100644
+index 617f96f0def49f9c0331963da01df8245046da66..be36e4307636a02c806ed8eb9d217e84d837fef2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -422,6 +422,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
diff --git a/patches/server/0971-More-DragonBattle-API.patch b/patches/server/0970-More-DragonBattle-API.patch
similarity index 97%
rename from patches/server/0971-More-DragonBattle-API.patch
rename to patches/server/0970-More-DragonBattle-API.patch
index 3831f7381e..368c6de4e6 100644
--- a/patches/server/0971-More-DragonBattle-API.patch
+++ b/patches/server/0970-More-DragonBattle-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.level.dimension.end.EndDragonFight respawnCrystals
 public net.minecraft.world.level.dimension.end.EndDragonFight spawnNewGateway(Lnet/minecraft/core/BlockPos;)V
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index c298977ae1cac57524b21efcb908b846cbcff6b6..17f4f6b098411c64d09fe01965c22a1789faa6bb 100644
+index e2e2c9f168ae4651f8fa484f6f2a17ba25f99207..2d9a7a91eb14c4f4f82d6ee491fbc628d91fb07d 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -439,6 +439,24 @@ public class EndDragonFight {
diff --git a/patches/server/0972-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0971-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/0972-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/0971-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/0973-Add-PlayerPickItemEvent.patch b/patches/server/0972-Add-PlayerPickItemEvent.patch
similarity index 96%
rename from patches/server/0973-Add-PlayerPickItemEvent.patch
rename to patches/server/0972-Add-PlayerPickItemEvent.patch
index 33b9f608e2..454a662705 100644
--- a/patches/server/0973-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0972-Add-PlayerPickItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eab3edcd040269ecd920c15ec96b25499aef83e1..4563032ea2acca60014b90c696c0e7d59cdd8132 100644
+index 3e20918724125e7e60f880026bbc93e7cca06897..4ce8af82944b1d164f3435125c22d1ab3a951c19 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -941,8 +941,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0974-Improve-performance-of-mass-crafts.patch b/patches/server/0973-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/0974-Improve-performance-of-mass-crafts.patch
rename to patches/server/0973-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/0975-Allow-trident-custom-damage.patch b/patches/server/0974-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0975-Allow-trident-custom-damage.patch
rename to patches/server/0974-Allow-trident-custom-damage.patch
diff --git a/patches/server/0976-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0975-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0976-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0975-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0977-Optimize-nearest-structure-border-iteration.patch b/patches/server/0976-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0977-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0976-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0978-Implement-OfflinePlayer-isConnected.patch b/patches/server/0977-Implement-OfflinePlayer-isConnected.patch
similarity index 94%
rename from patches/server/0978-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0977-Implement-OfflinePlayer-isConnected.patch
index 4b01206372..b6c36d01f0 100644
--- a/patches/server/0978-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0977-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 26a6a46ed8571193476676984559513c21b43293..875a195a3cb9d6330f7768fe24cc4a40f82b850b 100644
+index b0b18fcc2ec8769831860596823b362fe0fd9313..52879f6ae48c568ffa554772507449d7908179d1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -279,6 +279,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0979-Fix-inventory-desync.patch b/patches/server/0978-Fix-inventory-desync.patch
similarity index 91%
rename from patches/server/0979-Fix-inventory-desync.patch
rename to patches/server/0978-Fix-inventory-desync.patch
index b4970d0197..4345fa9aa5 100644
--- a/patches/server/0979-Fix-inventory-desync.patch
+++ b/patches/server/0978-Fix-inventory-desync.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix inventory desync
 
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index 977b9603fc04bd22b5830a6e7c80b3631effe57a..8ab80717f7f694ed262fb84f9145bc189e3c087c 100644
+index e258e5915b286f1117bc1413dfd3d2a5c4655380..8d2c0accadaf0c5d28e7db6e62a05f6c619cf02f 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
 @@ -116,7 +116,7 @@ public class BlockItem extends Item {
diff --git a/patches/server/0980-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0979-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 94%
rename from patches/server/0980-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0979-Add-titleOverride-to-InventoryOpenEvent.patch
index 79db0dc05d..0afa17ab3a 100644
--- a/patches/server/0980-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0979-Add-titleOverride-to-InventoryOpenEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 33ba61a71d3989ca53366d7c40a6d625fee524e8..6f06262d358a7f63a2ea35c0fd70b0c5aaa96182 100644
+index ea76c2845965ceecce8a1c13f1a8454a088a5354..8afbf0d40af4040b18f68a549710112a0aa5fd00 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1573,12 +1573,17 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 33ba61a71d3989ca53366d7c40a6d625fee524e8..6f06262d358a7f63a2ea35c0fd70b0c5
                  this.initMenu(container);
                  return OptionalInt.of(this.containerCounter);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index da586f935efa62f7ddd2ea27a8ec364a6b46bc86..5d4d45703212da37417aa98fa61ee479dac03ae5 100644
+index 94c2ea713e0614de570458f6b9c418a3d67d14b5..acbb64010cd59668aa1bcb52ff1220789cadb1d3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -357,12 +357,16 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -74,12 +74,12 @@ index da586f935efa62f7ddd2ea27a8ec364a6b46bc86..5d4d45703212da37417aa98fa61ee479
          //String title = inventory.getTitle(); // Paper - comment
          net.kyori.adventure.text.Component adventure$title = inventory.title(); // Paper
          if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(inventory.getTitle()); // Paper
-+        if (result.getFirst() != null) adventure$title = result.getFirst(); // Paper - Add titleOverride to InventoryOpenEvent        //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
++        if (result.getFirst() != null) adventure$title = result.getFirst(); // Paper - Add titleOverride to InventoryOpenEvent
          //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
          if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper - Prevent opening inventories when frozen
          player.containerMenu = container;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a57341356e3813423bb551902544ea9edb5950d7..9f279f469304ad83035035100eeb2559b4e8ea2e 100644
+index 51cf0a068d17c0b6eaee38bb1af5b3c470de5875..3865e6c7af0203ff9a366571a276b8af43b97c7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1438,10 +1438,21 @@ public class CraftEventFactory {
@@ -103,7 +103,7 @@ index a57341356e3813423bb551902544ea9edb5950d7..9f279f469304ad83035035100eeb2559
 +    public static com.mojang.datafixers.util.Pair<net.kyori.adventure.text.@org.jetbrains.annotations.Nullable Component, @org.jetbrains.annotations.Nullable AbstractContainerMenu> callInventoryOpenEventWithTitle(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) {
 +        // Paper end - Add titleOverride to InventoryOpenEvent
          if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
-             player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper
+             player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper - Inventory close reason
          }
 @@ -1456,10 +1467,10 @@ public class CraftEventFactory {
  
diff --git a/patches/server/0981-Configure-sniffer-egg-hatch-time.patch b/patches/server/0980-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0981-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0980-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0982-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0981-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 97%
rename from patches/server/0982-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0981-Do-crystal-portal-proximity-check-before-entity-look.patch
index 0d845b7122..5d4a0ea4eb 100644
--- a/patches/server/0982-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0981-Do-crystal-portal-proximity-check-before-entity-look.patch
@@ -34,7 +34,7 @@ index ca1edc083847b47bb450b291723aca778a5912dc..e1696f6b77df4c8fceaece64701d4db7
                      }
  
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index 17f4f6b098411c64d09fe01965c22a1789faa6bb..8d57a03793934c8c0b259974bd4d9f9c2cab884d 100644
+index 2d9a7a91eb14c4f4f82d6ee491fbc628d91fb07d..4d2ec3b14ed3b6c527745111950bbdf111129c41 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -558,6 +558,12 @@ public class EndDragonFight {
diff --git a/patches/server/0983-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0982-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0983-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0982-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0984-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0983-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 96%
rename from patches/server/0984-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0983-Add-slot-sanity-checks-in-container-clicks.patch
index 9cf439e965..0c616ab1a7 100644
--- a/patches/server/0984-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0983-Add-slot-sanity-checks-in-container-clicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 96d44798583ee876ca8121c381638cd741d8338c..ba6d22426398546b70760c2205ce625cead11803 100644
+index 4ce8af82944b1d164f3435125c22d1ab3a951c19..5234d3dcb60d84f65621713b57bea034038af2a5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2987,6 +2987,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0985-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0984-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0985-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0984-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0986-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0985-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/0986-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0985-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0987-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0986-Fix-silent-equipment-change-for-mobs.patch
similarity index 96%
rename from patches/server/0987-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0986-Fix-silent-equipment-change-for-mobs.patch
index 5ad357386c..71d648e31a 100644
--- a/patches/server/0987-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0986-Fix-silent-equipment-change-for-mobs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix silent equipment change for mobs
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 16d84042e2575418880897c728a99d1b8bbcdd15..c81c72bf1027fcbaac67808fbcf6e0af112176bc 100644
+index 74004b78673e81218b44097eea89a79217e005a6..4050c46df8537da37c3b022d94b064e9d5dd0659 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1059,13 +1059,20 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -32,7 +32,7 @@ index 16d84042e2575418880897c728a99d1b8bbcdd15..c81c72bf1027fcbaac67808fbcf6e0af
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 9af5a4b46dcec727c7c862332759ffbe3ebd87b5..8527388f7cb5fce43ff485c903d6b78c10c4259e 100644
+index 40664cc7e3665432a2ab5e552802c3fc3edbdb22..586e3e92ccc275446df6dbbff9bf010a37a9aa8f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -250,8 +250,8 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
diff --git a/patches/server/0988-Fix-spigot-s-Forced-Stats.patch b/patches/server/0987-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0988-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0987-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0989-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0988-Add-missing-InventoryHolders-to-inventories.patch
similarity index 96%
rename from patches/server/0989-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0988-Add-missing-InventoryHolders-to-inventories.patch
index 64367c8db8..2a79e00b73 100644
--- a/patches/server/0989-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0988-Add-missing-InventoryHolders-to-inventories.patch
@@ -57,7 +57,7 @@ index ff1aba1e69cfde633fd01724f1a8d0af7f59437f..9546d93f90ca34b4d35bd98df847bf89
      public SimpleContainer(int i, org.bukkit.inventory.InventoryHolder owner) {
          this.bukkitOwner = owner;
 diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
-index fd4caf18698ad51c789a57dec58e135c5de7ca19..1548bc20988fea3f032d71cad40299fdf5b08b71 100644
+index 4183afe565a46ebc52ff520b046fef405e3b22f7..48f634a7521d31c1e9dfd3cfc83139d428dbd37a 100644
 --- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
 @@ -1029,4 +1029,15 @@ public abstract class AbstractContainerMenu {
@@ -77,7 +77,7 @@ index fd4caf18698ad51c789a57dec58e135c5de7ca19..1548bc20988fea3f032d71cad40299fd
 +    // Paper end - Add missing InventoryHolders
  }
 diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
-index 3c67132bd3c1e4886f7ba823fe330b019359ac9d..1eda87516b3ac9bea08d18a06e9fd9eba03d02be 100644
+index 86199457586dc4d4f0d8ccaac812e8340aaac957..ae2dc7fc4df54f9ed8e78ff1347f9782eccc9d4b 100644
 --- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
 @@ -41,7 +41,7 @@ public class BeaconMenu extends AbstractContainerMenu {
@@ -90,7 +90,7 @@ index 3c67132bd3c1e4886f7ba823fe330b019359ac9d..1eda87516b3ac9bea08d18a06e9fd9eb
              public boolean canPlaceItem(int slot, ItemStack stack) {
                  return stack.is(ItemTags.BEACON_PAYMENT_ITEMS);
 diff --git a/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java b/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
-index 819187dbcf468d9278ce33bd97688476aab53f8e..32e7c7599bffb9ea5384615d31e0b63de08a8813 100644
+index ca3c8b31967a6efd7b0caacb091ab2151e7c0bee..45bf1c95d86bdfc709c5f1a1fbefb18e1cc51f4c 100644
 --- a/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/CartographyTableMenu.java
 @@ -52,7 +52,7 @@ public class CartographyTableMenu extends AbstractContainerMenu {
@@ -161,7 +161,7 @@ index c2d6265933dc4ceed80e2bd517970d02164a63df..343f44db579839eb61376f876b5eff2e
              public void setChanged() {
                  super.setChanged();
 diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 24187a7ce812cb83a9a736bec8dce9e68ccc0798..4acad717bfec91e4abcdd59900e6872838d0712c 100644
+index 95ac3446fba1f37637c9700080de2e1ce7a3550a..23462de504932bd351b8dfacde514fe361343912 100644
 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -59,8 +59,8 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -176,7 +176,7 @@ index 24187a7ce812cb83a9a736bec8dce9e68ccc0798..4acad717bfec91e4abcdd59900e68728
              public void setChanged() {
                  super.setChanged();
 diff --git a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
-index ff770b9ce68a62418de0c7ed389650626fa1dcb2..e5a7f36843d621e6c714ef2e1cb8e2e3551924ef 100644
+index eb36a69b8da492aec9609cc9ef80d7d68ff9af03..62e1b7096fa659778b737b3d520389e73138dc5d 100644
 --- a/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/ItemCombinerMenu.java
 @@ -18,7 +18,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
@@ -206,7 +206,7 @@ index ff770b9ce68a62418de0c7ed389650626fa1dcb2..e5a7f36843d621e6c714ef2e1cb8e2e3
              public void setChanged() {
                  super.setChanged();
 diff --git a/src/main/java/net/minecraft/world/inventory/LoomMenu.java b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
-index e28c1cdf4763e9db3e29b3c0f08d65f978017931..c70af9c36ab5806643b050554d7d27a1e2db2028 100644
+index b8440f2cd7ca46c243407ae1ba8f8c7adab4ecd4..e51dabca7b81adee35246e429dcb8f42ae0bf22c 100644
 --- a/src/main/java/net/minecraft/world/inventory/LoomMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/LoomMenu.java
 @@ -73,7 +73,7 @@ public class LoomMenu extends AbstractContainerMenu {
@@ -261,7 +261,7 @@ index d4592218d761eb38402e3d95c642e80a708cb333..4c4266a85c38e41e6c7e6144a68624f4
      public ResultContainer() {
          this.itemStacks = NonNullList.withSize(1, ItemStack.EMPTY);
 diff --git a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
-index aa1d1466d0a7b76967a41d948b7a4114fe06242f..d6b9de312f67269e1e4b7bb5200ce8a0be674602 100644
+index 4924993fab57bcf72a5d75cc2f7e6bed4f9f511c..6ba59a60b85c04127abd7df37a647fa71745327a 100644
 --- a/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/StonecutterMenu.java
 @@ -68,7 +68,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
diff --git a/patches/server/0990-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0989-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 97%
rename from patches/server/0990-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0989-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index 0da15fa481..a9d6af5d27 100644
--- a/patches/server/0990-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0989-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
@@ -10,7 +10,7 @@ which would cause a crash on Folia but would appear to function
 fine on Paper.
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
-index 72cfe25cbc2076bc83c9f965ab70b0e636800212..c57ca085afe52af0ae9e40e241452796e246f5cc 100644
+index c09d42c03e1e430dd65218e8297be9e35cdef030..362516b6703dfa037954c55b8628074965240dff 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java
 @@ -381,6 +381,13 @@ public class ChunkSerializer {
diff --git a/patches/server/0991-Actually-optimise-explosions.patch b/patches/server/0990-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/0991-Actually-optimise-explosions.patch
rename to patches/server/0990-Actually-optimise-explosions.patch
diff --git a/patches/server/0992-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0991-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/0992-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0991-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0993-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0992-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/0993-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/0992-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/0994-Fix-SuspiciousStewMeta.patch b/patches/server/0993-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/0994-Fix-SuspiciousStewMeta.patch
rename to patches/server/0993-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/0995-Optimise-chunk-tick-iteration.patch b/patches/server/0994-Optimise-chunk-tick-iteration.patch
similarity index 99%
rename from patches/server/0995-Optimise-chunk-tick-iteration.patch
rename to patches/server/0994-Optimise-chunk-tick-iteration.patch
index de585cf576..c8dc8078c6 100644
--- a/patches/server/0995-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0994-Optimise-chunk-tick-iteration.patch
@@ -108,7 +108,7 @@ index 2b998bdbe49bf8211b755e0eb7c1bf13ac280eab..627a88ec8c3b215b19b55a6d461c8754
              List list;
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index ce808a48478be3b310d33f4b28364f70f4cd3236..1b2b510cf5ea1799c1f5dec990cec52671e900a9 100644
+index c7d78fb217869204157606db8d6d73af0126a68f..6c28b37056c70fa0076b290b24168bfb79ddd77d 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -191,6 +191,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -365,7 +365,7 @@ index dfecd5531862109cd89cfd8a041a8beef70c1a6a..65a20974428ae1c0be2022d997234a16
              gameprofilerfiller.pop();
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 6ae35f3adce280e8be8e7e2f3bc4a0896ef6df83..84974c72dd3838ea118cc60c284709911cd7630b 100644
+index 8afbf0d40af4040b18f68a549710112a0aa5fd00..575681586667933e7f26bb16f7d2aa7c73188cde 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -325,6 +325,9 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0996-Lag-compensation-ticks.patch b/patches/server/0995-Lag-compensation-ticks.patch
similarity index 97%
rename from patches/server/0996-Lag-compensation-ticks.patch
rename to patches/server/0995-Lag-compensation-ticks.patch
index ff907a41e9..536c00fbbb 100644
--- a/patches/server/0996-Lag-compensation-ticks.patch
+++ b/patches/server/0995-Lag-compensation-ticks.patch
@@ -30,7 +30,7 @@ index 174f3dab7c7f02dd09d02dc8b4e69190284c3f48..ec1197e498d0fa8d58466b8dffe46fb0
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e8dc785913f5fd1238a73c2384d2abef0e9d2e4b..718ebe1ed29d6db62cc666d0b628e6f9a2a3ce5c 100644
+index ab472d2e81c0756020ffb727db4b71aeb8d9d020..ae6919fb2ed273d5527a6e4e7731c074d201393f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -565,6 +565,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -65,7 +65,7 @@ index 52764f0f5b42e3b7fd9624bc342e9927037880d2..6abc5061888d965161de979465bb625c
  
          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 09bca0dd8cb6289817f758a4f05a54c267aec885..099ee1186f84ce6a76ac33dbf9cae961641c6508 100644
+index 629d38851558207f302e9baa0157218d7c8596d7..91d88337f9147637b0e8fa1ac8bf9193b44751f2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3819,6 +3819,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0997-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0996-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/0997-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/0996-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0998-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0997-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/0998-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/0997-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0999-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0998-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/0999-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/0998-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1000-Optimise-nearby-player-retrieval.patch b/patches/server/0999-Optimise-nearby-player-retrieval.patch
similarity index 99%
rename from patches/server/1000-Optimise-nearby-player-retrieval.patch
rename to patches/server/0999-Optimise-nearby-player-retrieval.patch
index 7cbe0ada5e..e2bed5bf46 100644
--- a/patches/server/1000-Optimise-nearby-player-retrieval.patch
+++ b/patches/server/0999-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 718ebe1ed29d6db62cc666d0b628e6f9a2a3ce5c..989ea283a4dc24fa17dd4bd1e03167fde2c97132 100644
+index ae6919fb2ed273d5527a6e4e7731c074d201393f..f5254ccffc19cf451cd5e358256b97fa33e51cfc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -576,6 +576,115 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1001-Fix-missing-map-initialize-event-call.patch b/patches/server/1000-Fix-missing-map-initialize-event-call.patch
similarity index 95%
rename from patches/server/1001-Fix-missing-map-initialize-event-call.patch
rename to patches/server/1000-Fix-missing-map-initialize-event-call.patch
index e043a0374c..db53e677a1 100644
--- a/patches/server/1001-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/1000-Fix-missing-map-initialize-event-call.patch
@@ -7,7 +7,7 @@ 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 989ea283a4dc24fa17dd4bd1e03167fde2c97132..56f80db3dccc9db7bb5d5cb194fcf6af39c92aac 100644
+index f5254ccffc19cf451cd5e358256b97fa33e51cfc..8680f351795eb50b8eff231cde4a28dd2f8aa509 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2113,13 +2113,25 @@ public class ServerLevel extends Level implements WorldGenLevel {
diff --git a/patches/server/1002-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1001-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 92%
rename from patches/server/1002-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/1001-Update-entity-data-when-attaching-firework-to-entity.patch
index 0a98851952..8cbc0f974a 100644
--- a/patches/server/1002-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/1001-Update-entity-data-when-attaching-firework-to-entity.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Update entity data when attaching firework to entity
 public net.minecraft.world.entity.projectile.FireworkRocketEntity DATA_ATTACHED_TO_TARGET
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 13b09465952dca2e95647ddb9753a7fe2db51720..8694c0dd606ec4e0fd60be434f70860e7779a871 100644
+index fedbfbac02b73382aacc69f8a1e5a3e746c55ea2..1309fabd357eb9b8f90f882ec7ff3de9e60f187d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -69,6 +69,10 @@ public class CraftFirework extends CraftProjectile implements Firework {
diff --git a/patches/server/1003-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1002-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/1003-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/1002-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1004-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1003-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/1004-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/1003-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1005-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1004-Fix-UnsafeValues-loadAdvancement.patch
similarity index 96%
rename from patches/server/1005-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/1004-Fix-UnsafeValues-loadAdvancement.patch
index 834c4d579b..3f5ca7c359 100644
--- a/patches/server/1005-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/1004-Fix-UnsafeValues-loadAdvancement.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index da3f74ba0c84ad5a1447de72c9a90fdd88c254a7..ec2396f0e5d62b10450eaa7239a8c5479638b3c3 100644
+index 1cdcd673e67090b6ba3ec7b38bd062c0d8f7308a..509f8487a170f3dc84b091acf16df26e42391189 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -316,7 +316,27 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/1006-Add-player-idle-duration-API.patch b/patches/server/1005-Add-player-idle-duration-API.patch
similarity index 91%
rename from patches/server/1006-Add-player-idle-duration-API.patch
rename to patches/server/1005-Add-player-idle-duration-API.patch
index dcbfc33021..4a0cf2445b 100644
--- a/patches/server/1006-Add-player-idle-duration-API.patch
+++ b/patches/server/1005-Add-player-idle-duration-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 875a195a3cb9d6330f7768fe24cc4a40f82b850b..aa1747fe82af5b5eafc5742d47007873aa20f652 100644
+index 52879f6ae48c568ffa554772507449d7908179d1..7b75e248926dfef67533f3454017ed1d24df4a56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3311,6 +3311,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1007-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1006-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/1007-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/1006-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1008-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1007-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/1008-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/1007-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1009-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1008-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 90%
rename from patches/server/1009-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/1008-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 96a7e94ec3..8d351f9a68 100644
--- a/patches/server/1009-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1008-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index aa1747fe82af5b5eafc5742d47007873aa20f652..e27f65114e4a916089e3c6929838f44e93fdac35 100644
+index 7b75e248926dfef67533f3454017ed1d24df4a56..d1a15bd280fdd90c282d8badfdee5b944b75b2de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1083,7 +1083,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1010-Optimize-VarInts.patch b/patches/server/1009-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/1010-Optimize-VarInts.patch
rename to patches/server/1009-Optimize-VarInts.patch
diff --git a/patches/server/1011-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1010-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 94%
rename from patches/server/1011-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/1010-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index b12610027d..7841c265cd 100644
--- a/patches/server/1011-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/1010-Add-API-to-get-the-collision-shape-of-a-block-before.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add API to get the collision shape of a block before it's
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index ef4d45ebfe84467454a209501dad7db7fb316416..9cf4ec4e1610d5f7cafbb90ef0310034cc818549 100644
+index d5719d943946acd77dc9b26299c9f3d12d86062f..ee5e11e5f32b92390dae176e8538a09c3553d9f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -678,6 +678,20 @@ public class CraftBlockData implements BlockData {
diff --git a/patches/server/1012-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1011-Add-predicate-for-blocks-when-raytracing.patch
similarity index 98%
rename from patches/server/1012-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/1011-Add-predicate-for-blocks-when-raytracing.patch
index 2653ec0472..2d1ca7d6cf 100644
--- a/patches/server/1012-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/1011-Add-predicate-for-blocks-when-raytracing.patch
@@ -47,7 +47,7 @@ index 7df62a219d0bcffc793c1a8c55b6ed244fdeb199..4b7ea18a34675702c5b17c4819f79778
              Vec3 vec3d = raytrace1.getFrom().subtract(raytrace1.getTo());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index dff7bfaef05290b07ca6cbfbdefb3fd02a1cf8f6..5e4587148f1558dafccbdeb788384047e9fbfdbe 100644
+index 55330b6b5e52f67d7490a2932a0ac7ec0387f145..1843ae08cc19cb8f7290403f8622dcd760e9399f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1125,9 +1125,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/1013-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1012-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 92%
rename from patches/server/1013-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/1012-Broadcast-take-item-packets-with-collector-as-source.patch
index 17735a1c70..3b3dea7ae8 100644
--- a/patches/server/1013-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/1012-Broadcast-take-item-packets-with-collector-as-source.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Broadcast take item packets with collector as source
 This fixes players (which can't view the collector) seeing item pickups with themselves as the target.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f9de831797bff3707115f03c24bdca78889003a3..eb0e6cff1d93b06fea3e9b28a4ea1067e416183c 100644
+index 91d88337f9147637b0e8fa1ac8bf9193b44751f2..4785c1029f6c68406d6405ed5e950a75230dfdc0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3704,7 +3704,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1014-Expand-LingeringPotion-API.patch b/patches/server/1013-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/1014-Expand-LingeringPotion-API.patch
rename to patches/server/1013-Expand-LingeringPotion-API.patch
diff --git a/patches/server/1015-Add-MaterialTagsTest.patch b/patches/server/1014-Add-MaterialTagsTest.patch
similarity index 100%
rename from patches/server/1015-Add-MaterialTagsTest.patch
rename to patches/server/1014-Add-MaterialTagsTest.patch
diff --git a/patches/server/1016-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1015-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 97%
rename from patches/server/1016-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/1015-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index d0ef9bee8a..3ea939060d 100644
--- a/patches/server/1016-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/1015-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
@@ -45,7 +45,7 @@ index 0db0d67f9ac15372becc1166c37f7f0aede4a4da..a9e70484b01fc082ea25d43d1d428334
              BlockState iblockdata = BaseFireBlock.getState(this.level(), blockposition);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5e4587148f1558dafccbdeb788384047e9fbfdbe..851c186834b16a2ac18d74cc40d321eb988a5e0c 100644
+index 1843ae08cc19cb8f7290403f8622dcd760e9399f..af7ac110a30651ec02fcd57c33eb291c7fc28287 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -773,7 +773,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/1017-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1016-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/1017-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/1016-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/1018-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1017-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 97%
rename from patches/server/1018-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/1017-Fix-several-issues-with-EntityBreedEvent.patch
index b578662648..27e4615bf0 100644
--- a/patches/server/1018-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/1017-Fix-several-issues-with-EntityBreedEvent.patch
@@ -54,7 +54,7 @@ index 907ed82fea71254d6624eda878e2668cd26422a7..081d1e38b7b1f286e138b0981aaa760e
          this.level().broadcastEntityEvent(this, (byte) 18);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 3a6483c29803acbbb9a5b4b49fae22de7575504f..387aa050235c944818617e8896d0d5f1e7e4cecb 100644
+index f783fe169141d33e8569ec7f5d71985b74bdbcb6..be554dbaa9900207753e4f67f0ba402333e21338 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -649,8 +649,9 @@ public class Panda extends Animal {
@@ -82,7 +82,7 @@ index e89f454fe178483a7db381591a4a345ac24db2b8..f693d4d6a6a3c3d31c2d85ceb5b5b013
  
              boolean bl3 = this.isBaby();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 8fe5a4ccf474c094b8081828c93e8973cdabb6ed..d9539f5275c4cb63910ba79aa522d9569ad35a89 100644
+index 94dd97662ba07689fbfa16ef5c7d99fe12ce83de..815eb15086976b8f9e03bf8182d9ed50aec14720 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 @@ -513,7 +513,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
diff --git a/patches/server/1019-Add-UUID-attribute-modifier-API.patch b/patches/server/1018-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/1019-Add-UUID-attribute-modifier-API.patch
rename to patches/server/1018-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/1020-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1019-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 93%
rename from patches/server/1020-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/1019-Fix-missing-event-call-for-entity-teleport-API.patch
index 11ae1c6386..208b336712 100644
--- a/patches/server/1020-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/1019-Fix-missing-event-call-for-entity-teleport-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing event call for entity teleport API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ed49b04d3918e46cd0769838b81cd0fae0d4e43a..1c3e1153d08b59d29b3613fc3b50a4780aa7a3ac 100644
+index 03908ccb1bcd88b68fcec48c581677cb0a484508..f16ac1d640fc97f348c244d4ea86e3278b30ae19 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -255,6 +255,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/1021-Lazily-create-LootContext-for-criterions.patch b/patches/server/1020-Lazily-create-LootContext-for-criterions.patch
similarity index 95%
rename from patches/server/1021-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/1020-Lazily-create-LootContext-for-criterions.patch
index 611776bbed..293dfbd694 100644
--- a/patches/server/1021-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/1020-Lazily-create-LootContext-for-criterions.patch
@@ -8,7 +8,7 @@ For each player on each tick, enter block triggers are invoked, and these create
 To avoid this, we now lazily create the LootContext if the criterion passes the predicate AND if any of the listener triggers require a loot context instance
 
 diff --git a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
-index 0a22ed467d04c6421f4f8ef227a665ae135a5b0b..00bf770559d9c628119658cb027eb0b970c04e1b 100644
+index 805459ba815520165c86a537fbb1f3e04b85bfbd..a327973e37b5b8d4e15683ef24548482ac3dc3d5 100644
 --- a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
 +++ b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
 @@ -45,14 +45,14 @@ public abstract class SimpleCriterionTrigger<T extends SimpleCriterionTrigger.Si
diff --git a/patches/server/1022-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/1021-Don-t-fire-sync-events-during-worldgen.patch
similarity index 97%
rename from patches/server/1022-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/1021-Don-t-fire-sync-events-during-worldgen.patch
index 98d2be65ad..5c8ab53f3e 100644
--- a/patches/server/1022-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/1021-Don-t-fire-sync-events-during-worldgen.patch
@@ -19,7 +19,7 @@ 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 56f80db3dccc9db7bb5d5cb194fcf6af39c92aac..f27c9f99e70d45c433a348dd315bb31b44fefa78 100644
+index 8680f351795eb50b8eff231cde4a28dd2f8aa509..48b0bce01a9ae1ce869203a685be308d49a8c880 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1676,6 +1676,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -31,7 +31,7 @@ index 56f80db3dccc9db7bb5d5cb194fcf6af39c92aac..f27c9f99e70d45c433a348dd315bb31b
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 39b1fe633a301d8cf948e5d63c2cf8a26a4b8854..5dabf6c4ba63b82aefa22cf41ec65dcf85779fe9 100644
+index be36e4307636a02c806ed8eb9d217e84d837fef2..4fdc55b78c4212603bd57a292c72d89c73d28871 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -712,7 +712,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -68,7 +68,7 @@ index dd4cf9011bf48623e95d5d0f3ff27ee962c88200..a039217f9293ad3b0cc74c49450472eb
          }, () -> {
              EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index efbb37255885badf6908cad948614df7beda9712..e937ace0c4c1097de3f95198b1bc1830dbc74658 100644
+index 4785c1029f6c68406d6405ed5e950a75230dfdc0..68e1ef67e58ef348d35dfc3b3e890336d4cb2108 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1134,6 +1134,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/1023-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1022-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 93%
rename from patches/server/1023-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/1022-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index ccb27e52d9..8998416ffa 100644
--- a/patches/server/1023-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/1022-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index baf31c109ee8b5e59acd7ff5fc537ea46f27d164..efc6ca53c048dbd49438ce0f7718de332fd5de2f 100644
+index 4e7f5bfcdb8af7a9237dee3c8ebf9cde6f1248a4..b2f9a670c5224fb63081466fa594b2b4b3e8bddb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1167,7 +1167,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/1024-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1023-Restore-vanilla-entity-drops-behavior.patch
similarity index 97%
rename from patches/server/1024-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/1023-Restore-vanilla-entity-drops-behavior.patch
index af74fd9090..7ecbf4e964 100644
--- a/patches/server/1024-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/1023-Restore-vanilla-entity-drops-behavior.patch
@@ -9,7 +9,7 @@ on dropping the item instead of generalizing it for all dropped
 items like CB does.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ddea03dd90e7749ea2a347d2b9a985a0e4ab636c..2a897f577f4ed9cf8b3368fab971fa6381c90219 100644
+index 575681586667933e7f26bb16f7d2aa7c73188cde..38df47d282713522b3c5784a562ff09e3151fb27 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -944,22 +944,20 @@ public class ServerPlayer extends Player {
@@ -50,7 +50,7 @@ index ddea03dd90e7749ea2a347d2b9a985a0e4ab636c..2a897f577f4ed9cf8b3368fab971fa63
          if (entityitem == null) {
              return null;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5dabf6c4ba63b82aefa22cf41ec65dcf85779fe9..ec251d54324c01212a27adffb1883d2de9db162d 100644
+index 4fdc55b78c4212603bd57a292c72d89c73d28871..1a19f18b5d4c42ac07e7e4f305e140954dea481b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2702,6 +2702,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -104,7 +104,7 @@ index 5dabf6c4ba63b82aefa22cf41ec65dcf85779fe9..ec251d54324c01212a27adffb1883d2d
              return this.spawnAtLocation(entityitem);
          }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e937ace0c4c1097de3f95198b1bc1830dbc74658..e13bda6d3054dda9372c58566b5cdc5d0f4c1dcf 100644
+index 68e1ef67e58ef348d35dfc3b3e890336d4cb2108..5d27e1d3f15839663d89d198babe3be94cfd3f07 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -254,7 +254,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -134,7 +134,7 @@ index 45906d273e6d6ec20cf44b4d07efdac68752ee9b..ac9eaeaf7df1e84ee588f371628c0a10
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 1e42372f038757b48990643aa2f118be415e0463..69f29af64c55e68d1906a0d46943751d7de66cf4 100644
+index 92b4eecf7b8ce07334256a216d9caf241fa5363b..94a30a0c1266bf919d1dc4ca2b19489edd54a7fa 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -610,7 +610,7 @@ public class ArmorStand extends LivingEntity {
@@ -165,7 +165,7 @@ index 1e42372f038757b48990643aa2f118be415e0463..69f29af64c55e68d1906a0d46943751d
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9f279f469304ad83035035100eeb2559b4e8ea2e..311175ea5979d22766d897bd9a5172abcb91f1be 100644
+index b3b1211d20c6d28a14c656159a1e345f8406a093..4f4d76065edff508ff996d507e955f5d270450ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -937,17 +937,21 @@ public class CraftEventFactory {
diff --git a/patches/server/1025-Add-Structure-check-API.patch b/patches/server/1024-Add-Structure-check-API.patch
similarity index 91%
rename from patches/server/1025-Add-Structure-check-API.patch
rename to patches/server/1024-Add-Structure-check-API.patch
index 52303f67ed..47076e059c 100644
--- a/patches/server/1025-Add-Structure-check-API.patch
+++ b/patches/server/1024-Add-Structure-check-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 851c186834b16a2ac18d74cc40d321eb988a5e0c..67a3aa7db064fe680ae25ad446ab3170b1c3c453 100644
+index af7ac110a30651ec02fcd57c33eb291c7fc28287..7f74f80d11784987a438e6aabfac6fcfb5d9a968 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -230,6 +230,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/1026-Dont-resend-blocks-on-interactions.patch b/patches/server/1025-Dont-resend-blocks-on-interactions.patch
similarity index 98%
rename from patches/server/1026-Dont-resend-blocks-on-interactions.patch
rename to patches/server/1025-Dont-resend-blocks-on-interactions.patch
index cca46cbd54..caa9e6f2e3 100644
--- a/patches/server/1026-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/1025-Dont-resend-blocks-on-interactions.patch
@@ -8,7 +8,7 @@ In general, the client now has an acknowledgment system which will prevent block
 It should be noted that this system does not yet support block entities, so those still need to resynced when needed.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 52aadf7336c1486ccf0d192e27b742f9e63cfe9b..73823d637d9859797d57507932d132b21ba46d70 100644
+index 6abc5061888d965161de979465bb625c173c59c6..93906a31ddf99cf51541994d7a5c2e4131b697fa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -199,7 +199,7 @@ public class ServerPlayerGameMode {
@@ -149,7 +149,7 @@ index 4b9e726e6ac255e743479d5c2e0cdb98464399a4..6371f326fc86cfc53e39bf8ed13b646f
                      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 dc6a1a1fb78d25834f3f97c5ce3b13567c718ca0..46c7c36a07169915f7409f1146e5066e8ac65c21 100644
+index a33f22f03c54abed5fc24022a8b5f4af007e4597..ed27a963223bfe18310ad5adabf461b5e307ef9c 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -457,10 +457,12 @@ public final class ItemStack {
diff --git a/patches/server/1027-Keep-previous-behavior-for-setResourcePack.patch b/patches/server/1026-Keep-previous-behavior-for-setResourcePack.patch
similarity index 94%
rename from patches/server/1027-Keep-previous-behavior-for-setResourcePack.patch
rename to patches/server/1026-Keep-previous-behavior-for-setResourcePack.patch
index 722245e2ae..edb8c62895 100644
--- a/patches/server/1027-Keep-previous-behavior-for-setResourcePack.patch
+++ b/patches/server/1026-Keep-previous-behavior-for-setResourcePack.patch
@@ -10,7 +10,7 @@ packs before sending the new pack. Other API exists
 for adding a new pack to the existing packs on a client.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e27f65114e4a916089e3c6929838f44e93fdac35..02f97a9ec7b1b8354cfb97babd57595ef6503679 100644
+index d1a15bd280fdd90c282d8badfdee5b944b75b2de..fd67e7571841b345630078892e321283760341dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2351,8 +2351,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1028-properly-read-and-store-sus-effect-duration.patch b/patches/server/1027-properly-read-and-store-sus-effect-duration.patch
similarity index 100%
rename from patches/server/1028-properly-read-and-store-sus-effect-duration.patch
rename to patches/server/1027-properly-read-and-store-sus-effect-duration.patch
diff --git a/patches/server/1029-Use-correct-max-stack-size-in-crafter.patch b/patches/server/1028-Use-correct-max-stack-size-in-crafter.patch
similarity index 100%
rename from patches/server/1029-Use-correct-max-stack-size-in-crafter.patch
rename to patches/server/1028-Use-correct-max-stack-size-in-crafter.patch
diff --git a/patches/server/1030-add-more-scoreboard-API.patch b/patches/server/1029-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/1030-add-more-scoreboard-API.patch
rename to patches/server/1029-add-more-scoreboard-API.patch
diff --git a/patches/server/1031-Improve-Registry.patch b/patches/server/1030-Improve-Registry.patch
similarity index 100%
rename from patches/server/1031-Improve-Registry.patch
rename to patches/server/1030-Improve-Registry.patch
diff --git a/patches/server/1032-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/1031-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 96%
rename from patches/server/1032-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/1031-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index 910c95d430..77d16936c0 100644
--- a/patches/server/1032-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/1031-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
@@ -26,10 +26,10 @@ index 3fec07b250a8f145e30c8c41888e47d2a3c902e1..2ddd033e1c3a2e5c8950b93c83849192
                  x = to.getX();
                  y = to.getY();
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7fc84405bc96d768fd373dd6844de4204a39cd6a..353f8598ae940b15a71e71d7c6b80f9d063decb6 100644
+index 5d27e1d3f15839663d89d198babe3be94cfd3f07..5e2f6a1cdaf83468c0db6a2cc8fefb71e6ec51d8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -4205,7 +4205,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4204,7 +4204,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      if (!(this instanceof ServerPlayer)) {
                          EntityTeleportEvent teleport = new EntityTeleportEvent(this.getBukkitEntity(), new Location(this.level().getWorld(), d3, d4, d5), new Location(this.level().getWorld(), d0, d6, d2));
                          this.level().getCraftServer().getPluginManager().callEvent(teleport);
diff --git a/patches/server/1033-Add-experience-points-API.patch b/patches/server/1032-Add-experience-points-API.patch
similarity index 95%
rename from patches/server/1033-Add-experience-points-API.patch
rename to patches/server/1032-Add-experience-points-API.patch
index 68e09bcd32..29da9409a0 100644
--- a/patches/server/1033-Add-experience-points-API.patch
+++ b/patches/server/1032-Add-experience-points-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add experience points API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f07b79cced4fa47dbb6b4aa75a384a2a08a53b03..5174ae8b039bdbb96f92d0059ad25b10b962ba7b 100644
+index 7562b8a0f0bc8e43b3c0b64c6d66786c2c93b5cd..777043d4e4bd253a804353df3efad43078a5c3b3 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1833,7 +1833,7 @@ public abstract class Player extends LivingEntity {
@@ -18,7 +18,7 @@ index f07b79cced4fa47dbb6b4aa75a384a2a08a53b03..5174ae8b039bdbb96f92d0059ad25b10
      // Paper start - send SoundEffect to everyone who can see fromEntity
      private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 02f97a9ec7b1b8354cfb97babd57595ef6503679..e7ec441824e034a488deeede093cb9ea7add7c3e 100644
+index fd67e7571841b345630078892e321283760341dd..b8d3398b349d9294de6b8a8594b054d3c84dbe0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1821,6 +1821,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1034-Add-missing-InventoryType.patch b/patches/server/1033-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/1034-Add-missing-InventoryType.patch
rename to patches/server/1033-Add-missing-InventoryType.patch
diff --git a/patches/server/1035-Add-drops-to-shear-events.patch b/patches/server/1034-Add-drops-to-shear-events.patch
similarity index 99%
rename from patches/server/1035-Add-drops-to-shear-events.patch
rename to patches/server/1034-Add-drops-to-shear-events.patch
index e8dc631fb5..5ff56975af 100644
--- a/patches/server/1035-Add-drops-to-shear-events.patch
+++ b/patches/server/1034-Add-drops-to-shear-events.patch
@@ -233,7 +233,7 @@ index 8adcfc8f6772a32b5915e4a07100e8eb735f907a..b5d6857eaf2bed14adcb5f5e80d91b44
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 311175ea5979d22766d897bd9a5172abcb91f1be..0620857b4a248657c8fdcb9b12715fa02379a291 100644
+index 4f4d76065edff508ff996d507e955f5d270450ac..bf2323c81ddc5a1e495a694585135249c3fe1c4c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1716,20 +1716,20 @@ public class CraftEventFactory {
diff --git a/patches/server/1036-Add-PlayerShieldDisableEvent.patch b/patches/server/1035-Add-PlayerShieldDisableEvent.patch
similarity index 95%
rename from patches/server/1036-Add-PlayerShieldDisableEvent.patch
rename to patches/server/1035-Add-PlayerShieldDisableEvent.patch
index 511ecbf410..b1e67d302a 100644
--- a/patches/server/1036-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/1035-Add-PlayerShieldDisableEvent.patch
@@ -16,7 +16,7 @@ sideeffects, meaning the disable event cannot share a handlerlist with
 the cooldown event
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index c81c72bf1027fcbaac67808fbcf6e0af112176bc..42e2be9286b75a1d34845f303ffc65e96fdd5416 100644
+index 4050c46df8537da37c3b022d94b064e9d5dd0659..76497f642ff268d4039590902708e0d21ddb6531 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1703,7 +1703,11 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -33,7 +33,7 @@ index c81c72bf1027fcbaac67808fbcf6e0af112176bc..42e2be9286b75a1d34845f303ffc65e9
              }
          }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 5174ae8b039bdbb96f92d0059ad25b10b962ba7b..9044458491fc9a33923852e324a15ac59d6660b2 100644
+index 777043d4e4bd253a804353df3efad43078a5c3b3..7e77383368388f6e56159892cd483513b068e402 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -979,7 +979,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/1037-Add-HiddenPotionEffect-API.patch b/patches/server/1036-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/1037-Add-HiddenPotionEffect-API.patch
rename to patches/server/1036-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/1038-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/1037-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/1038-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/1037-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/1039-fix-ItemMeta-removing-CustomModelData.patch b/patches/server/1038-fix-ItemMeta-removing-CustomModelData.patch
similarity index 91%
rename from patches/server/1039-fix-ItemMeta-removing-CustomModelData.patch
rename to patches/server/1038-fix-ItemMeta-removing-CustomModelData.patch
index 6808c21745..6df545066e 100644
--- a/patches/server/1039-fix-ItemMeta-removing-CustomModelData.patch
+++ b/patches/server/1038-fix-ItemMeta-removing-CustomModelData.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] fix ItemMeta removing CustomModelData
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index efc6ca53c048dbd49438ce0f7718de332fd5de2f..ef2b0e8aa9cce09097000029e39ff70f177ed3a7 100644
+index b2f9a670c5224fb63081466fa594b2b4b3e8bddb..95c75aadea68e9b60caa935a88f2829e36948ae5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -381,7 +381,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/1040-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/1039-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 96%
rename from patches/server/1040-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/1039-Validate-ResourceLocation-in-NBT-reading.patch
index 42fc20efc7..bc30169ed2 100644
--- a/patches/server/1040-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/1039-Validate-ResourceLocation-in-NBT-reading.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate ResourceLocation in NBT reading
 
 
 diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
-index 18fad4f083862ace2bc56579883f548f6d697091..8e68a094a22243f3e84110ddf81136219ac1de7c 100644
+index ba0726157417cdde1c9bca93a9e37e68d9b2286d..e3a3f19a6e63fd42e29c418e5a7439972484d492 100644
 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java
 +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
 @@ -230,8 +230,10 @@ public final class NbtUtils {
@@ -53,7 +53,7 @@ index a039217f9293ad3b0cc74c49450472eb44c6a139..e52f3da3b63cc3dba59d3e874a8420dd
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 42e2be9286b75a1d34845f303ffc65e96fdd5416..0b5334004b9d0489e8465824870662b467ce321b 100644
+index 76497f642ff268d4039590902708e0d21ddb6531..3ebf777811cba0cc45cfae7587b277f06adeb045 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -620,7 +620,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
diff --git a/patches/server/1041-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/1040-Properly-handle-experience-dropping-on-block-break.patch
similarity index 98%
rename from patches/server/1041-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/1040-Properly-handle-experience-dropping-on-block-break.patch
index cd538d60af..96b22c026d 100644
--- a/patches/server/1041-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/1040-Properly-handle-experience-dropping-on-block-break.patch
@@ -7,7 +7,7 @@ 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 e6631ccf71dec785ab8decbf037e8bd622a7a613..04f5d1f853f1de95610404ea53a4a985fcf58066 100644
+index 1fd66fce58909b2001652f7d1d13028abee5fef7..1feca8c844c74b8f64d1a1034ae06bfd7a9c0ab2 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1102,7 +1102,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/1042-Fixup-NamespacedKey-handling.patch b/patches/server/1041-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/1042-Fixup-NamespacedKey-handling.patch
rename to patches/server/1041-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/1043-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/1042-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/1043-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/1042-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/1044-Write-SavedData-IO-async.patch b/patches/server/1043-Write-SavedData-IO-async.patch
similarity index 99%
rename from patches/server/1044-Write-SavedData-IO-async.patch
rename to patches/server/1043-Write-SavedData-IO-async.patch
index daaa279cd6..22cbb3848d 100644
--- a/patches/server/1044-Write-SavedData-IO-async.patch
+++ b/patches/server/1043-Write-SavedData-IO-async.patch
@@ -44,7 +44,7 @@ index 65a20974428ae1c0be2022d997234a16dc281292..77a2458b8acb21c64676934cd8d6b05e
  
      // 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 f27c9f99e70d45c433a348dd315bb31b44fefa78..0911b39561fb158dc2268b6054d5ce7a0c1dc465 100644
+index 48b0bce01a9ae1ce869203a685be308d49a8c880..7a327afc8c08dfb94e66595b015887c6d0018c37 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1486,7 +1486,7 @@ public class ServerLevel extends Level implements WorldGenLevel {