From 3a43821c382ed99b3e64892381c263a23e9cc56a Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 31 Dec 2021 19:05:42 -0800
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot)

---
 build-data/paper.at                           |  5 --
 patches/api/0006-Timings-v2.patch             | 10 ++--
 patches/api/0008-Adventure.patch              |  4 +-
 patches/api/0011-Version-Command-2.0.patch    |  4 +-
 ...dd-an-asterisk-to-legacy-API-plugins.patch |  4 +-
 .../api/0129-SkeletonHorse-Additions.patch    | 25 +++++----
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 .../0137-Make-EnderDragon-extend-Mob.patch    | 19 -------
 ...ots-for-Timings-Tile-Entity-reports.patch} |  0
 ...locks-to-be-accessed-via-a-long-key.patch} |  0
 ...tch => 0140-Slime-Pathfinder-Events.patch} |  0
 ...ch => 0141-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0142-Add-More-Creeper-API.patch} |  0
 ...=> 0143-Inventory-removeItemAnySlot.patch} |  0
 ....patch => 0144-isChunkGenerated-API.patch} |  2 +-
 ...constructor-and-getChangedBlockData.patch} |  0
 ...-API.patch => 0146-Async-Chunks-API.patch} |  2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0149-Improve-death-events.patch} |  0
 ...I.patch => 0150-Mob-Pathfinding-API.patch} |  0
 ...anPlaceOn-and-CanDestroy-NBT-values.patch} |  0
 ...urrency-Improvements-to-Permissions.patch} |  0
 ...Add-ItemStackRecipeChoice-Draft-API.patch} |  0
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ...atch => 0155-Material-API-additions.patch} |  6 +--
 ...ags.patch => 0156-Add-Material-Tags.patch} |  0
 ....patch => 0157-PreSpawnerSpawnEvent.patch} |  0
 ...58-Add-LivingEntity-getTargetEntity.patch} |  0
 ...I.patch => 0159-Add-sun-related-API.patch} |  2 +-
 ...Turtle-API.patch => 0160-Turtle-API.patch} |  0
 ...=> 0161-Add-spectator-target-events.patch} |  0
 patches/api/0161-Here-s-Johnny.patch          | 42 ---------------
 ...PI.patch => 0162-Add-more-Witch-API.patch} |  0
 ...ult-permission-message-configurable.patch} |  0
 ...ion-supression-of-EntityDismount-Ve.patch} |  0
 ...I.patch => 0165-Add-more-Zombie-API.patch} |  0
 ...served-channel-check-to-be-sensible.patch} |  0
 ...0167-Add-PlayerConnectionCloseEvent.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 ...ItemStack-Recipe-API-helper-methods.patch} |  0
 ...ent.patch => 0170-BlockDestroyEvent.patch} |  0
 ...ch => 0171-Add-WhitelistToggleEvent.patch} |  0
 ...t.patch => 0172-Add-GS4-Query-event.patch} |  0
 ... => 0173-Add-PlayerPostRespawnEvent.patch} |  0
 ...=> 0174-Entity-getEntitySpawnReason.patch} |  0
 ...0175-Fix-Spigot-annotation-mistakes.patch} |  2 +-
 ...ts.patch => 0176-Server-Tick-Events.patch} |  0
 ...177-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...API.patch => 0178-Add-Heightmap-API.patch} |  2 +-
 ...> 0179-Mob-Spawner-API-Enhancements.patch} |  0
 ... 0180-Add-BlockSoundGroup-interface.patch} |  0
 ...actAtEntityEvent-javadoc-for-ArmorS.patch} |  0
 ...custom-payload-channel-message-size.patch} |  0
 ...83-Expose-the-internal-current-tick.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...tch => 0186-Add-ThrownEggHatchEvent.patch} |  0
 ...p-API.patch => 0187-Entity-Jump-API.patch} |  0
 ...88-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...PI.patch => 0189-Add-tick-times-API.patch} |  0
 ...90-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  4 +-
 ...ts-firing-Async-errors-during-shutd.patch} |  0
 ...3-Make-JavaPluginLoader-thread-safe.patch} |  0
 ... 0194-Add-Player-Client-Options-API.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...Stack-swapping-the-extended-and-upg.patch} |  0
 ...7-Add-item-slot-convenience-methods.patch} |  0
 ...patch => 0198-Villager-Restocks-API.patch} |  0
 ...n.patch => 0199-Expose-game-version.patch} |  4 +-
 ...-API.patch => 0200-Add-Mob-Goal-API.patch} |  0
 ...=> 0201-Add-villager-reputation-API.patch} |  0
 ...-API.patch => 0202-Spawn-Reason-API.patch} |  0
 ...API.patch => 0203-Potential-bed-API.patch} |  0
 ...ioritise-own-classes-where-possible.patch} |  0
 ...a-useful-PluginClassLoader-toString.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0207-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...0209-Support-components-in-ItemMeta.patch} |  2 +-
 ...TargetReasons-for-1.16-mob-behavior.patch} |  0
 ...patch => 0211-Add-entity-liquid-API.patch} |  0
 ...eResultEvent-PrepareGrindstoneEvent.patch} |  0
 ...Support-hex-colors-in-getLastColors.patch} |  0
 ...patch => 0214-Add-setMaxPlayers-API.patch} |  4 +-
 ...PI.patch => 0215-Add-moon-phase-API.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...ent.patch => 0217-Add-BellRingEvent.patch} |  0
 ...support.patch => 0218-Brand-support.patch} |  0
 ...I.patch => 0219-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} | 10 ++--
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  4 +-
 ...king.patch => 0224-Entity-isTicking.patch} |  0
 ...ocs-for-Entity.getEntitySpawnReason.patch} |  0
 ....patch => 0226-Villager-resetOffers.patch} |  0
 ...tch => 0227-Player-elytra-boost-API.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0229-Add-ignore-discounts-API.patch} |  8 +--
 ...> 0230-Item-no-age-no-player-pickup.patch} |  0
 ...231-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0232-Add-API-for-quit-reason.patch} |  0
 ...patch => 0233-Add-Destroy-Speed-API.patch} |  0
 ...34-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0235-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0236-More-lightning-API.patch} |  0
 ...h => 0237-Add-PlayerShearBlockEvent.patch} |  0
 ...38-Enable-multi-release-plugin-jars.patch} |  0
 ...239-Player-Chunk-Load-Unload-Events.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...atch => 0242-Added-PlayerTradeEvent.patch} |  0
 ...atch => 0243-Add-TargetHitEvent-API.patch} |  0
 ...244-Additional-Block-Material-API-s.patch} |  0
 ...t-Material-from-Boats-and-Minecarts.patch} |  0
 ...-Add-PlayerFlowerPotManipulateEvent.patch} |  0
 ...h => 0247-Zombie-API-breaking-doors.patch} |  0
 ...=> 0248-Add-EntityLoadCrossbowEvent.patch} |  0
 ...0249-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...> 0251-Add-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...act-interaction-point-in-PlayerInte.patch} |  0
 ...I.patch => 0255-Add-sendOpLevel-API.patch} |  0
 ...ch => 0256-Add-StructureLocateEvent.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...h => 0258-Add-BlockPreDispenseEvent.patch} |  0
 ...h => 0259-Added-Vanilla-Entity-Tags.patch} |  0
 ...-API.patch => 0260-added-Wither-API.patch} |  0
 ...Added-PlayerChangeBeaconEffectEvent.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  0
 ...atch => 0264-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0265-EntityMoveEvent.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...s.patch => 0269-Add-missing-effects.patch} |  0
 ...atch => 0270-Expose-Tracked-Players.patch} |  0
 ...ache-the-result-of-Material-isBlock.patch} |  8 +--
 ...atch => 0272-Add-worldborder-events.patch} |  0
 ...=> 0273-added-PlayerNameEntityEvent.patch} |  0
 ...h => 0274-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0275-Add-Block-isValidTool.patch} |  0
 ...ch => 0276-Implement-Keyed-on-World.patch} |  2 +-
 ...y-API.patch => 0277-Item-Rarity-API.patch} |  8 +--
 ...tch => 0278-Expose-protocol-version.patch} |  4 +-
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |  2 +-
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ... => 0283-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0284-More-World-API.patch} |  2 +-
 ... 0285-Added-PlayerBedFailEnterEvent.patch} |  0
 ...acon-activation-deactivation-events.patch} |  0
 ...> 0287-PlayerMoveEvent-Improvements.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  0
 ...> 0289-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0293-Inventory-close.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...atch => 0295-Add-basic-Datapack-API.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  0
 ... => 0297-ItemStack-repair-check-API.patch} |  4 +-
 ....patch => 0298-More-Enchantment-API.patch} |  0
 ...missing-hard-depends-not-just-first.patch} |  0
 ...PI.patch => 0300-Add-Mob-lookAt-API.patch} |  0
 ...ta.patch => 0301-ItemStack-editMeta.patch} |  0
 ... => 0302-Add-EntityInsideBlockEvent.patch} |  0
 ...03-Attributes-API-for-item-defaults.patch} | 14 ++---
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...patch => 0305-More-Lidded-Block-API.patch} |  0
 ... => 0306-Add-PlayerKickEvent-causes.patch} |  2 +-
 ...0307-Add-PufferFishStateChangeEvent.patch} |  0
 ...h => 0308-Add-BellRevealRaiderEvent.patch} |  0
 ...09-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0310-Add-more-line-of-sight-methods.patch} |  2 +-
 ... => 0311-Add-more-LimitedRegion-API.patch} |  0
 ...=> 0312-Missing-Entity-Behavior-API.patch} |  8 ++-
 ...ation-to-version-command-on-startup.patch} |  2 +-
 ...ch => 0314-Adds-PlayerArmSwingEvent.patch} |  0
 ...dd-PlayerSignCommandPreprocessEvent.patch} |  0
 ...array-elements-in-command-arguments.patch} |  0
 ...inger-API.patch => 0317-Stinger-API.patch} |  0
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...tch => 0319-Add-PlayerSetSpawnEvent.patch} |  0
 ...=> 0320-Added-EntityDamageItemEvent.patch} |  0
 ...Make-EntityUnleashEvent-cancellable.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0323-Add-BlockBreakBlockEvent.patch} |  0
 ...pers-for-left-right-click-to-Action.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0326-More-CommandBlock-API.patch} |  0
 ...0327-Fix-plugin-provides-load-order.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0329-add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  2 +-
 ... 0331-Get-entity-default-attributes.patch} |  4 +-
 ...d-API.patch => 0332-Left-handed-API.patch} |  0
 ...=> 0333-Add-advancement-display-API.patch} |  0
 ...4-Add-ItemFactory-getMonsterEgg-API.patch} |  0
 ...tch => 0335-Add-critical-damage-API.patch} |  0
 ...0336-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} | 10 ++--
 ...-ram-API.patch => 0338-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...0-Add-Raw-Byte-Entity-Serialization.patch} |  4 +-
 ...0341-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0342-Add-player-health-update-API.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...patch => 0344-Add-more-Campfire-API.patch} |  0
 ...ehicleCollisionEvent-HandlerList-up.patch} |  0
 ... => 0346-Improve-scoreboard-entries.patch} |  0
 ...ch => 0347-Entity-powdered-snow-API.patch} |  0
 ...0348-Add-API-for-item-entity-health.patch} |  0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...le-API.patch => 0350-Bucketable-API.patch} |  0
 ...p-for-default-config-comment-parsing.patch | 51 ++++++++++++++++++
 patches/server/0006-MC-Utils.patch            | 12 ++---
 patches/server/0010-Timings-v2.patch          | 36 ++++++-------
 patches/server/0012-Adventure.patch           | 28 +++++-----
 .../0021-Implement-Paper-VersionChecker.patch |  4 +-
 patches/server/0027-Entity-Origin-API.patch   |  4 +-
 .../0031-Always-tick-falling-blocks.patch     |  4 +-
 ...47-Ensure-commands-are-not-ran-async.patch |  4 +-
 .../0061-Complete-resource-pack-API.patch     |  4 +-
 ...065-Handle-Item-Meta-Inconsistencies.patch |  4 +-
 ...0079-Add-PlayerUseUnknownEntityEvent.patch |  4 +-
 ...onfigurable-packet-in-spam-threshold.patch |  4 +-
 ...06-Configurable-flying-kick-messages.patch |  6 +--
 patches/server/0109-Add-EntityZapEvent.patch  |  6 +--
 ...23-Properly-fix-item-duplication-bug.patch |  4 +-
 ...PI-for-Reason-Source-Triggering-play.patch |  8 +--
 ...ke-parrots-stay-on-shoulders-despite.patch |  4 +-
 .../server/0147-Entity-fromMobSpawner.patch   |  4 +-
 ...48-Improve-the-Saddle-API-for-Horses.patch |  4 +-
 patches/server/0159-Add-PlayerJumpEvent.patch |  4 +-
 ...0-handle-PacketPlayInKeepAlive-async.patch |  4 +-
 ...rt-serverside-behavior-of-keepalives.patch |  8 +--
 .../server/0169-AsyncTabCompleteEvent.patch   |  6 +--
 .../server/0173-PreCreatureSpawnEvent.patch   |  4 +-
 .../0177-Add-ArmorStand-Item-Meta.patch       |  4 +-
 ...-allowed-colored-signs-to-be-created.patch |  4 +-
 .../0207-Fix-CraftEntity-hashCode.patch       |  4 +-
 ...plement-EntityKnockbackByEntityEvent.patch |  4 +-
 .../0219-InventoryCloseEvent-Reason-API.patch |  8 +--
 ...nventory-when-cancelling-PlayerInter.patch |  4 +-
 ...ftMagicNumbers.isSupportedApiVersion.patch |  4 +-
 .../server/0233-SkeletonHorse-Additions.patch | 20 ++-----
 ...nd-make-tab-spam-limits-configurable.patch |  8 +--
 .../0244-Make-EnderDragon-implement-Mob.patch | 33 ------------
 ...4-Use-ConcurrentHashMap-in-JsonList.patch} |  2 +-
 ...5-Use-a-Queue-for-Queueing-Commands.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  2 +-
 ...timize-BlockPosition-helper-methods.patch} |  0
 ...fault-mob-spawn-range-and-water-ani.patch} |  2 +-
 ...tch => 0249-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  2 +-
 ...51-Optimize-CraftBlockData-Creation.patch} |  0
 ...tch => 0252-Optimize-MappedRegistry.patch} |  0
 ...ch => 0253-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0254-Add-More-Creeper-API.patch} |  0
 ...=> 0255-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  0
 ...7-Asynchronous-chunk-IO-and-loading.patch} |  6 +--
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  2 +-
 ....patch => 0260-Improve-death-events.patch} |  4 +-
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0262-Mob-Pathfinding-API.patch} |  0
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  6 +--
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  0
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  0
 ...ning-from-loading-generating-chunks.patch} |  0
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ...rseException-in-Entity-and-TE-names.patch} |  0
 ...=> 0269-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  4 +-
 ...> 0271-Hook-into-CB-plugin-rewrites.patch} |  0
 ....patch => 0272-PreSpawnerSpawnEvent.patch} |  0
 ...73-Add-LivingEntity-getTargetEntity.patch} |  0
 ...I.patch => 0274-Add-sun-related-API.patch} |  0
 ...Turtle-API.patch => 0275-Turtle-API.patch} |  0
 ...ator-target-events-and-improve-impl.patch} |  0
 patches/server/0276-Here-s-Johnny.patch       | 25 ---------
 ...her-worlds-for-shooter-of-projectil.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...PI.patch => 0279-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  8 +--
 ...2-Reset-players-airTicks-on-respawn.patch} |  0
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  0
 ...=> 0285-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0287-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0288-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  4 +-
 ...ult-permission-message-configurable.patch} |  2 +-
 ...revent-rayTrace-from-loading-chunks.patch} |  0
 ...-Large-Packets-disconnecting-client.patch} |  0
 ...ntity-dismount-during-teleportation.patch} |  4 +-
 ...I.patch => 0294-Add-more-Zombie-API.patch} |  0
 ...mits.patch => 0295-Book-Size-Limits.patch} |  4 +-
 ...0296-Add-PlayerConnectionCloseEvent.patch} |  0
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  2 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  0
 ...ent.patch => 0301-BlockDestroyEvent.patch} |  0
 ... => 0302-Async-command-map-building.patch} |  0
 ...0303-Implement-Brigadier-Mojang-API.patch} |  6 +--
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ... 0305-Limit-Client-Sign-length-more.patch} |  6 +--
 ...onvertSigns-boolean-every-sign-save.patch} |  0
 ...Manager-and-add-advanced-packet-sup.patch} |  0
 ...e-Oversized-Tile-Entities-in-chunks.patch} |  0
 ...t-tick-at-start-of-drowning-process.patch} |  0
 ...ggleEvent-when-whitelist-is-toggled.patch} |  0
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0312-Entity-getEntitySpawnReason.patch} |  4 +-
 ...ty-Metadata-for-all-tracked-players.patch} |  4 +-
 ...tch => 0314-Fire-event-on-GS4-query.patch} |  0
 ...15-Implement-PlayerPostRespawnEvent.patch} |  0
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...ts.patch => 0317-Server-Tick-Events.patch} |  0
 ...318-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0320-Add-Heightmap-API.patch} |  0
 ...> 0321-Mob-Spawner-API-Enhancements.patch} |  0
 ...-to-changed-postToMainThread-method.patch} |  4 +-
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...25-improve-CraftWorld-isChunkLoaded.patch} |  0
 ...0326-Implement-CraftBlockSoundGroup.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  0
 ....patch => 0328-ChunkMapDistance-CME.patch} |  0
 ...d.patch => 0329-Chunk-debug-command.patch} |  0
 ...30-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...31-Expose-the-internal-current-tick.patch} |  0
 ...32-Fix-World-isChunkGenerated-calls.patch} |  0
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  0
 ...urable-projectile-relative-velocity.patch} |  0
 ...h => 0336-offset-item-frame-ticking.patch} |  0
 ...-158900.patch => 0337-Fix-MC-158900.patch} |  0
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ...9-Dont-send-unnecessary-sign-update.patch} |  4 +-
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...r-when-player-hand-set-to-empty-typ.patch} |  4 +-
 ...342-Flat-bedrock-generator-settings.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ... 0345-Duplicate-UUID-Resolve-Option.patch} |  0
 ...pers.patch => 0346-Optimize-Hoppers.patch} |  0
 ...ayerDeathEvent-shouldDropExperience.patch} |  0
 ...ading-chunks-checking-hive-position.patch} |  0
 ...hunks-from-Hoppers-and-other-things.patch} |  0
 ...ializing-mismatching-chunk-coordina.patch} |  0
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  0
 ...352-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0353-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0357-Entity-Activation-Range-2.0.patch} | 36 +++++++------
 ...h => 0358-Increase-Light-Queue-Size.patch} |  0
 ...and.patch => 0359-Fix-Light-Command.patch} |  0
 ...2-Anti-Xray.patch => 0360-Anti-Xray.patch} |  2 +-
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...=> 0362-Tracking-Range-Improvements.patch} |  0
 ...-items-vanishing-through-end-portal.patch} |  0
 ...ment-optional-per-player-mob-spawns.patch} |  0
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  2 +-
 ...0368-Add-debug-for-sync-chunk-loads.patch} |  2 +-
 ...w-overriding-the-java-version-check.patch} |  0
 ...tch => 0370-Add-ThrownEggHatchEvent.patch} |  0
 ...p-API.patch => 0371-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0373-Make-the-GUI-graph-fancier.patch} |  0
 ...74-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...5-Prevent-teleporting-dead-entities.patch} |  4 +-
 ...ipwire-hook-placement-before-update.patch} |  0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  0
 ...chance-of-villager-zombie-infection.patch} |  0
 ...tch => 0379-Optimise-Chunk-getFluid.patch} |  0
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...Add-tick-times-API-and-mspt-command.patch} |  2 +-
 ...82-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  4 +-
 ...pawn-settings-and-per-player-option.patch} |  0
 ...nections-shouldn-t-hold-up-shutdown.patch} |  0
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} |  0
 ...tch => 0388-Don-t-tick-dead-players.patch} |  0
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  2 +-
 ...timize-Collision-to-not-load-chunks.patch} |  0
 ...ove-existing-players-to-world-spawn.patch} |  0
 ...alSelector-Goal.Flag-Set-operations.patch} |  0
 ...h => 0393-Improved-Watchdog-Support.patch} |  0
 ....patch => 0394-Optimize-Pathfinding.patch} |  0
 ...5-Reduce-Either-Optional-allocation.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...98-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  0
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...2-Broadcast-join-message-to-console.patch} |  0
 ...Chunk-Post-Processing-deadlock-risk.patch} |  2 +-
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  0
 ...oad-Chunks-for-Login-Asynchronously.patch} |  8 +--
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  0
 ...patch => 0411-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  4 +-
 ...n.patch => 0413-Expose-game-version.patch} |  0
 ...> 0414-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ....patch => 0416-misc-debugging-dumps.patch} |  0
 ...traces-in-log-messages-crash-report.patch} |  0
 ...atch => 0418-Implement-Mob-Goal-API.patch} |  0
 ...=> 0419-Add-villager-reputation-API.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ...tch => 0421-ExperienceOrbMergeEvent.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...API.patch => 0424-Potential-bed-API.patch} |  0
 ...ait-for-Async-Tasks-during-shutdown.patch} |  0
 ...er-respects-game-and-entity-rules-f.patch} |  2 +-
 ...nd-End-Portal-Frames-from-being-des.patch} |  0
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  0
 ...> 0430-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...rCloseEnoughForSpawning-to-use-dist.patch} |  2 +-
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...Levels-chunk-level-checking-methods.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0437-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  0
 ...uping.patch => 0442-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  4 +-
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0445-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  4 +-
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...8-Add-permission-for-command-blocks.patch} |  6 +--
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  4 +-
 ...atch => 0451-Paper-dumpitem-command.patch} |  0
 ...52-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...incremental-chunk-and-player-saving.patch} |  2 +-
 ...e-operations-for-updating-light-dat.patch} |  0
 ...458-Support-old-UUID-format-for-NBT.patch} |  0
 ...p-duplicated-GameProfile-Properties.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  2 +-
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...0463-Support-components-in-ItemMeta.patch} |  2 +-
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0465-Add-entity-liquid-API.patch} |  4 +-
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  0
 ...atch => 0468-Add-PrepareResultEvent.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} |  2 +-
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  6 +--
 ...-5989.patch => 0476-Fix-SPIGOT-5989.patch} |  0
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0484-Brand-support.patch} | 10 ++--
 ...patch => 0485-Add-setMaxPlayers-API.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0487-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0489-Add-moon-phase-API.patch} |  0
 ...prove-Chunk-Status-Transition-Speed.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0492-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0494-Buffer-joins-to-world.patch} |  4 +-
 ...=> 0495-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0498-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0499-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} |  4 +-
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0502-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  8 +--
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  4 +-
 ...track-plugin-scoreboards-by-default.patch} |  2 +-
 ...king.patch => 0510-Entity-isTicking.patch} |  4 +-
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} | 10 ++--
 ...atch => 0515-Optimise-getType-calls.patch} |  0
 ....patch => 0516-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0521-Player-elytra-boost-API.patch} |  0
 ...22-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0525-Add-ignore-discounts-API.patch} | 10 ++--
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  4 +-
 ...> 0528-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...530-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0531-Add-API-for-quit-reason.patch} |  6 +--
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...ch => 0534-Expose-world-spawn-angle.patch} |  0
 ...patch => 0535-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...37-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0538-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0539-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  0
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0542-Add-PlayerShearBlockEvent.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  4 +-
 ....patch => 0544-Limit-recipe-packets.patch} |  8 +--
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0546-MC-4-Fix-item-position-desync.patch} |  2 +-
 ...547-Player-Chunk-Load-Unload-Events.patch} |  0
 ...8-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...-invalid-ingredient-lists-in-Villag.patch} |  0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |  0
 ...ch => 0553-Implement-TargetHitEvent.patch} |  0
 ...554-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0555-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0557-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  6 +--
 ...h => 0562-Zombie-API-breaking-doors.patch} |  0
 ...563-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0564-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0565-Guardian-beam-workaround.patch} |  0
 ...0566-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...mplemented-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  6 +--
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...I-to-expose-exact-interaction-point.patch} |  0
 ...OIs.patch => 0575-Remove-stale-POIs.patch} |  0
 ...h => 0576-Fix-villager-boat-exploit.patch} |  0
 ...I.patch => 0577-Add-sendOpLevel-API.patch} |  0
 ...ch => 0578-Add-StructureLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  0
 ...leHitEvent-call-when-fireballs-dead.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...582-Make-schedule-command-per-world.patch} |  0
 ...583-Configurable-max-leash-distance.patch} |  0
 ...584-Implement-BlockPreDispenseEvent.patch} |  0
 ...-API.patch => 0585-added-Wither-API.patch} |  0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  4 +-
 ...e-map-update-when-spawning-disabled.patch} |  2 +-
 ...shield-blocking-on-dimension-change.patch} |  0
 ...atch => 0592-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0593-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0595-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...ix-dead-slime-setSize-invincibility.patch} |  0
 ...pes-should-return-an-immutable-list.patch} |  0
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...atch => 0602-Expose-Tracked-Players.patch} |  4 +-
 ...3-Remove-streams-from-SensorNearest.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  0
 ...GUI.patch => 0605-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...607-fix-converting-txt-to-json-file.patch} |  0
 ...atch => 0608-Add-worldborder-events.patch} |  0
 ...=> 0609-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0611-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0612-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  4 +-
 ...ch => 0614-Implement-Keyed-on-World.patch} |  0
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0616-Item-Rarity-API.patch} |  4 +-
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...py-TESign-isEditable-from-snapshots.patch} |  0
 ...d-item-when-player-has-disconnected.patch} |  0
 ...elist-use-configurable-kick-message.patch} |  0
 ...gnore-result-of-PlayerEditBookEvent.patch} |  4 +-
 ...22-Entity-load-save-limit-per-chunk.patch} |  0
 ...block-falling-causing-client-desync.patch} |  0
 ...tch => 0624-Expose-protocol-version.patch} |  4 +-
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |  6 +--
 ...ab-completions-for-brigadier-comman.patch} |  2 +-
 ...temConsumeEvent-cancelling-properly.patch} |  0
 ...patch => 0628-Add-bypass-host-check.patch} |  0
 ...0629-Set-area-affect-cloud-rotation.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...ting-give-items-on-item-drop-cancel.patch} |  2 +-
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ...ix-PigZombieAngerEvent-cancellation.patch} |  0
 ...-checkReach-check-for-Shulker-boxes.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  4 +-
 ... => 0637-Added-PlayerDeepSleepEvent.patch} |  2 +-
 ...ld-API.patch => 0638-More-World-API.patch} |  0
 ... 0639-Added-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |  0
 ...acon-activation-deactivation-events.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  4 +-
 ...dd-Channel-initialization-listeners.patch} |  2 +-
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0646-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  2 +-
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0650-Inventory-close.patch} |  0
 ...reateEvent-players-and-end-platform.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0653-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0654-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  4 +-
 ... => 0657-ItemStack-repair-check-API.patch} |  4 +-
 ....patch => 0658-More-Enchantment-API.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0660-Add-Mob-lookAt-API.patch} |  0
 ...0661-Add-Unix-domain-socket-support.patch} |  4 +-
 ... => 0662-Add-EntityInsideBlockEvent.patch} |  0
 ...663-Attributes-API-for-item-defaults.patch | 30 +++++++++++
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...665-Attributes-API-for-item-defaults.patch | 45 ----------------
 ...patch => 0665-More-Lidded-Block-API.patch} |  0
 ...66-Limit-item-frame-cursors-on-maps.patch} |  0
 ... => 0667-Add-PlayerKickEvent-causes.patch} | 52 +++++++++----------
 ...0668-Add-PufferFishStateChangeEvent.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ReentrantLo.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0672-Add-BellRevealRaiderEvent.patch} |  0
 ... 0673-Fix-invulnerable-end-crystals.patch} |  0
 ...74-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0675-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  2 +-
 ...patch => 0678-Line-Of-Sight-Changes.patch} |  0
 ... => 0679-add-per-world-spawn-limits.patch} |  0
 ...plashEvent-for-water-splash-potions.patch} |  0
 ... => 0681-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  2 +-
 ...=> 0683-Missing-Entity-Behavior-API.patch} |  4 +-
 ...ect-for-book-edit-is-called-on-main.patch} |  4 +-
 ...of-Block-applyBoneMeal-always-being.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  4 +-
 ...rom-signs-not-firing-command-events.patch} |  0
 ...ch => 0688-Adds-PlayerArmSwingEvent.patch} |  4 +-
 ...-event-leave-message-not-being-sent.patch} |  8 +--
 ...-for-mobs-immune-to-default-effects.patch} |  0
 ...correct-message-for-outdated-client.patch} |  0
 ...-t-apply-cramming-damage-to-players.patch} |  0
 ...d-timings-for-sensors-and-behaviors.patch} |  0
 ...-bunch-of-missing-forceDrop-toggles.patch} | 14 -----
 ...inger-API.patch => 0695-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0697-Add-System.out-err-catcher.patch} |  0
 ... => 0698-Fix-test-not-bootstrapping.patch} |  0
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...-Improve-boat-collision-performance.patch} |  0
 ...AFK-kick-while-watching-end-credits.patch} |  4 +-
 ...iting-of-comments-to-server.propert.patch} |  0
 ...tch => 0703-Add-PlayerSetSpawnEvent.patch} |  0
 ...rs-respect-inventory-max-stack-size.patch} |  0
 ...ize-entity-tracker-passenger-checks.patch} |  0
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...=> 0707-Added-EntityDamageItemEvent.patch} |  0
 ...timize-indirect-passenger-iteration.patch} |  0
 ...osition-losing-precision-millions-o.patch} |  0
 ...em-frame-map-cursor-update-interval.patch} |  0
 ...Make-EntityUnleashEvent-cancellable.patch} |  2 +-
 ...712-Clear-bucket-NBT-after-dispense.patch} |  0
 ...ct-despawn-rate-in-item-merge-check.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0715-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0717-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0719-Add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  0
 ... 0721-Get-entity-default-attributes.patch} |  4 +-
 ...d-API.patch => 0722-Left-handed-API.patch} |  0
 ...=> 0723-Add-advancement-display-API.patch} |  0
 ...4-Add-ItemFactory-getMonsterEgg-API.patch} |  0
 ...tch => 0725-Add-critical-damage-API.patch} |  2 +-
 ...0726-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  4 +-
 ...-ram-API.patch => 0728-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...0-Add-Raw-Byte-Entity-Serialization.patch} |  8 +--
 ...31-Vanilla-command-permission-fixes.patch} |  0
 ...-Make-CallbackExecutor-strict-again.patch} |  2 +-
 ...server-to-unload-chunks-at-request-.patch} |  2 +-
 ...logic-for-inventories-on-chunk-unlo.patch} |  2 +-
 ...e-recursion-for-chunkholder-updates.patch} |  0
 ...ocking-from-state-access-in-UserCac.patch} |  0
 ...hunks-refusing-to-unload-at-low-TPS.patch} |  0
 ...et-level-changes-while-unloading-pl.patch} |  2 +-
 ...et-level-changes-when-updating-chun.patch} |  0
 ...profile-lookups-to-worldgen-threads.patch} |  0
 ...g-when-the-async-catcher-is-tripped.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  2 +-
 ...lls-removing-tickets-for-sync-loads.patch} |  2 +-
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...=> 0745-Optimise-general-POI-access.patch} |  0
 ...rolled-flushing-for-network-manager.patch} |  2 +-
 ...tch => 0747-Add-more-async-catchers.patch} |  0
 ...te-entity-bounding-box-lookup-calls.patch} |  6 +--
 ... 0749-Optimise-chunk-tick-iteration.patch} |  2 +-
 ...> 0750-Execute-chunk-tasks-mid-tick.patch} |  2 +-
 ... => 0751-Do-not-copy-visible-chunks.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  2 +-
 ...lly-inline-methods-in-BlockPosition.patch} |  0
 ... 0756-Distance-manager-tick-timings.patch} |  2 +-
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  0
 ...h => 0759-Add-packet-limiter-config.patch} |  0
 ... 0760-Lag-compensate-block-breaking.patch} |  0
 ...Stem-registry-when-loading-default-.patch} |  0
 ...our-chunk-data-off-disk-when-conver.patch} |  2 +-
 ...sh-calls-for-entity-tracker-packets.patch} |  2 +-
 ...-lookup-fluid-state-when-raytracing.patch} |  0
 ...atch => 0765-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  0
 ...7-Do-not-run-raytrace-logic-for-AIR.patch} |  0
 ...rimise-map-impl-for-tracked-players.patch} |  0
 ...imise-BlockSoil-nearby-water-lookup.patch} |  0
 ...ition-of-entities-to-entity-ticklis.patch} |  0
 ... 0771-Optimise-random-block-ticking.patch} |  0
 ...2-Optimise-non-flush-packet-sending.patch} |  2 +-
 ...0773-Optimise-nearby-player-lookups.patch} |  4 +-
 ...=> 0774-Optimise-WorldServer-notify.patch} |  0
 ...0775-Remove-streams-for-villager-AI.patch} |  0
 ...> 0776-Rewrite-dataconverter-system.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  4 +-
 ...hread-worker-count-for-low-core-cou.patch} |  0
 ...tity-loads-in-CraftChunk-getEntitie.patch} |  2 +-
 ...ifications-to-critical-entity-state.patch} |  0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  0
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  4 +-
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0786-Ensure-valid-vehicle-status.patch} |  0
 ...ftlocked-end-exit-portal-generation.patch} |  0
 ...r-causing-a-crash-when-trying-to-ge.patch} |  0
 ...-t-log-debug-logging-being-disabled.patch} |  0
 ...axolotls-from-buckets-as-persistent.patch} |  0
 ...ous-menus-with-empty-level-accesses.patch} |  0
 ...-O-threads-with-chunk-data-while-fl.patch} |  0
 ...h => 0793-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  0
 ...unintended-light-block-manipulation.patch} |  0
 ...piglins-and-hoglins-towards-mob-cap.patch} |  2 +-
 ...0797-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ...ion-for-logging-player-ip-addresses.patch} |  4 +-
 ... => 0800-Configurable-feature-seeds.patch} |  0
 ...pper-didnt-account-for-entity-sende.patch} |  0
 ... 0802-Add-root-admin-user-detection.patch} |  0
 ...ays-allow-item-changing-in-Fireball.patch} |  0
 ...t-attempt-to-teleport-dead-entities.patch} |  0
 ...pare-event-not-working-with-zero-xp.patch} |  0
 ...ive-velocity-through-repeated-crits.patch} |  0
 ...e-code-using-deprecated-for-removal.patch} |  0
 ...ch => 0808-Rewrite-the-light-engine.patch} |  2 +-
 ...ochunk-light-sources-unless-it-is-m.patch} |  0
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  0
 ...e-unnecessary-itemmeta-from-clients.patch} |  0
 ...ier-changing-growth-for-other-crops.patch} |  0
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0815-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0816-Add-player-health-update-API.patch} |  0
 ...tch => 0817-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  0
 ...n-checking-in-player-move-packet-ha.patch} | 18 +++----
 ...ch => 0821-Actually-unload-POI-data.patch} |  0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  2 +-
 ...te-Log4j.patch => 0823-Update-Log4j.patch} |  0
 ...patch => 0824-Add-more-Campfire-API.patch} |  0
 ...n-leak-when-converting-pre-1.18-chu.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} |  0
 ...27-Fix-tripwire-state-inconsistency.patch} |  0
 ...uid-logging-on-Block-breakNaturally.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0830-Improve-scoreboard-entries.patch} |  0
 ...ch => 0831-Entity-powdered-snow-API.patch} |  4 +-
 ...-type-tags-suggestions-in-selectors.patch} |  0
 ...0833-Add-API-for-item-entity-health.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
 ...=> 0838-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0839-Bucketable-API.patch} |  0
 ...layer-world-in-endPortalSoundRadius.patch} |  0
 ...0841-Fix-riding-distance-statistics.patch} |  6 +--
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 859 files changed, 561 insertions(+), 656 deletions(-)
 rename patches/api/{0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 delete mode 100644 patches/api/0137-Make-EnderDragon-extend-Mob.patch
 rename patches/api/{0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch => 0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch} (100%)
 rename patches/api/{0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch => 0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch} (100%)
 rename patches/api/{0141-Slime-Pathfinder-Events.patch => 0140-Slime-Pathfinder-Events.patch} (100%)
 rename patches/api/{0142-Add-PhantomPreSpawnEvent.patch => 0141-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/api/{0143-Add-More-Creeper-API.patch => 0142-Add-More-Creeper-API.patch} (100%)
 rename patches/api/{0144-Inventory-removeItemAnySlot.patch => 0143-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/api/{0145-isChunkGenerated-API.patch => 0144-isChunkGenerated-API.patch} (96%)
 rename patches/api/{0146-Add-source-block-constructor-and-getChangedBlockData.patch => 0145-Add-source-block-constructor-and-getChangedBlockData.patch} (100%)
 rename patches/api/{0147-Async-Chunks-API.patch => 0146-Async-Chunks-API.patch} (99%)
 rename patches/api/{0148-Add-ray-tracing-methods-to-LivingEntity.patch => 0147-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/api/{0149-Expose-attack-cooldown-methods-for-Player.patch => 0148-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename patches/api/{0150-Improve-death-events.patch => 0149-Improve-death-events.patch} (100%)
 rename patches/api/{0151-Mob-Pathfinding-API.patch => 0150-Mob-Pathfinding-API.patch} (100%)
 rename patches/api/{0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (100%)
 rename patches/api/{0153-Performance-Concurrency-Improvements-to-Permissions.patch => 0152-Performance-Concurrency-Improvements-to-Permissions.patch} (100%)
 rename patches/api/{0154-Add-ItemStackRecipeChoice-Draft-API.patch => 0153-Add-ItemStackRecipeChoice-Draft-API.patch} (100%)
 rename patches/api/{0155-Implement-furnace-cook-speed-multiplier-API.patch => 0154-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/api/{0156-Material-API-additions.patch => 0155-Material-API-additions.patch} (82%)
 rename patches/api/{0157-Add-Material-Tags.patch => 0156-Add-Material-Tags.patch} (100%)
 rename patches/api/{0158-PreSpawnerSpawnEvent.patch => 0157-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/api/{0159-Add-LivingEntity-getTargetEntity.patch => 0158-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename patches/api/{0160-Add-sun-related-API.patch => 0159-Add-sun-related-API.patch} (94%)
 rename patches/api/{0162-Turtle-API.patch => 0160-Turtle-API.patch} (100%)
 rename patches/api/{0163-Add-spectator-target-events.patch => 0161-Add-spectator-target-events.patch} (100%)
 delete mode 100644 patches/api/0161-Here-s-Johnny.patch
 rename patches/api/{0164-Add-more-Witch-API.patch => 0162-Add-more-Witch-API.patch} (100%)
 rename patches/api/{0165-Make-the-default-permission-message-configurable.patch => 0163-Make-the-default-permission-message-configurable.patch} (100%)
 rename patches/api/{0166-Support-cancellation-supression-of-EntityDismount-Ve.patch => 0164-Support-cancellation-supression-of-EntityDismount-Ve.patch} (100%)
 rename patches/api/{0167-Add-more-Zombie-API.patch => 0165-Add-more-Zombie-API.patch} (100%)
 rename patches/api/{0168-Change-the-reserved-channel-check-to-be-sensible.patch => 0166-Change-the-reserved-channel-check-to-be-sensible.patch} (100%)
 rename patches/api/{0169-Add-PlayerConnectionCloseEvent.patch => 0167-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/api/{0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename patches/api/{0171-Add-ItemStack-Recipe-API-helper-methods.patch => 0169-Add-ItemStack-Recipe-API-helper-methods.patch} (100%)
 rename patches/api/{0172-BlockDestroyEvent.patch => 0170-BlockDestroyEvent.patch} (100%)
 rename patches/api/{0173-Add-WhitelistToggleEvent.patch => 0171-Add-WhitelistToggleEvent.patch} (100%)
 rename patches/api/{0174-Add-GS4-Query-event.patch => 0172-Add-GS4-Query-event.patch} (100%)
 rename patches/api/{0175-Add-PlayerPostRespawnEvent.patch => 0173-Add-PlayerPostRespawnEvent.patch} (100%)
 rename patches/api/{0176-Entity-getEntitySpawnReason.patch => 0174-Entity-getEntitySpawnReason.patch} (100%)
 rename patches/api/{0177-Fix-Spigot-annotation-mistakes.patch => 0175-Fix-Spigot-annotation-mistakes.patch} (99%)
 rename patches/api/{0178-Server-Tick-Events.patch => 0176-Server-Tick-Events.patch} (100%)
 rename patches/api/{0179-PlayerDeathEvent-getItemsToKeep.patch => 0177-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename patches/api/{0180-Add-Heightmap-API.patch => 0178-Add-Heightmap-API.patch} (99%)
 rename patches/api/{0181-Mob-Spawner-API-Enhancements.patch => 0179-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/api/{0182-Add-BlockSoundGroup-interface.patch => 0180-Add-BlockSoundGroup-interface.patch} (100%)
 rename patches/api/{0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch => 0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch} (100%)
 rename patches/api/{0184-Increase-custom-payload-channel-message-size.patch => 0182-Increase-custom-payload-channel-message-size.patch} (100%)
 rename patches/api/{0185-Expose-the-internal-current-tick.patch => 0183-Expose-the-internal-current-tick.patch} (100%)
 rename patches/api/{0186-PlayerDeathEvent-shouldDropExperience.patch => 0184-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename patches/api/{0187-Add-effect-to-block-break-naturally.patch => 0185-Add-effect-to-block-break-naturally.patch} (100%)
 rename patches/api/{0188-Add-ThrownEggHatchEvent.patch => 0186-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/api/{0189-Entity-Jump-API.patch => 0187-Entity-Jump-API.patch} (100%)
 rename patches/api/{0190-add-hand-to-BlockMultiPlaceEvent.patch => 0188-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/api/{0191-Add-tick-times-API.patch => 0189-Add-tick-times-API.patch} (100%)
 rename patches/api/{0192-Expose-MinecraftServer-isRunning.patch => 0190-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/api/{0193-Add-Raw-Byte-ItemStack-Serialization.patch => 0191-Add-Raw-Byte-ItemStack-Serialization.patch} (94%)
 rename patches/api/{0194-Disable-Sync-Events-firing-Async-errors-during-shutd.patch => 0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch} (100%)
 rename patches/api/{0195-Make-JavaPluginLoader-thread-safe.patch => 0193-Make-JavaPluginLoader-thread-safe.patch} (100%)
 rename patches/api/{0196-Add-Player-Client-Options-API.patch => 0194-Add-Player-Client-Options-API.patch} (100%)
 rename patches/api/{0197-Add-PlayerAttackEntityCooldownResetEvent.patch => 0195-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/api/{0198-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch => 0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch} (100%)
 rename patches/api/{0199-Add-item-slot-convenience-methods.patch => 0197-Add-item-slot-convenience-methods.patch} (100%)
 rename patches/api/{0200-Villager-Restocks-API.patch => 0198-Villager-Restocks-API.patch} (100%)
 rename patches/api/{0201-Expose-game-version.patch => 0199-Expose-game-version.patch} (89%)
 rename patches/api/{0202-Add-Mob-Goal-API.patch => 0200-Add-Mob-Goal-API.patch} (100%)
 rename patches/api/{0203-Add-villager-reputation-API.patch => 0201-Add-villager-reputation-API.patch} (100%)
 rename patches/api/{0204-Spawn-Reason-API.patch => 0202-Spawn-Reason-API.patch} (100%)
 rename patches/api/{0205-Potential-bed-API.patch => 0203-Potential-bed-API.patch} (100%)
 rename patches/api/{0206-Prioritise-own-classes-where-possible.patch => 0204-Prioritise-own-classes-where-possible.patch} (100%)
 rename patches/api/{0207-Provide-a-useful-PluginClassLoader-toString.patch => 0205-Provide-a-useful-PluginClassLoader-toString.patch} (100%)
 rename patches/api/{0208-Inventory-getHolder-method-without-block-snapshot.patch => 0206-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/api/{0209-Expose-Arrow-getItemStack.patch => 0207-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/api/{0210-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0208-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/api/{0211-Support-components-in-ItemMeta.patch => 0209-Support-components-in-ItemMeta.patch} (96%)
 rename patches/api/{0212-added-2-new-TargetReasons-for-1.16-mob-behavior.patch => 0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch} (100%)
 rename patches/api/{0213-Add-entity-liquid-API.patch => 0211-Add-entity-liquid-API.patch} (100%)
 rename patches/api/{0214-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch => 0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch} (100%)
 rename patches/api/{0215-Support-hex-colors-in-getLastColors.patch => 0213-Support-hex-colors-in-getLastColors.patch} (100%)
 rename patches/api/{0216-Add-setMaxPlayers-API.patch => 0214-Add-setMaxPlayers-API.patch} (88%)
 rename patches/api/{0217-Add-moon-phase-API.patch => 0215-Add-moon-phase-API.patch} (94%)
 rename patches/api/{0218-Add-playPickupItemAnimation-to-LivingEntity.patch => 0216-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/api/{0219-Add-BellRingEvent.patch => 0217-Add-BellRingEvent.patch} (100%)
 rename patches/api/{0220-Brand-support.patch => 0218-Brand-support.patch} (100%)
 rename patches/api/{0221-Add-more-Evoker-API.patch => 0219-Add-more-Evoker-API.patch} (100%)
 rename patches/api/{0222-Add-methods-to-get-translation-keys.patch => 0220-Add-methods-to-get-translation-keys.patch} (97%)
 rename patches/api/{0223-Create-HoverEvent-from-ItemStack-Entity.patch => 0221-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/api/{0224-Add-additional-open-container-api-to-HumanEntity.patch => 0222-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/api/{0225-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (84%)
 rename patches/api/{0226-Entity-isTicking.patch => 0224-Entity-isTicking.patch} (100%)
 rename patches/api/{0227-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch => 0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch} (100%)
 rename patches/api/{0228-Villager-resetOffers.patch => 0226-Villager-resetOffers.patch} (100%)
 rename patches/api/{0229-Player-elytra-boost-API.patch => 0227-Player-elytra-boost-API.patch} (100%)
 rename patches/api/{0230-Add-getOfflinePlayerIfCached-String.patch => 0228-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/api/{0231-Add-ignore-discounts-API.patch => 0229-Add-ignore-discounts-API.patch} (88%)
 rename patches/api/{0232-Item-no-age-no-player-pickup.patch => 0230-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/api/{0233-Beacon-API-custom-effect-ranges.patch => 0231-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/api/{0234-Add-API-for-quit-reason.patch => 0232-Add-API-for-quit-reason.patch} (100%)
 rename patches/api/{0235-Add-Destroy-Speed-API.patch => 0233-Add-Destroy-Speed-API.patch} (100%)
 rename patches/api/{0236-Add-LivingEntity-clearActiveItem.patch => 0234-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/api/{0237-Add-PlayerItemCooldownEvent.patch => 0235-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/api/{0238-More-lightning-API.patch => 0236-More-lightning-API.patch} (100%)
 rename patches/api/{0239-Add-PlayerShearBlockEvent.patch => 0237-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/api/{0240-Enable-multi-release-plugin-jars.patch => 0238-Enable-multi-release-plugin-jars.patch} (100%)
 rename patches/api/{0241-Player-Chunk-Load-Unload-Events.patch => 0239-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/api/{0242-Expose-LivingEntity-hurt-direction.patch => 0240-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/api/{0243-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/api/{0244-Added-PlayerTradeEvent.patch => 0242-Added-PlayerTradeEvent.patch} (100%)
 rename patches/api/{0245-Add-TargetHitEvent-API.patch => 0243-Add-TargetHitEvent-API.patch} (100%)
 rename patches/api/{0246-Additional-Block-Material-API-s.patch => 0244-Additional-Block-Material-API-s.patch} (100%)
 rename patches/api/{0247-Add-API-to-get-Material-from-Boats-and-Minecarts.patch => 0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch} (100%)
 rename patches/api/{0248-Add-PlayerFlowerPotManipulateEvent.patch => 0246-Add-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/api/{0249-Zombie-API-breaking-doors.patch => 0247-Zombie-API-breaking-doors.patch} (100%)
 rename patches/api/{0250-Add-EntityLoadCrossbowEvent.patch => 0248-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/api/{0251-Added-WorldGameRuleChangeEvent.patch => 0249-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/api/{0252-Added-ServerResourcesReloadedEvent.patch => 0250-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/api/{0253-Add-BlockFailedDispenseEvent.patch => 0251-Add-BlockFailedDispenseEvent.patch} (100%)
 rename patches/api/{0254-Added-PlayerLecternPageChangeEvent.patch => 0252-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/api/{0255-Added-PlayerLoomPatternSelectEvent.patch => 0253-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/api/{0256-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch => 0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch} (100%)
 rename patches/api/{0257-Add-sendOpLevel-API.patch => 0255-Add-sendOpLevel-API.patch} (100%)
 rename patches/api/{0258-Add-StructureLocateEvent.patch => 0256-Add-StructureLocateEvent.patch} (100%)
 rename patches/api/{0259-Return-chat-component-with-empty-text-instead-of-thr.patch => 0257-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/api/{0260-Add-BlockPreDispenseEvent.patch => 0258-Add-BlockPreDispenseEvent.patch} (100%)
 rename patches/api/{0261-Added-Vanilla-Entity-Tags.patch => 0259-Added-Vanilla-Entity-Tags.patch} (100%)
 rename patches/api/{0262-added-Wither-API.patch => 0260-added-Wither-API.patch} (100%)
 rename patches/api/{0263-Added-PlayerChangeBeaconEffectEvent.patch => 0261-Added-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/api/{0264-Added-PlayerStonecutterRecipeSelectEvent.patch => 0262-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/api/{0265-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/api/{0266-add-DragonEggFormEvent.patch => 0264-add-DragonEggFormEvent.patch} (100%)
 rename patches/api/{0267-EntityMoveEvent.patch => 0265-EntityMoveEvent.patch} (100%)
 rename patches/api/{0268-Allow-adding-items-to-BlockDropItemEvent.patch => 0266-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/api/{0269-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/api/{0270-living-entity-allow-attribute-registration.patch => 0268-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/api/{0271-Add-missing-effects.patch => 0269-Add-missing-effects.patch} (100%)
 rename patches/api/{0272-Expose-Tracked-Players.patch => 0270-Expose-Tracked-Players.patch} (100%)
 rename patches/api/{0273-Cache-the-result-of-Material-isBlock.patch => 0271-Cache-the-result-of-Material-isBlock.patch} (81%)
 rename patches/api/{0274-Add-worldborder-events.patch => 0272-Add-worldborder-events.patch} (100%)
 rename patches/api/{0275-added-PlayerNameEntityEvent.patch => 0273-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/api/{0276-Add-recipe-to-cook-events.patch => 0274-Add-recipe-to-cook-events.patch} (100%)
 rename patches/api/{0277-Add-Block-isValidTool.patch => 0275-Add-Block-isValidTool.patch} (100%)
 rename patches/api/{0278-Implement-Keyed-on-World.patch => 0276-Implement-Keyed-on-World.patch} (98%)
 rename patches/api/{0279-Item-Rarity-API.patch => 0277-Item-Rarity-API.patch} (92%)
 rename patches/api/{0280-Expose-protocol-version.patch => 0278-Expose-protocol-version.patch} (82%)
 rename patches/api/{0281-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (99%)
 rename patches/api/{0282-add-isDeeplySleeping-to-HumanEntity.patch => 0280-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/api/{0283-add-consumeFuel-to-FurnaceBurnEvent.patch => 0281-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/api/{0284-add-get-set-drop-chance-to-EntityEquipment.patch => 0282-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/api/{0285-Added-PlayerDeepSleepEvent.patch => 0283-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/api/{0286-More-World-API.patch => 0284-More-World-API.patch} (97%)
 rename patches/api/{0287-Added-PlayerBedFailEnterEvent.patch => 0285-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/api/{0288-Introduce-beacon-activation-deactivation-events.patch => 0286-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/api/{0289-PlayerMoveEvent-Improvements.patch => 0287-PlayerMoveEvent-Improvements.patch} (100%)
 rename patches/api/{0290-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0288-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/api/{0291-Add-more-WanderingTrader-API.patch => 0289-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/api/{0292-Add-EntityBlockStorage-clearEntities.patch => 0290-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/api/{0293-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/api/{0294-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/api/{0295-Inventory-close.patch => 0293-Inventory-close.patch} (100%)
 rename patches/api/{0296-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/api/{0297-Add-basic-Datapack-API.patch => 0295-Add-basic-Datapack-API.patch} (100%)
 rename patches/api/{0298-additions-to-PlayerGameModeChangeEvent.patch => 0296-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/api/{0299-ItemStack-repair-check-API.patch => 0297-ItemStack-repair-check-API.patch} (94%)
 rename patches/api/{0300-More-Enchantment-API.patch => 0298-More-Enchantment-API.patch} (100%)
 rename patches/api/{0301-List-all-missing-hard-depends-not-just-first.patch => 0299-List-all-missing-hard-depends-not-just-first.patch} (100%)
 rename patches/api/{0302-Add-Mob-lookAt-API.patch => 0300-Add-Mob-lookAt-API.patch} (100%)
 rename patches/api/{0303-ItemStack-editMeta.patch => 0301-ItemStack-editMeta.patch} (100%)
 rename patches/api/{0304-Add-EntityInsideBlockEvent.patch => 0302-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/api/{0305-Attributes-API-for-item-defaults.patch => 0303-Attributes-API-for-item-defaults.patch} (71%)
 rename patches/api/{0306-Add-cause-to-Weather-ThunderChangeEvents.patch => 0304-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/api/{0307-More-Lidded-Block-API.patch => 0305-More-Lidded-Block-API.patch} (100%)
 rename patches/api/{0308-Add-PlayerKickEvent-causes.patch => 0306-Add-PlayerKickEvent-causes.patch} (97%)
 rename patches/api/{0309-Add-PufferFishStateChangeEvent.patch => 0307-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/api/{0310-Add-BellRevealRaiderEvent.patch => 0308-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/api/{0311-Add-ElderGuardianAppearanceEvent.patch => 0309-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/api/{0312-Add-more-line-of-sight-methods.patch => 0310-Add-more-line-of-sight-methods.patch} (95%)
 rename patches/api/{0313-Add-more-LimitedRegion-API.patch => 0311-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/api/{0314-Missing-Entity-Behavior-API.patch => 0312-Missing-Entity-Behavior-API.patch} (93%)
 rename patches/api/{0315-Add-Git-information-to-version-command-on-startup.patch => 0313-Add-Git-information-to-version-command-on-startup.patch} (98%)
 rename patches/api/{0316-Adds-PlayerArmSwingEvent.patch => 0314-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/api/{0317-Add-PlayerSignCommandPreprocessEvent.patch => 0315-Add-PlayerSignCommandPreprocessEvent.patch} (100%)
 rename patches/api/{0318-fix-empty-array-elements-in-command-arguments.patch => 0316-fix-empty-array-elements-in-command-arguments.patch} (100%)
 rename patches/api/{0319-Stinger-API.patch => 0317-Stinger-API.patch} (100%)
 rename patches/api/{0320-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/api/{0321-Add-PlayerSetSpawnEvent.patch => 0319-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/api/{0322-Added-EntityDamageItemEvent.patch => 0320-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/api/{0323-Make-EntityUnleashEvent-cancellable.patch => 0321-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/api/{0324-Change-EnderEye-target-without-changing-other-things.patch => 0322-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/api/{0325-Add-BlockBreakBlockEvent.patch => 0323-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/api/{0326-Add-helpers-for-left-right-click-to-Action.patch => 0324-Add-helpers-for-left-right-click-to-Action.patch} (100%)
 rename patches/api/{0327-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/api/{0328-More-CommandBlock-API.patch => 0326-More-CommandBlock-API.patch} (100%)
 rename patches/api/{0329-Fix-plugin-provides-load-order.patch => 0327-Fix-plugin-provides-load-order.patch} (100%)
 rename patches/api/{0330-Add-missing-team-sidebar-display-slots.patch => 0328-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/api/{0331-add-back-EntityPortalExitEvent.patch => 0329-add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/api/{0332-Add-methods-to-find-targets-for-lightning-strikes.patch => 0330-Add-methods-to-find-targets-for-lightning-strikes.patch} (95%)
 rename patches/api/{0333-Get-entity-default-attributes.patch => 0331-Get-entity-default-attributes.patch} (94%)
 rename patches/api/{0334-Left-handed-API.patch => 0332-Left-handed-API.patch} (100%)
 rename patches/api/{0335-Add-advancement-display-API.patch => 0333-Add-advancement-display-API.patch} (100%)
 rename patches/api/{0336-Add-ItemFactory-getMonsterEgg-API.patch => 0334-Add-ItemFactory-getMonsterEgg-API.patch} (100%)
 rename patches/api/{0337-Add-critical-damage-API.patch => 0335-Add-critical-damage-API.patch} (100%)
 rename patches/api/{0338-Fix-issues-with-mob-conversion.patch => 0336-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/api/{0339-Add-isCollidable-methods-to-various-places.patch => 0337-Add-isCollidable-methods-to-various-places.patch} (85%)
 rename patches/api/{0340-Goat-ram-API.patch => 0338-Goat-ram-API.patch} (100%)
 rename patches/api/{0341-Add-API-for-resetting-a-single-score.patch => 0339-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/api/{0342-Add-Raw-Byte-Entity-Serialization.patch => 0340-Add-Raw-Byte-Entity-Serialization.patch} (94%)
 rename patches/api/{0343-Add-PlayerItemFrameChangeEvent.patch => 0341-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/api/{0344-Add-player-health-update-API.patch => 0342-Add-player-health-update-API.patch} (100%)
 rename patches/api/{0345-Allow-delegation-to-vanilla-chunk-gen.patch => 0343-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/api/{0346-Add-more-Campfire-API.patch => 0344-Add-more-Campfire-API.patch} (100%)
 rename patches/api/{0347-Move-VehicleCollisionEvent-HandlerList-up.patch => 0345-Move-VehicleCollisionEvent-HandlerList-up.patch} (100%)
 rename patches/api/{0348-Improve-scoreboard-entries.patch => 0346-Improve-scoreboard-entries.patch} (100%)
 rename patches/api/{0349-Entity-powdered-snow-API.patch => 0347-Entity-powdered-snow-API.patch} (100%)
 rename patches/api/{0350-Add-API-for-item-entity-health.patch => 0348-Add-API-for-item-entity-health.patch} (100%)
 rename patches/api/{0351-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/api/{0352-Bucketable-API.patch => 0350-Bucketable-API.patch} (100%)
 create mode 100644 patches/api/0351-System-prop-for-default-config-comment-parsing.patch
 delete mode 100644 patches/server/0244-Make-EnderDragon-implement-Mob.patch
 rename patches/server/{0245-Use-ConcurrentHashMap-in-JsonList.patch => 0244-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename patches/server/{0246-Use-a-Queue-for-Queueing-Commands.patch => 0245-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename patches/server/{0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (96%)
 rename patches/server/{0248-Optimize-BlockPosition-helper-methods.patch => 0247-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename patches/server/{0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch => 0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch} (89%)
 rename patches/server/{0250-Slime-Pathfinder-Events.patch => 0249-Slime-Pathfinder-Events.patch} (100%)
 rename patches/server/{0251-Configurable-speed-for-water-flowing-over-lava.patch => 0250-Configurable-speed-for-water-flowing-over-lava.patch} (97%)
 rename patches/server/{0252-Optimize-CraftBlockData-Creation.patch => 0251-Optimize-CraftBlockData-Creation.patch} (100%)
 rename patches/server/{0253-Optimize-MappedRegistry.patch => 0252-Optimize-MappedRegistry.patch} (100%)
 rename patches/server/{0254-Add-PhantomPreSpawnEvent.patch => 0253-Add-PhantomPreSpawnEvent.patch} (100%)
 rename patches/server/{0255-Add-More-Creeper-API.patch => 0254-Add-More-Creeper-API.patch} (100%)
 rename patches/server/{0256-Inventory-removeItemAnySlot.patch => 0255-Inventory-removeItemAnySlot.patch} (100%)
 rename patches/server/{0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename patches/server/{0258-Asynchronous-chunk-IO-and-loading.patch => 0257-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename patches/server/{0259-Add-ray-tracing-methods-to-LivingEntity.patch => 0258-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename patches/server/{0260-Expose-attack-cooldown-methods-for-Player.patch => 0259-Expose-attack-cooldown-methods-for-Player.patch} (92%)
 rename patches/server/{0261-Improve-death-events.patch => 0260-Improve-death-events.patch} (99%)
 rename patches/server/{0262-Allow-chests-to-be-placed-with-NBT-data.patch => 0261-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename patches/server/{0263-Mob-Pathfinding-API.patch => 0262-Mob-Pathfinding-API.patch} (100%)
 rename patches/server/{0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (98%)
 rename patches/server/{0265-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0264-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename patches/server/{0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename patches/server/{0267-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0266-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename patches/server/{0268-Implement-furnace-cook-speed-multiplier-API.patch => 0267-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/server/{0269-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0268-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename patches/server/{0270-Honor-EntityAgeable.ageLock.patch => 0269-Honor-EntityAgeable.ageLock.patch} (100%)
 rename patches/server/{0271-Configurable-connection-throttle-kick-message.patch => 0270-Configurable-connection-throttle-kick-message.patch} (93%)
 rename patches/server/{0272-Hook-into-CB-plugin-rewrites.patch => 0271-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename patches/server/{0273-PreSpawnerSpawnEvent.patch => 0272-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/server/{0274-Add-LivingEntity-getTargetEntity.patch => 0273-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename patches/server/{0275-Add-sun-related-API.patch => 0274-Add-sun-related-API.patch} (100%)
 rename patches/server/{0277-Turtle-API.patch => 0275-Turtle-API.patch} (100%)
 rename patches/server/{0278-Call-player-spectator-target-events-and-improve-impl.patch => 0276-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 delete mode 100644 patches/server/0276-Here-s-Johnny.patch
 rename patches/server/{0279-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename patches/server/{0280-Add-Velocity-IP-Forwarding-Support.patch => 0278-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0281-Add-more-Witch-API.patch => 0279-Add-more-Witch-API.patch} (100%)
 rename patches/server/{0282-Check-Drowned-for-Villager-Aggression-Config.patch => 0280-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename patches/server/{0283-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0281-Add-option-to-prevent-players-from-moving-into-unloa.patch} (93%)
 rename patches/server/{0284-Reset-players-airTicks-on-respawn.patch => 0282-Reset-players-airTicks-on-respawn.patch} (100%)
 rename patches/server/{0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename patches/server/{0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename patches/server/{0287-Optimize-World-Time-Updates.patch => 0285-Optimize-World-Time-Updates.patch} (100%)
 rename patches/server/{0288-Restore-custom-InventoryHolder-support.patch => 0286-Restore-custom-InventoryHolder-support.patch} (100%)
 rename patches/server/{0289-Use-Vanilla-Minecart-Speeds.patch => 0287-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename patches/server/{0290-Fix-SpongeAbsortEvent-handling.patch => 0288-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename patches/server/{0291-Don-t-allow-digging-into-unloaded-chunks.patch => 0289-Don-t-allow-digging-into-unloaded-chunks.patch} (97%)
 rename patches/server/{0292-Make-the-default-permission-message-configurable.patch => 0290-Make-the-default-permission-message-configurable.patch} (97%)
 rename patches/server/{0293-Prevent-rayTrace-from-loading-chunks.patch => 0291-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename patches/server/{0294-Handle-Large-Packets-disconnecting-client.patch => 0292-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0295-force-entity-dismount-during-teleportation.patch => 0293-force-entity-dismount-during-teleportation.patch} (97%)
 rename patches/server/{0296-Add-more-Zombie-API.patch => 0294-Add-more-Zombie-API.patch} (100%)
 rename patches/server/{0297-Book-Size-Limits.patch => 0295-Book-Size-Limits.patch} (95%)
 rename patches/server/{0298-Add-PlayerConnectionCloseEvent.patch => 0296-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/server/{0299-Prevent-Enderman-from-loading-chunks.patch => 0297-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename patches/server/{0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (98%)
 rename patches/server/{0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename patches/server/{0302-Block-Entity-remove-from-being-called-on-Players.patch => 0300-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename patches/server/{0303-BlockDestroyEvent.patch => 0301-BlockDestroyEvent.patch} (100%)
 rename patches/server/{0304-Async-command-map-building.patch => 0302-Async-command-map-building.patch} (100%)
 rename patches/server/{0305-Implement-Brigadier-Mojang-API.patch => 0303-Implement-Brigadier-Mojang-API.patch} (97%)
 rename patches/server/{0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename patches/server/{0307-Limit-Client-Sign-length-more.patch => 0305-Limit-Client-Sign-length-more.patch} (92%)
 rename patches/server/{0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename patches/server/{0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0310-Handle-Oversized-Tile-Entities-in-chunks.patch => 0308-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename patches/server/{0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename patches/server/{0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename patches/server/{0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0311-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename patches/server/{0314-Entity-getEntitySpawnReason.patch => 0312-Entity-getEntitySpawnReason.patch} (97%)
 rename patches/server/{0315-Update-entity-Metadata-for-all-tracked-players.patch => 0313-Update-entity-Metadata-for-all-tracked-players.patch} (93%)
 rename patches/server/{0316-Fire-event-on-GS4-query.patch => 0314-Fire-event-on-GS4-query.patch} (100%)
 rename patches/server/{0317-Implement-PlayerPostRespawnEvent.patch => 0315-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename patches/server/{0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename patches/server/{0319-Server-Tick-Events.patch => 0317-Server-Tick-Events.patch} (100%)
 rename patches/server/{0320-PlayerDeathEvent-getItemsToKeep.patch => 0318-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename patches/server/{0321-Optimize-Captured-TileEntity-Lookup.patch => 0319-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename patches/server/{0322-Add-Heightmap-API.patch => 0320-Add-Heightmap-API.patch} (100%)
 rename patches/server/{0323-Mob-Spawner-API-Enhancements.patch => 0321-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/server/{0324-Fix-CB-call-to-changed-postToMainThread-method.patch => 0322-Fix-CB-call-to-changed-postToMainThread-method.patch} (86%)
 rename patches/server/{0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename patches/server/{0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0324-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename patches/server/{0327-improve-CraftWorld-isChunkLoaded.patch => 0325-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename patches/server/{0328-Implement-CraftBlockSoundGroup.patch => 0326-Implement-CraftBlockSoundGroup.patch} (100%)
 rename patches/server/{0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (100%)
 rename patches/server/{0330-ChunkMapDistance-CME.patch => 0328-ChunkMapDistance-CME.patch} (100%)
 rename patches/server/{0331-Chunk-debug-command.patch => 0329-Chunk-debug-command.patch} (100%)
 rename patches/server/{0332-Allow-Saving-of-Oversized-Chunks.patch => 0330-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0333-Expose-the-internal-current-tick.patch => 0331-Expose-the-internal-current-tick.patch} (100%)
 rename patches/server/{0334-Fix-World-isChunkGenerated-calls.patch => 0332-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename patches/server/{0335-Show-blockstate-location-if-we-failed-to-read-it.patch => 0333-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename patches/server/{0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename patches/server/{0337-Configurable-projectile-relative-velocity.patch => 0335-Configurable-projectile-relative-velocity.patch} (100%)
 rename patches/server/{0338-offset-item-frame-ticking.patch => 0336-offset-item-frame-ticking.patch} (100%)
 rename patches/server/{0339-Fix-MC-158900.patch => 0337-Fix-MC-158900.patch} (100%)
 rename patches/server/{0340-Prevent-consuming-the-wrong-itemstack.patch => 0338-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename patches/server/{0341-Dont-send-unnecessary-sign-update.patch => 0339-Dont-send-unnecessary-sign-update.patch} (87%)
 rename patches/server/{0342-Add-option-to-disable-pillager-patrols.patch => 0340-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename patches/server/{0343-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0341-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (88%)
 rename patches/server/{0344-Flat-bedrock-generator-settings.patch => 0342-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0343-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename patches/server/{0346-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0344-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename patches/server/{0347-Duplicate-UUID-Resolve-Option.patch => 0345-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename patches/server/{0348-Optimize-Hoppers.patch => 0346-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0349-PlayerDeathEvent-shouldDropExperience.patch => 0347-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename patches/server/{0350-Prevent-bees-loading-chunks-checking-hive-position.patch => 0348-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename patches/server/{0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0349-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename patches/server/{0352-Guard-against-serializing-mismatching-chunk-coordina.patch => 0350-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename patches/server/{0353-Optimise-IEntityAccess-getPlayerByUUID.patch => 0351-Optimise-IEntityAccess-getPlayerByUUID.patch} (100%)
 rename patches/server/{0354-Fix-items-not-falling-correctly.patch => 0352-Fix-items-not-falling-correctly.patch} (100%)
 rename patches/server/{0355-Lag-compensate-eating.patch => 0353-Lag-compensate-eating.patch} (100%)
 rename patches/server/{0356-Optimize-call-to-getFluid-for-explosions.patch => 0354-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename patches/server/{0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0355-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename patches/server/{0358-Add-effect-to-block-break-naturally.patch => 0356-Add-effect-to-block-break-naturally.patch} (100%)
 rename patches/server/{0359-Entity-Activation-Range-2.0.patch => 0357-Entity-Activation-Range-2.0.patch} (97%)
 rename patches/server/{0360-Increase-Light-Queue-Size.patch => 0358-Increase-Light-Queue-Size.patch} (100%)
 rename patches/server/{0361-Fix-Light-Command.patch => 0359-Fix-Light-Command.patch} (100%)
 rename patches/server/{0362-Anti-Xray.patch => 0360-Anti-Xray.patch} (99%)
 rename patches/server/{0363-Implement-alternative-item-despawn-rate.patch => 0361-Implement-alternative-item-despawn-rate.patch} (100%)
 rename patches/server/{0364-Tracking-Range-Improvements.patch => 0362-Tracking-Range-Improvements.patch} (100%)
 rename patches/server/{0365-Fix-items-vanishing-through-end-portal.patch => 0363-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename patches/server/{0366-implement-optional-per-player-mob-spawns.patch => 0364-implement-optional-per-player-mob-spawns.patch} (100%)
 rename patches/server/{0367-Avoid-hopper-searches-if-there-are-no-items.patch => 0365-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename patches/server/{0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename patches/server/{0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (96%)
 rename patches/server/{0370-Add-debug-for-sync-chunk-loads.patch => 0368-Add-debug-for-sync-chunk-loads.patch} (99%)
 rename patches/server/{0371-Allow-overriding-the-java-version-check.patch => 0369-Allow-overriding-the-java-version-check.patch} (100%)
 rename patches/server/{0372-Add-ThrownEggHatchEvent.patch => 0370-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/server/{0373-Entity-Jump-API.patch => 0371-Entity-Jump-API.patch} (100%)
 rename patches/server/{0374-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0372-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename patches/server/{0375-Make-the-GUI-graph-fancier.patch => 0373-Make-the-GUI-graph-fancier.patch} (100%)
 rename patches/server/{0376-add-hand-to-BlockMultiPlaceEvent.patch => 0374-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/server/{0377-Prevent-teleporting-dead-entities.patch => 0375-Prevent-teleporting-dead-entities.patch} (88%)
 rename patches/server/{0378-Validate-tripwire-hook-placement-before-update.patch => 0376-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename patches/server/{0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename patches/server/{0380-Configurable-chance-of-villager-zombie-infection.patch => 0378-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename patches/server/{0381-Optimise-Chunk-getFluid.patch => 0379-Optimise-Chunk-getFluid.patch} (100%)
 rename patches/server/{0382-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0380-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0383-Add-tick-times-API-and-mspt-command.patch => 0381-Add-tick-times-API-and-mspt-command.patch} (98%)
 rename patches/server/{0384-Expose-MinecraftServer-isRunning.patch => 0382-Expose-MinecraftServer-isRunning.patch} (100%)
 rename patches/server/{0385-Add-Raw-Byte-ItemStack-Serialization.patch => 0383-Add-Raw-Byte-ItemStack-Serialization.patch} (94%)
 rename patches/server/{0386-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0384-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename patches/server/{0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename patches/server/{0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename patches/server/{0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename patches/server/{0390-Don-t-tick-dead-players.patch => 0388-Don-t-tick-dead-players.patch} (100%)
 rename patches/server/{0391-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0389-Dead-Player-s-shouldn-t-be-able-to-move.patch} (90%)
 rename patches/server/{0392-Optimize-Collision-to-not-load-chunks.patch => 0390-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename patches/server/{0393-Don-t-move-existing-players-to-world-spawn.patch => 0391-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename patches/server/{0394-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{0395-Improved-Watchdog-Support.patch => 0393-Improved-Watchdog-Support.patch} (100%)
 rename patches/server/{0396-Optimize-Pathfinding.patch => 0394-Optimize-Pathfinding.patch} (100%)
 rename patches/server/{0397-Reduce-Either-Optional-allocation.patch => 0395-Reduce-Either-Optional-allocation.patch} (100%)
 rename patches/server/{0398-Reduce-memory-footprint-of-NBTTagCompound.patch => 0396-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename patches/server/{0399-Prevent-opening-inventories-when-frozen.patch => 0397-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename patches/server/{0400-Optimise-ArraySetSorted-removeIf.patch => 0398-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename patches/server/{0401-Don-t-run-entity-collision-code-if-not-needed.patch => 0399-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename patches/server/{0402-Implement-Player-Client-Options-API.patch => 0400-Implement-Player-Client-Options-API.patch} (100%)
 rename patches/server/{0403-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename patches/server/{0404-Broadcast-join-message-to-console.patch => 0402-Broadcast-join-message-to-console.patch} (100%)
 rename patches/server/{0405-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0403-Fix-Chunk-Post-Processing-deadlock-risk.patch} (97%)
 rename patches/server/{0406-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename patches/server/{0407-Load-Chunks-for-Login-Asynchronously.patch => 0405-Load-Chunks-for-Login-Asynchronously.patch} (98%)
 rename patches/server/{0408-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename patches/server/{0409-Add-PlayerAttackEntityCooldownResetEvent.patch => 0407-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/server/{0410-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0408-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename patches/server/{0411-Add-phantom-creative-and-insomniac-controls.patch => 0409-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename patches/server/{0412-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename patches/server/{0413-Villager-Restocks-API.patch => 0411-Villager-Restocks-API.patch} (100%)
 rename patches/server/{0414-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0412-Validate-PickItem-Packet-and-kick-for-invalid.patch} (91%)
 rename patches/server/{0415-Expose-game-version.patch => 0413-Expose-game-version.patch} (100%)
 rename patches/server/{0416-Optimize-Voxel-Shape-Merging.patch => 0414-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{0417-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename patches/server/{0418-misc-debugging-dumps.patch => 0416-misc-debugging-dumps.patch} (100%)
 rename patches/server/{0419-Deobfuscate-stacktraces-in-log-messages-crash-report.patch => 0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch} (100%)
 rename patches/server/{0420-Implement-Mob-Goal-API.patch => 0418-Implement-Mob-Goal-API.patch} (100%)
 rename patches/server/{0421-Add-villager-reputation-API.patch => 0419-Add-villager-reputation-API.patch} (100%)
 rename patches/server/{0422-Option-for-maximum-exp-value-when-merging-orbs.patch => 0420-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename patches/server/{0423-ExperienceOrbMergeEvent.patch => 0421-ExperienceOrbMergeEvent.patch} (100%)
 rename patches/server/{0424-Fix-PotionEffect-ignores-icon-flag.patch => 0422-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename patches/server/{0425-Optimize-brigadier-child-sorting-performance.patch => 0423-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename patches/server/{0426-Potential-bed-API.patch => 0424-Potential-bed-API.patch} (100%)
 rename patches/server/{0427-Wait-for-Async-Tasks-during-shutdown.patch => 0425-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename patches/server/{0428-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (91%)
 rename patches/server/{0429-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename patches/server/{0430-Reduce-MutableInt-allocations-from-light-engine.patch => 0428-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename patches/server/{0431-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename patches/server/{0432-Ensure-safe-gateway-teleport.patch => 0430-Ensure-safe-gateway-teleport.patch} (100%)
 rename patches/server/{0433-Add-option-for-console-having-all-permissions.patch => 0431-Add-option-for-console-having-all-permissions.patch} (100%)
 rename patches/server/{0434-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch => 0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch} (99%)
 rename patches/server/{0435-Use-distance-map-to-optimise-entity-tracker.patch => 0433-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename patches/server/{0436-Optimize-ServerLevels-chunk-level-checking-methods.patch => 0434-Optimize-ServerLevels-chunk-level-checking-methods.patch} (100%)
 rename patches/server/{0437-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename patches/server/{0438-Fix-villager-trading-demand-MC-163962.patch => 0436-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename patches/server/{0439-Maps-shouldn-t-load-chunks.patch => 0437-Maps-shouldn-t-load-chunks.patch} (100%)
 rename patches/server/{0440-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0438-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename patches/server/{0441-Fix-missing-chunks-due-to-integer-overflow.patch => 0439-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0442-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0440-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0443-Fix-piston-physics-inconsistency-MC-188840.patch => 0441-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0444-Fix-sand-duping.patch => 0442-Fix-sand-duping.patch} (100%)
 rename patches/server/{0445-Prevent-position-desync-in-playerconnection-causing-.patch => 0443-Prevent-position-desync-in-playerconnection-causing-.patch} (91%)
 rename patches/server/{0446-Inventory-getHolder-method-without-block-snapshot.patch => 0444-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0447-Expose-Arrow-getItemStack.patch => 0445-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/server/{0448-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0446-Add-and-implement-PlayerRecipeBookClickEvent.patch} (92%)
 rename patches/server/{0449-Hide-sync-chunk-writes-behind-flag.patch => 0447-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0450-Add-permission-for-command-blocks.patch => 0448-Add-permission-for-command-blocks.patch} (96%)
 rename patches/server/{0451-Ensure-Entity-AABB-s-are-never-invalid.patch => 0449-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0452-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (98%)
 rename patches/server/{0453-Paper-dumpitem-command.patch => 0451-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0454-Don-t-allow-null-UUID-s-for-chat.patch => 0452-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0455-Improve-Legacy-Component-serialization-size.patch => 0453-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0456-Optimize-Bit-Operations-by-inlining.patch => 0454-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{0457-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0458-incremental-chunk-and-player-saving.patch => 0456-incremental-chunk-and-player-saving.patch} (99%)
 rename patches/server/{0459-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0457-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0460-Support-old-UUID-format-for-NBT.patch => 0458-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0461-Clean-up-duplicated-GameProfile-Properties.patch => 0459-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0462-Convert-legacy-attributes-in-Item-Meta.patch => 0460-Convert-legacy-attributes-in-Item-Meta.patch} (97%)
 rename patches/server/{0463-Remove-some-streams-from-structures.patch => 0461-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0464-Remove-streams-from-classes-related-villager-gossip.patch => 0462-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0465-Support-components-in-ItemMeta.patch => 0463-Support-components-in-ItemMeta.patch} (97%)
 rename patches/server/{0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0464-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0467-Add-entity-liquid-API.patch => 0465-Add-entity-liquid-API.patch} (92%)
 rename patches/server/{0468-Update-itemstack-legacy-name-and-lore.patch => 0466-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0469-Spawn-player-in-correct-world-on-login.patch => 0467-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename patches/server/{0470-Add-PrepareResultEvent.patch => 0468-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0469-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (99%)
 rename patches/server/{0473-Optimize-NetworkManager-Exception-Handling.patch => 0471-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0474-Optimize-the-advancement-data-player-iteration-to-be.patch => 0472-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0475-Fix-arrows-never-despawning-MC-125757.patch => 0473-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0476-Thread-Safe-Vanilla-Command-permission-checking.patch => 0474-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0477-Move-range-check-for-block-placing-up.patch => 0475-Move-range-check-for-block-placing-up.patch} (93%)
 rename patches/server/{0478-Fix-SPIGOT-5989.patch => 0476-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0477-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0478-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0479-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0480-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0483-Fix-some-rails-connecting-improperly.patch => 0481-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0482-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0485-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0483-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0486-Brand-support.patch => 0484-Brand-support.patch} (92%)
 rename patches/server/{0487-Add-setMaxPlayers-API.patch => 0485-Add-setMaxPlayers-API.patch} (100%)
 rename patches/server/{0488-Add-playPickupItemAnimation-to-LivingEntity.patch => 0486-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0489-Don-t-require-FACING-data.patch => 0487-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename patches/server/{0491-Add-moon-phase-API.patch => 0489-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0492-Improve-Chunk-Status-Transition-Speed.patch => 0490-Improve-Chunk-Status-Transition-Speed.patch} (100%)
 rename patches/server/{0493-Prevent-headless-pistons-from-being-created.patch => 0491-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename patches/server/{0494-Add-BellRingEvent.patch => 0492-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0495-Add-zombie-targets-turtle-egg-config.patch => 0493-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0496-Buffer-joins-to-world.patch => 0494-Buffer-joins-to-world.patch} (93%)
 rename patches/server/{0497-Optimize-redstone-algorithm.patch => 0495-Optimize-redstone-algorithm.patch} (100%)
 rename patches/server/{0498-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0496-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0499-PortalCreateEvent-needs-to-know-its-entity.patch => 0497-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0500-Fix-CraftTeam-null-check.patch => 0498-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0501-Add-more-Evoker-API.patch => 0499-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0502-Add-methods-to-get-translation-keys.patch => 0500-Add-methods-to-get-translation-keys.patch} (97%)
 rename patches/server/{0503-Create-HoverEvent-from-ItemStack-Entity.patch => 0501-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0504-Cache-block-data-strings.patch => 0502-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0503-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (94%)
 rename patches/server/{0506-Add-additional-open-container-api-to-HumanEntity.patch => 0504-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0505-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0508-Extend-block-drop-capture-to-capture-all-items-added.patch => 0506-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0507-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename patches/server/{0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0508-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (90%)
 rename patches/server/{0511-Lazily-track-plugin-scoreboards-by-default.patch => 0509-Lazily-track-plugin-scoreboards-by-default.patch} (98%)
 rename patches/server/{0512-Entity-isTicking.patch => 0510-Entity-isTicking.patch} (91%)
 rename patches/server/{0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0511-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0514-Fix-Concurrency-issue-in-WeightedList.patch => 0512-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename patches/server/{0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0513-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0516-Fix-for-large-move-vectors-crashing-server.patch => 0514-Fix-for-large-move-vectors-crashing-server.patch} (95%)
 rename patches/server/{0517-Optimise-getType-calls.patch => 0515-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0518-Villager-resetOffers.patch => 0516-Villager-resetOffers.patch} (100%)
 rename patches/server/{0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0517-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0520-Retain-block-place-order-when-capturing-blockstates.patch => 0518-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0521-Reduce-blockpos-allocation-from-pathfinding.patch => 0519-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0522-Fix-item-locations-dropped-from-campfires.patch => 0520-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0523-Player-elytra-boost-API.patch => 0521-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0524-Fixed-TileEntityBell-memory-leak.patch => 0522-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0523-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0526-Add-getOfflinePlayerIfCached-String.patch => 0524-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0527-Add-ignore-discounts-API.patch => 0525-Add-ignore-discounts-API.patch} (96%)
 rename patches/server/{0528-Toggle-for-removing-existing-dragon.patch => 0526-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0529-Fix-client-lag-on-advancement-loading.patch => 0527-Fix-client-lag-on-advancement-loading.patch} (91%)
 rename patches/server/{0530-Item-no-age-no-player-pickup.patch => 0528-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0529-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0532-Beacon-API-custom-effect-ranges.patch => 0530-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0533-Add-API-for-quit-reason.patch => 0531-Add-API-for-quit-reason.patch} (95%)
 rename patches/server/{0534-Add-Wandering-Trader-spawn-rate-config-options.patch => 0532-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0535-Significantly-improve-performance-of-the-end-generat.patch => 0533-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0536-Expose-world-spawn-angle.patch => 0534-Expose-world-spawn-angle.patch} (100%)
 rename patches/server/{0537-Add-Destroy-Speed-API.patch => 0535-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0536-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0539-Add-LivingEntity-clearActiveItem.patch => 0537-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0540-Add-PlayerItemCooldownEvent.patch => 0538-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0541-More-lightning-API.patch => 0539-More-lightning-API.patch} (100%)
 rename patches/server/{0542-Climbing-should-not-bypass-cramming-gamerule.patch => 0540-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename patches/server/{0543-Added-missing-default-perms-for-commands.patch => 0541-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0544-Add-PlayerShearBlockEvent.patch => 0542-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0545-Fix-curing-zombie-villager-discount-exploit.patch => 0543-Fix-curing-zombie-villager-discount-exploit.patch} (94%)
 rename patches/server/{0546-Limit-recipe-packets.patch => 0544-Limit-recipe-packets.patch} (92%)
 rename patches/server/{0547-Fix-CraftSound-backwards-compatibility.patch => 0545-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0548-MC-4-Fix-item-position-desync.patch => 0546-MC-4-Fix-item-position-desync.patch} (97%)
 rename patches/server/{0549-Player-Chunk-Load-Unload-Events.patch => 0547-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0550-Optimize-Dynamic-get-Missing-Keys.patch => 0548-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0551-Expose-LivingEntity-hurt-direction.patch => 0549-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0550-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0551-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0552-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0555-Implement-TargetHitEvent.patch => 0553-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0556-Additional-Block-Material-API-s.patch => 0554-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0557-Fix-harming-potion-dupe.patch => 0555-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0556-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0559-Cache-burn-durations.patch => 0557-Cache-burn-durations.patch} (100%)
 rename patches/server/{0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0558-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0561-Fix-Not-a-string-Map-Conversion-spam.patch => 0559-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0562-Implement-PlayerFlowerPotManipulateEvent.patch => 0560-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0563-Fix-interact-event-not-being-called-in-adventure.patch => 0561-Fix-interact-event-not-being-called-in-adventure.patch} (90%)
 rename patches/server/{0564-Zombie-API-breaking-doors.patch => 0562-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0565-Fix-nerfed-slime-when-splitting.patch => 0563-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0566-Add-EntityLoadCrossbowEvent.patch => 0564-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0567-Guardian-beam-workaround.patch => 0565-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0568-Added-WorldGameRuleChangeEvent.patch => 0566-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0569-Added-ServerResourcesReloadedEvent.patch => 0567-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0570-Added-world-settings-for-mobs-picking-up-loot.patch => 0568-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0571-Implemented-BlockFailedDispenseEvent.patch => 0569-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0572-Added-PlayerLecternPageChangeEvent.patch => 0570-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0573-Added-PlayerLoomPatternSelectEvent.patch => 0571-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0574-Configurable-door-breaking-difficulty.patch => 0572-Configurable-door-breaking-difficulty.patch} (93%)
 rename patches/server/{0575-Empty-commands-shall-not-be-dispatched.patch => 0573-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0576-Implement-API-to-expose-exact-interaction-point.patch => 0574-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0577-Remove-stale-POIs.patch => 0575-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0578-Fix-villager-boat-exploit.patch => 0576-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0579-Add-sendOpLevel-API.patch => 0577-Add-sendOpLevel-API.patch} (100%)
 rename patches/server/{0580-Add-StructureLocateEvent.patch => 0578-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0581-Collision-option-for-requiring-a-player-participant.patch => 0579-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0580-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0583-Return-chat-component-with-empty-text-instead-of-thr.patch => 0581-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0584-Make-schedule-command-per-world.patch => 0582-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0585-Configurable-max-leash-distance.patch => 0583-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0586-Implement-BlockPreDispenseEvent.patch => 0584-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0587-added-Wither-API.patch => 0585-added-Wither-API.patch} (100%)
 rename patches/server/{0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0586-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0589-Add-toggle-for-always-placing-the-dragon-egg.patch => 0587-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0590-Added-PlayerStonecutterRecipeSelectEvent.patch => 0588-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0589-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (98%)
 rename patches/server/{0592-Skip-distance-map-update-when-spawning-disabled.patch => 0590-Skip-distance-map-update-when-spawning-disabled.patch} (92%)
 rename patches/server/{0593-Reset-shield-blocking-on-dimension-change.patch => 0591-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0594-add-DragonEggFormEvent.patch => 0592-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0595-EntityMoveEvent.patch => 0593-EntityMoveEvent.patch} (100%)
 rename patches/server/{0596-added-option-to-disable-pathfinding-updates-on-block.patch => 0594-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0597-Inline-shift-direction-fields.patch => 0595-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0598-Allow-adding-items-to-BlockDropItemEvent.patch => 0596-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0600-living-entity-allow-attribute-registration.patch => 0598-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0601-fix-dead-slime-setSize-invincibility.patch => 0599-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0602-Merchant-getRecipes-should-return-an-immutable-list.patch => 0600-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0603-Add-support-for-hex-color-codes-in-console.patch => 0601-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0604-Expose-Tracked-Players.patch => 0602-Expose-Tracked-Players.patch} (87%)
 rename patches/server/{0605-Remove-streams-from-SensorNearest.patch => 0603-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0606-Throw-proper-exception-on-empty-JsonList-file.patch => 0604-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0607-Improve-ServerGUI.patch => 0605-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0609-fix-converting-txt-to-json-file.patch => 0607-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0610-Add-worldborder-events.patch => 0608-Add-worldborder-events.patch} (100%)
 rename patches/server/{0611-added-PlayerNameEntityEvent.patch => 0609-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0612-Prevent-grindstones-from-overstacking-items.patch => 0610-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0613-Add-recipe-to-cook-events.patch => 0611-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0614-Add-Block-isValidTool.patch => 0612-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0615-Allow-using-signs-inside-spawn-protection.patch => 0613-Allow-using-signs-inside-spawn-protection.patch} (93%)
 rename patches/server/{0616-Implement-Keyed-on-World.patch => 0614-Implement-Keyed-on-World.patch} (100%)
 rename patches/server/{0617-Add-fast-alternative-constructor-for-Rotations.patch => 0615-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0618-Item-Rarity-API.patch => 0616-Item-Rarity-API.patch} (93%)
 rename patches/server/{0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0620-copy-TESign-isEditable-from-snapshots.patch => 0618-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0621-Drop-carried-item-when-player-has-disconnected.patch => 0619-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0622-forced-whitelist-use-configurable-kick-message.patch => 0620-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (86%)
 rename patches/server/{0624-Entity-load-save-limit-per-chunk.patch => 0622-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0625-fix-cancelling-block-falling-causing-client-desync.patch => 0623-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0626-Expose-protocol-version.patch => 0624-Expose-protocol-version.patch} (85%)
 rename patches/server/{0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (97%)
 rename patches/server/{0628-Enhance-console-tab-completions-for-brigadier-comman.patch => 0626-Enhance-console-tab-completions-for-brigadier-comman.patch} (99%)
 rename patches/server/{0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0630-Add-bypass-host-check.patch => 0628-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0631-Set-area-affect-cloud-rotation.patch => 0629-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0632-add-isDeeplySleeping-to-HumanEntity.patch => 0630-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0633-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0631-Fix-duplicating-give-items-on-item-drop-cancel.patch} (97%)
 rename patches/server/{0634-add-consumeFuel-to-FurnaceBurnEvent.patch => 0632-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0635-add-get-set-drop-chance-to-EntityEquipment.patch => 0633-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0636-fix-PigZombieAngerEvent-cancellation.patch => 0634-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0637-Fix-checkReach-check-for-Shulker-boxes.patch => 0635-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0638-fix-PlayerItemHeldEvent-firing-twice.patch => 0636-fix-PlayerItemHeldEvent-firing-twice.patch} (88%)
 rename patches/server/{0639-Added-PlayerDeepSleepEvent.patch => 0637-Added-PlayerDeepSleepEvent.patch} (91%)
 rename patches/server/{0640-More-World-API.patch => 0638-More-World-API.patch} (100%)
 rename patches/server/{0641-Added-PlayerBedFailEnterEvent.patch => 0639-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0642-Implement-methods-to-convert-between-Component-and-B.patch => 0640-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0644-Introduce-beacon-activation-deactivation-events.patch => 0642-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0645-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0643-add-RespawnFlags-to-PlayerRespawnEvent.patch} (95%)
 rename patches/server/{0646-Add-Channel-initialization-listeners.patch => 0644-Add-Channel-initialization-listeners.patch} (98%)
 rename patches/server/{0647-Send-empty-commands-if-tab-completion-is-disabled.patch => 0645-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0648-Add-more-WanderingTrader-API.patch => 0646-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0649-Add-EntityBlockStorage-clearEntities.patch => 0647-Add-EntityBlockStorage-clearEntities.patch} (94%)
 rename patches/server/{0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0652-Inventory-close.patch => 0650-Inventory-close.patch} (100%)
 rename patches/server/{0653-call-PortalCreateEvent-players-and-end-platform.patch => 0651-call-PortalCreateEvent-players-and-end-platform.patch} (100%)
 rename patches/server/{0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0655-Fix-CraftPotionBrewer-cache.patch => 0653-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0656-Add-basic-Datapack-API.patch => 0654-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0657-Add-environment-variable-to-disable-server-gui.patch => 0655-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0658-additions-to-PlayerGameModeChangeEvent.patch => 0656-additions-to-PlayerGameModeChangeEvent.patch} (98%)
 rename patches/server/{0659-ItemStack-repair-check-API.patch => 0657-ItemStack-repair-check-API.patch} (95%)
 rename patches/server/{0660-More-Enchantment-API.patch => 0658-More-Enchantment-API.patch} (100%)
 rename patches/server/{0661-Fix-and-optimise-world-force-upgrading.patch => 0659-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0662-Add-Mob-lookAt-API.patch => 0660-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0663-Add-Unix-domain-socket-support.patch => 0661-Add-Unix-domain-socket-support.patch} (97%)
 rename patches/server/{0664-Add-EntityInsideBlockEvent.patch => 0662-Add-EntityInsideBlockEvent.patch} (100%)
 create mode 100644 patches/server/0663-Attributes-API-for-item-defaults.patch
 rename patches/server/{0666-Add-cause-to-Weather-ThunderChangeEvents.patch => 0664-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 delete mode 100644 patches/server/0665-Attributes-API-for-item-defaults.patch
 rename patches/server/{0667-More-Lidded-Block-API.patch => 0665-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0668-Limit-item-frame-cursors-on-maps.patch => 0666-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0669-Add-PlayerKickEvent-causes.patch => 0667-Add-PlayerKickEvent-causes.patch} (94%)
 rename patches/server/{0670-Add-PufferFishStateChangeEvent.patch => 0668-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%)
 rename patches/server/{0673-Add-option-to-fix-items-merging-through-walls.patch => 0671-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0674-Add-BellRevealRaiderEvent.patch => 0672-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0675-Fix-invulnerable-end-crystals.patch => 0673-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0676-Add-ElderGuardianAppearanceEvent.patch => 0674-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0677-Fix-dangerous-end-portal-logic.patch => 0675-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0679-Make-item-validations-configurable.patch => 0677-Make-item-validations-configurable.patch} (98%)
 rename patches/server/{0680-Line-Of-Sight-Changes.patch => 0678-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0681-add-per-world-spawn-limits.patch => 0679-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0682-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0680-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0683-Add-more-LimitedRegion-API.patch => 0681-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0684-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0682-Fix-PlayerDropItemEvent-using-wrong-item.patch} (94%)
 rename patches/server/{0685-Missing-Entity-Behavior-API.patch => 0683-Missing-Entity-Behavior-API.patch} (97%)
 rename patches/server/{0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (88%)
 rename patches/server/{0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0688-Use-getChunkIfLoadedImmediately-in-places.patch => 0686-Use-getChunkIfLoadedImmediately-in-places.patch} (96%)
 rename patches/server/{0689-Fix-commands-from-signs-not-firing-command-events.patch => 0687-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0690-Adds-PlayerArmSwingEvent.patch => 0688-Adds-PlayerArmSwingEvent.patch} (87%)
 rename patches/server/{0691-Fixes-kick-event-leave-message-not-being-sent.patch => 0689-Fixes-kick-event-leave-message-not-being-sent.patch} (94%)
 rename patches/server/{0692-Add-config-for-mobs-immune-to-default-effects.patch => 0690-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0693-Fix-incorrect-message-for-outdated-client.patch => 0691-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0694-Don-t-apply-cramming-damage-to-players.patch => 0692-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0695-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0693-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0696-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0694-Add-a-bunch-of-missing-forceDrop-toggles.patch} (79%)
 rename patches/server/{0697-Stinger-API.patch => 0695-Stinger-API.patch} (100%)
 rename patches/server/{0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0699-Add-System.out-err-catcher.patch => 0697-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0700-Fix-test-not-bootstrapping.patch => 0698-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0702-Improve-boat-collision-performance.patch => 0700-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0703-Prevent-AFK-kick-while-watching-end-credits.patch => 0701-Prevent-AFK-kick-while-watching-end-credits.patch} (89%)
 rename patches/server/{0704-Allow-skipping-writing-of-comments-to-server.propert.patch => 0702-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0705-Add-PlayerSetSpawnEvent.patch => 0703-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/server/{0706-Make-hoppers-respect-inventory-max-stack-size.patch => 0704-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0707-Optimize-entity-tracker-passenger-checks.patch => 0705-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0708-Config-option-for-Piglins-guarding-chests.patch => 0706-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0709-Added-EntityDamageItemEvent.patch => 0707-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0710-Optimize-indirect-passenger-iteration.patch => 0708-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0711-Fix-block-drops-position-losing-precision-millions-o.patch => 0709-Fix-block-drops-position-losing-precision-millions-o.patch} (100%)
 rename patches/server/{0712-Configurable-item-frame-map-cursor-update-interval.patch => 0710-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0713-Make-EntityUnleashEvent-cancellable.patch => 0711-Make-EntityUnleashEvent-cancellable.patch} (96%)
 rename patches/server/{0714-Clear-bucket-NBT-after-dispense.patch => 0712-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0715-Respect-despawn-rate-in-item-merge-check.patch => 0713-Respect-despawn-rate-in-item-merge-check.patch} (100%)
 rename patches/server/{0716-Change-EnderEye-target-without-changing-other-things.patch => 0714-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0717-Add-BlockBreakBlockEvent.patch => 0715-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0718-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0719-More-CommandBlock-API.patch => 0717-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0720-Add-missing-team-sidebar-display-slots.patch => 0718-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0721-Add-back-EntityPortalExitEvent.patch => 0719-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0722-Add-methods-to-find-targets-for-lightning-strikes.patch => 0720-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/server/{0723-Get-entity-default-attributes.patch => 0721-Get-entity-default-attributes.patch} (97%)
 rename patches/server/{0724-Left-handed-API.patch => 0722-Left-handed-API.patch} (100%)
 rename patches/server/{0725-Add-advancement-display-API.patch => 0723-Add-advancement-display-API.patch} (100%)
 rename patches/server/{0726-Add-ItemFactory-getMonsterEgg-API.patch => 0724-Add-ItemFactory-getMonsterEgg-API.patch} (100%)
 rename patches/server/{0727-Add-critical-damage-API.patch => 0725-Add-critical-damage-API.patch} (98%)
 rename patches/server/{0728-Fix-issues-with-mob-conversion.patch => 0726-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0729-Add-isCollidable-methods-to-various-places.patch => 0727-Add-isCollidable-methods-to-various-places.patch} (94%)
 rename patches/server/{0730-Goat-ram-API.patch => 0728-Goat-ram-API.patch} (100%)
 rename patches/server/{0731-Add-API-for-resetting-a-single-score.patch => 0729-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0732-Add-Raw-Byte-Entity-Serialization.patch => 0730-Add-Raw-Byte-Entity-Serialization.patch} (93%)
 rename patches/server/{0733-Vanilla-command-permission-fixes.patch => 0731-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0734-Make-CallbackExecutor-strict-again.patch => 0732-Make-CallbackExecutor-strict-again.patch} (95%)
 rename patches/server/{0735-Do-not-allow-the-server-to-unload-chunks-at-request-.patch => 0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch} (92%)
 rename patches/server/{0736-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (97%)
 rename patches/server/{0737-Correctly-handle-recursion-for-chunkholder-updates.patch => 0735-Correctly-handle-recursion-for-chunkholder-updates.patch} (100%)
 rename patches/server/{0738-Separate-lookup-locking-from-state-access-in-UserCac.patch => 0736-Separate-lookup-locking-from-state-access-in-UserCac.patch} (100%)
 rename patches/server/{0739-Fix-chunks-refusing-to-unload-at-low-TPS.patch => 0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch} (100%)
 rename patches/server/{0740-Do-not-allow-ticket-level-changes-while-unloading-pl.patch => 0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch} (97%)
 rename patches/server/{0741-Do-not-allow-ticket-level-changes-when-updating-chun.patch => 0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch} (100%)
 rename patches/server/{0742-Do-not-submit-profile-lookups-to-worldgen-threads.patch => 0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch} (100%)
 rename patches/server/{0743-Log-when-the-async-catcher-is-tripped.patch => 0741-Log-when-the-async-catcher-is-tripped.patch} (100%)
 rename patches/server/{0744-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0742-Add-paper-mobcaps-and-paper-playermobcaps.patch} (99%)
 rename patches/server/{0745-Prevent-unload-calls-removing-tickets-for-sync-loads.patch => 0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch} (98%)
 rename patches/server/{0746-Sanitize-ResourceLocation-error-logging.patch => 0744-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0747-Optimise-general-POI-access.patch => 0745-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0748-Allow-controlled-flushing-for-network-manager.patch => 0746-Allow-controlled-flushing-for-network-manager.patch} (98%)
 rename patches/server/{0749-Add-more-async-catchers.patch => 0747-Add-more-async-catchers.patch} (100%)
 rename patches/server/{0750-Rewrite-entity-bounding-box-lookup-calls.patch => 0748-Rewrite-entity-bounding-box-lookup-calls.patch} (99%)
 rename patches/server/{0751-Optimise-chunk-tick-iteration.patch => 0749-Optimise-chunk-tick-iteration.patch} (98%)
 rename patches/server/{0752-Execute-chunk-tasks-mid-tick.patch => 0750-Execute-chunk-tasks-mid-tick.patch} (98%)
 rename patches/server/{0753-Do-not-copy-visible-chunks.patch => 0751-Do-not-copy-visible-chunks.patch} (100%)
 rename patches/server/{0754-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0755-Custom-table-implementation-for-blockstate-state-loo.patch => 0753-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0756-Detail-more-information-in-watchdog-dumps.patch => 0754-Detail-more-information-in-watchdog-dumps.patch} (99%)
 rename patches/server/{0757-Manually-inline-methods-in-BlockPosition.patch => 0755-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0758-Distance-manager-tick-timings.patch => 0756-Distance-manager-tick-timings.patch} (96%)
 rename patches/server/{0759-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0757-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0760-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0761-Add-packet-limiter-config.patch => 0759-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0762-Lag-compensate-block-breaking.patch => 0760-Lag-compensate-block-breaking.patch} (100%)
 rename patches/server/{0763-Use-correct-LevelStem-registry-when-loading-default-.patch => 0761-Use-correct-LevelStem-registry-when-loading-default-.patch} (100%)
 rename patches/server/{0764-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (93%)
 rename patches/server/{0765-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0763-Consolidate-flush-calls-for-entity-tracker-packets.patch} (96%)
 rename patches/server/{0766-Don-t-lookup-fluid-state-when-raytracing.patch => 0764-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0767-Time-scoreboard-search.patch => 0765-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0768-Send-full-pos-packets-for-hard-colliding-entities.patch => 0766-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0769-Do-not-run-raytrace-logic-for-AIR.patch => 0767-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0770-Oprimise-map-impl-for-tracked-players.patch => 0768-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0771-Optimise-BlockSoil-nearby-water-lookup.patch => 0769-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0772-Allow-removal-addition-of-entities-to-entity-ticklis.patch => 0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch} (100%)
 rename patches/server/{0773-Optimise-random-block-ticking.patch => 0771-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0774-Optimise-non-flush-packet-sending.patch => 0772-Optimise-non-flush-packet-sending.patch} (96%)
 rename patches/server/{0775-Optimise-nearby-player-lookups.patch => 0773-Optimise-nearby-player-lookups.patch} (99%)
 rename patches/server/{0776-Optimise-WorldServer-notify.patch => 0774-Optimise-WorldServer-notify.patch} (100%)
 rename patches/server/{0777-Remove-streams-for-villager-AI.patch => 0775-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0778-Rewrite-dataconverter-system.patch => 0776-Rewrite-dataconverter-system.patch} (100%)
 rename patches/server/{0779-Use-Velocity-compression-and-cipher-natives.patch => 0777-Use-Velocity-compression-and-cipher-natives.patch} (98%)
 rename patches/server/{0780-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0781-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch => 0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch} (97%)
 rename patches/server/{0782-Async-catch-modifications-to-critical-entity-state.patch => 0780-Async-catch-modifications-to-critical-entity-state.patch} (100%)
 rename patches/server/{0783-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0781-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0784-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0785-Check-requirement-before-suggesting-root-nodes.patch => 0783-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0786-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (86%)
 rename patches/server/{0787-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0788-Ensure-valid-vehicle-status.patch => 0786-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0789-Prevent-softlocked-end-exit-portal-generation.patch => 0787-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0790-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0791-Don-t-log-debug-logging-being-disabled.patch => 0789-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0792-Mark-fish-and-axolotls-from-buckets-as-persistent.patch => 0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch} (100%)
 rename patches/server/{0793-fix-various-menus-with-empty-level-accesses.patch => 0791-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0794-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch => 0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch} (100%)
 rename patches/server/{0795-Preserve-overstacked-loot.patch => 0793-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0796-Update-head-rotation-in-missing-places.patch => 0794-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0797-prevent-unintended-light-block-manipulation.patch => 0795-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0798-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch => 0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch} (93%)
 rename patches/server/{0799-Fix-CraftCriteria-defaults-map.patch => 0797-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0800-Fix-upstreams-block-state-factories.patch => 0798-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0801-Add-config-option-for-logging-player-ip-addresses.patch => 0799-Add-config-option-for-logging-player-ip-addresses.patch} (97%)
 rename patches/server/{0802-Configurable-feature-seeds.patch => 0800-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0803-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0804-Add-root-admin-user-detection.patch => 0802-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0805-Always-allow-item-changing-in-Fireball.patch => 0803-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0806-don-t-attempt-to-teleport-dead-entities.patch => 0804-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0807-Fix-anvil-prepare-event-not-working-with-zero-xp.patch => 0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch} (100%)
 rename patches/server/{0808-Prevent-excessive-velocity-through-repeated-crits.patch => 0806-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0809-Remove-client-side-code-using-deprecated-for-removal.patch => 0807-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0810-Rewrite-the-light-engine.patch => 0808-Rewrite-the-light-engine.patch} (99%)
 rename patches/server/{0811-Always-parse-protochunk-light-sources-unless-it-is-m.patch => 0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch} (100%)
 rename patches/server/{0812-Fix-removing-recipes-from-RecipeIterator.patch => 0810-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0813-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0811-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0814-Hide-unnecessary-itemmeta-from-clients.patch => 0812-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0815-Fix-kelp-modifier-changing-growth-for-other-crops.patch => 0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch} (100%)
 rename patches/server/{0816-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0817-Add-PlayerItemFrameChangeEvent.patch => 0815-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0818-Add-player-health-update-API.patch => 0816-Add-player-health-update-API.patch} (100%)
 rename patches/server/{0819-Optimize-HashMapPalette.patch => 0817-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0820-Allow-delegation-to-vanilla-chunk-gen.patch => 0818-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0821-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (100%)
 rename patches/server/{0822-Optimise-collision-checking-in-player-move-packet-ha.patch => 0820-Optimise-collision-checking-in-player-move-packet-ha.patch} (94%)
 rename patches/server/{0823-Actually-unload-POI-data.patch => 0821-Actually-unload-POI-data.patch} (100%)
 rename patches/server/{0824-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (96%)
 rename patches/server/{0825-Update-Log4j.patch => 0823-Update-Log4j.patch} (100%)
 rename patches/server/{0826-Add-more-Campfire-API.patch => 0824-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0827-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch => 0825-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch} (100%)
 rename patches/server/{0828-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0826-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0829-Fix-tripwire-state-inconsistency.patch => 0827-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0830-Fix-fluid-logging-on-Block-breakNaturally.patch => 0828-Fix-fluid-logging-on-Block-breakNaturally.patch} (100%)
 rename patches/server/{0831-Forward-CraftEntity-in-teleport-command.patch => 0829-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0832-Improve-scoreboard-entries.patch => 0830-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0833-Entity-powdered-snow-API.patch => 0831-Entity-powdered-snow-API.patch} (90%)
 rename patches/server/{0834-Fix-entity-type-tags-suggestions-in-selectors.patch => 0832-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0835-Add-API-for-item-entity-health.patch => 0833-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0836-Configurable-max-block-light-for-monster-spawning.patch => 0834-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0837-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0835-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0838-Load-effect-amplifiers-greater-than-127-correctly.patch => 0836-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0839-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0837-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0840-Fix-bees-aging-inside-hives.patch => 0838-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0841-Bucketable-API.patch => 0839-Bucketable-API.patch} (100%)
 rename patches/server/{0842-Check-player-world-in-endPortalSoundRadius.patch => 0840-Check-player-world-in-endPortalSoundRadius.patch} (100%)
 rename patches/server/{0843-Fix-riding-distance-statistics.patch => 0841-Fix-riding-distance-statistics.patch} (92%)

diff --git a/build-data/paper.at b/build-data/paper.at
index 3e2f39ada6..fdecc391fd 100644
--- a/build-data/paper.at
+++ b/build-data/paper.at
@@ -54,9 +54,6 @@ public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V
 # LivingEntity setkiller
 public net.minecraft.world.entity.LivingEntity lastHurtByPlayerTime
 
-# SkeletonHorse Additions
-public net.minecraft.world.entity.animal.horse.SkeletonHorse trapTime
-
 # Fix client rendering skulls
 public net.minecraft.world.item.ItemStack tag
 
@@ -189,8 +186,6 @@ public net.minecraft.server.level.ServerLevel players
 # Chunk priority urgency system
 public net.minecraft.server.level.ChunkMap$ChunkDistanceManager
 
-# Here's Johnny
-public net.minecraft.world.entity.monster.Vindicator isJohnny
 
 # Chunk debug command
 public net.minecraft.server.level.Ticket createdTick
diff --git a/patches/api/0006-Timings-v2.patch b/patches/api/0006-Timings-v2.patch
index ed2bf61dad..74de307938 100644
--- a/patches/api/0006-Timings-v2.patch
+++ b/patches/api/0006-Timings-v2.patch
@@ -2825,10 +2825,10 @@ index 2bfccae871b92749fa5893b5a7ff327fc93695ad..31e989bdaf60d38e14c84c4a0a31ede6
           * Sends the component to the player
           *
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 247d194f86c00db11acbc58e7d163b2606db4f07..945b8b030d1b2a13afc0c4efad76997eb7bf00ba 100644
+index 9ccef14c8afcb3072bf19ebce8849f9acf84be73..93345eaf4bd987490d32f9e60ab54140dbeda5c4 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -18,6 +18,7 @@ import org.bukkit.plugin.PluginDescriptionFile;
+@@ -22,6 +22,7 @@ import org.bukkit.plugin.PluginDescriptionFile;
  @Deprecated
  public interface UnsafeValues {
  
@@ -2836,10 +2836,10 @@ index 247d194f86c00db11acbc58e7d163b2606db4f07..945b8b030d1b2a13afc0c4efad76997e
      Material toLegacy(Material material);
  
      Material fromLegacy(Material material);
-@@ -69,4 +70,12 @@ public interface UnsafeValues {
-      * @return true if a file matching this key was found and deleted
-      */
+@@ -75,4 +76,12 @@ public interface UnsafeValues {
      boolean removeAdvancement(NamespacedKey key);
+ 
+     Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(Material material, EquipmentSlot slot);
 +
 +    // Paper start
 +    /**
diff --git a/patches/api/0008-Adventure.patch b/patches/api/0008-Adventure.patch
index 59f583d377..ebbbcd2963 100644
--- a/patches/api/0008-Adventure.patch
+++ b/patches/api/0008-Adventure.patch
@@ -1102,10 +1102,10 @@ index ac5e263d737973af077e3406a84a84baca4370db..2d91924b7f5ef16a91d40cdc1bfc3d68
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 945b8b030d1b2a13afc0c4efad76997eb7bf00ba..e464769f72bf7d8e0f0630fd4f03011f8ac80dc7 100644
+index 93345eaf4bd987490d32f9e60ab54140dbeda5c4..e9306f581b733b717efa932408cf9d74da4d911d 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -17,6 +17,14 @@ import org.bukkit.plugin.PluginDescriptionFile;
+@@ -21,6 +21,14 @@ import org.bukkit.plugin.PluginDescriptionFile;
   */
  @Deprecated
  public interface UnsafeValues {
diff --git a/patches/api/0011-Version-Command-2.0.patch b/patches/api/0011-Version-Command-2.0.patch
index bd894be42c..494c650061 100644
--- a/patches/api/0011-Version-Command-2.0.patch
+++ b/patches/api/0011-Version-Command-2.0.patch
@@ -56,10 +56,10 @@ index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c7
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e464769f72bf7d8e0f0630fd4f03011f8ac80dc7..bfeec56e83229dbfc8625b3b90bd6c138c73bc1d 100644
+index e9306f581b733b717efa932408cf9d74da4d911d..10028a178b415135d9ea7694e2db8c8c6972c389 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -85,5 +85,12 @@ public interface UnsafeValues {
+@@ -91,5 +91,12 @@ public interface UnsafeValues {
       * @return name
       */
      String getTimingsServerName();
diff --git a/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch b/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch
index 5c3bfe82c9..377de82f1d 100644
--- a/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch
+++ b/patches/api/0123-Add-an-asterisk-to-legacy-API-plugins.patch
@@ -7,10 +7,10 @@ Not here to name and shame, only so server admins can be aware of which
 plugins have and haven't been updated.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index bfeec56e83229dbfc8625b3b90bd6c138c73bc1d..9341c7fbf619a42ed5329136b7fb4f52fb81a922 100644
+index 10028a178b415135d9ea7694e2db8c8c6972c389..2b123aa748d6ba6c1367f376fedb0b9f019ef7fb 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -92,5 +92,11 @@ public interface UnsafeValues {
+@@ -98,5 +98,11 @@ public interface UnsafeValues {
      default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
          return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher();
      }
diff --git a/patches/api/0129-SkeletonHorse-Additions.patch b/patches/api/0129-SkeletonHorse-Additions.patch
index 8d4dd478ab..d50767241a 100644
--- a/patches/api/0129-SkeletonHorse-Additions.patch
+++ b/patches/api/0129-SkeletonHorse-Additions.patch
@@ -73,20 +73,25 @@ index 0000000000000000000000000000000000000000..9ce2948dfaa56d0adf53fe9b6117a90d
 +}
 +
 diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-index b2c6b6a8689f6bd6ce784bbe6f571f756dd700c1..ba9983463263f77db3d3487bc12f01db4508a32b 100644
+index a34ad28fc43bde224c39253e8479bf7bb7e8df1c..38539d5b77e06865aa65b8db0c1a3b6eaa914d03 100644
 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java
 +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java
-@@ -3,4 +3,12 @@ package org.bukkit.entity;
- /**
-  * Represents a SkeletonHorse - variant of {@link AbstractHorse}.
-  */
--public interface SkeletonHorse extends AbstractHorse { }
-+public interface SkeletonHorse extends AbstractHorse {
-+    // Paper start
-+    int getTrapTime();
+@@ -43,4 +43,18 @@ public interface SkeletonHorse extends AbstractHorse {
+      * @param trapTime new trap time
+      */
+     void setTrapTime(int trapTime);
 +
++    // Paper start
++    /**
++     * @deprecated use {@link #isTrapped()}
++     */
++    @Deprecated
 +    boolean isTrap();
 +
++    /**
++     * @deprecated use {@link #setTrapped(boolean)}
++     */
++    @Deprecated
 +    void setTrap(boolean trap);
 +    // Paper end
-+}
+ }
diff --git a/patches/api/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from patches/api/0138-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/patches/api/0137-Make-EnderDragon-extend-Mob.patch b/patches/api/0137-Make-EnderDragon-extend-Mob.patch
deleted file mode 100644
index 6779d66171..0000000000
--- a/patches/api/0137-Make-EnderDragon-extend-Mob.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 10 Aug 2018 22:08:34 -0400
-Subject: [PATCH] Make EnderDragon extend Mob
-
-
-diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index c14278d2c99deedddfd9c8afdc900760b0331546..92da609fb2bdf7c6396ba868410a40725fda05f0 100644
---- a/src/main/java/org/bukkit/entity/EnderDragon.java
-+++ b/src/main/java/org/bukkit/entity/EnderDragon.java
-@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * Represents an Ender Dragon
-  */
--public interface EnderDragon extends ComplexLivingEntity, Boss {
-+public interface EnderDragon extends ComplexLivingEntity, Boss, org.bukkit.entity.Mob { // Paper - add Mob
- 
-     /**
-      * Represents a phase or action that an Ender Dragon can perform.
diff --git a/patches/api/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
similarity index 100%
rename from patches/api/0139-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
rename to patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch
diff --git a/patches/api/0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
similarity index 100%
rename from patches/api/0140-Allow-Blocks-to-be-accessed-via-a-long-key.patch
rename to patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch
diff --git a/patches/api/0141-Slime-Pathfinder-Events.patch b/patches/api/0140-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/api/0141-Slime-Pathfinder-Events.patch
rename to patches/api/0140-Slime-Pathfinder-Events.patch
diff --git a/patches/api/0142-Add-PhantomPreSpawnEvent.patch b/patches/api/0141-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/api/0142-Add-PhantomPreSpawnEvent.patch
rename to patches/api/0141-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/api/0143-Add-More-Creeper-API.patch b/patches/api/0142-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/api/0143-Add-More-Creeper-API.patch
rename to patches/api/0142-Add-More-Creeper-API.patch
diff --git a/patches/api/0144-Inventory-removeItemAnySlot.patch b/patches/api/0143-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/api/0144-Inventory-removeItemAnySlot.patch
rename to patches/api/0143-Inventory-removeItemAnySlot.patch
diff --git a/patches/api/0145-isChunkGenerated-API.patch b/patches/api/0144-isChunkGenerated-API.patch
similarity index 96%
rename from patches/api/0145-isChunkGenerated-API.patch
rename to patches/api/0144-isChunkGenerated-API.patch
index 97d62bee5d..73597aade9 100644
--- a/patches/api/0145-isChunkGenerated-API.patch
+++ b/patches/api/0144-isChunkGenerated-API.patch
@@ -34,7 +34,7 @@ index 58728a0f0722b378efa129e26f0c822b63d1af36..88b3e0323dbc4f0fce31b147c7aaa08d
      /**
       * Sets the position of this Location and returns itself
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7ed2442031cdcc429aabe91d639871566359ba53..59c796ec6b33b282d1f1ee769bc802a3fe7061b1 100644
+index 4789dafc716c3db63983d49d7af75e3f374f4f51..f5d21da75d5f78cc081995e3ac02464bf6a9d045 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -253,6 +253,17 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0146-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch
similarity index 100%
rename from patches/api/0146-Add-source-block-constructor-and-getChangedBlockData.patch
rename to patches/api/0145-Add-source-block-constructor-and-getChangedBlockData.patch
diff --git a/patches/api/0147-Async-Chunks-API.patch b/patches/api/0146-Async-Chunks-API.patch
similarity index 99%
rename from patches/api/0147-Async-Chunks-API.patch
rename to patches/api/0146-Async-Chunks-API.patch
index a5013f6db3..7df9c1c121 100644
--- a/patches/api/0147-Async-Chunks-API.patch
+++ b/patches/api/0146-Async-Chunks-API.patch
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 59c796ec6b33b282d1f1ee769bc802a3fe7061b1..a0a4d0f143303bd449494ec1479db1e449836595 100644
+index f5d21da75d5f78cc081995e3ac02464bf6a9d045..df90ff43657e6d5f776df95e55fa30538e5c2998 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -962,6 +962,482 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0148-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/api/0148-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/api/0149-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from patches/api/0149-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/patches/api/0150-Improve-death-events.patch b/patches/api/0149-Improve-death-events.patch
similarity index 100%
rename from patches/api/0150-Improve-death-events.patch
rename to patches/api/0149-Improve-death-events.patch
diff --git a/patches/api/0151-Mob-Pathfinding-API.patch b/patches/api/0150-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/api/0151-Mob-Pathfinding-API.patch
rename to patches/api/0150-Mob-Pathfinding-API.patch
diff --git a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 100%
rename from patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch
rename to patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 100%
rename from patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch
rename to patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0156-Material-API-additions.patch b/patches/api/0155-Material-API-additions.patch
similarity index 82%
rename from patches/api/0156-Material-API-additions.patch
rename to patches/api/0155-Material-API-additions.patch
index 2443a618e8..4e5966c908 100644
--- a/patches/api/0156-Material-API-additions.patch
+++ b/patches/api/0155-Material-API-additions.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 2a0773e0981f8470eb897ffd9178bb97e8365050..58c3ab444d484ac781810e26e04b9919eaff3bf2 100644
+index 89f593cd3299672c9384cfe15d4085b93c28e462..57af1ab7223d7f949706625118ccc451b82435db 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -99,6 +99,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -102,6 +102,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * An enum of all material IDs accepted by the official server and client
   */
@@ -16,7 +16,7 @@ index 2a0773e0981f8470eb897ffd9178bb97e8365050..58c3ab444d484ac781810e26e04b9919
  public enum Material implements Keyed {
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
-@@ -3969,6 +3970,22 @@ public enum Material implements Keyed {
+@@ -3972,6 +3973,22 @@ public enum Material implements Keyed {
          }
      }
  
diff --git a/patches/api/0157-Add-Material-Tags.patch b/patches/api/0156-Add-Material-Tags.patch
similarity index 100%
rename from patches/api/0157-Add-Material-Tags.patch
rename to patches/api/0156-Add-Material-Tags.patch
diff --git a/patches/api/0158-PreSpawnerSpawnEvent.patch b/patches/api/0157-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/api/0158-PreSpawnerSpawnEvent.patch
rename to patches/api/0157-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0159-Add-LivingEntity-getTargetEntity.patch b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/api/0159-Add-LivingEntity-getTargetEntity.patch
rename to patches/api/0158-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0160-Add-sun-related-API.patch b/patches/api/0159-Add-sun-related-API.patch
similarity index 94%
rename from patches/api/0160-Add-sun-related-API.patch
rename to patches/api/0159-Add-sun-related-API.patch
index 677e68f14b..2cb44c5d04 100644
--- a/patches/api/0160-Add-sun-related-API.patch
+++ b/patches/api/0159-Add-sun-related-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index a0a4d0f143303bd449494ec1479db1e449836595..614c04c31c95e9a404b5caac3e07285ce2c58367 100644
+index df90ff43657e6d5f776df95e55fa30538e5c2998..c0e7e96735c8c544b8b80908613bc97117a71703 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1789,6 +1789,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0162-Turtle-API.patch b/patches/api/0160-Turtle-API.patch
similarity index 100%
rename from patches/api/0162-Turtle-API.patch
rename to patches/api/0160-Turtle-API.patch
diff --git a/patches/api/0163-Add-spectator-target-events.patch b/patches/api/0161-Add-spectator-target-events.patch
similarity index 100%
rename from patches/api/0163-Add-spectator-target-events.patch
rename to patches/api/0161-Add-spectator-target-events.patch
diff --git a/patches/api/0161-Here-s-Johnny.patch b/patches/api/0161-Here-s-Johnny.patch
deleted file mode 100644
index faaadfb5db..0000000000
--- a/patches/api/0161-Here-s-Johnny.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 12 Oct 2018 01:37:16 -0500
-Subject: [PATCH] Here's Johnny!
-
-
-diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java
-index b8ea68a8f420c1ba99c0621a15e654d3ee48c8d6..c5d9e76a6a4125eb0409967a57e3836b8f2d24a0 100644
---- a/src/main/java/org/bukkit/entity/Vindicator.java
-+++ b/src/main/java/org/bukkit/entity/Vindicator.java
-@@ -3,4 +3,30 @@ package org.bukkit.entity;
- /**
-  * Represents a Vindicator.
-  */
--public interface Vindicator extends Illager { }
-+public interface Vindicator extends Illager {
-+    // Paper start
-+    /**
-+     * Check if this Vindicator is set to Johnny mode.
-+     * <p>
-+     * When in Johnny mode the Vindicator will be hostile to any kind of mob, except
-+     * for evokers, ghasts, illusioners and other vindicators. It will even be hostile
-+     * to vexes. All mobs, except for endermites, phantoms, guardians, slimes and
-+     * magma cubes, will try to attack the vindicator in return.
-+     *
-+     * @return True if in Johnny mode
-+     */
-+    boolean isJohnny();
-+
-+    /**
-+     * Set this Vindicator's Johnny mode.
-+     * <p>
-+     * When in Johnny mode the Vindicator will be hostile to any kind of mob, except
-+     * for evokers, ghasts, illusioners and other vindicators. It will even be hostile
-+     * to vexes. All mobs, except for endermites, phantoms, guardians, slimes and
-+     * magma cubes, will try to attack the vindicator in return.
-+     *
-+     * @param johnny True to enable Johnny mode
-+     */
-+    void setJohnny(boolean johnny);
-+    // Paper end
-+}
diff --git a/patches/api/0164-Add-more-Witch-API.patch b/patches/api/0162-Add-more-Witch-API.patch
similarity index 100%
rename from patches/api/0164-Add-more-Witch-API.patch
rename to patches/api/0162-Add-more-Witch-API.patch
diff --git a/patches/api/0165-Make-the-default-permission-message-configurable.patch b/patches/api/0163-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from patches/api/0165-Make-the-default-permission-message-configurable.patch
rename to patches/api/0163-Make-the-default-permission-message-configurable.patch
diff --git a/patches/api/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 100%
rename from patches/api/0166-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0167-Add-more-Zombie-API.patch b/patches/api/0165-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/api/0167-Add-more-Zombie-API.patch
rename to patches/api/0165-Add-more-Zombie-API.patch
diff --git a/patches/api/0168-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 100%
rename from patches/api/0168-Change-the-reserved-channel-check-to-be-sensible.patch
rename to patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0169-Add-PlayerConnectionCloseEvent.patch b/patches/api/0167-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/api/0169-Add-PlayerConnectionCloseEvent.patch
rename to patches/api/0167-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/api/0170-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 100%
rename from patches/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch
rename to patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/0172-BlockDestroyEvent.patch b/patches/api/0170-BlockDestroyEvent.patch
similarity index 100%
rename from patches/api/0172-BlockDestroyEvent.patch
rename to patches/api/0170-BlockDestroyEvent.patch
diff --git a/patches/api/0173-Add-WhitelistToggleEvent.patch b/patches/api/0171-Add-WhitelistToggleEvent.patch
similarity index 100%
rename from patches/api/0173-Add-WhitelistToggleEvent.patch
rename to patches/api/0171-Add-WhitelistToggleEvent.patch
diff --git a/patches/api/0174-Add-GS4-Query-event.patch b/patches/api/0172-Add-GS4-Query-event.patch
similarity index 100%
rename from patches/api/0174-Add-GS4-Query-event.patch
rename to patches/api/0172-Add-GS4-Query-event.patch
diff --git a/patches/api/0175-Add-PlayerPostRespawnEvent.patch b/patches/api/0173-Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/api/0175-Add-PlayerPostRespawnEvent.patch
rename to patches/api/0173-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/0176-Entity-getEntitySpawnReason.patch b/patches/api/0174-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/api/0176-Entity-getEntitySpawnReason.patch
rename to patches/api/0174-Entity-getEntitySpawnReason.patch
diff --git a/patches/api/0177-Fix-Spigot-annotation-mistakes.patch b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch
similarity index 99%
rename from patches/api/0177-Fix-Spigot-annotation-mistakes.patch
rename to patches/api/0175-Fix-Spigot-annotation-mistakes.patch
index b5819b7369..4f5e32284c 100644
--- a/patches/api/0177-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0175-Fix-Spigot-annotation-mistakes.patch
@@ -170,7 +170,7 @@ index 686e2a0b9fe061816b41435ef2337870dbdca8e5..aacf8ea85909299355d16cad0386072e
          return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone();
      }
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 01b462fccce71cef3398dd43944046f322b8e57e..3ab4fa1fe924aa49fedc63241d7b629eb596f35a 100644
+index 01b462fccce71cef3398dd43944046f322b8e57e..8c48a5c61b5afb5407ebf5d734858a0177e3ffa1 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -74,8 +74,10 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
diff --git a/patches/api/0178-Server-Tick-Events.patch b/patches/api/0176-Server-Tick-Events.patch
similarity index 100%
rename from patches/api/0178-Server-Tick-Events.patch
rename to patches/api/0176-Server-Tick-Events.patch
diff --git a/patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/0180-Add-Heightmap-API.patch b/patches/api/0178-Add-Heightmap-API.patch
similarity index 99%
rename from patches/api/0180-Add-Heightmap-API.patch
rename to patches/api/0178-Add-Heightmap-API.patch
index 5f54b14be5..bc06ea7363 100644
--- a/patches/api/0180-Add-Heightmap-API.patch
+++ b/patches/api/0178-Add-Heightmap-API.patch
@@ -103,7 +103,7 @@ index 23ca89dde7f6ac9082d4b97fce2959425f3680cb..8321441b8f528a05e297f485672f928e
       * Creates explosion at this location with given power
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 614c04c31c95e9a404b5caac3e07285ce2c58367..ed97f1f2566582df2c1794856caefff5bedb0fb0 100644
+index c0e7e96735c8c544b8b80908613bc97117a71703..99729c954ae5114260ae50ad3de32ba9d9344ca8 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -160,6 +160,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0181-Mob-Spawner-API-Enhancements.patch b/patches/api/0179-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/api/0181-Mob-Spawner-API-Enhancements.patch
rename to patches/api/0179-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/0182-Add-BlockSoundGroup-interface.patch b/patches/api/0180-Add-BlockSoundGroup-interface.patch
similarity index 100%
rename from patches/api/0182-Add-BlockSoundGroup-interface.patch
rename to patches/api/0180-Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
similarity index 100%
rename from patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
rename to patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/0184-Increase-custom-payload-channel-message-size.patch b/patches/api/0182-Increase-custom-payload-channel-message-size.patch
similarity index 100%
rename from patches/api/0184-Increase-custom-payload-channel-message-size.patch
rename to patches/api/0182-Increase-custom-payload-channel-message-size.patch
diff --git a/patches/api/0185-Expose-the-internal-current-tick.patch b/patches/api/0183-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/api/0185-Expose-the-internal-current-tick.patch
rename to patches/api/0183-Expose-the-internal-current-tick.patch
diff --git a/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/0187-Add-effect-to-block-break-naturally.patch b/patches/api/0185-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/api/0187-Add-effect-to-block-break-naturally.patch
rename to patches/api/0185-Add-effect-to-block-break-naturally.patch
diff --git a/patches/api/0188-Add-ThrownEggHatchEvent.patch b/patches/api/0186-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/api/0188-Add-ThrownEggHatchEvent.patch
rename to patches/api/0186-Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/0189-Entity-Jump-API.patch b/patches/api/0187-Entity-Jump-API.patch
similarity index 100%
rename from patches/api/0189-Entity-Jump-API.patch
rename to patches/api/0187-Entity-Jump-API.patch
diff --git a/patches/api/0190-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/api/0190-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/0191-Add-tick-times-API.patch b/patches/api/0189-Add-tick-times-API.patch
similarity index 100%
rename from patches/api/0191-Add-tick-times-API.patch
rename to patches/api/0189-Add-tick-times-API.patch
diff --git a/patches/api/0192-Expose-MinecraftServer-isRunning.patch b/patches/api/0190-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/api/0192-Expose-MinecraftServer-isRunning.patch
rename to patches/api/0190-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/api/0193-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 94%
rename from patches/api/0193-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch
index c44c30f654..cbc4e7962e 100644
--- a/patches/api/0193-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 9341c7fbf619a42ed5329136b7fb4f52fb81a922..0f76963fb442b228ead081b1c50bfaf420d815d9 100644
+index 2b123aa748d6ba6c1367f376fedb0b9f019ef7fb..ed5835985df93e87e2eb834c501fae2f1d1ad0d5 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -98,5 +98,9 @@ public interface UnsafeValues {
+@@ -104,5 +104,9 @@ public interface UnsafeValues {
      static boolean isLegacyPlugin(org.bukkit.plugin.Plugin plugin) {
          return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
      }
diff --git a/patches/api/0194-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
similarity index 100%
rename from patches/api/0194-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
rename to patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
diff --git a/patches/api/0195-Make-JavaPluginLoader-thread-safe.patch b/patches/api/0193-Make-JavaPluginLoader-thread-safe.patch
similarity index 100%
rename from patches/api/0195-Make-JavaPluginLoader-thread-safe.patch
rename to patches/api/0193-Make-JavaPluginLoader-thread-safe.patch
diff --git a/patches/api/0196-Add-Player-Client-Options-API.patch b/patches/api/0194-Add-Player-Client-Options-API.patch
similarity index 100%
rename from patches/api/0196-Add-Player-Client-Options-API.patch
rename to patches/api/0194-Add-Player-Client-Options-API.patch
diff --git a/patches/api/0197-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/api/0197-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/0198-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
similarity index 100%
rename from patches/api/0198-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
rename to patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/patches/api/0199-Add-item-slot-convenience-methods.patch b/patches/api/0197-Add-item-slot-convenience-methods.patch
similarity index 100%
rename from patches/api/0199-Add-item-slot-convenience-methods.patch
rename to patches/api/0197-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0200-Villager-Restocks-API.patch b/patches/api/0198-Villager-Restocks-API.patch
similarity index 100%
rename from patches/api/0200-Villager-Restocks-API.patch
rename to patches/api/0198-Villager-Restocks-API.patch
diff --git a/patches/api/0201-Expose-game-version.patch b/patches/api/0199-Expose-game-version.patch
similarity index 89%
rename from patches/api/0201-Expose-game-version.patch
rename to patches/api/0199-Expose-game-version.patch
index 74762b0fe2..52c97d53de 100644
--- a/patches/api/0201-Expose-game-version.patch
+++ b/patches/api/0199-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ddaee386c6039eabb349481c2a66ec1292d0bfde..93f6168f2748f127d94a13a3c92e257135bfc534 100644
+index c043e6798314e322e32a1c8e8ef6a795e022b858..92bebf6f46cdd2ff5bc09af32e2d6d2ef0f4f45b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -133,6 +133,18 @@ public final class Bukkit {
@@ -28,7 +28,7 @@ index ddaee386c6039eabb349481c2a66ec1292d0bfde..93f6168f2748f127d94a13a3c92e2571
       * Gets a view of all currently logged in players. This {@linkplain
       * Collections#unmodifiableCollection(Collection) view} is a reused
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index dd263faad52612a076847c717582e8fc09dc3345..3b370b0cefe2debacb187d74e8c47ae56c7397e1 100644
+index ad940c5d327c7e1e09aea7d2cee27a8abcf3fed7..f9b25ecf5642c30c04f5e0483a654ff33d1c188d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -110,6 +110,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0202-Add-Mob-Goal-API.patch b/patches/api/0200-Add-Mob-Goal-API.patch
similarity index 100%
rename from patches/api/0202-Add-Mob-Goal-API.patch
rename to patches/api/0200-Add-Mob-Goal-API.patch
diff --git a/patches/api/0203-Add-villager-reputation-API.patch b/patches/api/0201-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/api/0203-Add-villager-reputation-API.patch
rename to patches/api/0201-Add-villager-reputation-API.patch
diff --git a/patches/api/0204-Spawn-Reason-API.patch b/patches/api/0202-Spawn-Reason-API.patch
similarity index 100%
rename from patches/api/0204-Spawn-Reason-API.patch
rename to patches/api/0202-Spawn-Reason-API.patch
diff --git a/patches/api/0205-Potential-bed-API.patch b/patches/api/0203-Potential-bed-API.patch
similarity index 100%
rename from patches/api/0205-Potential-bed-API.patch
rename to patches/api/0203-Potential-bed-API.patch
diff --git a/patches/api/0206-Prioritise-own-classes-where-possible.patch b/patches/api/0204-Prioritise-own-classes-where-possible.patch
similarity index 100%
rename from patches/api/0206-Prioritise-own-classes-where-possible.patch
rename to patches/api/0204-Prioritise-own-classes-where-possible.patch
diff --git a/patches/api/0207-Provide-a-useful-PluginClassLoader-toString.patch b/patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch
similarity index 100%
rename from patches/api/0207-Provide-a-useful-PluginClassLoader-toString.patch
rename to patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch
diff --git a/patches/api/0208-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/api/0208-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0209-Expose-Arrow-getItemStack.patch b/patches/api/0207-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/api/0209-Expose-Arrow-getItemStack.patch
rename to patches/api/0207-Expose-Arrow-getItemStack.patch
diff --git a/patches/api/0210-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/api/0210-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0211-Support-components-in-ItemMeta.patch b/patches/api/0209-Support-components-in-ItemMeta.patch
similarity index 96%
rename from patches/api/0211-Support-components-in-ItemMeta.patch
rename to patches/api/0209-Support-components-in-ItemMeta.patch
index 8224daa2cc..1d7063a0ed 100644
--- a/patches/api/0211-Support-components-in-ItemMeta.patch
+++ b/patches/api/0209-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 3ab4fa1fe924aa49fedc63241d7b629eb596f35a..10c649a491ad90288975f278c8d1ba3fe17d69e5 100644
+index 8c48a5c61b5afb5407ebf5d734858a0177e3ffa1..77f52b117dec8b99a507995a587505229eadb89e 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -5,6 +5,7 @@ import java.util.Collection;
diff --git a/patches/api/0212-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
similarity index 100%
rename from patches/api/0212-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
rename to patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0213-Add-entity-liquid-API.patch b/patches/api/0211-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/api/0213-Add-entity-liquid-API.patch
rename to patches/api/0211-Add-entity-liquid-API.patch
diff --git a/patches/api/0214-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
similarity index 100%
rename from patches/api/0214-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
rename to patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0215-Support-hex-colors-in-getLastColors.patch b/patches/api/0213-Support-hex-colors-in-getLastColors.patch
similarity index 100%
rename from patches/api/0215-Support-hex-colors-in-getLastColors.patch
rename to patches/api/0213-Support-hex-colors-in-getLastColors.patch
diff --git a/patches/api/0216-Add-setMaxPlayers-API.patch b/patches/api/0214-Add-setMaxPlayers-API.patch
similarity index 88%
rename from patches/api/0216-Add-setMaxPlayers-API.patch
rename to patches/api/0214-Add-setMaxPlayers-API.patch
index d7ae3e24f8..ae03432b12 100644
--- a/patches/api/0216-Add-setMaxPlayers-API.patch
+++ b/patches/api/0214-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 338f0938fbae7eec6cecaf3f1cd30d3e27ad40d6..899a9dbd277b755195a67b6a0c56ac266a52e4c8 100644
+index 0a29ddee94051e398780b9fa07e5ce2b46c51b97..dee9bcd9caee7c900a38c92d5e967cdaaf875a08 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -186,6 +186,17 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index 338f0938fbae7eec6cecaf3f1cd30d3e27ad40d6..899a9dbd277b755195a67b6a0c56ac26
       * Get the game port that the server runs on.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5a98eaeafafc11a7f925701187fc96eb5c675efe..ad19ce0418ce3477d21583cb83c9ced639b250ff 100644
+index a8e187a3f386210c712ab7d620d6a4aa91bf42f8..a3f6a2bbc1d4626b657acc1e108c04ce8d0d577c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -157,6 +157,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0217-Add-moon-phase-API.patch b/patches/api/0215-Add-moon-phase-API.patch
similarity index 94%
rename from patches/api/0217-Add-moon-phase-API.patch
rename to patches/api/0215-Add-moon-phase-API.patch
index c33f01a844..b3431f8823 100644
--- a/patches/api/0217-Add-moon-phase-API.patch
+++ b/patches/api/0215-Add-moon-phase-API.patch
@@ -47,7 +47,7 @@ index 0000000000000000000000000000000000000000..df05153397b42930cd53d37b30824c7e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index ed97f1f2566582df2c1794856caefff5bedb0fb0..9506523227af07667fe2aaa7479f87e4a79b369f 100644
+index 99729c954ae5114260ae50ad3de32ba9d9344ca8..f60fdb12d7dcd60179e07ea764302ebb1c91c619 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -68,6 +68,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0218-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/api/0218-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0219-Add-BellRingEvent.patch b/patches/api/0217-Add-BellRingEvent.patch
similarity index 100%
rename from patches/api/0219-Add-BellRingEvent.patch
rename to patches/api/0217-Add-BellRingEvent.patch
diff --git a/patches/api/0220-Brand-support.patch b/patches/api/0218-Brand-support.patch
similarity index 100%
rename from patches/api/0220-Brand-support.patch
rename to patches/api/0218-Brand-support.patch
diff --git a/patches/api/0221-Add-more-Evoker-API.patch b/patches/api/0219-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/api/0221-Add-more-Evoker-API.patch
rename to patches/api/0219-Add-more-Evoker-API.patch
diff --git a/patches/api/0222-Add-methods-to-get-translation-keys.patch b/patches/api/0220-Add-methods-to-get-translation-keys.patch
similarity index 97%
rename from patches/api/0222-Add-methods-to-get-translation-keys.patch
rename to patches/api/0220-Add-methods-to-get-translation-keys.patch
index 781f56693e..930d552924 100644
--- a/patches/api/0222-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0220-Add-methods-to-get-translation-keys.patch
@@ -112,10 +112,10 @@ index 442db40bc6ea2cfd2f724807544a080bb62bd8c5..d3365e44e64c2e72416d3a50be20ada7
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 58c3ab444d484ac781810e26e04b9919eaff3bf2..b637686404f0aa87c6996220987ed4a303496b43 100644
+index 57af1ab7223d7f949706625118ccc451b82435db..0f8712cef078c11e49bcd73d556d9edce5057952 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -100,7 +100,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -103,7 +103,7 @@ import org.jetbrains.annotations.Nullable;
   * An enum of all material IDs accepted by the official server and client
   */
  @SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
@@ -124,7 +124,7 @@ index 58c3ab444d484ac781810e26e04b9919eaff3bf2..b637686404f0aa87c6996220987ed4a3
      //<editor-fold desc="Materials" defaultstate="collapsed">
      AIR(9648, 0),
      STONE(22948),
-@@ -3984,6 +3984,23 @@ public enum Material implements Keyed {
+@@ -3987,6 +3987,23 @@ public enum Material implements Keyed {
          }
          return false;
      }
@@ -149,10 +149,10 @@ index 58c3ab444d484ac781810e26e04b9919eaff3bf2..b637686404f0aa87c6996220987ed4a3
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 0f76963fb442b228ead081b1c50bfaf420d815d9..5880774f1ca967894ba0bd66da20ffb97d5f6636 100644
+index ed5835985df93e87e2eb834c501fae2f1d1ad0d5..92ab4481e9ec09595911e9df3d666cf46d5a743c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -102,5 +102,34 @@ public interface UnsafeValues {
+@@ -108,5 +108,34 @@ public interface UnsafeValues {
      byte[] serializeItem(ItemStack item);
  
      ItemStack deserializeItem(byte[] data);
diff --git a/patches/api/0223-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/api/0223-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0224-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/api/0224-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0225-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 84%
rename from patches/api/0225-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 8c899cc4ae..79f2f8817c 100644
--- a/patches/api/0225-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 5880774f1ca967894ba0bd66da20ffb97d5f6636..5a5098445eaa9399feb0f90550ab8c79376ac247 100644
+index 92ab4481e9ec09595911e9df3d666cf46d5a743c..a7a5eada1302dac046619d8a01c887965f22dd09 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -131,5 +131,12 @@ public interface UnsafeValues {
+@@ -137,5 +137,12 @@ public interface UnsafeValues {
       * @return the translation key
       */
      String getTranslationKey(ItemStack itemStack);
diff --git a/patches/api/0226-Entity-isTicking.patch b/patches/api/0224-Entity-isTicking.patch
similarity index 100%
rename from patches/api/0226-Entity-isTicking.patch
rename to patches/api/0224-Entity-isTicking.patch
diff --git a/patches/api/0227-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
similarity index 100%
rename from patches/api/0227-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
rename to patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/patches/api/0228-Villager-resetOffers.patch b/patches/api/0226-Villager-resetOffers.patch
similarity index 100%
rename from patches/api/0228-Villager-resetOffers.patch
rename to patches/api/0226-Villager-resetOffers.patch
diff --git a/patches/api/0229-Player-elytra-boost-API.patch b/patches/api/0227-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/api/0229-Player-elytra-boost-API.patch
rename to patches/api/0227-Player-elytra-boost-API.patch
diff --git a/patches/api/0230-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/api/0230-Add-getOfflinePlayerIfCached-String.patch
rename to patches/api/0228-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/0231-Add-ignore-discounts-API.patch b/patches/api/0229-Add-ignore-discounts-API.patch
similarity index 88%
rename from patches/api/0231-Add-ignore-discounts-API.patch
rename to patches/api/0229-Add-ignore-discounts-API.patch
index fae76b45fa..89655ddef8 100644
--- a/patches/api/0231-Add-ignore-discounts-API.patch
+++ b/patches/api/0229-Add-ignore-discounts-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ignore discounts API
 
 
 diff --git a/src/main/java/org/bukkit/inventory/MerchantRecipe.java b/src/main/java/org/bukkit/inventory/MerchantRecipe.java
-index 620a4df8166be7a17ba4546f5d705114490c2526..c52326961a163c552025456bcadc1c897e08deb0 100644
+index d33b66facf36587d703c29e9085289ce919ae621..afaa21b9347683fa373a938d9b1aa01c2058192a 100644
 --- a/src/main/java/org/bukkit/inventory/MerchantRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/MerchantRecipe.java
-@@ -59,6 +59,7 @@ public class MerchantRecipe implements Recipe {
+@@ -57,6 +57,7 @@ public class MerchantRecipe implements Recipe {
      private int demand;
      private int villagerExperience;
      private float priceMultiplier;
@@ -16,7 +16,7 @@ index 620a4df8166be7a17ba4546f5d705114490c2526..c52326961a163c552025456bcadc1c89
  
      public MerchantRecipe(@NotNull ItemStack result, int maxUses) {
          this(result, 0, maxUses, false);
-@@ -73,6 +74,15 @@ public class MerchantRecipe implements Recipe {
+@@ -71,6 +72,15 @@ public class MerchantRecipe implements Recipe {
      }
  
      public MerchantRecipe(@NotNull ItemStack result, int uses, int maxUses, boolean experienceReward, int villagerExperience, float priceMultiplier, int demand, int specialPrice) {
@@ -32,7 +32,7 @@ index 620a4df8166be7a17ba4546f5d705114490c2526..c52326961a163c552025456bcadc1c89
          this.result = result;
          this.uses = uses;
          this.maxUses = maxUses;
-@@ -298,4 +308,20 @@ public class MerchantRecipe implements Recipe {
+@@ -283,4 +293,20 @@ public class MerchantRecipe implements Recipe {
      public void setPriceMultiplier(float priceMultiplier) {
          this.priceMultiplier = priceMultiplier;
      }
diff --git a/patches/api/0232-Item-no-age-no-player-pickup.patch b/patches/api/0230-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/api/0232-Item-no-age-no-player-pickup.patch
rename to patches/api/0230-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0233-Beacon-API-custom-effect-ranges.patch b/patches/api/0231-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/api/0233-Beacon-API-custom-effect-ranges.patch
rename to patches/api/0231-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0234-Add-API-for-quit-reason.patch b/patches/api/0232-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/api/0234-Add-API-for-quit-reason.patch
rename to patches/api/0232-Add-API-for-quit-reason.patch
diff --git a/patches/api/0235-Add-Destroy-Speed-API.patch b/patches/api/0233-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/api/0235-Add-Destroy-Speed-API.patch
rename to patches/api/0233-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0236-Add-LivingEntity-clearActiveItem.patch b/patches/api/0234-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/api/0236-Add-LivingEntity-clearActiveItem.patch
rename to patches/api/0234-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0237-Add-PlayerItemCooldownEvent.patch b/patches/api/0235-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/api/0237-Add-PlayerItemCooldownEvent.patch
rename to patches/api/0235-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0238-More-lightning-API.patch b/patches/api/0236-More-lightning-API.patch
similarity index 100%
rename from patches/api/0238-More-lightning-API.patch
rename to patches/api/0236-More-lightning-API.patch
diff --git a/patches/api/0239-Add-PlayerShearBlockEvent.patch b/patches/api/0237-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/api/0239-Add-PlayerShearBlockEvent.patch
rename to patches/api/0237-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0240-Enable-multi-release-plugin-jars.patch b/patches/api/0238-Enable-multi-release-plugin-jars.patch
similarity index 100%
rename from patches/api/0240-Enable-multi-release-plugin-jars.patch
rename to patches/api/0238-Enable-multi-release-plugin-jars.patch
diff --git a/patches/api/0241-Player-Chunk-Load-Unload-Events.patch b/patches/api/0239-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/api/0241-Player-Chunk-Load-Unload-Events.patch
rename to patches/api/0239-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0242-Expose-LivingEntity-hurt-direction.patch b/patches/api/0240-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/api/0242-Expose-LivingEntity-hurt-direction.patch
rename to patches/api/0240-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0243-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/api/0243-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0244-Added-PlayerTradeEvent.patch b/patches/api/0242-Added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/api/0244-Added-PlayerTradeEvent.patch
rename to patches/api/0242-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0245-Add-TargetHitEvent-API.patch b/patches/api/0243-Add-TargetHitEvent-API.patch
similarity index 100%
rename from patches/api/0245-Add-TargetHitEvent-API.patch
rename to patches/api/0243-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0246-Additional-Block-Material-API-s.patch b/patches/api/0244-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/api/0246-Additional-Block-Material-API-s.patch
rename to patches/api/0244-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0247-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/api/0247-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0248-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/api/0248-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0249-Zombie-API-breaking-doors.patch b/patches/api/0247-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/api/0249-Zombie-API-breaking-doors.patch
rename to patches/api/0247-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0250-Add-EntityLoadCrossbowEvent.patch b/patches/api/0248-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/api/0250-Add-EntityLoadCrossbowEvent.patch
rename to patches/api/0248-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0251-Added-WorldGameRuleChangeEvent.patch b/patches/api/0249-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/api/0251-Added-WorldGameRuleChangeEvent.patch
rename to patches/api/0249-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0252-Added-ServerResourcesReloadedEvent.patch b/patches/api/0250-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/api/0252-Added-ServerResourcesReloadedEvent.patch
rename to patches/api/0250-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0253-Add-BlockFailedDispenseEvent.patch b/patches/api/0251-Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/api/0253-Add-BlockFailedDispenseEvent.patch
rename to patches/api/0251-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0254-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0252-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/api/0254-Added-PlayerLecternPageChangeEvent.patch
rename to patches/api/0252-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0255-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/api/0255-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0256-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
similarity index 100%
rename from patches/api/0256-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
rename to patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0257-Add-sendOpLevel-API.patch b/patches/api/0255-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/api/0257-Add-sendOpLevel-API.patch
rename to patches/api/0255-Add-sendOpLevel-API.patch
diff --git a/patches/api/0258-Add-StructureLocateEvent.patch b/patches/api/0256-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/api/0258-Add-StructureLocateEvent.patch
rename to patches/api/0256-Add-StructureLocateEvent.patch
diff --git a/patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0257-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/api/0257-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/api/0260-Add-BlockPreDispenseEvent.patch b/patches/api/0258-Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/api/0260-Add-BlockPreDispenseEvent.patch
rename to patches/api/0258-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0261-Added-Vanilla-Entity-Tags.patch b/patches/api/0259-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/api/0261-Added-Vanilla-Entity-Tags.patch
rename to patches/api/0259-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/api/0262-added-Wither-API.patch b/patches/api/0260-added-Wither-API.patch
similarity index 100%
rename from patches/api/0262-added-Wither-API.patch
rename to patches/api/0260-added-Wither-API.patch
diff --git a/patches/api/0263-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/api/0263-Added-PlayerChangeBeaconEffectEvent.patch
rename to patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0264-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/api/0264-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0265-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/api/0265-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0266-add-DragonEggFormEvent.patch b/patches/api/0264-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/api/0266-add-DragonEggFormEvent.patch
rename to patches/api/0264-add-DragonEggFormEvent.patch
diff --git a/patches/api/0267-EntityMoveEvent.patch b/patches/api/0265-EntityMoveEvent.patch
similarity index 100%
rename from patches/api/0267-EntityMoveEvent.patch
rename to patches/api/0265-EntityMoveEvent.patch
diff --git a/patches/api/0268-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/api/0268-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0269-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/api/0269-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0270-living-entity-allow-attribute-registration.patch b/patches/api/0268-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/api/0270-living-entity-allow-attribute-registration.patch
rename to patches/api/0268-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0271-Add-missing-effects.patch b/patches/api/0269-Add-missing-effects.patch
similarity index 100%
rename from patches/api/0271-Add-missing-effects.patch
rename to patches/api/0269-Add-missing-effects.patch
diff --git a/patches/api/0272-Expose-Tracked-Players.patch b/patches/api/0270-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/api/0272-Expose-Tracked-Players.patch
rename to patches/api/0270-Expose-Tracked-Players.patch
diff --git a/patches/api/0273-Cache-the-result-of-Material-isBlock.patch b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
similarity index 81%
rename from patches/api/0273-Cache-the-result-of-Material-isBlock.patch
rename to patches/api/0271-Cache-the-result-of-Material-isBlock.patch
index 24348cb303..8409f2c664 100644
--- a/patches/api/0273-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0271-Cache-the-result-of-Material-isBlock.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index b637686404f0aa87c6996220987ed4a303496b43..5922f4a3d5ac69abb232e8e497d838e10e35316e 100644
+index 0f8712cef078c11e49bcd73d556d9edce5057952..5764944121a0e47a8f6decb75fbc6331a15e3d9d 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -3928,6 +3928,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -3931,6 +3931,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      public final Class<?> data;
      private final boolean legacy;
      private final NamespacedKey key;
@@ -16,7 +16,7 @@ index b637686404f0aa87c6996220987ed4a303496b43..5922f4a3d5ac69abb232e8e497d838e1
  
      private Material(final int id) {
          this(id, 64);
-@@ -4132,6 +4133,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -4135,6 +4136,11 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
       * @return true if this material is a block
       */
      public boolean isBlock() {
@@ -28,7 +28,7 @@ index b637686404f0aa87c6996220987ed4a303496b43..5922f4a3d5ac69abb232e8e497d838e1
          switch (this) {
              //<editor-fold defaultstate="collapsed" desc="isBlock">
              case ACACIA_BUTTON:
-@@ -5213,6 +5219,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -5216,6 +5222,7 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      static {
          for (Material material : values()) {
              BY_NAME.put(material.name(), material);
diff --git a/patches/api/0274-Add-worldborder-events.patch b/patches/api/0272-Add-worldborder-events.patch
similarity index 100%
rename from patches/api/0274-Add-worldborder-events.patch
rename to patches/api/0272-Add-worldborder-events.patch
diff --git a/patches/api/0275-added-PlayerNameEntityEvent.patch b/patches/api/0273-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/api/0275-added-PlayerNameEntityEvent.patch
rename to patches/api/0273-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0276-Add-recipe-to-cook-events.patch b/patches/api/0274-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/api/0276-Add-recipe-to-cook-events.patch
rename to patches/api/0274-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0277-Add-Block-isValidTool.patch b/patches/api/0275-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/api/0277-Add-Block-isValidTool.patch
rename to patches/api/0275-Add-Block-isValidTool.patch
diff --git a/patches/api/0278-Implement-Keyed-on-World.patch b/patches/api/0276-Implement-Keyed-on-World.patch
similarity index 98%
rename from patches/api/0278-Implement-Keyed-on-World.patch
rename to patches/api/0276-Implement-Keyed-on-World.patch
index 990e32790c..789e49fa6f 100644
--- a/patches/api/0278-Implement-Keyed-on-World.patch
+++ b/patches/api/0276-Implement-Keyed-on-World.patch
@@ -50,7 +50,7 @@ index df893601ec71dcc782a7050fb10684c5980105ee..e435df76a752c523b8bc0bd2d2abf35c
       * Gets the map from the given item ID.
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9506523227af07667fe2aaa7479f87e4a79b369f..49cbc8c1f05f2d48177f1b8fec25e2e1439be0d8 100644
+index f60fdb12d7dcd60179e07ea764302ebb1c91c619..82ca519c18e49fb4df1932e871a6c9d3dc7e86b2 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -41,7 +41,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0279-Item-Rarity-API.patch b/patches/api/0277-Item-Rarity-API.patch
similarity index 92%
rename from patches/api/0279-Item-Rarity-API.patch
rename to patches/api/0277-Item-Rarity-API.patch
index 0638f50ee2..c44bb630c8 100644
--- a/patches/api/0279-Item-Rarity-API.patch
+++ b/patches/api/0277-Item-Rarity-API.patch
@@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 5922f4a3d5ac69abb232e8e497d838e10e35316e..fd1f64089359bf432a4934932ca6cad46145c04b 100644
+index 5764944121a0e47a8f6decb75fbc6331a15e3d9d..d187038a0ad2f4c73484c0b494ba58373adfe743 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4002,6 +4002,17 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -4005,6 +4005,17 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      public @NotNull String translationKey() {
          return Bukkit.getUnsafe().getTranslationKey(this);
      }
@@ -61,10 +61,10 @@ index 5922f4a3d5ac69abb232e8e497d838e10e35316e..fd1f64089359bf432a4934932ca6cad4
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 5a5098445eaa9399feb0f90550ab8c79376ac247..ec3a3a02cc7ed68b88cfbe6c83111bbe818c0a37 100644
+index a7a5eada1302dac046619d8a01c887965f22dd09..2392efea1b514671014c39d75407f59fdea842ef 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -138,5 +138,22 @@ public interface UnsafeValues {
+@@ -144,5 +144,22 @@ public interface UnsafeValues {
       * Use this when sending custom packets, so that there are no collisions on the client or server.
       */
      public int nextEntityId();
diff --git a/patches/api/0280-Expose-protocol-version.patch b/patches/api/0278-Expose-protocol-version.patch
similarity index 82%
rename from patches/api/0280-Expose-protocol-version.patch
rename to patches/api/0278-Expose-protocol-version.patch
index 520c434566..8848c96adf 100644
--- a/patches/api/0280-Expose-protocol-version.patch
+++ b/patches/api/0278-Expose-protocol-version.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index ec3a3a02cc7ed68b88cfbe6c83111bbe818c0a37..62e40c2e5f0da64a40772ae1445c679fd1c7c457 100644
+index 2392efea1b514671014c39d75407f59fdea842ef..8f85c41be166ea720a0bf5b6b58bc51a6d2c71cc 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -155,5 +155,12 @@ public interface UnsafeValues {
+@@ -161,5 +161,12 @@ public interface UnsafeValues {
       * @return the itemstack rarity
       */
      public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
diff --git a/patches/api/0281-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 99%
rename from patches/api/0281-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index ecc4f96db7..70c19ffd10 100644
--- a/patches/api/0281-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -393,7 +393,7 @@ index 0000000000000000000000000000000000000000..6f560a51277ccbd46a9142cfa057d276
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 61441e56da69ee8cb92a2b1239f5406425a8344d..b4f1d5034db98b021225bb082915bf4c463aaf52 100644
+index 7f57b95727d0336f1f1548055574e0c129fe9643..57cf9fab2501da6f1abd12e14697630ca82b0a6d 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -48,6 +48,8 @@ public class AnnotationTest {
diff --git a/patches/api/0282-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/api/0282-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0283-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/api/0283-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0284-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/api/0284-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0285-Added-PlayerDeepSleepEvent.patch b/patches/api/0283-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/api/0285-Added-PlayerDeepSleepEvent.patch
rename to patches/api/0283-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0286-More-World-API.patch b/patches/api/0284-More-World-API.patch
similarity index 97%
rename from patches/api/0286-More-World-API.patch
rename to patches/api/0284-More-World-API.patch
index f01a61011d..ebb222a25c 100644
--- a/patches/api/0286-More-World-API.patch
+++ b/patches/api/0284-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 49cbc8c1f05f2d48177f1b8fec25e2e1439be0d8..5f9daafea35f9763189e3436eaf20c975158e712 100644
+index 82ca519c18e49fb4df1932e871a6c9d3dc7e86b2..facbf08b5427cf3841d58cfb946129bf7d7f8ea3 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -3498,6 +3498,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0287-Added-PlayerBedFailEnterEvent.patch b/patches/api/0285-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/api/0287-Added-PlayerBedFailEnterEvent.patch
rename to patches/api/0285-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0288-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/api/0288-Introduce-beacon-activation-deactivation-events.patch
rename to patches/api/0286-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0289-PlayerMoveEvent-Improvements.patch b/patches/api/0287-PlayerMoveEvent-Improvements.patch
similarity index 100%
rename from patches/api/0289-PlayerMoveEvent-Improvements.patch
rename to patches/api/0287-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0290-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/api/0290-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0291-Add-more-WanderingTrader-API.patch b/patches/api/0289-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/api/0291-Add-more-WanderingTrader-API.patch
rename to patches/api/0289-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0292-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/api/0292-Add-EntityBlockStorage-clearEntities.patch
rename to patches/api/0290-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0293-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/api/0293-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0294-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/api/0294-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0295-Inventory-close.patch b/patches/api/0293-Inventory-close.patch
similarity index 100%
rename from patches/api/0295-Inventory-close.patch
rename to patches/api/0293-Inventory-close.patch
diff --git a/patches/api/0296-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/api/0296-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0297-Add-basic-Datapack-API.patch b/patches/api/0295-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/api/0297-Add-basic-Datapack-API.patch
rename to patches/api/0295-Add-basic-Datapack-API.patch
diff --git a/patches/api/0298-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/api/0298-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0299-ItemStack-repair-check-API.patch b/patches/api/0297-ItemStack-repair-check-API.patch
similarity index 94%
rename from patches/api/0299-ItemStack-repair-check-API.patch
rename to patches/api/0297-ItemStack-repair-check-API.patch
index a0357bb2da..edd6a579bd 100644
--- a/patches/api/0299-ItemStack-repair-check-API.patch
+++ b/patches/api/0297-ItemStack-repair-check-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 62e40c2e5f0da64a40772ae1445c679fd1c7c457..e0043bb2890862d9227f5faf15a3e4993dfc59ca 100644
+index 8f85c41be166ea720a0bf5b6b58bc51a6d2c71cc..c1bda4dba319999261613d4aa45a280ed1af0d8c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -156,6 +156,16 @@ public interface UnsafeValues {
+@@ -162,6 +162,16 @@ public interface UnsafeValues {
       */
      public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
  
diff --git a/patches/api/0300-More-Enchantment-API.patch b/patches/api/0298-More-Enchantment-API.patch
similarity index 100%
rename from patches/api/0300-More-Enchantment-API.patch
rename to patches/api/0298-More-Enchantment-API.patch
diff --git a/patches/api/0301-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch
similarity index 100%
rename from patches/api/0301-List-all-missing-hard-depends-not-just-first.patch
rename to patches/api/0299-List-all-missing-hard-depends-not-just-first.patch
diff --git a/patches/api/0302-Add-Mob-lookAt-API.patch b/patches/api/0300-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/api/0302-Add-Mob-lookAt-API.patch
rename to patches/api/0300-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0303-ItemStack-editMeta.patch b/patches/api/0301-ItemStack-editMeta.patch
similarity index 100%
rename from patches/api/0303-ItemStack-editMeta.patch
rename to patches/api/0301-ItemStack-editMeta.patch
diff --git a/patches/api/0304-Add-EntityInsideBlockEvent.patch b/patches/api/0302-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/api/0304-Add-EntityInsideBlockEvent.patch
rename to patches/api/0302-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0305-Attributes-API-for-item-defaults.patch b/patches/api/0303-Attributes-API-for-item-defaults.patch
similarity index 71%
rename from patches/api/0305-Attributes-API-for-item-defaults.patch
rename to patches/api/0303-Attributes-API-for-item-defaults.patch
index ee092fb497..b8db4c424a 100644
--- a/patches/api/0305-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0303-Attributes-API-for-item-defaults.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index fd1f64089359bf432a4934932ca6cad46145c04b..d849908850025a078ec5127870ec0f61d77a72e9 100644
+index d187038a0ad2f4c73484c0b494ba58373adfe743..663d2ce14030a54b83c7e9aebad48f8fd6c41b69 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4013,6 +4013,19 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+@@ -4016,6 +4016,21 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
      public io.papermc.paper.inventory.ItemRarity getItemRarity() {
          return Bukkit.getUnsafe().getItemRarity(this);
      }
@@ -20,19 +20,21 @@ index fd1f64089359bf432a4934932ca6cad46145c04b..d849908850025a078ec5127870ec0f61
 +     * @param equipmentSlot the slot to get the attributes for
 +     * @throws IllegalArgumentException if {@link #isItem()} is false
 +     * @return an immutable multimap of attributes
++     * @deprecated use {@link #getDefaultAttributeModifiers(EquipmentSlot)}
 +     */
 +    @NotNull
-+    public com.google.common.collect.Multimap<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
++    @Deprecated
++    public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
 +        return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot);
 +    }
      // Paper end
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e0043bb2890862d9227f5faf15a3e4993dfc59ca..e21c42e14d9fdbe5ee9c15cfd8e408062cffc471 100644
+index c1bda4dba319999261613d4aa45a280ed1af0d8c..153ceeb45fc331ca27e0646bc63626e2ea779624 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -166,6 +166,18 @@ public interface UnsafeValues {
+@@ -172,6 +172,18 @@ public interface UnsafeValues {
       */
      public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial);
  
@@ -46,7 +48,7 @@ index e0043bb2890862d9227f5faf15a3e4993dfc59ca..e21c42e14d9fdbe5ee9c15cfd8e40806
 +     * @return an immutable multimap of attributes
 +     */
 +    @org.jetbrains.annotations.NotNull
-+    public com.google.common.collect.Multimap<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getItemAttributes(@org.jetbrains.annotations.NotNull Material material, @org.jetbrains.annotations.NotNull org.bukkit.inventory.EquipmentSlot equipmentSlot);
++    public Multimap<Attribute, AttributeModifier> getItemAttributes(@org.jetbrains.annotations.NotNull Material material, @org.jetbrains.annotations.NotNull EquipmentSlot equipmentSlot);
 +
      /**
       * Returns the server's protocol version.
diff --git a/patches/api/0306-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/api/0306-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0307-More-Lidded-Block-API.patch b/patches/api/0305-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/api/0307-More-Lidded-Block-API.patch
rename to patches/api/0305-More-Lidded-Block-API.patch
diff --git a/patches/api/0308-Add-PlayerKickEvent-causes.patch b/patches/api/0306-Add-PlayerKickEvent-causes.patch
similarity index 97%
rename from patches/api/0308-Add-PlayerKickEvent-causes.patch
rename to patches/api/0306-Add-PlayerKickEvent-causes.patch
index 246a802b8a..807eb5fb94 100644
--- a/patches/api/0308-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0306-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a27abc477900e7007e8e001a778a647af79c2d86..bcd17e01e1be66cc5b7c851a4d1ad62b9f158f9b 100644
+index 3b24457a1d25515132613b7e4fdaa7901d00ab78..ecd1a8c13137adc880067f9e911e8b1a08c5cd14 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -241,6 +241,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0309-Add-PufferFishStateChangeEvent.patch b/patches/api/0307-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/api/0309-Add-PufferFishStateChangeEvent.patch
rename to patches/api/0307-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0310-Add-BellRevealRaiderEvent.patch b/patches/api/0308-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/api/0310-Add-BellRevealRaiderEvent.patch
rename to patches/api/0308-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0311-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/api/0311-Add-ElderGuardianAppearanceEvent.patch
rename to patches/api/0309-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0312-Add-more-line-of-sight-methods.patch b/patches/api/0310-Add-more-line-of-sight-methods.patch
similarity index 95%
rename from patches/api/0312-Add-more-line-of-sight-methods.patch
rename to patches/api/0310-Add-more-line-of-sight-methods.patch
index f90ea0bf15..8a93ce42bc 100644
--- a/patches/api/0312-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0310-Add-more-line-of-sight-methods.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more line of sight methods
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5f9daafea35f9763189e3436eaf20c975158e712..5810bcf92ddff080511dd07326769c8fef53d7b9 100644
+index facbf08b5427cf3841d58cfb946129bf7d7f8ea3..a0e4264b5dc8df806b5bec52a8cb831005833161 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -74,6 +74,14 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0313-Add-more-LimitedRegion-API.patch b/patches/api/0311-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/api/0313-Add-more-LimitedRegion-API.patch
rename to patches/api/0311-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0314-Missing-Entity-Behavior-API.patch b/patches/api/0312-Missing-Entity-Behavior-API.patch
similarity index 93%
rename from patches/api/0314-Missing-Entity-Behavior-API.patch
rename to patches/api/0312-Missing-Entity-Behavior-API.patch
index f2f7bbea36..e0b155bc4f 100644
--- a/patches/api/0314-Missing-Entity-Behavior-API.patch
+++ b/patches/api/0312-Missing-Entity-Behavior-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Missing Entity Behavior API
 
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
-index 2bbf1d074b7d46e176f2589db7abe5e3ef47871c..e023ed37963177e35bfe78105768ca6b2af6c2a1 100644
+index 0d88dce9978243a1f995c5fb448c5d71b01136eb..cad47139de57642fb3bb483e7a5acaa7fea78cb4 100644
 --- a/src/main/java/org/bukkit/entity/AbstractHorse.java
 +++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
-@@ -105,4 +105,54 @@ public interface AbstractHorse extends Vehicle, InventoryHolder, Tameable {
+@@ -119,4 +119,58 @@ public interface AbstractHorse extends Vehicle, InventoryHolder, Tameable {
      @NotNull
      @Override
      public AbstractHorseInventory getInventory();
@@ -18,7 +18,9 @@ index 2bbf1d074b7d46e176f2589db7abe5e3ef47871c..e023ed37963177e35bfe78105768ca6b
 +     * Gets if a horse is in their eating grass animation.
 +     *
 +     * @return eating grass animation is active
++     * @deprecated use {@link #isEatingHaystack()}
 +     */
++    @Deprecated
 +    public boolean isEatingGrass();
 +
 +    /**
@@ -27,7 +29,9 @@ index 2bbf1d074b7d46e176f2589db7abe5e3ef47871c..e023ed37963177e35bfe78105768ca6b
 +     * <p>When true, the horse will lower its neck.</p>
 +     *
 +     * @param eating eating grass animation is active
++     * @deprecated use {@link #setEatingHaystack(boolean)}
 +     */
++    @Deprecated
 +    public void setEatingGrass(boolean eating);
 +
 +    /**
diff --git a/patches/api/0315-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0313-Add-Git-information-to-version-command-on-startup.patch
similarity index 98%
rename from patches/api/0315-Add-Git-information-to-version-command-on-startup.patch
rename to patches/api/0313-Add-Git-information-to-version-command-on-startup.patch
index 1ffb550288..6165ea46da 100644
--- a/patches/api/0315-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/api/0313-Add-Git-information-to-version-command-on-startup.patch
@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0521781a48d326c0a4a01b920188e9ce00b51ef0..eb0aa2a2a9def0270341ee15d8a7a0629a67a823 100644
+index 63a4e03b0c5508d5f027c7fa3cecb8b5aa9d450b..f7df34539f03e2d5bbb2733709dcbcda65a23b29 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -51,6 +51,7 @@ import org.bukkit.util.CachedServerIcon;
diff --git a/patches/api/0316-Adds-PlayerArmSwingEvent.patch b/patches/api/0314-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/api/0316-Adds-PlayerArmSwingEvent.patch
rename to patches/api/0314-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0317-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch
similarity index 100%
rename from patches/api/0317-Add-PlayerSignCommandPreprocessEvent.patch
rename to patches/api/0315-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0318-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0316-fix-empty-array-elements-in-command-arguments.patch
similarity index 100%
rename from patches/api/0318-fix-empty-array-elements-in-command-arguments.patch
rename to patches/api/0316-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0319-Stinger-API.patch b/patches/api/0317-Stinger-API.patch
similarity index 100%
rename from patches/api/0319-Stinger-API.patch
rename to patches/api/0317-Stinger-API.patch
diff --git a/patches/api/0320-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/api/0320-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/api/0318-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0321-Add-PlayerSetSpawnEvent.patch b/patches/api/0319-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/api/0321-Add-PlayerSetSpawnEvent.patch
rename to patches/api/0319-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0322-Added-EntityDamageItemEvent.patch b/patches/api/0320-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/api/0322-Added-EntityDamageItemEvent.patch
rename to patches/api/0320-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0323-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0321-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/api/0323-Make-EntityUnleashEvent-cancellable.patch
rename to patches/api/0321-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0324-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/api/0324-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/api/0322-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0325-Add-BlockBreakBlockEvent.patch b/patches/api/0323-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/api/0325-Add-BlockBreakBlockEvent.patch
rename to patches/api/0323-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0326-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch
similarity index 100%
rename from patches/api/0326-Add-helpers-for-left-right-click-to-Action.patch
rename to patches/api/0324-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0327-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/api/0327-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/api/0325-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0328-More-CommandBlock-API.patch b/patches/api/0326-More-CommandBlock-API.patch
similarity index 100%
rename from patches/api/0328-More-CommandBlock-API.patch
rename to patches/api/0326-More-CommandBlock-API.patch
diff --git a/patches/api/0329-Fix-plugin-provides-load-order.patch b/patches/api/0327-Fix-plugin-provides-load-order.patch
similarity index 100%
rename from patches/api/0329-Fix-plugin-provides-load-order.patch
rename to patches/api/0327-Fix-plugin-provides-load-order.patch
diff --git a/patches/api/0330-Add-missing-team-sidebar-display-slots.patch b/patches/api/0328-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/api/0330-Add-missing-team-sidebar-display-slots.patch
rename to patches/api/0328-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0331-add-back-EntityPortalExitEvent.patch b/patches/api/0329-add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/api/0331-add-back-EntityPortalExitEvent.patch
rename to patches/api/0329-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0332-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 95%
rename from patches/api/0332-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch
index 7c7c9187bb..4327c1700d 100644
--- a/patches/api/0332-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5810bcf92ddff080511dd07326769c8fef53d7b9..1f8a51897d9de00f0004ab1de479198390483f7d 100644
+index a0e4264b5dc8df806b5bec52a8cb831005833161..96235d5e77563496bcf3e2152b6aad9956f492c9 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -757,6 +757,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0333-Get-entity-default-attributes.patch b/patches/api/0331-Get-entity-default-attributes.patch
similarity index 94%
rename from patches/api/0333-Get-entity-default-attributes.patch
rename to patches/api/0331-Get-entity-default-attributes.patch
index a7d1059cd5..b94a84323d 100644
--- a/patches/api/0333-Get-entity-default-attributes.patch
+++ b/patches/api/0331-Get-entity-default-attributes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Get entity default attributes
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e21c42e14d9fdbe5ee9c15cfd8e408062cffc471..12b945dbae1d24c3e8a95037d17d0535108ec163 100644
+index 153ceeb45fc331ca27e0646bc63626e2ea779624..ae55b9e3560ba63bc95f90ceadccc6492be9de56 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -184,5 +184,22 @@ public interface UnsafeValues {
+@@ -190,5 +190,22 @@ public interface UnsafeValues {
       * @return the server's protocol version
       */
      int getProtocolVersion();
diff --git a/patches/api/0334-Left-handed-API.patch b/patches/api/0332-Left-handed-API.patch
similarity index 100%
rename from patches/api/0334-Left-handed-API.patch
rename to patches/api/0332-Left-handed-API.patch
diff --git a/patches/api/0335-Add-advancement-display-API.patch b/patches/api/0333-Add-advancement-display-API.patch
similarity index 100%
rename from patches/api/0335-Add-advancement-display-API.patch
rename to patches/api/0333-Add-advancement-display-API.patch
diff --git a/patches/api/0336-Add-ItemFactory-getMonsterEgg-API.patch b/patches/api/0334-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/api/0336-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/api/0334-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/api/0337-Add-critical-damage-API.patch b/patches/api/0335-Add-critical-damage-API.patch
similarity index 100%
rename from patches/api/0337-Add-critical-damage-API.patch
rename to patches/api/0335-Add-critical-damage-API.patch
diff --git a/patches/api/0338-Fix-issues-with-mob-conversion.patch b/patches/api/0336-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/api/0338-Fix-issues-with-mob-conversion.patch
rename to patches/api/0336-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0339-Add-isCollidable-methods-to-various-places.patch b/patches/api/0337-Add-isCollidable-methods-to-various-places.patch
similarity index 85%
rename from patches/api/0339-Add-isCollidable-methods-to-various-places.patch
rename to patches/api/0337-Add-isCollidable-methods-to-various-places.patch
index 7932527080..827d2d1a08 100644
--- a/patches/api/0339-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0337-Add-isCollidable-methods-to-various-places.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Add isCollidable methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index d849908850025a078ec5127870ec0f61d77a72e9..f24820f14d689d49dfea25605199d5299ec28e7c 100644
+index 663d2ce14030a54b83c7e9aebad48f8fd6c41b69..56e5ab93096801277ec5162981ddf5275d2c7669 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4026,6 +4026,16 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
-     public com.google.common.collect.Multimap<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
+@@ -4031,6 +4031,16 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
+     public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
          return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot);
      }
 +
@@ -26,10 +26,10 @@ index d849908850025a078ec5127870ec0f61d77a72e9..f24820f14d689d49dfea25605199d529
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 12b945dbae1d24c3e8a95037d17d0535108ec163..85296a8aa92465e1ee8a828d56a134078b889678 100644
+index ae55b9e3560ba63bc95f90ceadccc6492be9de56..7406c413f2988f2aadac95a85801df30deb6ae43 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -201,5 +201,14 @@ public interface UnsafeValues {
+@@ -207,5 +207,14 @@ public interface UnsafeValues {
       * @throws IllegalArgumentException if the entity does not exist of have default attributes (use {@link #hasDefaultEntityAttributes(NamespacedKey)} first)
       */
      @org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
diff --git a/patches/api/0340-Goat-ram-API.patch b/patches/api/0338-Goat-ram-API.patch
similarity index 100%
rename from patches/api/0340-Goat-ram-API.patch
rename to patches/api/0338-Goat-ram-API.patch
diff --git a/patches/api/0341-Add-API-for-resetting-a-single-score.patch b/patches/api/0339-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/api/0341-Add-API-for-resetting-a-single-score.patch
rename to patches/api/0339-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0342-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch
similarity index 94%
rename from patches/api/0342-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch
index ebabbcaa42..f2df17f6fc 100644
--- a/patches/api/0342-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0340-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 85296a8aa92465e1ee8a828d56a134078b889678..81e17ebb54f8b5c085842f223081f3d6d33a317d 100644
+index 7406c413f2988f2aadac95a85801df30deb6ae43..f59030893eba2bf653207b040a5f54fdf7b7b50f 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -103,6 +103,14 @@ public interface UnsafeValues {
+@@ -109,6 +109,14 @@ public interface UnsafeValues {
  
      ItemStack deserializeItem(byte[] data);
  
diff --git a/patches/api/0343-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0341-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/api/0343-Add-PlayerItemFrameChangeEvent.patch
rename to patches/api/0341-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0344-Add-player-health-update-API.patch b/patches/api/0342-Add-player-health-update-API.patch
similarity index 100%
rename from patches/api/0344-Add-player-health-update-API.patch
rename to patches/api/0342-Add-player-health-update-API.patch
diff --git a/patches/api/0345-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/api/0345-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/api/0343-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0346-Add-more-Campfire-API.patch b/patches/api/0344-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/api/0346-Add-more-Campfire-API.patch
rename to patches/api/0344-Add-more-Campfire-API.patch
diff --git a/patches/api/0347-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch
similarity index 100%
rename from patches/api/0347-Move-VehicleCollisionEvent-HandlerList-up.patch
rename to patches/api/0345-Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/api/0348-Improve-scoreboard-entries.patch b/patches/api/0346-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/api/0348-Improve-scoreboard-entries.patch
rename to patches/api/0346-Improve-scoreboard-entries.patch
diff --git a/patches/api/0349-Entity-powdered-snow-API.patch b/patches/api/0347-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/api/0349-Entity-powdered-snow-API.patch
rename to patches/api/0347-Entity-powdered-snow-API.patch
diff --git a/patches/api/0350-Add-API-for-item-entity-health.patch b/patches/api/0348-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/api/0350-Add-API-for-item-entity-health.patch
rename to patches/api/0348-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0351-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/api/0351-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/api/0349-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0352-Bucketable-API.patch b/patches/api/0350-Bucketable-API.patch
similarity index 100%
rename from patches/api/0352-Bucketable-API.patch
rename to patches/api/0350-Bucketable-API.patch
diff --git a/patches/api/0351-System-prop-for-default-config-comment-parsing.patch b/patches/api/0351-System-prop-for-default-config-comment-parsing.patch
new file mode 100644
index 0000000000..c28a3f9b5f
--- /dev/null
+++ b/patches/api/0351-System-prop-for-default-config-comment-parsing.patch
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Thu, 30 Dec 2021 16:35:56 -0800
+Subject: [PATCH] System prop for default config comment parsing
+
+Allows for certain legacy plugins to continue to work without changing
+by setting `Paper.parseYamlCommentsByDefault` to false
+
+diff --git a/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java b/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
+index c71f8a7b96fc5abc499802a79fcb3b0771de021c..121dbbf163588690d0678ae73a6ab8edf82f8367 100644
+--- a/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
++++ b/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
+@@ -15,7 +15,10 @@ import org.jetbrains.annotations.Nullable;
+ public class FileConfigurationOptions extends MemoryConfigurationOptions {
+     private List<String> header = Collections.emptyList();
+     private List<String> footer = Collections.emptyList();
+-    private boolean parseComments = true;
++    // Paper start - add system prop for comment parsing
++    private static final boolean PAPER_PARSE_COMMENTS_BY_DEFAULT = Boolean.parseBoolean(System.getProperty("Paper.parseYamlCommentsByDefault", "true"));
++    private boolean parseComments = PAPER_PARSE_COMMENTS_BY_DEFAULT;
++    // Paper end
+ 
+     protected FileConfigurationOptions(@NotNull MemoryConfiguration configuration) {
+         super(configuration);
+diff --git a/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java b/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java
+index 20e968764725ddb324be28d81c50be57abd00e05..1514d3ec63a6c43fbdb4933ef75f9617ce1a1a4d 100644
+--- a/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java
++++ b/src/main/java/org/bukkit/configuration/file/YamlRepresenter.java
+@@ -11,11 +11,22 @@ import org.yaml.snakeyaml.representer.Representer;
+ public class YamlRepresenter extends Representer {
+ 
+     public YamlRepresenter() {
++        this.multiRepresenters.put(org.bukkit.configuration.ConfigurationSection.class, new RepresentConfigurationSection()); // Paper - restore old yaml config section representer
+         this.multiRepresenters.put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());
+         // SPIGOT-6234: We could just switch YamlConstructor to extend Constructor rather than SafeConstructor, however there is a very small risk of issues with plugins treating config as untrusted input
+         // So instead we will just allow future plugins to have their enums extend ConfigurationSerializable
+         this.multiRepresenters.remove(Enum.class);
+     }
++    // Paper start - restore old yaml config section representer
++    private class RepresentConfigurationSection extends RepresentMap {
++
++        @NotNull
++        @Override
++        public Node representData(@NotNull Object data) {
++            return super.representData(((org.bukkit.configuration.ConfigurationSection) data).getValues(false));
++        }
++    }
++    // Paper end
+ 
+     private class RepresentConfigurationSerializable extends RepresentMap {
+ 
diff --git a/patches/server/0006-MC-Utils.patch b/patches/server/0006-MC-Utils.patch
index a1e9813c22..4325d26ee0 100644
--- a/patches/server/0006-MC-Utils.patch
+++ b/patches/server/0006-MC-Utils.patch
@@ -6055,10 +6055,10 @@ index d679be6c3ce0d57fa2063a45baec1b108a0a2707..de5e18a331178da8f7e82aa2419a0ee6
      public BlockState getBlockState(BlockPos pos) {
          return this.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ())).getBlockState(pos);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index baabc63258872c274ea790356a373f8baf326357..92acae1b00f06d47eb2d9326ba09d73c344a81b8 100644
+index 02dd09abc24479f5f78a99ab8c3a7f42d62150fc..c3e9391a0a50449fa163c2265efb80dd6e56380d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -217,9 +217,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -218,9 +218,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private final MinecraftServer server;
      public ServerPlayer player;
      private int tickCount;
@@ -6118,7 +6118,7 @@ index e772ed45ba7cf366c6da0dc8b1bd3497d561473a..e9e97cf0b202c84252fb3bada9789019
      @Override
      public float getBukkitYaw() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 1dbfdf060294e8f322e45625cf981087b9fcdac7..f6c93812c30bd1637219c22c1a903e2ec93a9d72 100644
+index 59a54e99baf8219c3878b25a214508e09e819778..31f98763da600c34246d722cb92dda4442a3f046 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -238,6 +238,7 @@ public abstract class Mob extends LivingEntity {
@@ -6963,10 +6963,10 @@ index 0000000000000000000000000000000000000000..909b2c98e7a9117d2f737245e4661792
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1befbe94f6e47caf60fbfd7719e4008805cca198..bcd17766cb0a2be11669ded7d339de1c565ab112 100644
+index 5c5a0c6695fd68f16792995f9537e05b446ad7e9..8cb510615bc8b4638b4aadfd9732c9a3d65b1fac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -88,8 +88,17 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -97,8 +97,17 @@ public final class CraftMagicNumbers implements UnsafeValues {
      private static final Map<Material, Item> MATERIAL_ITEM = new HashMap<>();
      private static final Map<Material, Block> MATERIAL_BLOCK = new HashMap<>();
      private static final Map<Material, net.minecraft.world.level.material.Fluid> MATERIAL_FLUID = new HashMap<>();
@@ -6984,7 +6984,7 @@ index 1befbe94f6e47caf60fbfd7719e4008805cca198..bcd17766cb0a2be11669ded7d339de1c
          for (Block block : net.minecraft.core.Registry.BLOCK) {
              BLOCK_MATERIAL.put(block, Material.getMaterial(net.minecraft.core.Registry.BLOCK.getKey(block).getPath().toUpperCase(Locale.ROOT)));
          }
-@@ -155,6 +164,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -164,6 +173,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public static ResourceLocation key(Material mat) {
          return CraftNamespacedKey.toMinecraft(mat.getKey());
      }
diff --git a/patches/server/0010-Timings-v2.patch b/patches/server/0010-Timings-v2.patch
index beab4653a4..958eb48126 100644
--- a/patches/server/0010-Timings-v2.patch
+++ b/patches/server/0010-Timings-v2.patch
@@ -1333,10 +1333,10 @@ index ce9ff034a281cd9cc76c26713b6d1eab3f6c9fe2..ae090f58bec25270e55f8da373553517
                  this.entityManager.saveAll();
              } else {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 92acae1b00f06d47eb2d9326ba09d73c344a81b8..01abf5d48f63d7456a0ca5043289f6a0de9d4a9d 100644
+index c3e9391a0a50449fa163c2265efb80dd6e56380d..267a2dea86f8d9b3dc4ff588a49466fe2ffb3d63 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -207,6 +207,7 @@ import org.bukkit.inventory.EquipmentSlot;
+@@ -208,6 +208,7 @@ import org.bukkit.inventory.EquipmentSlot;
  import org.bukkit.inventory.InventoryView;
  import org.bukkit.inventory.SmithingInventory;
  import org.bukkit.util.NumberConversions;
@@ -1344,7 +1344,7 @@ index 92acae1b00f06d47eb2d9326ba09d73c344a81b8..01abf5d48f63d7456a0ca5043289f6a0
  // CraftBukkit end
  
  public class ServerGamePacketListenerImpl implements ServerPlayerConnection, ServerGamePacketListener {
-@@ -287,7 +288,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -288,7 +289,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      // CraftBukkit end
  
      public void tick() {
@@ -1352,7 +1352,7 @@ index 92acae1b00f06d47eb2d9326ba09d73c344a81b8..01abf5d48f63d7456a0ca5043289f6a0
          this.resetPosition();
          this.player.xo = this.player.getX();
          this.player.yo = this.player.getY();
-@@ -363,7 +363,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -364,7 +364,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
              this.disconnect(new TranslatableComponent("multiplayer.disconnect.idling"));
          }
@@ -1360,7 +1360,7 @@ index 92acae1b00f06d47eb2d9326ba09d73c344a81b8..01abf5d48f63d7456a0ca5043289f6a0
  
      }
  
-@@ -1916,7 +1915,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1917,7 +1916,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      // CraftBukkit end
  
      private void handleCommand(String input) {
@@ -1369,7 +1369,7 @@ index 92acae1b00f06d47eb2d9326ba09d73c344a81b8..01abf5d48f63d7456a0ca5043289f6a0
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + input);
-@@ -1927,7 +1926,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1928,7 +1927,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          this.cserver.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1378,7 +1378,7 @@ index 92acae1b00f06d47eb2d9326ba09d73c344a81b8..01abf5d48f63d7456a0ca5043289f6a0
              return;
          }
  
-@@ -1940,7 +1939,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1941,7 +1940,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
@@ -2114,10 +2114,10 @@ index e52ef47b783785dc214746b678e7b549aea9a274..3d90b3426873a3528af14f7f1ab0adae
          this.value = value;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index bcd17766cb0a2be11669ded7d339de1c565ab112..afdf4bc63dfaa469a16701541332e5380a027c22 100644
+index 8cb510615bc8b4638b4aadfd9732c9a3d65b1fac..e0ba1608d83c6007717df3323b916a92906f5a17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -173,6 +173,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -182,6 +182,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
      }
      // Paper end
      // ========================================================================
@@ -2130,8 +2130,8 @@ index bcd17766cb0a2be11669ded7d339de1c565ab112..afdf4bc63dfaa469a16701541332e538
  
      public static byte toLegacyData(BlockState data) {
          return CraftLegacy.toLegacyData(data);
-@@ -347,6 +353,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         return clazz;
+@@ -369,6 +375,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+         return defaultAttributes.build();
      }
  
 +    // Paper start
@@ -2145,10 +2145,10 @@ index bcd17766cb0a2be11669ded7d339de1c565ab112..afdf4bc63dfaa469a16701541332e538
       * This helper class represents the different NBT Tags.
       * <p>
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 747131fbfb2c31ee8cb1587ef6ee34feab8799a8..258b969acab161a861bb66b7748bc87dc0f1a024 100644
+index 67f4ebf30d752fdc595fc847d695d8dad0e805d8..af66bb6b3733eaf722838de8b9f45396ffddc2f3 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -27,7 +27,7 @@ import net.minecraft.world.entity.projectile.ThrownTrident;
+@@ -28,7 +28,7 @@ import net.minecraft.world.entity.projectile.ThrownTrident;
  import net.minecraft.world.entity.raid.Raider;
  import net.minecraft.world.level.Level;
  import net.minecraft.world.phys.AABB;
@@ -2157,7 +2157,7 @@ index 747131fbfb2c31ee8cb1587ef6ee34feab8799a8..258b969acab161a861bb66b7748bc87d
  
  public class ActivationRange
  {
-@@ -71,8 +71,8 @@ public class ActivationRange
+@@ -72,8 +72,8 @@ public class ActivationRange
      /**
       * These entities are excluded from Activation range checks.
       *
@@ -2168,7 +2168,7 @@ index 747131fbfb2c31ee8cb1587ef6ee34feab8799a8..258b969acab161a861bb66b7748bc87d
       * @return boolean If it should always tick.
       */
      public static boolean initializeEntityActivationState(Entity entity, SpigotWorldConfig config)
-@@ -107,7 +107,7 @@ public class ActivationRange
+@@ -108,7 +108,7 @@ public class ActivationRange
       */
      public static void activateEntities(Level world)
      {
@@ -2177,7 +2177,7 @@ index 747131fbfb2c31ee8cb1587ef6ee34feab8799a8..258b969acab161a861bb66b7748bc87d
          final int miscActivationRange = world.spigotConfig.miscActivationRange;
          final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
          final int animalActivationRange = world.spigotConfig.animalActivationRange;
-@@ -130,7 +130,7 @@ public class ActivationRange
+@@ -131,7 +131,7 @@ public class ActivationRange
  
              world.getEntities().get(maxBB, ActivationRange::activateEntity);
          }
@@ -2186,7 +2186,7 @@ index 747131fbfb2c31ee8cb1587ef6ee34feab8799a8..258b969acab161a861bb66b7748bc87d
      }
  
      /**
-@@ -221,10 +221,8 @@ public class ActivationRange
+@@ -226,10 +226,8 @@ public class ActivationRange
       */
      public static boolean checkIfActive(Entity entity)
      {
@@ -2197,7 +2197,7 @@ index 747131fbfb2c31ee8cb1587ef6ee34feab8799a8..258b969acab161a861bb66b7748bc87d
              return true;
          }
  
-@@ -248,7 +246,6 @@ public class ActivationRange
+@@ -253,7 +251,6 @@ public class ActivationRange
          {
              isActive = false;
          }
diff --git a/patches/server/0012-Adventure.patch b/patches/server/0012-Adventure.patch
index 1becb54e62..4b4ebe219c 100644
--- a/patches/server/0012-Adventure.patch
+++ b/patches/server/0012-Adventure.patch
@@ -1292,10 +1292,10 @@ index 925ffbddd5475be7fe00570d861b615f707434b4..a3436596d05547a60c9906c92f709bb5
          // CraftBukkit end
          this.chatVisibility = packet.chatVisibility();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 01abf5d48f63d7456a0ca5043289f6a0de9d4a9d..8dfc214b57f77c86f3e3f52ef8b6058295bf7be9 100644
+index 267a2dea86f8d9b3dc4ff588a49466fe2ffb3d63..687e638d21b868396b77cf0148f4d9ea00f80066 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -160,6 +160,8 @@ import org.apache.logging.log4j.LogManager;
+@@ -154,6 +154,8 @@ import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
  // CraftBukkit start
@@ -1303,8 +1303,8 @@ index 01abf5d48f63d7456a0ca5043289f6a0de9d4a9d..8dfc214b57f77c86f3e3f52ef8b60582
 +import io.papermc.paper.adventure.PaperAdventure; // Paper
  import java.util.concurrent.ExecutionException;
  import java.util.concurrent.atomic.AtomicInteger;
- import net.minecraft.world.inventory.AbstractContainerMenu;
-@@ -384,21 +386,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+ import net.minecraft.world.entity.animal.Bucketable;
+@@ -385,21 +387,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          return this.server.isSingleplayerOwner(this.player.getGameProfile());
      }
  
@@ -1337,7 +1337,7 @@ index 01abf5d48f63d7456a0ca5043289f6a0de9d4a9d..8dfc214b57f77c86f3e3f52ef8b60582
  
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
-@@ -409,8 +414,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -410,8 +415,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              return;
          }
          // Send the possibly modified leave message
@@ -1347,7 +1347,7 @@ index 01abf5d48f63d7456a0ca5043289f6a0de9d4a9d..8dfc214b57f77c86f3e3f52ef8b60582
          // CraftBukkit end
  
          this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), (future) -> {
-@@ -1666,9 +1670,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1667,9 +1671,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          */
  
          this.player.disconnect();
@@ -1362,7 +1362,7 @@ index 01abf5d48f63d7456a0ca5043289f6a0de9d4a9d..8dfc214b57f77c86f3e3f52ef8b60582
          }
          // CraftBukkit end
          this.player.getTextFilter().leave();
-@@ -1850,7 +1856,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1851,7 +1857,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              this.handleCommand(s);
          } else if (this.player.getChatVisibility() == ChatVisiblity.SYSTEM) {
              // Do nothing, this is coming from a plugin
@@ -1376,7 +1376,7 @@ index 01abf5d48f63d7456a0ca5043289f6a0de9d4a9d..8dfc214b57f77c86f3e3f52ef8b60582
              Player player = this.getCraftPlayer();
              AsyncPlayerChatEvent event = new AsyncPlayerChatEvent(async, player, s, new LazyPlayerSet(this.server));
              this.cserver.getPluginManager().callEvent(event);
-@@ -2640,30 +2651,30 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2641,30 +2652,30 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  return;
              }
  
@@ -2233,7 +2233,7 @@ index cf69a45f038c2b8336010f5fe277313fd0513b5b..eb99e0c2462a2d1ab4508a5c3f1580b6
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
          return this.target;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a9f02b8246c27936b6260fc4e9c83c474ef85fd1..b80b834fc35201746f5bba079aff6d95874f8f57 100644
+index 4e823d5e8e78db502f979182f1ce276ba0096007..2980a92e548efea7104e909e1cdf9887ef617a9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -189,6 +189,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -2244,7 +2244,7 @@ index a9f02b8246c27936b6260fc4e9c83c474ef85fd1..b80b834fc35201746f5bba079aff6d95
  
      public CraftEntity(final CraftServer server, final Entity entity) {
          this.server = server;
-@@ -815,6 +816,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -816,6 +817,32 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.getHandle().getVehicle().getBukkitEntity();
      }
  
@@ -2277,7 +2277,7 @@ index a9f02b8246c27936b6260fc4e9c83c474ef85fd1..b80b834fc35201746f5bba079aff6d95
      @Override
      public void setCustomName(String name) {
          // sane limit for name length
-@@ -870,6 +897,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -871,6 +898,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public String getName() {
          return CraftChatMessage.fromComponent(this.getHandle().getName());
      }
@@ -3196,7 +3196,7 @@ index 00445fc7373c70f4cecc4114f9bcfb4b6f27c0e8..b132c151e4fb6c64b633a0712100c3ae
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 86fabf0554d853de68f5db0548ffddf1ae25d267..af2d0bfab14cf7133eeaff484895cba6b37391e8 100644
+index f9626f2ec5e26685660c1c96d2fc507c06a20a1b..39d2cd4acbce96cd7b9bd76bddf85b9b8729855a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -746,6 +746,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -3525,10 +3525,10 @@ index f9b7b8f7ccc95b73967a51420fd6ce88d80d75fe..0de5a46423ae0403dcbfca630dfd7c5a
  
          boolean hadFormat = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index afdf4bc63dfaa469a16701541332e5380a027c22..df92e13eafbba7e2a09f4feaa25a701572799e4d 100644
+index e0ba1608d83c6007717df3323b916a92906f5a17..aea6f16d767a7cc7934688b550376338c63fd807 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -57,6 +57,38 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -66,6 +66,38 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      private CraftMagicNumbers() {}
  
diff --git a/patches/server/0021-Implement-Paper-VersionChecker.patch b/patches/server/0021-Implement-Paper-VersionChecker.patch
index aea04b5b7e..a5f7c0e901 100644
--- a/patches/server/0021-Implement-Paper-VersionChecker.patch
+++ b/patches/server/0021-Implement-Paper-VersionChecker.patch
@@ -140,10 +140,10 @@ index 0000000000000000000000000000000000000000..91d7afc710a2d52b4f429e0381cf6417
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index df92e13eafbba7e2a09f4feaa25a701572799e4d..02f6b94b68778bbd5bc61832a5099080805a83a2 100644
+index aea6f16d767a7cc7934688b550376338c63fd807..330597270e4f224a9689fd9a3afcedba114abc52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -390,6 +390,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -412,6 +412,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public String getTimingsServerName() {
          return com.destroystokyo.paper.PaperConfig.timingsServerName;
      }
diff --git a/patches/server/0027-Entity-Origin-API.patch b/patches/server/0027-Entity-Origin-API.patch
index 9fb06ca68c..a17b0cfba8 100644
--- a/patches/server/0027-Entity-Origin-API.patch
+++ b/patches/server/0027-Entity-Origin-API.patch
@@ -132,10 +132,10 @@ index 1f61dcc3d6f33f69fbebaaaee0554403c3e13adf..7135e22a2ee274eaef52804d60f15002
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b80b834fc35201746f5bba079aff6d95874f8f57..506bc08a7aadf5246f57e6935dbaa81ca482fb9a 100644
+index 2980a92e548efea7104e909e1cdf9887ef617a9d..128d635576b411c7bd6f0f4babb8d22073cc60e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1146,4 +1146,21 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1147,4 +1147,21 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0031-Always-tick-falling-blocks.patch b/patches/server/0031-Always-tick-falling-blocks.patch
index 204256a0af..0ef71f7437 100644
--- a/patches/server/0031-Always-tick-falling-blocks.patch
+++ b/patches/server/0031-Always-tick-falling-blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Always tick falling blocks
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index f023f3a0d1671398363f0caa432ffb61fd07c9b2..84ce3d38d5decb4a2f9fae78e0ef5d715860dc7d 100644
+index af66bb6b3733eaf722838de8b9f45396ffddc2f3..c3b7b1bc978eb0d40587682795e86b82981aed82 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -89,6 +89,7 @@ public class ActivationRange
+@@ -90,6 +90,7 @@ public class ActivationRange
                  || entity instanceof AbstractHurtingProjectile
                  || entity instanceof LightningBolt
                  || entity instanceof PrimedTnt
diff --git a/patches/server/0047-Ensure-commands-are-not-ran-async.patch b/patches/server/0047-Ensure-commands-are-not-ran-async.patch
index ac56314eca..4051339294 100644
--- a/patches/server/0047-Ensure-commands-are-not-ran-async.patch
+++ b/patches/server/0047-Ensure-commands-are-not-ran-async.patch
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8dfc214b57f77c86f3e3f52ef8b6058295bf7be9..25117f4b7f6139688c1845a1dc257f7d5c268fde 100644
+index 687e638d21b868396b77cf0148f4d9ea00f80066..a1fe02097f369a350de79d7eb94f4a6eb3d3530e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1853,6 +1853,29 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1854,6 +1854,29 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
  
          if (!async && s.startsWith("/")) {
diff --git a/patches/server/0061-Complete-resource-pack-API.patch b/patches/server/0061-Complete-resource-pack-API.patch
index bb5373485e..b698a48b83 100644
--- a/patches/server/0061-Complete-resource-pack-API.patch
+++ b/patches/server/0061-Complete-resource-pack-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 25117f4b7f6139688c1845a1dc257f7d5c268fde..103d0afd73de68e3b07a9a4ef6d2f5af0a0e40c5 100644
+index a1fe02097f369a350de79d7eb94f4a6eb3d3530e..d64e7bbfda0ad2fd086fd918bf5fa31ebbdbd67e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1635,8 +1635,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1636,8 +1636,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName());
              this.disconnect(new TranslatableComponent("multiplayer.requiredTexturePrompt.disconnect"));
          }
diff --git a/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
index df1e94275b..da1b991600 100644
--- a/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch
@@ -203,7 +203,7 @@ index e88df908377450964ae5b6ff97ee97bd2f09c05f..ba70ac49222c517a38e20e86cee1fd38
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.world.item.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index af2d0bfab14cf7133eeaff484895cba6b37391e8..0baca5f3c3f73323b6f5b283fc00be39477ccf59 100644
+index 39d2cd4acbce96cd7b9bd76bddf85b9b8729855a..51d37a8963a2f8f5381bf802e28e5dfcdcc27eaa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;
@@ -315,7 +315,7 @@ index af2d0bfab14cf7133eeaff484895cba6b37391e8..0baca5f3c3f73323b6f5b283fc00be39
              }
              if (this.hasAttributeModifiers()) {
                  clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers);
-@@ -1450,4 +1453,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1451,4 +1454,22 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              return CraftMetaItem.HANDLED_TAGS;
          }
      }
diff --git a/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
index dfee9b2f25..da6fefdd06 100644
--- a/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
+++ b/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch
@@ -20,10 +20,10 @@ index 8834ed411a7db86b4d2b88183a1315317107d719..c45b5ab6776f3ac79f856c3a6467c510
      static final ServerboundInteractPacket.Action ATTACK_ACTION = new ServerboundInteractPacket.Action() {
          @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 103d0afd73de68e3b07a9a4ef6d2f5af0a0e40c5..71b424b65d55302c8d5b243f6f3bc9fae1b7b98f 100644
+index d64e7bbfda0ad2fd086fd918bf5fa31ebbdbd67e..4ee11bd08c4b9f0ec3f1620e63cbe98d52b70db5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2201,8 +2201,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2202,8 +2202,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  });
              }
          }
diff --git a/patches/server/0105-Configurable-packet-in-spam-threshold.patch b/patches/server/0105-Configurable-packet-in-spam-threshold.patch
index 386952e4e5..050dcbf2b2 100644
--- a/patches/server/0105-Configurable-packet-in-spam-threshold.patch
+++ b/patches/server/0105-Configurable-packet-in-spam-threshold.patch
@@ -23,10 +23,10 @@ index 728835cddd413d778e9628360989724f65335b46..6c13fe725ca2b2a6f0f375b80f6c2cb6
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 71b424b65d55302c8d5b243f6f3bc9fae1b7b98f..d5ada382c2239d459338f377c9835cdcc573bd0e 100644
+index 4ee11bd08c4b9f0ec3f1620e63cbe98d52b70db5..faeb99b93ead7c444fc23d542c7e2b11055ebfba 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1490,13 +1490,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1491,13 +1491,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
diff --git a/patches/server/0106-Configurable-flying-kick-messages.patch b/patches/server/0106-Configurable-flying-kick-messages.patch
index c4b6d10c0f..7641f9ace5 100644
--- a/patches/server/0106-Configurable-flying-kick-messages.patch
+++ b/patches/server/0106-Configurable-flying-kick-messages.patch
@@ -21,10 +21,10 @@ index 6c13fe725ca2b2a6f0f375b80f6c2cb643b9913d..5e23ff0c5e44427a996281ae42fc12c2
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d5ada382c2239d459338f377c9835cdcc573bd0e..0d947ddd19841ab4de3a2d46c6a5a8b5fd42385b 100644
+index faeb99b93ead7c444fc23d542c7e2b11055ebfba..6de1ea5c10f335a39f73033998629068cf93a539 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -301,7 +301,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -302,7 +302,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          if (this.clientIsFloating && !this.player.isSleeping()) {
              if (++this.aboveGroundTickCount > 80) {
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating too long!", this.player.getName().getString());
@@ -33,7 +33,7 @@ index d5ada382c2239d459338f377c9835cdcc573bd0e..0d947ddd19841ab4de3a2d46c6a5a8b5
                  return;
              }
          } else {
-@@ -320,7 +320,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -321,7 +321,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              if (this.clientVehicleIsFloating && this.player.getRootVehicle().getControllingPassenger() == this.player) {
                  if (++this.aboveGroundVehicleTickCount > 80) {
                      ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName().getString());
diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch
index faf8e76941..d142e89e28 100644
--- a/patches/server/0109-Add-EntityZapEvent.patch
+++ b/patches/server/0109-Add-EntityZapEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityZapEvent
 
 
 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 4529692f3e5df444bf4d58704d7608d8f4219a77..d9539f906348c13afc6f1b0032c3ce259f1c87c0 100644
+index e2ac5290751b8c219add3823251e0131c0d2b52e..8785a112519de49e0d61eab5ab5325f9b2068d7e 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -829,9 +829,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -834,9 +834,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      @Override
      public void thunderHit(ServerLevel world, LightningBolt lightning) {
          if (world.getDifficulty() != Difficulty.PEACEFUL) {
@@ -28,7 +28,7 @@ index 4529692f3e5df444bf4d58704d7608d8f4219a77..d9539f906348c13afc6f1b0032c3ce25
              entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
              entitywitch.setNoAi(this.isNoAi());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e172f574d5a5ab848197a113167872ec82355471..918ea9531e5cb37cc60ad00f78a1b4d31037704f 100644
+index 4da8af129b8c4f61617348b292166b9b1e300ac8..e65ea3fc9c95e50d787474340019fbdaf0c115f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1121,6 +1121,14 @@ public class CraftEventFactory {
diff --git a/patches/server/0123-Properly-fix-item-duplication-bug.patch b/patches/server/0123-Properly-fix-item-duplication-bug.patch
index d3c15f5fe0..75d10f9a54 100644
--- a/patches/server/0123-Properly-fix-item-duplication-bug.patch
+++ b/patches/server/0123-Properly-fix-item-duplication-bug.patch
@@ -19,10 +19,10 @@ index 3a97690a1e65db9a1c184fa4df5899cfda3d44bc..ab73818893b00551f8137704a727e330
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0d947ddd19841ab4de3a2d46c6a5a8b5fd42385b..0d473a405345d809742cb312068db8bf33ef17e7 100644
+index 6de1ea5c10f335a39f73033998629068cf93a539..84f62311f50b6ed58fa37588d8fc6f7782758d19 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2818,7 +2818,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2819,7 +2819,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      }
  
      public final boolean isDisconnected() {
diff --git a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 129eeab398..c0f769f21b 100644
--- a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -129,7 +129,7 @@ index f7cbe6819b8c4f7eaca2389de8eaceb50bce4b15..90692df7e02346d4ba785d2eaf724d06
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 88066799a0090d22a2e22df17e2967774089f8b7..a11ee8a247affeb97de4c3152ea1449e8bc5b223 100644
+index 30c47f64e938ccf90a68af421898fee99081f916..36aef3dbfe407ca6fa206bc3fc4390e5c2770aa3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1699,7 +1699,8 @@ public abstract class LivingEntity extends Entity {
@@ -204,10 +204,10 @@ index 2584c02a5f6511ade260986a6aacef401c294549..19e594757fca90c64c4dc59233ff956e
  
              if (this.dragonFight != null) {
 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 d9539f906348c13afc6f1b0032c3ce259f1c87c0..8d76fe0154f31445a889dfe4cca716cb658053f6 100644
+index 8785a112519de49e0d61eab5ab5325f9b2068d7e..bd073ac603be130e649d206992c01860ee72d531 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -617,7 +617,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -622,7 +622,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          }
  
          if (offer.shouldRewardExp()) {
@@ -301,7 +301,7 @@ index ba9f209c2674107fd5751cb28c4f80fcbbc0aaa2..6c33b524d81ccd8ed060c3a9067cb1b6
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 5af5c9738021880e8f2375fb0e97e704f5099a13..83cc44fe7a76a14b4ccd71c814181629514ce1dd 100644
+index 01988598d9113a1e93f185bafb0db916b9519c00..1179fa40f4d23bb5d0308d4e8ef2ac16e4d09db2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -875,7 +875,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index f97ed1bf54..4a8ba14b44 100644
--- a/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/patches/server/0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -26,10 +26,10 @@ index 47b717e8741bb2b8f3aa776dcdc73a3e7dbb5960..9dad1efab44b8a23f274aa89c85944d9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0d473a405345d809742cb312068db8bf33ef17e7..57f1d97c77350757e1686023a422d343af6d6e92 100644
+index 84f62311f50b6ed58fa37588d8fc6f7782758d19..e9bccb569f6161dff3dd232355d8692123f846fe 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2051,6 +2051,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2052,6 +2052,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          switch (packet.getAction()) {
              case PRESS_SHIFT_KEY:
                  this.player.setShiftKeyDown(true);
diff --git a/patches/server/0147-Entity-fromMobSpawner.patch b/patches/server/0147-Entity-fromMobSpawner.patch
index 6825a9968e..a48b88a3be 100644
--- a/patches/server/0147-Entity-fromMobSpawner.patch
+++ b/patches/server/0147-Entity-fromMobSpawner.patch
@@ -49,10 +49,10 @@ index 002144601e8f75766b9e462579123559e4d651fe..1c5865ee2a9f3b142d92d63c19ffd785
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
                              Entity vehicle = entity.getVehicle();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 78b3be2ea6351cb6375b77340218615aa75b87f5..a83d15178f71b1c4c6d8d49f7621eddd66577251 100644
+index fa17458b313661d9396e2ed9398d31aacc97a6ab..0b4548eada28b11a69d29427cdefd328a81eda9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1192,5 +1192,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1193,5 +1193,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          //noinspection ConstantConditions
          return originVector.toLocation(world);
      }
diff --git a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
index ca612caa3b..ccd3b7baf4 100644
--- a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
+++ b/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 5edd8c38a4a73c1d4a6314159eea99b3881f8eeb..6151df2086d92fd5f428e2efe0df8d1c154ff891 100644
+index d74c9eeb7f622f0a7265fec51d851ffd3de1c69b..a5202ee012034678efbbd5ca1eccf2fd72a315bd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -5,6 +5,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
@@ -18,7 +18,7 @@ index 5edd8c38a4a73c1d4a6314159eea99b3881f8eeb..6151df2086d92fd5f428e2efe0df8d1c
  import org.bukkit.entity.AbstractHorse;
  import org.bukkit.entity.AnimalTamer;
  import org.bukkit.entity.Horse;
-@@ -98,6 +99,6 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
+@@ -108,6 +109,6 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
  
      @Override
      public AbstractHorseInventory getInventory() {
diff --git a/patches/server/0159-Add-PlayerJumpEvent.patch b/patches/server/0159-Add-PlayerJumpEvent.patch
index 936203cc45..3a0e8309cf 100644
--- a/patches/server/0159-Add-PlayerJumpEvent.patch
+++ b/patches/server/0159-Add-PlayerJumpEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 57f1d97c77350757e1686023a422d343af6d6e92..3a744fce441052427cb16dd99fbcefdb20761651 100644
+index e9bccb569f6161dff3dd232355d8692123f846fe..b57b7d2337b363b711a2347a3e6a71b6500fefe2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1174,7 +1174,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1175,7 +1175,34 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                              boolean flag = d8 > 0.0D;
  
                              if (this.player.isOnGround() && !packet.isOnGround() && flag) {
diff --git a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
index e14533f60e..e0f153e7df 100644
--- a/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
+++ b/patches/server/0160-handle-PacketPlayInKeepAlive-async.patch
@@ -15,10 +15,10 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3a744fce441052427cb16dd99fbcefdb20761651..77378ca56f1ec0f26fc29c2a80e27b7eddb94b93 100644
+index b57b7d2337b363b711a2347a3e6a71b6500fefe2..6fe3749376dabf6c6d003fee7ccdd6f882e1cf02 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2777,14 +2777,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2778,14 +2778,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
diff --git a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch b/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
index 4a7f76a37f..ffeb5fbdc6 100644
--- a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/0162-revert-serverside-behavior-of-keepalives.patch
@@ -17,10 +17,10 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 77378ca56f1ec0f26fc29c2a80e27b7eddb94b93..c63bb524cbcceb926fa7f0b72bfffb670e560c5a 100644
+index 6fe3749376dabf6c6d003fee7ccdd6f882e1cf02..ed2cbef0a1211fe5330d4d059657c7460fc2bc8d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -220,9 +220,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -221,9 +221,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private final MinecraftServer server;
      public ServerPlayer player;
      private int tickCount;
@@ -33,7 +33,7 @@ index 77378ca56f1ec0f26fc29c2a80e27b7eddb94b93..c63bb524cbcceb926fa7f0b72bfffb67
      // CraftBukkit start - multithreaded fields
      private final AtomicInteger chatSpamTickCount = new AtomicInteger();
      // CraftBukkit end
-@@ -251,6 +251,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -252,6 +252,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private int aboveGroundVehicleTickCount;
      private int receivedMovePacketCount;
      private int knownMovePacketCount;
@@ -41,7 +41,7 @@ index 77378ca56f1ec0f26fc29c2a80e27b7eddb94b93..c63bb524cbcceb926fa7f0b72bfffb67
  
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
          this.server = server;
-@@ -334,18 +335,25 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -335,18 +336,25 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
  
          this.server.getProfiler().push("keepAlive");
diff --git a/patches/server/0169-AsyncTabCompleteEvent.patch b/patches/server/0169-AsyncTabCompleteEvent.patch
index 2e58f17deb..031507ec5e 100644
--- a/patches/server/0169-AsyncTabCompleteEvent.patch
+++ b/patches/server/0169-AsyncTabCompleteEvent.patch
@@ -14,10 +14,10 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c63bb524cbcceb926fa7f0b72bfffb670e560c5a..fd7242648da5acbb6b7c5f4c182c1e0442dff77d 100644
+index ed2cbef0a1211fe5330d4d059657c7460fc2bc8d..b64bf84751e0437e26fcebdc35dd53069b9f2551 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -702,10 +702,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -703,10 +703,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
@@ -30,7 +30,7 @@ index c63bb524cbcceb926fa7f0b72bfffb670e560c5a..fd7242648da5acbb6b7c5f4c182c1e04
              return;
          }
          // CraftBukkit end
-@@ -715,12 +715,35 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -716,12 +716,35 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              stringreader.skip();
          }
  
diff --git a/patches/server/0173-PreCreatureSpawnEvent.patch b/patches/server/0173-PreCreatureSpawnEvent.patch
index ec1b396a0a..4486d9093c 100644
--- a/patches/server/0173-PreCreatureSpawnEvent.patch
+++ b/patches/server/0173-PreCreatureSpawnEvent.patch
@@ -40,10 +40,10 @@ index 20cfdba68c200e87d00995a6a4e25a5fa8171f6c..05ca012854100013714e3d6e8803a295
  
          if (t0 != null) {
 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 8d76fe0154f31445a889dfe4cca716cb658053f6..55e4e7fcefc60e66239035e72ad44e0c796bf300 100644
+index bd073ac603be130e649d206992c01860ee72d531..6600272bfd5e5ae1699485b143a49a2471c561d9 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -990,6 +990,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -995,6 +995,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              BlockPos blockposition1 = this.findSpawnPositionForGolemInColumn(blockposition, d0, d1);
  
              if (blockposition1 != null) {
diff --git a/patches/server/0177-Add-ArmorStand-Item-Meta.patch b/patches/server/0177-Add-ArmorStand-Item-Meta.patch
index 6761bbd8f2..e468d79145 100644
--- a/patches/server/0177-Add-ArmorStand-Item-Meta.patch
+++ b/patches/server/0177-Add-ArmorStand-Item-Meta.patch
@@ -256,10 +256,10 @@ index aee796567f11c8b93ac9ec0b8cb8f3a8412b23ce..39b98305632271e7375afe6c7001f241
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 0baca5f3c3f73323b6f5b283fc00be39477ccf59..ec26116dcaa2b1ba71498323d3b7624aad49dbbf 100644
+index 51d37a8963a2f8f5381bf802e28e5dfcdcc27eaa..2244a3c61f4effd365ed5fc010ecd1a4858b53a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -1444,6 +1444,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1445,6 +1445,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                          CraftMetaCrossbow.CHARGED.NBT,
                          CraftMetaCrossbow.CHARGED_PROJECTILES.NBT,
                          CraftMetaSuspiciousStew.EFFECTS.NBT,
diff --git a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index ad15443ad9..b3577ccf2e 100644
--- a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index fd7242648da5acbb6b7c5f4c182c1e0442dff77d..222487a756ae17ffaf8b42c3b2d81873ccd103eb 100644
+index b64bf84751e0437e26fcebdc35dd53069b9f2551..d3ec46ea2e6dddcd760ac8daf32869b7f6ddf64d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2783,9 +2783,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2784,9 +2784,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  TextFilter.FilteredText currentLine = signText.get(i);
  
                  if (this.player.isTextFilteringEnabled()) {
diff --git a/patches/server/0207-Fix-CraftEntity-hashCode.patch b/patches/server/0207-Fix-CraftEntity-hashCode.patch
index 9b88bfc3be..f7e17ee8f0 100644
--- a/patches/server/0207-Fix-CraftEntity-hashCode.patch
+++ b/patches/server/0207-Fix-CraftEntity-hashCode.patch
@@ -21,10 +21,10 @@ 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 a83d15178f71b1c4c6d8d49f7621eddd66577251..ec11cf974222a2719aeea86ab425fdddb38928a8 100644
+index 0b4548eada28b11a69d29427cdefd328a81eda9d..e5dea302a7548b648ed0b0a5297cc35397cabe50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -792,14 +792,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -793,14 +793,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return false;
          }
          final CraftEntity other = (CraftEntity) obj;
diff --git a/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch
index 533d8fe71b..ec54e71031 100644
--- a/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch
+++ b/patches/server/0213-Implement-EntityKnockbackByEntityEvent.patch
@@ -56,10 +56,10 @@ index e0d958b2e23e1128b09a27c32836aa3fd012c49d..16936d7ce3faec09ccdde58b2bf2b6f9
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 3eda6821d12bf616037f6c00815602428afbcdaf..ad2ef9460d85b2182f6af35733daadcedbd15e4c 100644
+index f7223b224354fdb817497f0ea4268109e20562ac..4c2efb04ef00f638576cb1f0692e114620aaa889 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1552,7 +1552,7 @@ public abstract class Mob extends LivingEntity {
+@@ -1554,7 +1554,7 @@ public abstract class Mob extends LivingEntity {
  
          if (flag) {
              if (f1 > 0.0F && target instanceof LivingEntity) {
diff --git a/patches/server/0219-InventoryCloseEvent-Reason-API.patch b/patches/server/0219-InventoryCloseEvent-Reason-API.patch
index 827a533b5a..264ab8cb78 100644
--- a/patches/server/0219-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0219-InventoryCloseEvent-Reason-API.patch
@@ -75,10 +75,10 @@ index 90bff0dd400a67bcb84f8576bd8326793420919a..fd1937f49312204d38510996a5be43b7
          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 222487a756ae17ffaf8b42c3b2d81873ccd103eb..00db9e4f46f810a4c51a0aa3d8b1a5673e2e1d67 100644
+index d3ec46ea2e6dddcd760ac8daf32869b7f6ddf64d..99dc424cd8e740baf12032d1bdc7d28ce84b2ca8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -186,6 +186,7 @@ import org.bukkit.event.inventory.ClickType;
+@@ -187,6 +187,7 @@ import org.bukkit.event.inventory.ClickType;
  import org.bukkit.event.inventory.CraftItemEvent;
  import org.bukkit.event.inventory.InventoryAction;
  import org.bukkit.event.inventory.InventoryClickEvent;
@@ -86,7 +86,7 @@ index 222487a756ae17ffaf8b42c3b2d81873ccd103eb..00db9e4f46f810a4c51a0aa3d8b1a567
  import org.bukkit.event.inventory.InventoryCreativeEvent;
  import org.bukkit.event.inventory.InventoryType.SlotType;
  import org.bukkit.event.inventory.SmithItemEvent;
-@@ -2331,10 +2332,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2332,10 +2333,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleContainerClose(ServerboundContainerClosePacket packet) {
@@ -174,7 +174,7 @@ index 278f1f403c43a5c55a53ef8639bf2ea87a676498..c787bb69baa1b30fc513965fe4a9578c
      @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 3df6adfe061392992b5f7dbf246cdf8fca21a478..9b97224009b572a75fa6d289c226801a558d2484 100644
+index c66767e94cb123d9286b43a115ba4fda7727337f..9495c5c41b1671fbc3930fb374efd7c7a68073bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -941,7 +941,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 5c7ef9b376..1927112480 100644
--- a/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/patches/server/0221-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,10 +16,10 @@ 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 00db9e4f46f810a4c51a0aa3d8b1a5673e2e1d67..1c81dff5ddd54ce9ae8e8d1ba9e986647e52ca29 100644
+index 99dc424cd8e740baf12032d1bdc7d28ce84b2ca8..86ff600e471effc97b214f6b6fb5b2e0a0d0df1c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2216,6 +2216,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2217,6 +2217,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                          }
  
                          if (event.isCancelled()) {
diff --git a/patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch
index 31e6b1d86f..a5fa4a3d84 100644
--- a/patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/patches/server/0225-Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 02f6b94b68778bbd5bc61832a5099080805a83a2..539f259aad2733b1313547aebd3e128815c1680a 100644
+index 330597270e4f224a9689fd9a3afcedba114abc52..99322a92b16010ed2ed2505067096e6baef2f616 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -395,6 +395,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -417,6 +417,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
          return new com.destroystokyo.paper.PaperVersionFetcher();
      }
diff --git a/patches/server/0233-SkeletonHorse-Additions.patch b/patches/server/0233-SkeletonHorse-Additions.patch
index 32b85d739b..72eefb7d71 100644
--- a/patches/server/0233-SkeletonHorse-Additions.patch
+++ b/patches/server/0233-SkeletonHorse-Additions.patch
@@ -65,25 +65,15 @@ index 0dc46471f7247e5d36c3896a0c87473072362fe6..bc3bfe8d3c2f87e2e9f167b9ff34d9ca
      default Player getNearestPlayer(Entity entity, double maxDistance) {
          return this.getNearestPlayer(entity.getX(), entity.getY(), entity.getZ(), maxDistance, false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-index b52ca4a612e30542ef4029cb1340f616bc4c36e6..90a61d1472afea12637814256f91dbd2f5acb42e 100644
+index e42dfd154f05130ff26f4d47d6817a1a561bfd54..78bc77d9cc5797fa8edd189167bb60b75b7f920e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java
-@@ -25,4 +25,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
-     public Variant getVariant() {
-         return Variant.SKELETON_HORSE;
+@@ -50,4 +50,16 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo
+     public void setTrapTime(int trapTime) {
+         this.getHandle().trapTime = trapTime;
      }
 +
-+    // Paper start
-+    @Override
-+    public net.minecraft.world.entity.animal.horse.SkeletonHorse getHandle() {
-+        return (net.minecraft.world.entity.animal.horse.SkeletonHorse) super.getHandle();
-+    }
-+
-+    @Override
-+    public int getTrapTime() {
-+        return getHandle().trapTime;
-+    }
-+
++    // Paper start - replaced by above methods
 +    @Override
 +    public boolean isTrap() {
 +        return getHandle().isTrap();
diff --git a/patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch
index bbfa2ad6fb..841e8a22a2 100644
--- a/patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/patches/server/0239-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -45,10 +45,10 @@ index 915e2c5b0ffbd0d459a203e1bfb131be4c5476d4..00dd9dab2b19f3e49f3b41c20eb96a84
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1c81dff5ddd54ce9ae8e8d1ba9e986647e52ca29..3b757e6748fa2af3730ae18d1bad1d7c86a11b90 100644
+index 86ff600e471effc97b214f6b6fb5b2e0a0d0df1c..d9ee15ba1aeae66e7da1c40a565e594f9e636dbb 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -226,6 +226,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -227,6 +227,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private long keepAliveChallenge;
      // CraftBukkit start - multithreaded fields
      private final AtomicInteger chatSpamTickCount = new AtomicInteger();
@@ -56,7 +56,7 @@ index 1c81dff5ddd54ce9ae8e8d1ba9e986647e52ca29..3b757e6748fa2af3730ae18d1bad1d7c
      // CraftBukkit end
      private int dropSpamTickCount;
      private double firstGoodX;
-@@ -359,6 +360,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -360,6 +361,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          this.server.getProfiler().pop();
          // CraftBukkit start
          for (int spam; (spam = this.chatSpamTickCount.get()) > 0 && !this.chatSpamTickCount.compareAndSet(spam, spam - 1); ) ;
@@ -64,7 +64,7 @@ index 1c81dff5ddd54ce9ae8e8d1ba9e986647e52ca29..3b757e6748fa2af3730ae18d1bad1d7c
          /* Use thread-safe field access instead
          if (this.chatSpamTickCount > 0) {
              --this.chatSpamTickCount;
-@@ -705,7 +707,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -706,7 +708,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
          // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
          // CraftBukkit start
diff --git a/patches/server/0244-Make-EnderDragon-implement-Mob.patch b/patches/server/0244-Make-EnderDragon-implement-Mob.patch
deleted file mode 100644
index 8392dc7bad..0000000000
--- a/patches/server/0244-Make-EnderDragon-implement-Mob.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 10 Aug 2018 22:11:49 -0400
-Subject: [PATCH] Make EnderDragon implement Mob
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-index bba2e3152ee7073b75ecce1a4792178db20344db..aea39a6cb778d2ef88f66b632aebd824aaef2ea6 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java
-@@ -1,17 +1,17 @@
- package org.bukkit.craftbukkit.entity;
- 
--import net.minecraft.world.entity.LivingEntity;
-+import net.minecraft.world.entity.Mob;
- import org.bukkit.craftbukkit.CraftServer;
- import org.bukkit.entity.ComplexLivingEntity;
- 
--public abstract class CraftComplexLivingEntity extends CraftLivingEntity implements ComplexLivingEntity {
--    public CraftComplexLivingEntity(CraftServer server, LivingEntity entity) {
-+public abstract class CraftComplexLivingEntity extends CraftMob implements ComplexLivingEntity { // Paper
-+    public CraftComplexLivingEntity(CraftServer server, Mob entity) { // Paper
-         super(server, entity);
-     }
- 
-     @Override
--    public LivingEntity getHandle() {
--        return (LivingEntity) entity;
-+    public Mob getHandle() { // Paper
-+        return (Mob) entity; // Paper
-     }
- 
-     @Override
diff --git a/patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch
rename to patches/server/0244-Use-ConcurrentHashMap-in-JsonList.patch
index ef8e18d8d4..3a7984285d 100644
--- a/patches/server/0245-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/patches/server/0244-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 a08115bff1e9207fa8b2bd2407a76899f9d3e8c2..6c03e900a23cced5874ba79f7b309b773f1bbc9e 100644
+index f2efbb954ca56040ed39937750c4a01a4b6334fc..e1603b674823067a55faa12e716b695171b31d32 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -618,7 +618,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from patches/server/0246-Use-a-Queue-for-Queueing-Commands.patch
rename to patches/server/0245-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 96%
rename from patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
index 771018ee28..28dbf7c0e4 100644
--- a/patches/server/0247-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
+++ b/patches/server/0246-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 92a33a23764e8ca1e2e6b2b0feb6caca2a5dfc56..7bc1219523eeb0880493e6fb42692f1fdb30c110 100644
+index 6c47771e0168e958b22c987bcd8bc100f6208c10..a1fe076d76fe5f84eca39ea68e9820096f58f5a7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -4,8 +4,10 @@ import com.google.common.base.Preconditions;
diff --git a/patches/server/0248-Optimize-BlockPosition-helper-methods.patch b/patches/server/0247-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from patches/server/0248-Optimize-BlockPosition-helper-methods.patch
rename to patches/server/0247-Optimize-BlockPosition-helper-methods.patch
diff --git a/patches/server/0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch b/patches/server/0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
similarity index 89%
rename from patches/server/0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
rename to patches/server/0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
index 7e3e22c914..81295c2213 100644
--- a/patches/server/0249-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
+++ b/patches/server/0248-Restore-vanlla-default-mob-spawn-range-and-water-ani.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Restore vanlla default mob-spawn-range and water animals
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 35f6619081e5a1053c9d655f18359927b2fc6d6b..a6d07b9b8f4fc45d737a2769eeb5ad6eacba978e 100644
+index 6c5113545914842ffb310522a7549ae7dd2466b2..21e0f9b4d3e1dc6e104bffdffcc23d62a739ab3c 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -184,7 +184,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0250-Slime-Pathfinder-Events.patch b/patches/server/0249-Slime-Pathfinder-Events.patch
similarity index 100%
rename from patches/server/0250-Slime-Pathfinder-Events.patch
rename to patches/server/0249-Slime-Pathfinder-Events.patch
diff --git a/patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 97%
rename from patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch
rename to patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch
index 15d7a0d5f1..f8d88afb90 100644
--- a/patches/server/0251-Configurable-speed-for-water-flowing-over-lava.patch
+++ b/patches/server/0250-Configurable-speed-for-water-flowing-over-lava.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 719b87705577132389f262a1557e5e84d37374d0..9c558fc727eb597612139820650a4226a7923cbb 100644
+index 831e874f01d8edcff12a094dbf918d2533939c60..e57ab8a3e6efd78e12385042b7d91dcd27fef11d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -425,4 +425,10 @@ public class PaperWorldConfig {
diff --git a/patches/server/0252-Optimize-CraftBlockData-Creation.patch b/patches/server/0251-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from patches/server/0252-Optimize-CraftBlockData-Creation.patch
rename to patches/server/0251-Optimize-CraftBlockData-Creation.patch
diff --git a/patches/server/0253-Optimize-MappedRegistry.patch b/patches/server/0252-Optimize-MappedRegistry.patch
similarity index 100%
rename from patches/server/0253-Optimize-MappedRegistry.patch
rename to patches/server/0252-Optimize-MappedRegistry.patch
diff --git a/patches/server/0254-Add-PhantomPreSpawnEvent.patch b/patches/server/0253-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from patches/server/0254-Add-PhantomPreSpawnEvent.patch
rename to patches/server/0253-Add-PhantomPreSpawnEvent.patch
diff --git a/patches/server/0255-Add-More-Creeper-API.patch b/patches/server/0254-Add-More-Creeper-API.patch
similarity index 100%
rename from patches/server/0255-Add-More-Creeper-API.patch
rename to patches/server/0254-Add-More-Creeper-API.patch
diff --git a/patches/server/0256-Inventory-removeItemAnySlot.patch b/patches/server/0255-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from patches/server/0256-Inventory-removeItemAnySlot.patch
rename to patches/server/0255-Inventory-removeItemAnySlot.patch
diff --git a/patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from patches/server/0257-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to patches/server/0256-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0257-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from patches/server/0258-Asynchronous-chunk-IO-and-loading.patch
rename to patches/server/0257-Asynchronous-chunk-IO-and-loading.patch
index 242a9038d1..28725d5c8b 100644
--- a/patches/server/0258-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0257-Asynchronous-chunk-IO-and-loading.patch
@@ -2849,10 +2849,10 @@ index 0d536d72ac918fbd403397ff369d10143ee9c204..be677d437d17b74c6188ce1bd5fc6fdc
      private final String name;
      private final Comparator<T> comparator;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3b757e6748fa2af3730ae18d1bad1d7c86a11b90..a2783f87c560f4104216dce0c662e464f247356c 100644
+index d9ee15ba1aeae66e7da1c40a565e594f9e636dbb..995895dc1a97564e7f5565f9c26d18d1d8b4b4c0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -711,6 +711,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -712,6 +712,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              server.scheduleOnMain(() -> this.disconnect(new TranslatableComponent("disconnect.spam", new Object[0]))); // Paper
              return;
          }
@@ -3584,7 +3584,7 @@ index dafdfce21f6629d6f99bcf4e47e82e2fbf332f09..ab00e3a834c77e080a1ca4acf077c948
      // Spigot start
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ec11cf974222a2719aeea86ab425fdddb38928a8..989824be9c26d138ceed62ac533fcf2bbf37755f 100644
+index e5dea302a7548b648ed0b0a5297cc35397cabe50..a1812c570215b14e89ce61ebbd78871fa57c9323 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -15,6 +15,7 @@ import net.minecraft.network.chat.Component;
diff --git a/patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0259-Add-ray-tracing-methods-to-LivingEntity.patch
rename to patches/server/0258-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch
similarity index 92%
rename from patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch
rename to patches/server/0259-Expose-attack-cooldown-methods-for-Player.patch
index 56ce418f3a..eca08e0955 100644
--- a/patches/server/0260-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0259-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 b549107e022e036164a213ff22b03d8148271118..bce9305b736832abbc9de10a1bf6554c2e724fdf 100644
+index 9495c5c41b1671fbc3930fb374efd7c7a68073bf..e216c9a84efdf3f3eb7145d6136dbe8d92c0dcc3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2372,6 +2372,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0261-Improve-death-events.patch b/patches/server/0260-Improve-death-events.patch
similarity index 99%
rename from patches/server/0261-Improve-death-events.patch
rename to patches/server/0260-Improve-death-events.patch
index 922f0be605..02974861e5 100644
--- a/patches/server/0261-Improve-death-events.patch
+++ b/patches/server/0260-Improve-death-events.patch
@@ -209,7 +209,7 @@ index cf4640f1e38f3e50b3a85692e032a78b4102d31e..28ec62fd75abc04d4dc22204bfd999d2
      // 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 85af49ff909635973ff20ec3e528a4a0a7c19fc4..7db99b4ad89fd5b38a4767d166caedda86a6188a 100644
+index 4c2efb04ef00f638576cb1f0692e114620aaa889..95058ddac0dd75f84781227cc1061bcc325954e9 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1002,7 +1002,9 @@ public abstract class Mob extends LivingEntity {
@@ -295,7 +295,7 @@ index 91cf7728aee475cb36f2c02bbfb7e3d2e0d00576..a3a900d10440ed5ebe24370a77ccb6ca
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index bce9305b736832abbc9de10a1bf6554c2e724fdf..076135ecdfcb589e39deef50c44196d5ffe53434 100644
+index e216c9a84efdf3f3eb7145d6136dbe8d92c0dcc3..08093c890141fa146da00c413bd3509e2019cb59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1935,7 +1935,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from patches/server/0262-Allow-chests-to-be-placed-with-NBT-data.patch
rename to patches/server/0261-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/patches/server/0263-Mob-Pathfinding-API.patch b/patches/server/0262-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/server/0263-Mob-Pathfinding-API.patch
rename to patches/server/0262-Mob-Pathfinding-API.patch
diff --git a/patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 98%
rename from patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index 297eb4c4cf..ebe8731d02 100644
--- a/patches/server/0264-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/patches/server/0263-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index ec26116dcaa2b1ba71498323d3b7624aad49dbbf..9d4685698ed707239b071a366eebbc4b8450683c 100644
+index 2244a3c61f4effd365ed5fc010ecd1a4858b53a8..59bb47ab215e83ca5446621cae1e3fa4a02f7d6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -83,6 +83,12 @@ import org.bukkit.persistence.PersistentDataContainer;
@@ -244,7 +244,7 @@ index ec26116dcaa2b1ba71498323d3b7624aad49dbbf..9d4685698ed707239b071a366eebbc4b
          final Map<String, Tag> internalTags = new HashMap<String, Tag>(this.unhandledTags);
          this.serializeInternal(internalTags);
          if (!internalTags.isEmpty()) {
-@@ -1451,6 +1592,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1452,6 +1593,8 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                          CraftMetaArmorStand.SHOW_ARMS.NBT,
                          CraftMetaArmorStand.SMALL.NBT,
                          CraftMetaArmorStand.MARKER.NBT,
@@ -253,7 +253,7 @@ index ec26116dcaa2b1ba71498323d3b7624aad49dbbf..9d4685698ed707239b071a366eebbc4b
                          // Paper end
                          CraftMetaCompass.LODESTONE_DIMENSION.NBT,
                          CraftMetaCompass.LODESTONE_POS.NBT,
-@@ -1479,4 +1622,147 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1480,4 +1623,147 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      }
      // Paper end
  
diff --git a/patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from patches/server/0265-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to patches/server/0264-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from patches/server/0266-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to patches/server/0265-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from patches/server/0267-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to patches/server/0266-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/server/0268-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/server/0267-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from patches/server/0269-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to patches/server/0268-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/patches/server/0270-Honor-EntityAgeable.ageLock.patch b/patches/server/0269-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from patches/server/0270-Honor-EntityAgeable.ageLock.patch
rename to patches/server/0269-Honor-EntityAgeable.ageLock.patch
diff --git a/patches/server/0271-Configurable-connection-throttle-kick-message.patch b/patches/server/0270-Configurable-connection-throttle-kick-message.patch
similarity index 93%
rename from patches/server/0271-Configurable-connection-throttle-kick-message.patch
rename to patches/server/0270-Configurable-connection-throttle-kick-message.patch
index 73bbdac9ba..335161867f 100644
--- a/patches/server/0271-Configurable-connection-throttle-kick-message.patch
+++ b/patches/server/0270-Configurable-connection-throttle-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable connection throttle kick message
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a89ccdf2ea517d2ec38c9433bdc26802884ed988..da21f1623a90ade429723d4eb12d646aaf28071e 100644
+index 7cec7a377d64dd00ea6fb8f82af489d4bf3bf572..9aa28bb2968522ef1b9375bcc872e6d8dfb01764 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -294,6 +294,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index a89ccdf2ea517d2ec38c9433bdc26802884ed988..da21f1623a90ade429723d4eb12d646a
          Object val = config.get("settings.save-player-data");
          if (val instanceof Boolean) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
-index 484221e5a9c246aa91e0eacef3911b0e9ecff401..c09d3cdb3acb04b6a833c30a619ff2af5e8b6b18 100644
+index 85fea9b0bf84a8b40098f35eac503070914c98d8..687308a414095f95b567a2993b679d8b62856578 100644
 --- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
 @@ -50,7 +50,7 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
diff --git a/patches/server/0272-Hook-into-CB-plugin-rewrites.patch b/patches/server/0271-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from patches/server/0272-Hook-into-CB-plugin-rewrites.patch
rename to patches/server/0271-Hook-into-CB-plugin-rewrites.patch
diff --git a/patches/server/0273-PreSpawnerSpawnEvent.patch b/patches/server/0272-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/server/0273-PreSpawnerSpawnEvent.patch
rename to patches/server/0272-PreSpawnerSpawnEvent.patch
diff --git a/patches/server/0274-Add-LivingEntity-getTargetEntity.patch b/patches/server/0273-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/server/0274-Add-LivingEntity-getTargetEntity.patch
rename to patches/server/0273-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/server/0275-Add-sun-related-API.patch b/patches/server/0274-Add-sun-related-API.patch
similarity index 100%
rename from patches/server/0275-Add-sun-related-API.patch
rename to patches/server/0274-Add-sun-related-API.patch
diff --git a/patches/server/0277-Turtle-API.patch b/patches/server/0275-Turtle-API.patch
similarity index 100%
rename from patches/server/0277-Turtle-API.patch
rename to patches/server/0275-Turtle-API.patch
diff --git a/patches/server/0278-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from patches/server/0278-Call-player-spectator-target-events-and-improve-impl.patch
rename to patches/server/0276-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/patches/server/0276-Here-s-Johnny.patch b/patches/server/0276-Here-s-Johnny.patch
deleted file mode 100644
index fb2a745aa8..0000000000
--- a/patches/server/0276-Here-s-Johnny.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 12 Oct 2018 01:37:22 -0500
-Subject: [PATCH] Here's Johnny!
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 3c5994e9862e5caa257ee6a21f8fba2df39c98c5..50a318d7a6cec1e137c913f1d04a7e9606ba2ec2 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-@@ -24,4 +24,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {
-     public EntityType getType() {
-         return EntityType.VINDICATOR;
-     }
-+
-+    // Paper start
-+    public boolean isJohnny() {
-+        return getHandle().isJohnny;
-+    }
-+
-+    public void setJohnny(boolean johnny) {
-+        getHandle().isJohnny = johnny;
-+    }
-+    // Paper end
- }
diff --git a/patches/server/0279-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from patches/server/0279-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to patches/server/0277-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0280-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0278-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0281-Add-more-Witch-API.patch b/patches/server/0279-Add-more-Witch-API.patch
similarity index 100%
rename from patches/server/0281-Add-more-Witch-API.patch
rename to patches/server/0279-Add-more-Witch-API.patch
diff --git a/patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from patches/server/0282-Check-Drowned-for-Villager-Aggression-Config.patch
rename to patches/server/0280-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/patches/server/0283-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 93%
rename from patches/server/0283-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 8c9c0d72f9..df06cbd459 100644
--- a/patches/server/0283-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/patches/server/0281-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -20,10 +20,10 @@ index e57ab8a3e6efd78e12385042b7d91dcd27fef11d..eb44aef0aecf65f5c1b19f42bf85a3a2
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a2783f87c560f4104216dce0c662e464f247356c..886c150861c77bf26111b2ef26713e7d260f10ac 100644
+index 995895dc1a97564e7f5565f9c26d18d1d8b4b4c0..6976987320f168b422d9d430ab00d4b49dbd0d43 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -531,6 +531,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -532,6 +532,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  }
                  speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
  
@@ -37,7 +37,7 @@ index a2783f87c560f4104216dce0c662e464f247356c..886c150861c77bf26111b2ef26713e7d
                  if (d10 - d9 > Math.max(100.0D, Math.pow((double) (org.spigotmc.SpigotConfig.movedTooQuicklyMultiplier * (float) i * speed), 2)) && !this.isSingleplayerOwner()) {
                  // CraftBukkit end
                      ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved too quickly! {},{},{}", entity.getName().getString(), this.player.getName().getString(), d6, d7, d8);
-@@ -1155,9 +1162,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1156,9 +1163,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                          float prevYaw = this.player.getYRot();
                          float prevPitch = this.player.getXRot();
                          // CraftBukkit end
@@ -49,7 +49,7 @@ index a2783f87c560f4104216dce0c662e464f247356c..886c150861c77bf26111b2ef26713e7d
                          double d6 = this.player.getY();
                          double d7 = d0 - this.firstGoodX;
                          double d8 = d1 - this.firstGoodY;
-@@ -1195,6 +1202,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1196,6 +1203,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                              } else {
                                  speed = this.player.getAbilities().walkingSpeed * 10f;
                              }
diff --git a/patches/server/0284-Reset-players-airTicks-on-respawn.patch b/patches/server/0282-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from patches/server/0284-Reset-players-airTicks-on-respawn.patch
rename to patches/server/0282-Reset-players-airTicks-on-respawn.patch
diff --git a/patches/server/0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from patches/server/0285-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to patches/server/0283-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/patches/server/0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from patches/server/0286-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to patches/server/0284-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/patches/server/0287-Optimize-World-Time-Updates.patch b/patches/server/0285-Optimize-World-Time-Updates.patch
similarity index 100%
rename from patches/server/0287-Optimize-World-Time-Updates.patch
rename to patches/server/0285-Optimize-World-Time-Updates.patch
diff --git a/patches/server/0288-Restore-custom-InventoryHolder-support.patch b/patches/server/0286-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from patches/server/0288-Restore-custom-InventoryHolder-support.patch
rename to patches/server/0286-Restore-custom-InventoryHolder-support.patch
diff --git a/patches/server/0289-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0287-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from patches/server/0289-Use-Vanilla-Minecart-Speeds.patch
rename to patches/server/0287-Use-Vanilla-Minecart-Speeds.patch
diff --git a/patches/server/0290-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0288-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from patches/server/0290-Fix-SpongeAbsortEvent-handling.patch
rename to patches/server/0288-Fix-SpongeAbsortEvent-handling.patch
diff --git a/patches/server/0291-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 97%
rename from patches/server/0291-Don-t-allow-digging-into-unloaded-chunks.patch
rename to patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch
index 3eead4a690..50e5d1c6c1 100644
--- a/patches/server/0291-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/patches/server/0289-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -59,10 +59,10 @@ index 1d1f355a49e2324902feee10c1717fd772e359c6..d0b54ebc05cac6535a023709c76efd80
  
                  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 886c150861c77bf26111b2ef26713e7d260f10ac..96987ac75a2cb33e3761857f2c5074066f8c8b03 100644
+index 6976987320f168b422d9d430ab00d4b49dbd0d43..3dbd73a83942a693746d1565f92d163f912c9bde 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1551,7 +1551,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1552,7 +1552,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              case START_DESTROY_BLOCK:
              case ABORT_DESTROY_BLOCK:
              case STOP_DESTROY_BLOCK:
diff --git a/patches/server/0292-Make-the-default-permission-message-configurable.patch b/patches/server/0290-Make-the-default-permission-message-configurable.patch
similarity index 97%
rename from patches/server/0292-Make-the-default-permission-message-configurable.patch
rename to patches/server/0290-Make-the-default-permission-message-configurable.patch
index 8d179d354e..0e4d633b5e 100644
--- a/patches/server/0292-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0290-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 1fa190e098079522e0fe3593fa261c1b7ad4e24b..1eb45df9dca5d0c31ac46709e706136a
      }
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1015fcc6c77bd64c3f3cbf234e85a6602dbfa0d7..769353df1fcdaacecd80085165a1d72f99b577ee 100644
+index edf0a82ba7e16b86100aa1920fa41508be2ab1e8..c48b175d5511b733bcff9a93a874f5ffc0174691 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -20,6 +20,7 @@ import java.util.regex.Pattern;
diff --git a/patches/server/0293-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0293-Prevent-rayTrace-from-loading-chunks.patch
rename to patches/server/0291-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/patches/server/0294-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0292-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0294-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0292-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0295-force-entity-dismount-during-teleportation.patch b/patches/server/0293-force-entity-dismount-during-teleportation.patch
similarity index 97%
rename from patches/server/0295-force-entity-dismount-during-teleportation.patch
rename to patches/server/0293-force-entity-dismount-during-teleportation.patch
index ae88db7dc9..bedea1e192 100644
--- a/patches/server/0295-force-entity-dismount-during-teleportation.patch
+++ b/patches/server/0293-force-entity-dismount-during-teleportation.patch
@@ -41,7 +41,7 @@ index db7f2715534ed71a2b285de095238586fe6a35b0..f51c416e7938b7905f7efb154ab14cad
  
          if (entity1 != entity && this.connection != null) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 2981a29b011cb1a08a776abc5ec6a94228061f98..7ec6561722644bfd9dd81d12732eab67c8dd57ae 100644
+index 1ca2b4d0d0cd87c5b2eb7b490032f317e760bce2..f015b1990a509071b6154a9eb7405fa2cbacb111 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2238,11 +2238,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -114,7 +114,7 @@ index fdf759ee33b591ffce5385c424df7879a4e0a85f..75beea5653d04555b46c4b3a2054405c
              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 0cd00d0b1017b2995f565ed6a871653a2644ffa1..09bb891fb1274027ea0696a0319816d05d4dc5bc 100644
+index ab78cc99d0e814577cf65353997b7095e574a139..2c46f54751c49d9adce1a8724b93f06438544129 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1094,7 +1094,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0296-Add-more-Zombie-API.patch b/patches/server/0294-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/server/0296-Add-more-Zombie-API.patch
rename to patches/server/0294-Add-more-Zombie-API.patch
diff --git a/patches/server/0297-Book-Size-Limits.patch b/patches/server/0295-Book-Size-Limits.patch
similarity index 95%
rename from patches/server/0297-Book-Size-Limits.patch
rename to patches/server/0295-Book-Size-Limits.patch
index 7cd525e492..f200bacc68 100644
--- a/patches/server/0297-Book-Size-Limits.patch
+++ b/patches/server/0295-Book-Size-Limits.patch
@@ -24,10 +24,10 @@ index c48b175d5511b733bcff9a93a874f5ffc0174691..e683e5bf47abe7bd3d2f7e9811a37754
      private static void asyncChunks() {
          ConfigurationSection section;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 96987ac75a2cb33e3761857f2c5074066f8c8b03..e1004d267fc62ecce8a1f98cbec40dddaa6e1485 100644
+index 3dbd73a83942a693746d1565f92d163f912c9bde..5c7f1b6b6e5fbd4c064ef39ab910655e90ace788 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1001,6 +1001,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1002,6 +1002,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleEditBook(ServerboundEditBookPacket packet) {
diff --git a/patches/server/0298-Add-PlayerConnectionCloseEvent.patch b/patches/server/0296-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/server/0298-Add-PlayerConnectionCloseEvent.patch
rename to patches/server/0296-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/server/0299-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0297-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0299-Prevent-Enderman-from-loading-chunks.patch
rename to patches/server/0297-Prevent-Enderman-from-loading-chunks.patch
diff --git a/patches/server/0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 98%
rename from patches/server/0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 7c602f7d79..4a8cea2bd7 100644
--- a/patches/server/0300-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0298-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -106,7 +106,7 @@ index c7e4c6d29378675b76ebb179022ddbb02831a1dc..88bc0807e8bf66a65422f85f11123363
      public Location getBedSpawnLocation() {
          CompoundTag data = this.getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2a313757c85faeb353fb8140db84a464cc46b524..3026243161b6a0f978a62c67ecb7825713ac5249 100644
+index 08093c890141fa146da00c413bd3509e2019cb59..5beb5568c4c2a1ab8ac737e26a78178c788961d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -156,6 +156,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from patches/server/0301-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to patches/server/0299-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0300-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from patches/server/0302-Block-Entity-remove-from-being-called-on-Players.patch
rename to patches/server/0300-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/patches/server/0303-BlockDestroyEvent.patch b/patches/server/0301-BlockDestroyEvent.patch
similarity index 100%
rename from patches/server/0303-BlockDestroyEvent.patch
rename to patches/server/0301-BlockDestroyEvent.patch
diff --git a/patches/server/0304-Async-command-map-building.patch b/patches/server/0302-Async-command-map-building.patch
similarity index 100%
rename from patches/server/0304-Async-command-map-building.patch
rename to patches/server/0302-Async-command-map-building.patch
diff --git a/patches/server/0305-Implement-Brigadier-Mojang-API.patch b/patches/server/0303-Implement-Brigadier-Mojang-API.patch
similarity index 97%
rename from patches/server/0305-Implement-Brigadier-Mojang-API.patch
rename to patches/server/0303-Implement-Brigadier-Mojang-API.patch
index 2b2758f26f..221f6c7ece 100644
--- a/patches/server/0305-Implement-Brigadier-Mojang-API.patch
+++ b/patches/server/0303-Implement-Brigadier-Mojang-API.patch
@@ -81,10 +81,10 @@ index ee31455158afbed8f3bbac57d2f41a59d01a0670..4049576478efed97092b7e1b3d40afda
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e1004d267fc62ecce8a1f98cbec40dddaa6e1485..3dc23e2eaa5bf9c2bdbba366767be39a8de81b5f 100644
+index 5c7f1b6b6e5fbd4c064ef39ab910655e90ace788..39913117f5ba2d455af6781e35abc3088640185e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -748,8 +748,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -749,8 +749,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                      ParseResults<CommandSourceStack> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
  
                      this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
@@ -99,7 +99,7 @@ index e1004d267fc62ecce8a1f98cbec40dddaa6e1485..3dc23e2eaa5bf9c2bdbba366767be39a
                      });
                  });
              }
-@@ -758,7 +762,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -759,7 +763,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              builder = builder.createOffset(builder.getInput().lastIndexOf(' ') + 1);
              completions.forEach(builder::suggest);
diff --git a/patches/server/0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from patches/server/0306-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to patches/server/0304-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/patches/server/0307-Limit-Client-Sign-length-more.patch b/patches/server/0305-Limit-Client-Sign-length-more.patch
similarity index 92%
rename from patches/server/0307-Limit-Client-Sign-length-more.patch
rename to patches/server/0305-Limit-Client-Sign-length-more.patch
index 9ad77d45f3..3052de7316 100644
--- a/patches/server/0307-Limit-Client-Sign-length-more.patch
+++ b/patches/server/0305-Limit-Client-Sign-length-more.patch
@@ -22,10 +22,10 @@ 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 3dc23e2eaa5bf9c2bdbba366767be39a8de81b5f..8585cc9441674950dc8646f12698fb356cfc9e96 100644
+index 39913117f5ba2d455af6781e35abc3088640185e..8250b82056d63a2bd48d2bc8d830c53f1867152e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -253,6 +253,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -254,6 +254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private int aboveGroundVehicleTickCount;
      private int receivedMovePacketCount;
      private int knownMovePacketCount;
@@ -33,7 +33,7 @@ index 3dc23e2eaa5bf9c2bdbba366767be39a8de81b5f..8585cc9441674950dc8646f12698fb35
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
  
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
-@@ -2862,6 +2863,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2863,6 +2864,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              for (int i = 0; i < signText.size(); ++i) {
                  TextFilter.FilteredText currentLine = signText.get(i);
diff --git a/patches/server/0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from patches/server/0308-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to patches/server/0306-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/patches/server/0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0309-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0307-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0310-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0308-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from patches/server/0310-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to patches/server/0308-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/patches/server/0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from patches/server/0311-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to patches/server/0309-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/patches/server/0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from patches/server/0312-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to patches/server/0310-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/patches/server/0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0311-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from patches/server/0313-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to patches/server/0311-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/patches/server/0314-Entity-getEntitySpawnReason.patch b/patches/server/0312-Entity-getEntitySpawnReason.patch
similarity index 97%
rename from patches/server/0314-Entity-getEntitySpawnReason.patch
rename to patches/server/0312-Entity-getEntitySpawnReason.patch
index 6d3489374b..8d5702ff82 100644
--- a/patches/server/0314-Entity-getEntitySpawnReason.patch
+++ b/patches/server/0312-Entity-getEntitySpawnReason.patch
@@ -105,10 +105,10 @@ index f08c5ae9d41ec9efb627665f5de4dd6165fd0092..30930a24c197c45f2ed86eaf7a150252
                          // Spigot Start
                          if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 989824be9c26d138ceed62ac533fcf2bbf37755f..fd811e2ba455d7e4eb618d48ca2c4983797a265c 100644
+index a1812c570215b14e89ce61ebbd78871fa57c9323..d7dabaa5087f87b97a2e66b871fb618918eb568b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1230,5 +1230,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1231,5 +1231,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean fromMobSpawner() {
          return getHandle().spawnedViaMobSpawner;
      }
diff --git a/patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 93%
rename from patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch
rename to patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch
index ab0862ea30..0d500e2067 100644
--- a/patches/server/0315-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/patches/server/0313-Update-entity-Metadata-for-all-tracked-players.patch
@@ -22,10 +22,10 @@ index 3d27cbf5e9105def2f38525a85da5acf8ebf8fe9..ceba19ea3bb9664899b83f82f28af064
          this.broadcast.accept(packet);
          if (this.entity instanceof ServerPlayer) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8585cc9441674950dc8646f12698fb356cfc9e96..e3d0180fc1219cfb33cfc3b55a127f86fa23618a 100644
+index 8250b82056d63a2bd48d2bc8d830c53f1867152e..29e5265a99c8156ad83e5e2cc75910273d84458e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2287,7 +2287,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2288,7 +2288,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                          if (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem) {
                              // Refresh the current entity metadata
diff --git a/patches/server/0316-Fire-event-on-GS4-query.patch b/patches/server/0314-Fire-event-on-GS4-query.patch
similarity index 100%
rename from patches/server/0316-Fire-event-on-GS4-query.patch
rename to patches/server/0314-Fire-event-on-GS4-query.patch
diff --git a/patches/server/0317-Implement-PlayerPostRespawnEvent.patch b/patches/server/0315-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/server/0317-Implement-PlayerPostRespawnEvent.patch
rename to patches/server/0315-Implement-PlayerPostRespawnEvent.patch
diff --git a/patches/server/0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from patches/server/0318-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to patches/server/0316-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/patches/server/0319-Server-Tick-Events.patch b/patches/server/0317-Server-Tick-Events.patch
similarity index 100%
rename from patches/server/0319-Server-Tick-Events.patch
rename to patches/server/0317-Server-Tick-Events.patch
diff --git a/patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0318-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/server/0320-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/server/0318-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0319-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from patches/server/0321-Optimize-Captured-TileEntity-Lookup.patch
rename to patches/server/0319-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/patches/server/0322-Add-Heightmap-API.patch b/patches/server/0320-Add-Heightmap-API.patch
similarity index 100%
rename from patches/server/0322-Add-Heightmap-API.patch
rename to patches/server/0320-Add-Heightmap-API.patch
diff --git a/patches/server/0323-Mob-Spawner-API-Enhancements.patch b/patches/server/0321-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/server/0323-Mob-Spawner-API-Enhancements.patch
rename to patches/server/0321-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 86%
rename from patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch
index e82dc3ca33..3fcef43501 100644
--- a/patches/server/0324-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0322-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index e3d0180fc1219cfb33cfc3b55a127f86fa23618a..240c97682863d78d7c3621131ee1407932ec4599 100644
+index 29e5265a99c8156ad83e5e2cc75910273d84458e..0b6739fcda89df0f91cddc493f45b0bf9e433b53 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -439,7 +439,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -440,7 +440,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
          Objects.requireNonNull(this.connection);
          // CraftBukkit - Don't wait
diff --git a/patches/server/0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from patches/server/0325-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to patches/server/0323-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0324-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from patches/server/0326-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to patches/server/0324-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/patches/server/0327-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0325-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from patches/server/0327-improve-CraftWorld-isChunkLoaded.patch
rename to patches/server/0325-improve-CraftWorld-isChunkLoaded.patch
diff --git a/patches/server/0328-Implement-CraftBlockSoundGroup.patch b/patches/server/0326-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from patches/server/0328-Implement-CraftBlockSoundGroup.patch
rename to patches/server/0326-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from patches/server/0329-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to patches/server/0327-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/patches/server/0330-ChunkMapDistance-CME.patch b/patches/server/0328-ChunkMapDistance-CME.patch
similarity index 100%
rename from patches/server/0330-ChunkMapDistance-CME.patch
rename to patches/server/0328-ChunkMapDistance-CME.patch
diff --git a/patches/server/0331-Chunk-debug-command.patch b/patches/server/0329-Chunk-debug-command.patch
similarity index 100%
rename from patches/server/0331-Chunk-debug-command.patch
rename to patches/server/0329-Chunk-debug-command.patch
diff --git a/patches/server/0332-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0330-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0332-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0330-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0333-Expose-the-internal-current-tick.patch b/patches/server/0331-Expose-the-internal-current-tick.patch
similarity index 100%
rename from patches/server/0333-Expose-the-internal-current-tick.patch
rename to patches/server/0331-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0334-Fix-World-isChunkGenerated-calls.patch b/patches/server/0332-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0334-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0332-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0335-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0333-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from patches/server/0335-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to patches/server/0333-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/patches/server/0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from patches/server/0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to patches/server/0334-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0337-Configurable-projectile-relative-velocity.patch b/patches/server/0335-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from patches/server/0337-Configurable-projectile-relative-velocity.patch
rename to patches/server/0335-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0338-offset-item-frame-ticking.patch b/patches/server/0336-offset-item-frame-ticking.patch
similarity index 100%
rename from patches/server/0338-offset-item-frame-ticking.patch
rename to patches/server/0336-offset-item-frame-ticking.patch
diff --git a/patches/server/0339-Fix-MC-158900.patch b/patches/server/0337-Fix-MC-158900.patch
similarity index 100%
rename from patches/server/0339-Fix-MC-158900.patch
rename to patches/server/0337-Fix-MC-158900.patch
diff --git a/patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0338-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch
rename to patches/server/0338-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0341-Dont-send-unnecessary-sign-update.patch b/patches/server/0339-Dont-send-unnecessary-sign-update.patch
similarity index 87%
rename from patches/server/0341-Dont-send-unnecessary-sign-update.patch
rename to patches/server/0339-Dont-send-unnecessary-sign-update.patch
index b482be0ba7..03ad1c7cd5 100644
--- a/patches/server/0341-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0339-Dont-send-unnecessary-sign-update.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dont send unnecessary sign update
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 240c97682863d78d7c3621131ee1407932ec4599..5efac3203b98870a3f3549baddd5f773de961ee8 100644
+index 0b6739fcda89df0f91cddc493f45b0bf9e433b53..66f0b20964f2cd3a46d7f34680d2abd3da887c46 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2857,6 +2857,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2858,6 +2858,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              if (!tileentitysign.isEditable() || !this.player.getUUID().equals(tileentitysign.getPlayerWhoMayEdit())) {
                  ServerGamePacketListenerImpl.LOGGER.warn("Player {} just tried to change non-editable sign", this.player.getName().getString());
diff --git a/patches/server/0342-Add-option-to-disable-pillager-patrols.patch b/patches/server/0340-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from patches/server/0342-Add-option-to-disable-pillager-patrols.patch
rename to patches/server/0340-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0343-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0341-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 88%
rename from patches/server/0343-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to patches/server/0341-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index fe606e0430..ef08923de7 100644
--- a/patches/server/0343-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/patches/server/0341-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -7,10 +7,10 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
 Fixes GH-2718
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5efac3203b98870a3f3549baddd5f773de961ee8..a0aa9be6ee16109c68c2c75b2a150982f2ab3d62 100644
+index 66f0b20964f2cd3a46d7f34680d2abd3da887c46..8fb4aa97b07bd9fadd1751f41155b83077d25991 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1735,6 +1735,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1736,6 +1736,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  this.player.getBukkitEntity().updateInventory(); // SPIGOT-2524
                  return;
              }
diff --git a/patches/server/0344-Flat-bedrock-generator-settings.patch b/patches/server/0342-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0344-Flat-bedrock-generator-settings.patch
rename to patches/server/0342-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0343-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to patches/server/0343-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0344-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to patches/server/0344-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0347-Duplicate-UUID-Resolve-Option.patch b/patches/server/0345-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from patches/server/0347-Duplicate-UUID-Resolve-Option.patch
rename to patches/server/0345-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0348-Optimize-Hoppers.patch b/patches/server/0346-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0348-Optimize-Hoppers.patch
rename to patches/server/0346-Optimize-Hoppers.patch
diff --git a/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0347-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/server/0347-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0348-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to patches/server/0348-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0349-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to patches/server/0349-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0350-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to patches/server/0350-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0351-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to patches/server/0351-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/patches/server/0354-Fix-items-not-falling-correctly.patch b/patches/server/0352-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from patches/server/0354-Fix-items-not-falling-correctly.patch
rename to patches/server/0352-Fix-items-not-falling-correctly.patch
diff --git a/patches/server/0355-Lag-compensate-eating.patch b/patches/server/0353-Lag-compensate-eating.patch
similarity index 100%
rename from patches/server/0355-Lag-compensate-eating.patch
rename to patches/server/0353-Lag-compensate-eating.patch
diff --git a/patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0354-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch
rename to patches/server/0354-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0355-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to patches/server/0355-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/patches/server/0358-Add-effect-to-block-break-naturally.patch b/patches/server/0356-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/server/0358-Add-effect-to-block-break-naturally.patch
rename to patches/server/0356-Add-effect-to-block-break-naturally.patch
diff --git a/patches/server/0359-Entity-Activation-Range-2.0.patch b/patches/server/0357-Entity-Activation-Range-2.0.patch
similarity index 97%
rename from patches/server/0359-Entity-Activation-Range-2.0.patch
rename to patches/server/0357-Entity-Activation-Range-2.0.patch
index 5123e70572..d1a5aefd1b 100644
--- a/patches/server/0359-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0357-Entity-Activation-Range-2.0.patch
@@ -144,7 +144,7 @@ index aa5fdc74a3b06b8d8b82b86fb4f1469ddd4c629e..ae454b12a0671f6698ff2b889988348e
              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 7db99b4ad89fd5b38a4767d166caedda86a6188a..341614d0f0df4008a443d9cda400d0c0103af90a 100644
+index 95058ddac0dd75f84781227cc1061bcc325954e9..77d85265eb090f61476faedbffd4ad3d2e9ae38a 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -206,6 +206,19 @@ public abstract class Mob extends LivingEntity {
@@ -248,7 +248,7 @@ index 8d8cce87acc5a93afb4b8925a5a5dbf71d371fcd..7fc40bb5fb6265b283c7c611f63aae76
                          }
                      }
 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 fc47ef685539addfcfc6b5defea8936fbca9f69d..55b44d0391e9b946536f070ea5bbdd19cd0ae981 100644
+index 6600272bfd5e5ae1699485b143a49a2471c561d9..8bcb6df10e99e47dee35f441261847aa8e62e165 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -223,17 +223,29 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -335,10 +335,10 @@ index 6b29f66aec8a82b367a979b5b04857416b697c14..78d252b829e5c1f19532656a72862085
                              }
                          }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4a7eaa946 100644
+index c3b7b1bc978eb0d40587682795e86b82981aed82..ec9907947b13ca3367c7ef5cb006bbabec3f2293 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -1,39 +1,51 @@
+@@ -1,40 +1,52 @@
  package org.spigotmc;
  
 -import java.util.Collection;
@@ -346,6 +346,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
  import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.level.ServerChunkCache;
  import net.minecraft.world.entity.Entity;
+ import net.minecraft.world.entity.ExperienceOrb;
 +import net.minecraft.world.entity.FlyingMob;
  import net.minecraft.world.entity.LightningBolt;
  import net.minecraft.world.entity.LivingEntity;
@@ -394,7 +395,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
          MONSTER,
          ANIMAL,
          RAIDER,
-@@ -41,6 +53,43 @@ public class ActivationRange
+@@ -42,6 +54,43 @@ public class ActivationRange
  
          AABB boundingBox = new AABB( 0, 0, 0, 0, 0, 0 );
      }
@@ -438,7 +439,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
  
      static AABB maxBB = new AABB( 0, 0, 0, 0, 0, 0 );
  
-@@ -53,10 +102,13 @@ public class ActivationRange
+@@ -54,10 +103,13 @@ public class ActivationRange
       */
      public static ActivationType initializeEntityActivationType(Entity entity)
      {
@@ -453,7 +454,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
          {
              return ActivationType.MONSTER;
          } else if ( entity instanceof PathfinderMob || entity instanceof AmbientCreature )
-@@ -77,10 +129,14 @@ public class ActivationRange
+@@ -78,10 +130,14 @@ public class ActivationRange
       */
      public static boolean initializeEntityActivationState(Entity entity, SpigotWorldConfig config)
      {
@@ -472,7 +473,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
                  || entity instanceof Player
                  || entity instanceof ThrowableProjectile
                  || entity instanceof EnderDragon
-@@ -113,10 +169,25 @@ public class ActivationRange
+@@ -114,10 +170,25 @@ public class ActivationRange
          final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
          final int animalActivationRange = world.spigotConfig.animalActivationRange;
          final int monsterActivationRange = world.spigotConfig.monsterActivationRange;
@@ -498,7 +499,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
          maxRange = Math.min( ( world.spigotConfig.simulationDistance << 4 ) - 8, maxRange );
  
          for ( Player player : world.players() )
-@@ -128,6 +199,11 @@ public class ActivationRange
+@@ -129,6 +200,11 @@ public class ActivationRange
              ActivationType.RAIDER.boundingBox = player.getBoundingBox().inflate( raiderActivationRange, 256, raiderActivationRange );
              ActivationType.ANIMAL.boundingBox = player.getBoundingBox().inflate( animalActivationRange, 256, animalActivationRange );
              ActivationType.MONSTER.boundingBox = player.getBoundingBox().inflate( monsterActivationRange, 256, monsterActivationRange );
@@ -510,7 +511,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
  
              world.getEntities().get(maxBB, ActivationRange::activateEntity);
          }
-@@ -162,56 +238,108 @@ public class ActivationRange
+@@ -163,60 +239,112 @@ public class ActivationRange
       * @param entity
       * @return
       */
@@ -566,8 +567,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
              {
 -                return true;
 +                return 20; // Paper
-             }
--            if ( entity instanceof Villager && ( (Villager) entity ).canBreed() )
++            }
 +            // Paper start
 +            if (entity instanceof Bee) {
 +                Bee bee = (Bee)entity;
@@ -595,7 +595,8 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
 +                        return config.villagersWorkImmunityFor;
 +                    }
 +                }
-+            }
+             }
+-            if ( entity instanceof Villager && ( (Villager) entity ).canBreed() )
 +            if ( entity instanceof Llama && ( (Llama) entity ).inCaravan() )
              {
 -                return true;
@@ -630,12 +631,17 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
              }
 +            // Paper end
          }
+         // SPIGOT-6644: Otherwise the target refresh tick will be missed
+         if (entity instanceof ExperienceOrb) {
+-            return true;
++            return 20; // Paper
+         }
 -        return false;
 +        return -1; // Paper
      }
  
      /**
-@@ -226,8 +354,19 @@ public class ActivationRange
+@@ -231,8 +359,19 @@ public class ActivationRange
          if ( entity instanceof FireworkRocketEntity ) {
              return true;
          }
@@ -656,7 +662,7 @@ index ffca120995c6f3eac1db7642bec08ce210321249..d0e697138ec1a2a0570d4cf46e4f28b4
  
          // Should this entity tick?
          if ( !isActive )
-@@ -235,15 +374,19 @@ public class ActivationRange
+@@ -240,15 +379,19 @@ public class ActivationRange
              if ( ( MinecraftServer.currentTick - entity.activatedTick - 1 ) % 20 == 0 )
              {
                  // Check immunities every 20 ticks.
diff --git a/patches/server/0360-Increase-Light-Queue-Size.patch b/patches/server/0358-Increase-Light-Queue-Size.patch
similarity index 100%
rename from patches/server/0360-Increase-Light-Queue-Size.patch
rename to patches/server/0358-Increase-Light-Queue-Size.patch
diff --git a/patches/server/0361-Fix-Light-Command.patch b/patches/server/0359-Fix-Light-Command.patch
similarity index 100%
rename from patches/server/0361-Fix-Light-Command.patch
rename to patches/server/0359-Fix-Light-Command.patch
diff --git a/patches/server/0362-Anti-Xray.patch b/patches/server/0360-Anti-Xray.patch
similarity index 99%
rename from patches/server/0362-Anti-Xray.patch
rename to patches/server/0360-Anti-Xray.patch
index 77ea3047ac..6672214e34 100644
--- a/patches/server/0362-Anti-Xray.patch
+++ b/patches/server/0360-Anti-Xray.patch
@@ -1565,7 +1565,7 @@ index cf86755050632b158576849b786079787db11763..1267e93d1e315d55086a87670fd098db
  
      public static CompoundTag write(ServerLevel world, ChunkAccess chunk) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 7bc1219523eeb0880493e6fb42692f1fdb30c110..d6efa18ba9c032858071f6c87f1bdc0ce2ddb20f 100644
+index a1fe076d76fe5f84eca39ea68e9820096f58f5a7..155933ef7c324ea17c2349a1f73ede29169ec4f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -52,7 +52,7 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0363-Implement-alternative-item-despawn-rate.patch b/patches/server/0361-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from patches/server/0363-Implement-alternative-item-despawn-rate.patch
rename to patches/server/0361-Implement-alternative-item-despawn-rate.patch
diff --git a/patches/server/0364-Tracking-Range-Improvements.patch b/patches/server/0362-Tracking-Range-Improvements.patch
similarity index 100%
rename from patches/server/0364-Tracking-Range-Improvements.patch
rename to patches/server/0362-Tracking-Range-Improvements.patch
diff --git a/patches/server/0365-Fix-items-vanishing-through-end-portal.patch b/patches/server/0363-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from patches/server/0365-Fix-items-vanishing-through-end-portal.patch
rename to patches/server/0363-Fix-items-vanishing-through-end-portal.patch
diff --git a/patches/server/0366-implement-optional-per-player-mob-spawns.patch b/patches/server/0364-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0366-implement-optional-per-player-mob-spawns.patch
rename to patches/server/0364-implement-optional-per-player-mob-spawns.patch
diff --git a/patches/server/0367-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from patches/server/0367-Avoid-hopper-searches-if-there-are-no-items.patch
rename to patches/server/0365-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from patches/server/0368-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to patches/server/0366-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 96%
rename from patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 88f3dc5615..0d1a96433f 100644
--- a/patches/server/0369-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0367-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 313e1ba78abd6394def9d00ae671b901a6298bd1..8a6d23475983560644e391607137953803824b4b 100644
+index 17a36ee61aacfc41e2d926335c460350cd25ab42..f08490a9829d3558008b44a8eb12ce7041510b7a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -612,6 +612,12 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0370-Add-debug-for-sync-chunk-loads.patch b/patches/server/0368-Add-debug-for-sync-chunk-loads.patch
similarity index 99%
rename from patches/server/0370-Add-debug-for-sync-chunk-loads.patch
rename to patches/server/0368-Add-debug-for-sync-chunk-loads.patch
index 5e497afc6b..f1a4b1be88 100644
--- a/patches/server/0370-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0368-Add-debug-for-sync-chunk-loads.patch
@@ -305,7 +305,7 @@ index 0000000000000000000000000000000000000000..0bb4aaa546939b67a5d22865190f3047
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 8a6d23475983560644e391607137953803824b4b..5d7ea3dc5b294c1a4f22042796ca9b6d626e866d 100644
+index f08490a9829d3558008b44a8eb12ce7041510b7a..5b6381858418ceca4fe40ef329e050538e980cdb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -644,6 +644,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0371-Allow-overriding-the-java-version-check.patch b/patches/server/0369-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from patches/server/0371-Allow-overriding-the-java-version-check.patch
rename to patches/server/0369-Allow-overriding-the-java-version-check.patch
diff --git a/patches/server/0372-Add-ThrownEggHatchEvent.patch b/patches/server/0370-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/server/0372-Add-ThrownEggHatchEvent.patch
rename to patches/server/0370-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0373-Entity-Jump-API.patch b/patches/server/0371-Entity-Jump-API.patch
similarity index 100%
rename from patches/server/0373-Entity-Jump-API.patch
rename to patches/server/0371-Entity-Jump-API.patch
diff --git a/patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from patches/server/0374-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to patches/server/0372-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0375-Make-the-GUI-graph-fancier.patch b/patches/server/0373-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from patches/server/0375-Make-the-GUI-graph-fancier.patch
rename to patches/server/0373-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0374-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/server/0376-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/server/0374-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/server/0377-Prevent-teleporting-dead-entities.patch b/patches/server/0375-Prevent-teleporting-dead-entities.patch
similarity index 88%
rename from patches/server/0377-Prevent-teleporting-dead-entities.patch
rename to patches/server/0375-Prevent-teleporting-dead-entities.patch
index 51fc4ad832..27e85d7b27 100644
--- a/patches/server/0377-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0375-Prevent-teleporting-dead-entities.patch
@@ -5,10 +5,10 @@ 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 a0aa9be6ee16109c68c2c75b2a150982f2ab3d62..3bfa07fb3f41752dc8de82afd78a48ccc9015664 100644
+index 8fb4aa97b07bd9fadd1751f41155b83077d25991..0e91a6b4d07b14cff98c97262329a46c4238317c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1495,6 +1495,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1496,6 +1496,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      }
  
      private void internalTeleport(double d0, double d1, double d2, float f, float f1, Set<ClientboundPlayerPositionPacket.RelativeArgument> set, boolean flag) {
diff --git a/patches/server/0378-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0376-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from patches/server/0378-Validate-tripwire-hook-placement-before-update.patch
rename to patches/server/0376-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from patches/server/0379-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to patches/server/0377-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from patches/server/0380-Configurable-chance-of-villager-zombie-infection.patch
rename to patches/server/0378-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0381-Optimise-Chunk-getFluid.patch b/patches/server/0379-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from patches/server/0381-Optimise-Chunk-getFluid.patch
rename to patches/server/0379-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0382-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0380-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0382-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0380-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0383-Add-tick-times-API-and-mspt-command.patch b/patches/server/0381-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from patches/server/0383-Add-tick-times-API-and-mspt-command.patch
rename to patches/server/0381-Add-tick-times-API-and-mspt-command.patch
index 0754a3d76f..23085db60e 100644
--- a/patches/server/0383-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0381-Add-tick-times-API-and-mspt-command.patch
@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 4875e323e8ba52cf91259262b8418310061718ad..a074df5708624bd4b0bc2ad3dcbd4bc4ff737595 100644
+index e683e5bf47abe7bd3d2f7e9811a377549308ded4..c20fe23174d8a12bfc5acb4b0e947c6fca5ab897 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -69,6 +69,7 @@ public class PaperConfig {
diff --git a/patches/server/0384-Expose-MinecraftServer-isRunning.patch b/patches/server/0382-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from patches/server/0384-Expose-MinecraftServer-isRunning.patch
rename to patches/server/0382-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0385-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0383-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 94%
rename from patches/server/0385-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/server/0383-Add-Raw-Byte-ItemStack-Serialization.patch
index a4e7ecb175..0bd429884a 100644
--- a/patches/server/0385-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0383-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Raw Byte ItemStack Serialization
 Serializes using NBT which is safer for server data migrations than bukkits format.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 539f259aad2733b1313547aebd3e128815c1680a..e1d73c1916d6ce26d0f4da107e83513cd369e4eb 100644
+index 99322a92b16010ed2ed2505067096e6baef2f616..92cf689c0c2a6602a42319d0a665b3635ca88da5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -400,6 +400,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -422,6 +422,53 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public boolean isSupportedApiVersion(String apiVersion) {
          return apiVersion != null && SUPPORTED_API.contains(apiVersion);
      }
diff --git a/patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from patches/server/0386-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to patches/server/0384-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from patches/server/0387-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to patches/server/0385-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from patches/server/0388-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to patches/server/0386-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from patches/server/0389-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to patches/server/0387-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0390-Don-t-tick-dead-players.patch b/patches/server/0388-Don-t-tick-dead-players.patch
similarity index 100%
rename from patches/server/0390-Don-t-tick-dead-players.patch
rename to patches/server/0388-Don-t-tick-dead-players.patch
diff --git a/patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 90%
rename from patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to patches/server/0389-Dead-Player-s-shouldn-t-be-able-to-move.patch
index b069a347d2..cd785070f9 100644
--- a/patches/server/0391-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0389-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 09bb891fb1274027ea0696a0319816d05d4dc5bc..14bcc4642d7dd81e5bc30f40e3c9d8269d409d20 100644
+index 2c46f54751c49d9adce1a8724b93f06438544129..95b03fbdc0a5483761fce5c5542ce8f3187761c5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1106,7 +1106,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0392-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0392-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0390-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from patches/server/0393-Don-t-move-existing-players-to-world-spawn.patch
rename to patches/server/0391-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/patches/server/0394-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0394-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0392-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/0395-Improved-Watchdog-Support.patch b/patches/server/0393-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/0395-Improved-Watchdog-Support.patch
rename to patches/server/0393-Improved-Watchdog-Support.patch
diff --git a/patches/server/0396-Optimize-Pathfinding.patch b/patches/server/0394-Optimize-Pathfinding.patch
similarity index 100%
rename from patches/server/0396-Optimize-Pathfinding.patch
rename to patches/server/0394-Optimize-Pathfinding.patch
diff --git a/patches/server/0397-Reduce-Either-Optional-allocation.patch b/patches/server/0395-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from patches/server/0397-Reduce-Either-Optional-allocation.patch
rename to patches/server/0395-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0398-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from patches/server/0398-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to patches/server/0396-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/patches/server/0399-Prevent-opening-inventories-when-frozen.patch b/patches/server/0397-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from patches/server/0399-Prevent-opening-inventories-when-frozen.patch
rename to patches/server/0397-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0400-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0398-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from patches/server/0400-Optimise-ArraySetSorted-removeIf.patch
rename to patches/server/0398-Optimise-ArraySetSorted-removeIf.patch
diff --git a/patches/server/0401-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from patches/server/0401-Don-t-run-entity-collision-code-if-not-needed.patch
rename to patches/server/0399-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/patches/server/0402-Implement-Player-Client-Options-API.patch b/patches/server/0400-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from patches/server/0402-Implement-Player-Client-Options-API.patch
rename to patches/server/0400-Implement-Player-Client-Options-API.patch
diff --git a/patches/server/0403-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from patches/server/0403-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to patches/server/0401-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0404-Broadcast-join-message-to-console.patch b/patches/server/0402-Broadcast-join-message-to-console.patch
similarity index 100%
rename from patches/server/0404-Broadcast-join-message-to-console.patch
rename to patches/server/0402-Broadcast-join-message-to-console.patch
diff --git a/patches/server/0405-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 97%
rename from patches/server/0405-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch
index 3c97b33094..d1cd3c0860 100644
--- a/patches/server/0405-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/patches/server/0403-Fix-Chunk-Post-Processing-deadlock-risk.patch
@@ -46,7 +46,7 @@ index 6f851c24a67d1b3a349790b0d60f45b23ff93bc6..4566af37c76cb3a2fe6441451a444a5a
  
          completablefuture1.thenAcceptAsync((either) -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 5d7ea3dc5b294c1a4f22042796ca9b6d626e866d..41d2027cd4cf8f5de7bd59283361f7f1075356cb 100644
+index 5b6381858418ceca4fe40ef329e050538e980cdb..66dfe3d79fa3273a2bab64193f73f2b38002c18c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -1144,6 +1144,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0406-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from patches/server/0406-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to patches/server/0404-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/patches/server/0407-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
similarity index 98%
rename from patches/server/0407-Load-Chunks-for-Login-Asynchronously.patch
rename to patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
index de38679eb8..71f00cb156 100644
--- a/patches/server/0407-Load-Chunks-for-Login-Asynchronously.patch
+++ b/patches/server/0405-Load-Chunks-for-Login-Asynchronously.patch
@@ -37,10 +37,10 @@ index be677d437d17b74c6188ce1bd5fc6fdc228fd92f..78fbb4c3e52e900956ae0811aaf934c8
      public static final TicketType<ChunkPos> UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1);
      public static final TicketType<Unit> PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 52448f75d093a4880ce619036af00c8a1772ad80..bce9986235833b6ee3b470f8d77f2d38ee017620 100644
+index 0e91a6b4d07b14cff98c97262329a46c4238317c..ea6e6dd473be39722271dd2a2928356ded6e14fd 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 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -220,6 +220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final int LATENCY_CHECK_INTERVAL = 15000;
      public final Connection connection;
      private final MinecraftServer server;
@@ -48,7 +48,7 @@ index 52448f75d093a4880ce619036af00c8a1772ad80..bce9986235833b6ee3b470f8d77f2d38
      public ServerPlayer player;
      private int tickCount;
      private long keepAliveTime = Util.getMillis();
-@@ -294,6 +295,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -295,6 +296,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      // CraftBukkit end
  
      public void tick() {
@@ -64,7 +64,7 @@ index 52448f75d093a4880ce619036af00c8a1772ad80..bce9986235833b6ee3b470f8d77f2d38
          this.resetPosition();
          this.player.xo = this.player.getX();
          this.player.yo = this.player.getY();
-@@ -335,7 +345,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -336,7 +346,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              this.lastVehicle = null;
              this.clientVehicleIsFloating = false;
              this.aboveGroundVehicleTickCount = 0;
diff --git a/patches/server/0408-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from patches/server/0408-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to patches/server/0406-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/patches/server/0409-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/server/0409-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/server/0407-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/server/0410-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from patches/server/0410-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to patches/server/0408-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0411-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from patches/server/0411-Add-phantom-creative-and-insomniac-controls.patch
rename to patches/server/0409-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/patches/server/0412-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from patches/server/0412-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to patches/server/0410-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/patches/server/0413-Villager-Restocks-API.patch b/patches/server/0411-Villager-Restocks-API.patch
similarity index 100%
rename from patches/server/0413-Villager-Restocks-API.patch
rename to patches/server/0411-Villager-Restocks-API.patch
diff --git a/patches/server/0414-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 91%
rename from patches/server/0414-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch
index b46c78bdb2..2b0c8043d4 100644
--- a/patches/server/0414-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0412-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,10 +5,10 @@ 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 bce9986235833b6ee3b470f8d77f2d38ee017620..ed5beda4b159001de4bc8b624d0cb103e257aed3 100644
+index ea6e6dd473be39722271dd2a2928356ded6e14fd..9bbffaa02b68f4c99ae3008e25a81a15fc09aa49 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -876,7 +876,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -877,7 +877,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      @Override
      public void handlePickItem(ServerboundPickItemPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
diff --git a/patches/server/0415-Expose-game-version.patch b/patches/server/0413-Expose-game-version.patch
similarity index 100%
rename from patches/server/0415-Expose-game-version.patch
rename to patches/server/0413-Expose-game-version.patch
diff --git a/patches/server/0416-Optimize-Voxel-Shape-Merging.patch b/patches/server/0414-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/0416-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/0414-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/0417-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from patches/server/0417-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to patches/server/0415-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0418-misc-debugging-dumps.patch b/patches/server/0416-misc-debugging-dumps.patch
similarity index 100%
rename from patches/server/0418-misc-debugging-dumps.patch
rename to patches/server/0416-misc-debugging-dumps.patch
diff --git a/patches/server/0419-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
similarity index 100%
rename from patches/server/0419-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
rename to patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
diff --git a/patches/server/0420-Implement-Mob-Goal-API.patch b/patches/server/0418-Implement-Mob-Goal-API.patch
similarity index 100%
rename from patches/server/0420-Implement-Mob-Goal-API.patch
rename to patches/server/0418-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0421-Add-villager-reputation-API.patch b/patches/server/0419-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/server/0421-Add-villager-reputation-API.patch
rename to patches/server/0419-Add-villager-reputation-API.patch
diff --git a/patches/server/0422-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0420-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from patches/server/0422-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to patches/server/0420-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/patches/server/0423-ExperienceOrbMergeEvent.patch b/patches/server/0421-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from patches/server/0423-ExperienceOrbMergeEvent.patch
rename to patches/server/0421-ExperienceOrbMergeEvent.patch
diff --git a/patches/server/0424-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0422-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from patches/server/0424-Fix-PotionEffect-ignores-icon-flag.patch
rename to patches/server/0422-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/patches/server/0425-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0423-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from patches/server/0425-Optimize-brigadier-child-sorting-performance.patch
rename to patches/server/0423-Optimize-brigadier-child-sorting-performance.patch
diff --git a/patches/server/0426-Potential-bed-API.patch b/patches/server/0424-Potential-bed-API.patch
similarity index 100%
rename from patches/server/0426-Potential-bed-API.patch
rename to patches/server/0424-Potential-bed-API.patch
diff --git a/patches/server/0427-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0425-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from patches/server/0427-Wait-for-Async-Tasks-during-shutdown.patch
rename to patches/server/0425-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/patches/server/0428-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 91%
rename from patches/server/0428-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to patches/server/0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index dc78ba0edd..45c945da59 100644
--- a/patches/server/0428-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0426-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure EntityRaider respects game and entity rules for
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index b2786cd7135ae85f04c899a99d47af5a3ac71bb3..039544609aa4fd2f5ab5075792a2e51ef315dc37 100644
+index b55945ee649437d8fb313bdda935e691fb97b651..74a0866513ea04f635089badfd5cde132d2d1355 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -313,6 +313,7 @@ public abstract class Raider extends PatrollingMonster {
diff --git a/patches/server/0429-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0429-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0427-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0430-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0428-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from patches/server/0430-Reduce-MutableInt-allocations-from-light-engine.patch
rename to patches/server/0428-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/patches/server/0431-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0431-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0429-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0432-Ensure-safe-gateway-teleport.patch b/patches/server/0430-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from patches/server/0432-Ensure-safe-gateway-teleport.patch
rename to patches/server/0430-Ensure-safe-gateway-teleport.patch
diff --git a/patches/server/0433-Add-option-for-console-having-all-permissions.patch b/patches/server/0431-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from patches/server/0433-Add-option-for-console-having-all-permissions.patch
rename to patches/server/0431-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0434-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 99%
rename from patches/server/0434-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
index 3281a5cfd3..6cfc9cc85a 100644
--- a/patches/server/0434-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
+++ b/patches/server/0432-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
@@ -269,7 +269,7 @@ index 8868ffcda194e8c2300181a2cdda9337dbde6284..95f195980e28bb59f43e5ca1d5e79ebe
  
      public String getDebugStatus() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 41d2027cd4cf8f5de7bd59283361f7f1075356cb..24d0b02264e4cced08a60f36b5c41bb350a1dc60 100644
+index 66dfe3d79fa3273a2bab64193f73f2b38002c18c..1115df1f148bcb079edb9eb397de3fab725bf83b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -881,6 +881,37 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0435-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/0435-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/0436-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0434-Optimize-ServerLevels-chunk-level-checking-methods.patch
similarity index 100%
rename from patches/server/0436-Optimize-ServerLevels-chunk-level-checking-methods.patch
rename to patches/server/0434-Optimize-ServerLevels-chunk-level-checking-methods.patch
diff --git a/patches/server/0437-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from patches/server/0437-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to patches/server/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/patches/server/0438-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0436-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from patches/server/0438-Fix-villager-trading-demand-MC-163962.patch
rename to patches/server/0436-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0439-Maps-shouldn-t-load-chunks.patch b/patches/server/0437-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from patches/server/0439-Maps-shouldn-t-load-chunks.patch
rename to patches/server/0437-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0440-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0438-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from patches/server/0440-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to patches/server/0438-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0441-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0439-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0441-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0439-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0442-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0440-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0442-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0440-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0443-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0441-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0443-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0441-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0444-Fix-sand-duping.patch b/patches/server/0442-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0444-Fix-sand-duping.patch
rename to patches/server/0442-Fix-sand-duping.patch
diff --git a/patches/server/0445-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0443-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 91%
rename from patches/server/0445-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0443-Prevent-position-desync-in-playerconnection-causing-.patch
index a0c9934cf6..196ded8f2b 100644
--- a/patches/server/0445-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/patches/server/0443-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,10 +14,10 @@ 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 ed5beda4b159001de4bc8b624d0cb103e257aed3..ba2fef9d01d54ad590535532a4f44ab5918d7135 100644
+index 9bbffaa02b68f4c99ae3008e25a81a15fc09aa49..9008b4ae19baee69bc8b510e2680caaa58300423 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1325,6 +1325,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1326,6 +1326,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                              this.player.move(MoverType.PLAYER, new Vec3(d7, d8, d9));
                              this.player.onGround = packet.isOnGround(); // CraftBukkit - SPIGOT-5810, SPIGOT-5835, SPIGOT-6828: reset by this.player.move
diff --git a/patches/server/0446-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0444-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0446-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0444-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0447-Expose-Arrow-getItemStack.patch b/patches/server/0445-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0447-Expose-Arrow-getItemStack.patch
rename to patches/server/0445-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0448-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0446-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 92%
rename from patches/server/0448-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0446-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 23de49416c..f2f08f8d8b 100644
--- a/patches/server/0448-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0446-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 852da9f18f503829b8d4ee9223f9d5a63e7c01b0..5985a26b7e5a19567561a6dd869527f36c60e7f8 100644
+index 9008b4ae19baee69bc8b510e2680caaa58300423..f6007a34b56c80e96aa29def9c070f717b61c5ed 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2777,9 +2777,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2778,9 +2778,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          this.player.resetLastActionTime();
          if (!this.player.isSpectator() && this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu instanceof RecipeBookMenu) {
diff --git a/patches/server/0449-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0447-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0449-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0447-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0450-Add-permission-for-command-blocks.patch b/patches/server/0448-Add-permission-for-command-blocks.patch
similarity index 96%
rename from patches/server/0450-Add-permission-for-command-blocks.patch
rename to patches/server/0448-Add-permission-for-command-blocks.patch
index 47344e7f6f..83a295d0cf 100644
--- a/patches/server/0450-Add-permission-for-command-blocks.patch
+++ b/patches/server/0448-Add-permission-for-command-blocks.patch
@@ -18,10 +18,10 @@ index d87ee258db769bc072cbdae4298ebc08588b2160..29809127da2961858142bfb5b54c6db1
                  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 3e7d09445ed0679b962a226364b7aedba0fb2d74..62deb7cc804b97528a74600b1918fc88d71e2966 100644
+index f6007a34b56c80e96aa29def9c070f717b61c5ed..7975508532fc0e97b10eca88e43aefe3af711c0f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -787,7 +787,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -788,7 +788,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendMessage(new TranslatableComponent("advMode.notEnabled"), Util.NIL_UUID);
@@ -30,7 +30,7 @@ index 3e7d09445ed0679b962a226364b7aedba0fb2d74..62deb7cc804b97528a74600b1918fc88
              this.player.sendMessage(new TranslatableComponent("advMode.notAllowed"), Util.NIL_UUID);
          } else {
              BaseCommandBlock commandblocklistenerabstract = null;
-@@ -854,7 +854,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -855,7 +855,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (!this.server.isCommandBlockEnabled()) {
              this.player.sendMessage(new TranslatableComponent("advMode.notEnabled"), Util.NIL_UUID);
diff --git a/patches/server/0451-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0449-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0451-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0449-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0452-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 98%
rename from patches/server/0452-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 37a8fae374..15db415536 100644
--- a/patches/server/0452-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -94,10 +94,10 @@ index 2f13055a39c26fe12d2c1094103186635e536166..6b0cb662d9163c360035e19c5faad59f
  
                  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 0b9728eec5d2037b28febc7f1bf2e4bb2cb51d86..f5e78a5e416552fcd180790bc890c9af6898af2e 100644
+index 7975508532fc0e97b10eca88e43aefe3af711c0f..2d8405652f4bae5a9ad0815c17325ac238e737fd 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3032,7 +3032,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3033,7 +3033,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (this.player.hasPermissions(2) || this.isSingleplayerOwner()) {
diff --git a/patches/server/0453-Paper-dumpitem-command.patch b/patches/server/0451-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0453-Paper-dumpitem-command.patch
rename to patches/server/0451-Paper-dumpitem-command.patch
diff --git a/patches/server/0454-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0452-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0454-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0452-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0455-Improve-Legacy-Component-serialization-size.patch b/patches/server/0453-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0455-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0453-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0456-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/0456-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/0454-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/0457-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0457-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0458-incremental-chunk-and-player-saving.patch b/patches/server/0456-incremental-chunk-and-player-saving.patch
similarity index 99%
rename from patches/server/0458-incremental-chunk-and-player-saving.patch
rename to patches/server/0456-incremental-chunk-and-player-saving.patch
index 33618d5f96..5a38def770 100644
--- a/patches/server/0458-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0456-incremental-chunk-and-player-saving.patch
@@ -281,7 +281,7 @@ index 2534cae6f1b369843808aac91931bdc845bbacb1..74187951dc906e72904788ff0b42adc2
              ChunkPos chunkcoordintpair = chunk.getPos();
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 24d0b02264e4cced08a60f36b5c41bb350a1dc60..013c4c428b3cf3c9ad7b9b2ed8b00b410e1804a9 100644
+index 1115df1f148bcb079edb9eb397de3fab725bf83b..3ebe6d4a87eac760d65ea335d683742a06c6c580 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -825,6 +825,15 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0459-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0457-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0459-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0457-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0460-Support-old-UUID-format-for-NBT.patch b/patches/server/0458-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0460-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0458-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0461-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0459-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0461-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0459-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0460-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 97%
rename from patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0460-Convert-legacy-attributes-in-Item-Meta.patch
index 1225ad8355..f98b66147d 100644
--- a/patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0460-Convert-legacy-attributes-in-Item-Meta.patch
@@ -30,7 +30,7 @@ index 0520c45197629cbdc2777d9ae11eef572e793160..46c313d581b9af6aa0a48f97ae3cc800
      public CraftAttributeMap(AttributeMap handle) {
          this.handle = handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 9d4685698ed707239b071a366eebbc4b8450683c..9ef1da08fe1b0ff8146c4931139eee9a2c6d5f12 100644
+index 59bb47ab215e83ca5446621cae1e3fa4a02f7d6f..0f24f26644250905fe47c64bb203f234267b474f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -480,7 +480,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0463-Remove-some-streams-from-structures.patch b/patches/server/0461-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0463-Remove-some-streams-from-structures.patch
rename to patches/server/0461-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0464-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0462-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0464-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0462-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0465-Support-components-in-ItemMeta.patch b/patches/server/0463-Support-components-in-ItemMeta.patch
similarity index 97%
rename from patches/server/0465-Support-components-in-ItemMeta.patch
rename to patches/server/0463-Support-components-in-ItemMeta.patch
index 64e131bec1..ad452ddc2a 100644
--- a/patches/server/0465-Support-components-in-ItemMeta.patch
+++ b/patches/server/0463-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 9ef1da08fe1b0ff8146c4931139eee9a2c6d5f12..bfede0c5dac43e063d465e386a080d2ffb89eb6f 100644
+index 0f24f26644250905fe47c64bb203f234267b474f..4506438ac75ca3724d096a454e07fb7e950228f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -874,11 +874,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0464-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0464-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0467-Add-entity-liquid-API.patch b/patches/server/0465-Add-entity-liquid-API.patch
similarity index 92%
rename from patches/server/0467-Add-entity-liquid-API.patch
rename to patches/server/0465-Add-entity-liquid-API.patch
index 0507e83a33..635dcd34e9 100644
--- a/patches/server/0467-Add-entity-liquid-API.patch
+++ b/patches/server/0465-Add-entity-liquid-API.patch
@@ -17,10 +17,10 @@ index 59175679a2fae171b3d01fed5db8ac57d0a63a29..5a23c9fe4147c82ce2e6eda9690b158b
          return this.isInWater() || this.isInRain() || this.isInBubbleColumn();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index fd811e2ba455d7e4eb618d48ca2c4983797a265c..38e38abd5302a9f8c5eb2d3d81d825cdae99d7c4 100644
+index d7dabaa5087f87b97a2e66b871fb618918eb568b..7f9409bf8c3cc39376d9da04440f124958df401a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1235,5 +1235,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1236,5 +1236,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() {
          return getHandle().spawnReason;
      }
diff --git a/patches/server/0468-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0466-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0468-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0466-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0469-Spawn-player-in-correct-world-on-login.patch b/patches/server/0467-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0469-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0467-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0470-Add-PrepareResultEvent.patch b/patches/server/0468-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0470-Add-PrepareResultEvent.patch
rename to patches/server/0468-Add-PrepareResultEvent.patch
diff --git a/patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0469-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0469-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 99%
rename from patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 74051a6320..591580f203 100644
--- a/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -711,7 +711,7 @@ index 84dc1e94b4f7b8315d8422634dd49b1f85044d18..451d5e9b5906e662a0c2e04b407068ea
          Ticket<ChunkPos> ticket = new Ticket<>(TicketType.FORCED, 31, pos);
          long i = pos.toLong();
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 013c4c428b3cf3c9ad7b9b2ed8b00b410e1804a9..785f07fddb84cf34fbd9d6ca89ff391d451aad17 100644
+index 3ebe6d4a87eac760d65ea335d683742a06c6c580..42cecd0f072505c80b65ccf26e5d838750d21e28 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -601,6 +601,26 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0473-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0471-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0473-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0471-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0474-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0472-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0474-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0472-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0475-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0473-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0475-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0473-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0476-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0474-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0476-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0474-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0477-Move-range-check-for-block-placing-up.patch b/patches/server/0475-Move-range-check-for-block-placing-up.patch
similarity index 93%
rename from patches/server/0477-Move-range-check-for-block-placing-up.patch
rename to patches/server/0475-Move-range-check-for-block-placing-up.patch
index 7a9e8a8104..d6c4888b8d 100644
--- a/patches/server/0477-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0475-Move-range-check-for-block-placing-up.patch
@@ -5,10 +5,10 @@ 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 f5e78a5e416552fcd180790bc890c9af6898af2e..30433da90db7c905c752213220ed01cdadad6b72 100644
+index 2d8405652f4bae5a9ad0815c17325ac238e737fd..4a17f98d06f061a2253dc75e313c618e550ed100 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1670,6 +1670,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1671,6 +1671,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      }
      // Spigot end
  
@@ -23,7 +23,7 @@ index f5e78a5e416552fcd180790bc890c9af6898af2e..30433da90db7c905c752213220ed01cd
      @Override
      public void handleUseItemOn(ServerboundUseItemOnPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-@@ -1682,17 +1690,22 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1683,17 +1691,22 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          BlockPos blockposition = movingobjectpositionblock.getBlockPos();
          Direction enumdirection = movingobjectpositionblock.getDirection();
  
diff --git a/patches/server/0478-Fix-SPIGOT-5989.patch b/patches/server/0476-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0478-Fix-SPIGOT-5989.patch
rename to patches/server/0476-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0477-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0477-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0478-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0478-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0479-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0479-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0480-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0480-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0483-Fix-some-rails-connecting-improperly.patch b/patches/server/0481-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0483-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0481-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0482-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0482-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0485-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0483-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0485-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0483-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0486-Brand-support.patch b/patches/server/0484-Brand-support.patch
similarity index 92%
rename from patches/server/0486-Brand-support.patch
rename to patches/server/0484-Brand-support.patch
index 78bb6a2919..935df29cb2 100644
--- a/patches/server/0486-Brand-support.patch
+++ b/patches/server/0484-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 30433da90db7c905c752213220ed01cdadad6b72..acaa1c367806e8ba10838ca1058c917c7ab7a04c 100644
+index 4a17f98d06f061a2253dc75e313c618e550ed100..f9073eaa82c79f0b8ad738213b53f991d1b855a3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
@@ -24,7 +24,7 @@ index 30433da90db7c905c752213220ed01cdadad6b72..acaa1c367806e8ba10838ca1058c917c
  import net.minecraft.network.chat.ChatType;
  import net.minecraft.network.chat.Component;
  import net.minecraft.network.chat.MutableComponent;
-@@ -257,6 +259,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -258,6 +260,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final int MAX_SIGN_LINE_LENGTH = Integer.getInteger("Paper.maxSignLength", 80);
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
  
@@ -33,7 +33,7 @@ index 30433da90db7c905c752213220ed01cdadad6b72..acaa1c367806e8ba10838ca1058c917c
      public ServerGamePacketListenerImpl(MinecraftServer server, Connection connection, ServerPlayer player) {
          this.server = server;
          this.connection = connection;
-@@ -3000,6 +3004,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3001,6 +3005,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final ResourceLocation CUSTOM_REGISTER = new ResourceLocation("register");
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
@@ -42,7 +42,7 @@ index 30433da90db7c905c752213220ed01cdadad6b72..acaa1c367806e8ba10838ca1058c917c
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
-@@ -3027,6 +3033,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3028,6 +3034,15 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
                  packet.data.readBytes(data);
@@ -58,7 +58,7 @@ index 30433da90db7c905c752213220ed01cdadad6b72..acaa1c367806e8ba10838ca1058c917c
                  this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
-@@ -3036,6 +3051,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3037,6 +3052,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      }
  
diff --git a/patches/server/0487-Add-setMaxPlayers-API.patch b/patches/server/0485-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/server/0487-Add-setMaxPlayers-API.patch
rename to patches/server/0485-Add-setMaxPlayers-API.patch
diff --git a/patches/server/0488-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0486-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0488-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0486-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0489-Don-t-require-FACING-data.patch b/patches/server/0487-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0489-Don-t-require-FACING-data.patch
rename to patches/server/0487-Don-t-require-FACING-data.patch
diff --git a/patches/server/0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from patches/server/0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0491-Add-moon-phase-API.patch b/patches/server/0489-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0491-Add-moon-phase-API.patch
rename to patches/server/0489-Add-moon-phase-API.patch
diff --git a/patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0490-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch
rename to patches/server/0490-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/patches/server/0493-Prevent-headless-pistons-from-being-created.patch b/patches/server/0491-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from patches/server/0493-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0491-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0494-Add-BellRingEvent.patch b/patches/server/0492-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0494-Add-BellRingEvent.patch
rename to patches/server/0492-Add-BellRingEvent.patch
diff --git a/patches/server/0495-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0493-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0495-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0493-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0496-Buffer-joins-to-world.patch b/patches/server/0494-Buffer-joins-to-world.patch
similarity index 93%
rename from patches/server/0496-Buffer-joins-to-world.patch
rename to patches/server/0494-Buffer-joins-to-world.patch
index 80114c30ef..5db79b54e5 100644
--- a/patches/server/0496-Buffer-joins-to-world.patch
+++ b/patches/server/0494-Buffer-joins-to-world.patch
@@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 09755771f8a3b2f696dc9c33916546fc1d5ac4ba..16d6ce24031590ff9dfba5c938aeb9755704798d 100644
+index 1fd89294fabcd2a390ba7f1502acbfeb9a2343d6..8111e5e1752d93f94b773e35f7ff3857144def63 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
@@ -24,7 +24,7 @@ index 09755771f8a3b2f696dc9c33916546fc1d5ac4ba..16d6ce24031590ff9dfba5c938aeb975
          for (Map.Entry<String, Command> entry : commands.entrySet()) {
              MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index f13e24eede7f09ecc8f375df5e27e385f589005d..d30bc3f1da336b421d9a42070184e07169dd14e4 100644
+index fc33e1dd5db461d380cfcbb3dacea095dd55b757..93a75f66935b19475aa878ebb00b44f35b3e29d6 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -37,6 +37,7 @@ import net.minecraft.network.protocol.Packet;
diff --git a/patches/server/0497-Optimize-redstone-algorithm.patch b/patches/server/0495-Optimize-redstone-algorithm.patch
similarity index 100%
rename from patches/server/0497-Optimize-redstone-algorithm.patch
rename to patches/server/0495-Optimize-redstone-algorithm.patch
diff --git a/patches/server/0498-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0496-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0498-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0496-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0499-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0497-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0499-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0497-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0500-Fix-CraftTeam-null-check.patch b/patches/server/0498-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0500-Fix-CraftTeam-null-check.patch
rename to patches/server/0498-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0501-Add-more-Evoker-API.patch b/patches/server/0499-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0501-Add-more-Evoker-API.patch
rename to patches/server/0499-Add-more-Evoker-API.patch
diff --git a/patches/server/0502-Add-methods-to-get-translation-keys.patch b/patches/server/0500-Add-methods-to-get-translation-keys.patch
similarity index 97%
rename from patches/server/0502-Add-methods-to-get-translation-keys.patch
rename to patches/server/0500-Add-methods-to-get-translation-keys.patch
index 311c8f4072..98a0851f6e 100644
--- a/patches/server/0502-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0500-Add-methods-to-get-translation-keys.patch
@@ -42,10 +42,10 @@ index eb99e0c2462a2d1ab4508a5c3f1580b6e31d7465..c536eceef3365a7b726cd970df345ba1
  
      public net.minecraft.world.item.enchantment.Enchantment getHandle() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index e1d73c1916d6ce26d0f4da107e83513cd369e4eb..b6abdad7b289ed200befdcf2a4d31508d2e934f6 100644
+index 92cf689c0c2a6602a42319d0a665b3635ca88da5..698eac97ff9ca6c52e6e04332689794d8b65fa11 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -447,6 +447,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -469,6 +469,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
          Preconditions.checkArgument(dataVersion <= getDataVersion(), "Newer version! Server downgrades are not supported!");
          return compound;
      }
diff --git a/patches/server/0503-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0501-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0503-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0501-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0504-Cache-block-data-strings.patch b/patches/server/0502-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0504-Cache-block-data-strings.patch
rename to patches/server/0502-Cache-block-data-strings.patch
diff --git a/patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0503-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 94%
rename from patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0503-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index 177d35559a..dfc948204b 100644
--- a/patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0503-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -9,10 +9,10 @@ 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 acaa1c367806e8ba10838ca1058c917c7ab7a04c..a1948acde83b1cd70fb8fa5fb89535c34833a680 100644
+index f9073eaa82c79f0b8ad738213b53f991d1b855a3..ff313dad1215762e2dc25d751f20aa71b91bd6fc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -681,7 +681,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -682,7 +682,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      public void handleAcceptTeleportPacket(ServerboundAcceptTeleportationPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (packet.getId() == this.awaitingTeleport && this.awaitingPositionFromClient != null) { // CraftBukkit
@@ -21,7 +21,7 @@ index acaa1c367806e8ba10838ca1058c917c7ab7a04c..a1948acde83b1cd70fb8fa5fb89535c3
              this.lastGoodX = this.awaitingPositionFromClient.x;
              this.lastGoodY = this.awaitingPositionFromClient.y;
              this.lastGoodZ = this.awaitingPositionFromClient.z;
-@@ -1558,7 +1558,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1559,7 +1559,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          // CraftBukkit end
  
          this.awaitingTeleportTime = this.tickCount;
@@ -69,7 +69,7 @@ index c0f33a6cb4812e13204552c125df06210adc7196..03726227fdd60e9cf77213d50184abff
                          if (entity instanceof Mob) {
                              Mob entityinsentient = (Mob) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 38e38abd5302a9f8c5eb2d3d81d825cdae99d7c4..0547727afbd1b37c1a75fd8b4da585d80d54245a 100644
+index 7f9409bf8c3cc39376d9da04440f124958df401a..d0ad0e6bbb944a33fd67a7d3e36958407a774ede 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -577,7 +577,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0506-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0504-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0506-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0504-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0505-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0505-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0508-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0506-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0508-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0506-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0507-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from patches/server/0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0507-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0508-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 90%
rename from patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0508-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 443227fa3f..4e68012226 100644
--- a/patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0508-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
@@ -21,10 +21,10 @@ index a35078c299c3c8d7e670d2ca82c110e62b374490..a6cc8d8691f314fe7d5499f525a45b1c
 +    // 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 b6abdad7b289ed200befdcf2a4d31508d2e934f6..36f93f411563233b28018581f7d2cce461349915 100644
+index 698eac97ff9ca6c52e6e04332689794d8b65fa11..eaeeff92c0ff0cee9f4efaba536b750020670293 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -471,6 +471,10 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -493,6 +493,10 @@ public final class CraftMagicNumbers implements UnsafeValues {
          net.minecraft.world.item.ItemStack nmsItemStack = CraftItemStack.asNMSCopy(itemStack);
          return nmsItemStack.getItem().getDescriptionId(nmsItemStack);
      }
diff --git a/patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0509-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 98%
rename from patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0509-Lazily-track-plugin-scoreboards-by-default.patch
index e2d6b40548..26354870bb 100644
--- a/patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0509-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,7 +14,7 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 16d6ce24031590ff9dfba5c938aeb9755704798d..bd7926fa89621e8cdd0b5fdd8ed3b8c6dbfbc3ec 100644
+index 8111e5e1752d93f94b773e35f7ff3857144def63..ec42fb00b6f4a691fa710c68131f80b242e3e6e8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -96,6 +96,11 @@ public class PaperConfig {
diff --git a/patches/server/0512-Entity-isTicking.patch b/patches/server/0510-Entity-isTicking.patch
similarity index 91%
rename from patches/server/0512-Entity-isTicking.patch
rename to patches/server/0510-Entity-isTicking.patch
index d814f5634a..61786b1457 100644
--- a/patches/server/0512-Entity-isTicking.patch
+++ b/patches/server/0510-Entity-isTicking.patch
@@ -27,10 +27,10 @@ index a6cc8d8691f314fe7d5499f525a45b1c2e7f31e5..de984785361221dffece2a86c859ccf9
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0547727afbd1b37c1a75fd8b4da585d80d54245a..986f045a2e6a040c6e2aab7420c8cb2d4ac3a726 100644
+index d0ad0e6bbb944a33fd67a7d3e36958407a774ede..c2d92e0eb65b2a70fcae12b09e5a105cc820894f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1259,5 +1259,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1260,5 +1260,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isInLava() {
          return getHandle().isInLava();
      }
diff --git a/patches/server/0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0511-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0511-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0514-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0512-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0514-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0512-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0513-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0513-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0514-Fix-for-large-move-vectors-crashing-server.patch
similarity index 95%
rename from patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0514-Fix-for-large-move-vectors-crashing-server.patch
index 7d8b99b371..737dc157d3 100644
--- a/patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0514-Fix-for-large-move-vectors-crashing-server.patch
@@ -6,10 +6,10 @@ 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 70c1f6d91d1792ef713e46b93897a94fc50e08eb..5313b035870fc39af214b18383a496b2fccdc1f4 100644
+index ff313dad1215762e2dc25d751f20aa71b91bd6fc..da130b7f0da73eb9868539911ba3157b88fc7199 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -506,20 +506,31 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -507,20 +507,31 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
                  ServerLevel worldserver = this.player.getLevel();
@@ -49,7 +49,7 @@ index 70c1f6d91d1792ef713e46b93897a94fc50e08eb..5313b035870fc39af214b18383a496b2
  
                  // CraftBukkit start - handle custom speeds and skipped ticks
                  this.allowedPlayerTicks += (System.currentTimeMillis() / 50) - this.lastTick;
-@@ -562,9 +573,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -563,9 +574,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                  boolean flag = worldserver.noCollision(entity, entity.getBoundingBox().deflate(0.0625D));
  
@@ -62,7 +62,7 @@ index 70c1f6d91d1792ef713e46b93897a94fc50e08eb..5313b035870fc39af214b18383a496b2
                  entity.move(MoverType.PLAYER, new Vec3(d6, d7, d8));
                  double d11 = d7;
  
-@@ -1232,14 +1243,25 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1233,14 +1244,25 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                          float prevPitch = this.player.getXRot();
                          // CraftBukkit end
                          double d3 = this.player.getX(); final double toX = d3; // Paper - OBFHELPER
@@ -90,7 +90,7 @@ index 70c1f6d91d1792ef713e46b93897a94fc50e08eb..5313b035870fc39af214b18383a496b2
  
                          if (this.player.isSleeping()) {
                              if (d11 > 1.0D) {
-@@ -1291,9 +1313,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1292,9 +1314,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                              AABB axisalignedbb = this.player.getBoundingBox();
  
diff --git a/patches/server/0517-Optimise-getType-calls.patch b/patches/server/0515-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0517-Optimise-getType-calls.patch
rename to patches/server/0515-Optimise-getType-calls.patch
diff --git a/patches/server/0518-Villager-resetOffers.patch b/patches/server/0516-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0518-Villager-resetOffers.patch
rename to patches/server/0516-Villager-resetOffers.patch
diff --git a/patches/server/0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0517-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0517-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0520-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0518-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0520-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0518-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0521-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0519-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0521-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0519-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0522-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0520-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0522-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0520-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0523-Player-elytra-boost-API.patch b/patches/server/0521-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0523-Player-elytra-boost-API.patch
rename to patches/server/0521-Player-elytra-boost-API.patch
diff --git a/patches/server/0524-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0522-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0524-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0522-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0523-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0523-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0526-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0524-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0526-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0524-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0527-Add-ignore-discounts-API.patch b/patches/server/0525-Add-ignore-discounts-API.patch
similarity index 96%
rename from patches/server/0527-Add-ignore-discounts-API.patch
rename to patches/server/0525-Add-ignore-discounts-API.patch
index b09ae75fa6..fc5b6ad9c8 100644
--- a/patches/server/0527-Add-ignore-discounts-API.patch
+++ b/patches/server/0525-Add-ignore-discounts-API.patch
@@ -5,18 +5,18 @@ Subject: [PATCH] Add ignore discounts API
 
 
 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 55b44d0391e9b946536f070ea5bbdd19cd0ae981..6cd297e66a7563bb8f2988302c657ac81fdd3d0f 100644
+index 8bcb6df10e99e47dee35f441261847aa8e62e165..9bd07dfbedbffb8f7d4f82f74af0a543027d4c7c 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -475,6 +475,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -487,6 +487,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
              while (iterator.hasNext()) {
                  MerchantOffer merchantrecipe = (MerchantOffer) iterator.next();
 +                if (merchantrecipe.ignoreDiscounts) continue; // Paper
  
-                 // CraftBukkit start
-                 int bonus = -Mth.floor((float) i * merchantrecipe.getPriceMultiplier());
-@@ -494,6 +495,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+                 merchantrecipe.addToSpecialPriceDiff(-Mth.floor((float) i * merchantrecipe.getPriceMultiplier()));
+             }
+@@ -499,6 +500,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
  
              while (iterator1.hasNext()) {
                  MerchantOffer merchantrecipe1 = (MerchantOffer) iterator1.next();
diff --git a/patches/server/0528-Toggle-for-removing-existing-dragon.patch b/patches/server/0526-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0528-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0526-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0529-Fix-client-lag-on-advancement-loading.patch b/patches/server/0527-Fix-client-lag-on-advancement-loading.patch
similarity index 91%
rename from patches/server/0529-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0527-Fix-client-lag-on-advancement-loading.patch
index 235ed841bd..d4944d32cb 100644
--- a/patches/server/0529-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0527-Fix-client-lag-on-advancement-loading.patch
@@ -15,10 +15,10 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 36f93f411563233b28018581f7d2cce461349915..f6cb3cb848f62e1d360034721694e6d8a9e73d95 100644
+index eaeeff92c0ff0cee9f4efaba536b750020670293..f84322256c19a5619fc5cd2efa3f64580d299bbf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -328,7 +328,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -337,7 +337,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
                      Bukkit.getLogger().log(Level.SEVERE, "Error saving advancement " + key, ex);
                  }
  
diff --git a/patches/server/0530-Item-no-age-no-player-pickup.patch b/patches/server/0528-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0530-Item-no-age-no-player-pickup.patch
rename to patches/server/0528-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0529-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0529-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0532-Beacon-API-custom-effect-ranges.patch b/patches/server/0530-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0532-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0530-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0533-Add-API-for-quit-reason.patch b/patches/server/0531-Add-API-for-quit-reason.patch
similarity index 95%
rename from patches/server/0533-Add-API-for-quit-reason.patch
rename to patches/server/0531-Add-API-for-quit-reason.patch
index 89a652575c..065f588c26 100644
--- a/patches/server/0533-Add-API-for-quit-reason.patch
+++ b/patches/server/0531-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 d30bc3f1da336b421d9a42070184e07169dd14e4..a6eadf71957b37e2acc5d09f0ce4ee961810891f 100644
+index 93a75f66935b19475aa878ebb00b44f35b3e29d6..ea7444d5d242e15fe3fb1d87ddb98f3074d3e979 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -142,12 +142,15 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -37,10 +37,10 @@ index c68b95ef0d4c3e0d942e61bfccf23a00d0d8afd9..57ca53876941faf6a1cbefd6e0382ee0
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5313b035870fc39af214b18383a496b2fccdc1f4..f62f2c0bf9a9d280ed68de8c1afc382b561f31ec 100644
+index da130b7f0da73eb9868539911ba3157b88fc7199..c321f22af679cafd00be09a9212346b5ccbc8dfc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -443,6 +443,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -444,6 +444,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          final Component ichatbasecomponent = PaperAdventure.asVanilla(event.reason()); // Paper - Adventure
          // CraftBukkit end
  
diff --git a/patches/server/0534-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0532-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0534-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0532-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0535-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0533-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0535-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0533-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0536-Expose-world-spawn-angle.patch b/patches/server/0534-Expose-world-spawn-angle.patch
similarity index 100%
rename from patches/server/0536-Expose-world-spawn-angle.patch
rename to patches/server/0534-Expose-world-spawn-angle.patch
diff --git a/patches/server/0537-Add-Destroy-Speed-API.patch b/patches/server/0535-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0537-Add-Destroy-Speed-API.patch
rename to patches/server/0535-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0536-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0536-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0539-Add-LivingEntity-clearActiveItem.patch b/patches/server/0537-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0539-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0537-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0540-Add-PlayerItemCooldownEvent.patch b/patches/server/0538-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0540-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0538-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0541-More-lightning-API.patch b/patches/server/0539-More-lightning-API.patch
similarity index 100%
rename from patches/server/0541-More-lightning-API.patch
rename to patches/server/0539-More-lightning-API.patch
diff --git a/patches/server/0542-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0540-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from patches/server/0542-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0540-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/patches/server/0543-Added-missing-default-perms-for-commands.patch b/patches/server/0541-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0543-Added-missing-default-perms-for-commands.patch
rename to patches/server/0541-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0544-Add-PlayerShearBlockEvent.patch b/patches/server/0542-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0544-Add-PlayerShearBlockEvent.patch
rename to patches/server/0542-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0543-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 94%
rename from patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0543-Fix-curing-zombie-villager-discount-exploit.patch
index 1fdd4122e7..6fdd548a68 100644
--- a/patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0543-Fix-curing-zombie-villager-discount-exploit.patch
@@ -24,10 +24,10 @@ index 8a266d1276595d5b2bd0b60f08d99d4cceea929a..0dafb6b4837f9b68249e64a9f0b7f8f7
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 6cd297e66a7563bb8f2988302c657ac81fdd3d0f..0ac3d6b25857bc5af0a4909a70053eeb86ea48ea 100644
+index 9bd07dfbedbffb8f7d4f82f74af0a543027d4c7c..ea612b3c3ed7305b504d65eb6d38ed99547fd488 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -1059,6 +1059,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -1064,6 +1064,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      @Override
      public void onReputationEventFrom(ReputationEventType interaction, Entity entity) {
          if (interaction == ReputationEventType.ZOMBIE_VILLAGER_CURED) {
diff --git a/patches/server/0546-Limit-recipe-packets.patch b/patches/server/0544-Limit-recipe-packets.patch
similarity index 92%
rename from patches/server/0546-Limit-recipe-packets.patch
rename to patches/server/0544-Limit-recipe-packets.patch
index 49633c2f39..704cb09efa 100644
--- a/patches/server/0546-Limit-recipe-packets.patch
+++ b/patches/server/0544-Limit-recipe-packets.patch
@@ -23,10 +23,10 @@ index ec42fb00b6f4a691fa710c68131f80b242e3e6e8..d5ae781d65016e0382cb3497cb8cac20
      public static boolean velocityOnlineMode;
      public static byte[] velocitySecretKey;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index be3ba42c1aada1dab05bc531bd9c7956fa25fe8e..88beed5a93bc849fa0a97654ce668ca30b080f1a 100644
+index c321f22af679cafd00be09a9212346b5ccbc8dfc..b2768522a94944bd70ffdcf45119565a55f2c5ce 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -230,6 +230,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -231,6 +231,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      // CraftBukkit start - multithreaded fields
      private final AtomicInteger chatSpamTickCount = new AtomicInteger();
      private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
@@ -34,7 +34,7 @@ index be3ba42c1aada1dab05bc531bd9c7956fa25fe8e..88beed5a93bc849fa0a97654ce668ca3
      // CraftBukkit end
      private int dropSpamTickCount;
      private double firstGoodX;
-@@ -376,6 +377,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -377,6 +378,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          // CraftBukkit start
          for (int spam; (spam = this.chatSpamTickCount.get()) > 0 && !this.chatSpamTickCount.compareAndSet(spam, spam - 1); ) ;
          if (tabSpamLimiter.get() > 0) tabSpamLimiter.getAndDecrement(); // Paper - split to seperate variable
@@ -42,7 +42,7 @@ index be3ba42c1aada1dab05bc531bd9c7956fa25fe8e..88beed5a93bc849fa0a97654ce668ca3
          /* Use thread-safe field access instead
          if (this.chatSpamTickCount > 0) {
              --this.chatSpamTickCount;
-@@ -2814,6 +2816,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2815,6 +2817,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) {
diff --git a/patches/server/0547-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0545-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0547-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0545-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0548-MC-4-Fix-item-position-desync.patch b/patches/server/0546-MC-4-Fix-item-position-desync.patch
similarity index 97%
rename from patches/server/0548-MC-4-Fix-item-position-desync.patch
rename to patches/server/0546-MC-4-Fix-item-position-desync.patch
index 97d9ce3a34..10094224bc 100644
--- a/patches/server/0548-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0546-MC-4-Fix-item-position-desync.patch
@@ -9,7 +9,7 @@ loss, which forces the server to lose the same precision as the client
 keeping them in sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f20497eb1202e3e4c256f6cf04f8644a2413fe27..d48c8e3408510cacc148e8071af95994610869a6 100644
+index d5ae781d65016e0382cb3497cb8cac201680bc8c..266e52e1bf4d03ce7ad9dd329a18577b887cc767 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -101,6 +101,11 @@ public class PaperConfig {
diff --git a/patches/server/0549-Player-Chunk-Load-Unload-Events.patch b/patches/server/0547-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0549-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0547-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0550-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0548-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0550-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0548-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0551-Expose-LivingEntity-hurt-direction.patch b/patches/server/0549-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0551-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0549-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0550-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0550-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0551-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0551-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0552-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0552-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0555-Implement-TargetHitEvent.patch b/patches/server/0553-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0555-Implement-TargetHitEvent.patch
rename to patches/server/0553-Implement-TargetHitEvent.patch
diff --git a/patches/server/0556-Additional-Block-Material-API-s.patch b/patches/server/0554-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0556-Additional-Block-Material-API-s.patch
rename to patches/server/0554-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0557-Fix-harming-potion-dupe.patch b/patches/server/0555-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0557-Fix-harming-potion-dupe.patch
rename to patches/server/0555-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0556-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0556-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0559-Cache-burn-durations.patch b/patches/server/0557-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0559-Cache-burn-durations.patch
rename to patches/server/0557-Cache-burn-durations.patch
diff --git a/patches/server/0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0558-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0558-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0561-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0559-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0561-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0559-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0562-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0560-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0562-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0560-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0561-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 90%
rename from patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0561-Fix-interact-event-not-being-called-in-adventure.patch
index da4a148267..1eafeee50e 100644
--- a/patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch
+++ b/patches/server/0561-Fix-interact-event-not-being-called-in-adventure.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix interact event not being called in adventure
 Call PlayerInteractEvent when left-clicking on a block in adventure mode
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 88beed5a93bc849fa0a97654ce668ca30b080f1a..161b5d3382070ef54233a87c735e91b0d907704f 100644
+index b2768522a94944bd70ffdcf45119565a55f2c5ce..b6b22a3fdb73fc2b3e2eed12216ae199d2f14022 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1743,7 +1743,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1744,7 +1744,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                      MutableComponent ichatmutablecomponent = (new TranslatableComponent("build.tooHigh", new Object[]{i - 1})).withStyle(ChatFormatting.RED);
  
                      this.player.sendMessage(ichatmutablecomponent, ChatType.GAME_INFO, Util.NIL_UUID);
@@ -18,7 +18,7 @@ index 88beed5a93bc849fa0a97654ce668ca30b080f1a..161b5d3382070ef54233a87c735e91b0
                      this.player.swing(enumhand, true);
                  }
              }
-@@ -2215,7 +2215,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2216,7 +2216,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          Vec3 vec3d1 = vec3d.add((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
          HitResult movingobjectposition = this.player.level.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, this.player));
  
diff --git a/patches/server/0564-Zombie-API-breaking-doors.patch b/patches/server/0562-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0564-Zombie-API-breaking-doors.patch
rename to patches/server/0562-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0565-Fix-nerfed-slime-when-splitting.patch b/patches/server/0563-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0565-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0563-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0566-Add-EntityLoadCrossbowEvent.patch b/patches/server/0564-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0566-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0564-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0567-Guardian-beam-workaround.patch b/patches/server/0565-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0567-Guardian-beam-workaround.patch
rename to patches/server/0565-Guardian-beam-workaround.patch
diff --git a/patches/server/0568-Added-WorldGameRuleChangeEvent.patch b/patches/server/0566-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0568-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0566-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0569-Added-ServerResourcesReloadedEvent.patch b/patches/server/0567-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0569-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0567-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0570-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0568-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0570-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0568-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0571-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0569-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0571-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0569-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0572-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0570-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0572-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0570-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0573-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0571-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0573-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0571-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0574-Configurable-door-breaking-difficulty.patch b/patches/server/0572-Configurable-door-breaking-difficulty.patch
similarity index 93%
rename from patches/server/0574-Configurable-door-breaking-difficulty.patch
rename to patches/server/0572-Configurable-door-breaking-difficulty.patch
index a8527c8842..b2d66405fc 100644
--- a/patches/server/0574-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0572-Configurable-door-breaking-difficulty.patch
@@ -35,12 +35,12 @@ index 63d0971379f96e000ab9e7939f626c216cb6d12c..95952806a544d38952b82f7078a46a5e
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index ddf77350b1762be523eeed760669bc33f634109f..85294ab8eaa654be9358f489cec7e1ae665fc34b 100644
+index 920c2101ebbdc07c7fd15903a3d641aa55f8336d..b3a00bff85ade49b476c883350ff3563e1a4b842 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -195,7 +195,7 @@ public class Vindicator extends AbstractIllager {
+@@ -192,7 +192,7 @@ public class Vindicator extends AbstractIllager {
+     private static class VindicatorBreakDoorGoal extends BreakDoorGoal {
  
-     static class VindicatorBreakDoorGoal extends BreakDoorGoal {
          public VindicatorBreakDoorGoal(Mob mob) {
 -            super(mob, 6, Vindicator.DOOR_BREAKING_PREDICATE);
 +            super(mob, 6, com.google.common.base.Predicates.in(mob.level.paperConfig.vindicatorBreakDoors)); // Paper
diff --git a/patches/server/0575-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0573-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0575-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0573-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0576-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0574-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0576-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0574-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0577-Remove-stale-POIs.patch b/patches/server/0575-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0577-Remove-stale-POIs.patch
rename to patches/server/0575-Remove-stale-POIs.patch
diff --git a/patches/server/0578-Fix-villager-boat-exploit.patch b/patches/server/0576-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0578-Fix-villager-boat-exploit.patch
rename to patches/server/0576-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0579-Add-sendOpLevel-API.patch b/patches/server/0577-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/server/0579-Add-sendOpLevel-API.patch
rename to patches/server/0577-Add-sendOpLevel-API.patch
diff --git a/patches/server/0580-Add-StructureLocateEvent.patch b/patches/server/0578-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0580-Add-StructureLocateEvent.patch
rename to patches/server/0578-Add-StructureLocateEvent.patch
diff --git a/patches/server/0581-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0579-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0581-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0579-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0580-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0580-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0581-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0581-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0584-Make-schedule-command-per-world.patch b/patches/server/0582-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0584-Make-schedule-command-per-world.patch
rename to patches/server/0582-Make-schedule-command-per-world.patch
diff --git a/patches/server/0585-Configurable-max-leash-distance.patch b/patches/server/0583-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0585-Configurable-max-leash-distance.patch
rename to patches/server/0583-Configurable-max-leash-distance.patch
diff --git a/patches/server/0586-Implement-BlockPreDispenseEvent.patch b/patches/server/0584-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0586-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0584-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0587-added-Wither-API.patch b/patches/server/0585-added-Wither-API.patch
similarity index 100%
rename from patches/server/0587-added-Wither-API.patch
rename to patches/server/0585-added-Wither-API.patch
diff --git a/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0586-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0586-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0587-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0587-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0588-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0588-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0589-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 98%
rename from patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0589-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index dd1e928fa0..abe574ae06 100644
--- a/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0589-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 341614d0f0df4008a443d9cda400d0c0103af90a..0909d3cd41fa8c8fe971e1a6c5a67bab7e0a3dc9 100644
+index 77d85265eb090f61476faedbffd4ad3d2e9ae38a..4566037b8772e81cc28ed3cb3a6b756da85c7260 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1230,12 +1230,15 @@ public abstract class Mob extends LivingEntity {
@@ -54,7 +54,7 @@ index 341614d0f0df4008a443d9cda400d0c0103af90a..0909d3cd41fa8c8fe971e1a6c5a67bab
          }
  
          return flag1;
-@@ -1628,8 +1637,11 @@ public abstract class Mob extends LivingEntity {
+@@ -1630,8 +1639,11 @@ public abstract class Mob extends LivingEntity {
      @Override
      protected void removeAfterChangingDimensions() {
          super.removeAfterChangingDimensions();
diff --git a/patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0590-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 92%
rename from patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0590-Skip-distance-map-update-when-spawning-disabled.patch
index 11557d5dcb..b666026596 100644
--- a/patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/patches/server/0590-Skip-distance-map-update-when-spawning-disabled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Skip distance map update when spawning disabled.
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 785f07fddb84cf34fbd9d6ca89ff391d451aad17..761bd290d5a041d56ce6be98443107b8f87137aa 100644
+index 42cecd0f072505c80b65ccf26e5d838750d21e28..dcb65eb4e5790e12ebe83b0d25b5a8c7a8bfbb6b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -966,7 +966,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0593-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0591-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0593-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0591-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0594-add-DragonEggFormEvent.patch b/patches/server/0592-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0594-add-DragonEggFormEvent.patch
rename to patches/server/0592-add-DragonEggFormEvent.patch
diff --git a/patches/server/0595-EntityMoveEvent.patch b/patches/server/0593-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0595-EntityMoveEvent.patch
rename to patches/server/0593-EntityMoveEvent.patch
diff --git a/patches/server/0596-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0596-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0594-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0597-Inline-shift-direction-fields.patch b/patches/server/0595-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0597-Inline-shift-direction-fields.patch
rename to patches/server/0595-Inline-shift-direction-fields.patch
diff --git a/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0596-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0597-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0600-living-entity-allow-attribute-registration.patch b/patches/server/0598-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0600-living-entity-allow-attribute-registration.patch
rename to patches/server/0598-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0601-fix-dead-slime-setSize-invincibility.patch b/patches/server/0599-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0601-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0599-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0602-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0602-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0600-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0603-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0601-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0603-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0601-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0604-Expose-Tracked-Players.patch b/patches/server/0602-Expose-Tracked-Players.patch
similarity index 87%
rename from patches/server/0604-Expose-Tracked-Players.patch
rename to patches/server/0602-Expose-Tracked-Players.patch
index a7b6532874..87e72c41f9 100644
--- a/patches/server/0604-Expose-Tracked-Players.patch
+++ b/patches/server/0602-Expose-Tracked-Players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 986f045a2e6a040c6e2aab7420c8cb2d4ac3a726..ee50ea695585639d0ff184b675f3fb3b205b9f86 100644
+index c2d92e0eb65b2a70fcae12b09e5a105cc820894f..dd1a86ddbe54aa6c26fd81cfe42a7f89eca5899d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1263,5 +1263,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1264,5 +1264,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean isTicking() {
          return getHandle().isTicking();
      }
diff --git a/patches/server/0605-Remove-streams-from-SensorNearest.patch b/patches/server/0603-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0605-Remove-streams-from-SensorNearest.patch
rename to patches/server/0603-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0606-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0606-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0604-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0607-Improve-ServerGUI.patch b/patches/server/0605-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0607-Improve-ServerGUI.patch
rename to patches/server/0605-Improve-ServerGUI.patch
diff --git a/patches/server/0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0606-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0609-fix-converting-txt-to-json-file.patch b/patches/server/0607-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0609-fix-converting-txt-to-json-file.patch
rename to patches/server/0607-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0610-Add-worldborder-events.patch b/patches/server/0608-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0610-Add-worldborder-events.patch
rename to patches/server/0608-Add-worldborder-events.patch
diff --git a/patches/server/0611-added-PlayerNameEntityEvent.patch b/patches/server/0609-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0611-added-PlayerNameEntityEvent.patch
rename to patches/server/0609-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0612-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0610-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0612-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0610-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0613-Add-recipe-to-cook-events.patch b/patches/server/0611-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0613-Add-recipe-to-cook-events.patch
rename to patches/server/0611-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0614-Add-Block-isValidTool.patch b/patches/server/0612-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0614-Add-Block-isValidTool.patch
rename to patches/server/0612-Add-Block-isValidTool.patch
diff --git a/patches/server/0615-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
similarity index 93%
rename from patches/server/0615-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
index 9ce67a9a48..dbceecec24 100644
--- a/patches/server/0615-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0613-Allow-using-signs-inside-spawn-protection.patch
@@ -19,10 +19,10 @@ index 83d5bbf0a819d6a75d148de5a7f3679e3faad9ec..f372caad76d5f59f37d073bb245fca3a
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 161b5d3382070ef54233a87c735e91b0d907704f..706ac5e8fc14e94c750ba6c475541257cad65db7 100644
+index b6b22a3fdb73fc2b3e2eed12216ae199d2f14022..1bb4ef2daea3bc919059ffdfeb17f7db157e0619 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1732,7 +1732,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1733,7 +1733,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          int i = this.player.level.getMaxBuildHeight();
  
          if (blockposition.getY() < i) {
diff --git a/patches/server/0616-Implement-Keyed-on-World.patch b/patches/server/0614-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0616-Implement-Keyed-on-World.patch
rename to patches/server/0614-Implement-Keyed-on-World.patch
diff --git a/patches/server/0617-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0617-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0615-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0618-Item-Rarity-API.patch b/patches/server/0616-Item-Rarity-API.patch
similarity index 93%
rename from patches/server/0618-Item-Rarity-API.patch
rename to patches/server/0616-Item-Rarity-API.patch
index 895868ba49..46c0a4f795 100644
--- a/patches/server/0618-Item-Rarity-API.patch
+++ b/patches/server/0616-Item-Rarity-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Item Rarity API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index f6cb3cb848f62e1d360034721694e6d8a9e73d95..07acef23a63ece3cb4bd1cbd0410328df437afd4 100644
+index f84322256c19a5619fc5cd2efa3f64580d299bbf..14267529e5db9e8f77beffabd07e3f6c876239c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -481,6 +481,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -503,6 +503,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public int nextEntityId() {
          return net.minecraft.world.entity.Entity.nextEntityId();
      }
diff --git a/patches/server/0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0617-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0620-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0618-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0620-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0618-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0621-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0621-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0619-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0622-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0620-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0622-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0620-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 86%
rename from patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 899ceb3a90..b2dccc85a3 100644
--- a/patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0621-Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -5,10 +5,10 @@ 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 cd1a06338cebfc6cc65a2545a882c59949635061..127472fc929ed121f63a4ee53ff6cfd80db36b7f 100644
+index 1bb4ef2daea3bc919059ffdfeb17f7db157e0619..e3d0c7f357a579811de1b55d8fde018aa55fea47 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1177,7 +1177,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1178,7 +1178,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
  
          itemstack.addTagElement("pages", nbttaglist);
diff --git a/patches/server/0624-Entity-load-save-limit-per-chunk.patch b/patches/server/0622-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0624-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0622-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0625-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0623-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0625-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0623-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0626-Expose-protocol-version.patch b/patches/server/0624-Expose-protocol-version.patch
similarity index 85%
rename from patches/server/0626-Expose-protocol-version.patch
rename to patches/server/0624-Expose-protocol-version.patch
index 8d6f71c795..cadbb97788 100644
--- a/patches/server/0626-Expose-protocol-version.patch
+++ b/patches/server/0624-Expose-protocol-version.patch
@@ -5,10 +5,10 @@ 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 07acef23a63ece3cb4bd1cbd0410328df437afd4..ca44ec3e2bb62f9ac029c854257bdae79a62531d 100644
+index 14267529e5db9e8f77beffabd07e3f6c876239c9..7af823c7d3192f7fbd9be5ee32c91e5b4ba9e2ee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -495,6 +495,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -517,6 +517,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public io.papermc.paper.inventory.ItemRarity getItemStackRarity(org.bukkit.inventory.ItemStack itemStack) {
          return io.papermc.paper.inventory.ItemRarity.values()[getItem(itemStack.getType()).getRarity(CraftItemStack.asNMSCopy(itemStack)).ordinal()];
      }
diff --git a/patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 97%
rename from patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index 885ffa6011..ebf81d7cb6 100644
--- a/patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/server/0625-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow for Component suggestion tooltips in
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 127472fc929ed121f63a4ee53ff6cfd80db36b7f..9178614b456cf528e910e9fe991300ce24e92158 100644
+index e3d0c7f357a579811de1b55d8fde018aa55fea47..acbaba8750c373b90f6af0fb592f7226ba1acf0e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -763,12 +763,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -764,12 +764,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
          // Paper start - async tab completion
          com.destroystokyo.paper.event.server.AsyncTabCompleteEvent event;
@@ -24,7 +24,7 @@ index 127472fc929ed121f63a4ee53ff6cfd80db36b7f..9178614b456cf528e910e9fe991300ce
          // If the event isn't handled, we can assume that we have no completions, and so we'll ask the server
          if (!event.isHandled()) {
              if (!event.isCancelled()) {
-@@ -787,10 +786,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -788,10 +787,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  });
              }
          } else if (!completions.isEmpty()) {
diff --git a/patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 99%
rename from patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch
index 139325cbeb..950901ff4c 100644
--- a/patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0626-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d48c8e3408510cacc148e8071af95994610869a6..ae7ca7fbed3a1a4532a78bb8a029bb7fc642bcb3 100644
+index 266e52e1bf4d03ce7ad9dd329a18577b887cc767..6ebc539a5cf795fdde38a199fbce7fed39a07e0c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -106,6 +106,13 @@ public class PaperConfig {
diff --git a/patches/server/0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0627-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0630-Add-bypass-host-check.patch b/patches/server/0628-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0630-Add-bypass-host-check.patch
rename to patches/server/0628-Add-bypass-host-check.patch
diff --git a/patches/server/0631-Set-area-affect-cloud-rotation.patch b/patches/server/0629-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0631-Set-area-affect-cloud-rotation.patch
rename to patches/server/0629-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0632-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0632-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0630-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 97%
rename from patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch
index ee8bbaabe6..88b9af1f6c 100644
--- a/patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch
+++ b/patches/server/0631-Fix-duplicating-give-items-on-item-drop-cancel.patch
@@ -42,7 +42,7 @@ index 58941830a4bd024fcdb97df47783c82062e9167f..a0dc380e90415de9068ea408d62a1605
                              itemEntity2.makeFakeItem();
                          }
 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 14bcc4642d7dd81e5bc30f40e3c9d8269d409d20..9c71fdcb68a865bfc9b3b081a904598dfab4105c 100644
+index 95b03fbdc0a5483761fce5c5542ce8f3187761c5..af0ff22ab9fde658b10604f08d29c28071a9fd06 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -683,6 +683,13 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0634-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0634-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0632-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0635-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0635-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0633-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0634-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0637-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0637-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0635-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 88%
rename from patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch
index f02b69b355..e16ad06b1e 100644
--- a/patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0636-fix-PlayerItemHeldEvent-firing-twice.patch
@@ -5,10 +5,10 @@ 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 5150211773d8a6f189bd800cede2ba19c398d438..0a954a84079cda9f79d897ba97e4e882652d0a6c 100644
+index acbaba8750c373b90f6af0fb592f7226ba1acf0e..e3d62889d7a985289d20ada6b42cc008aee7f353 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1936,6 +1936,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1937,6 +1937,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (this.player.isImmobile()) return; // CraftBukkit
          if (packet.getSlot() >= 0 && packet.getSlot() < Inventory.getSelectionSize()) {
diff --git a/patches/server/0639-Added-PlayerDeepSleepEvent.patch b/patches/server/0637-Added-PlayerDeepSleepEvent.patch
similarity index 91%
rename from patches/server/0639-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0637-Added-PlayerDeepSleepEvent.patch
index b0434fe757..1255d32c2a 100644
--- a/patches/server/0639-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0637-Added-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added 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 9c71fdcb68a865bfc9b3b081a904598dfab4105c..a67a04cbb94edd02918809d5654399952d2597a2 100644
+index af0ff22ab9fde658b10604f08d29c28071a9fd06..ec44db1e6a6c92d8aff241b5f9acf743d3088fea 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -245,6 +245,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0640-More-World-API.patch b/patches/server/0638-More-World-API.patch
similarity index 100%
rename from patches/server/0640-More-World-API.patch
rename to patches/server/0638-More-World-API.patch
diff --git a/patches/server/0641-Added-PlayerBedFailEnterEvent.patch b/patches/server/0639-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0641-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0639-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0642-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0642-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0640-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0641-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0644-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0642-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0644-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0642-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 95%
rename from patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 9eed10fb07..df7081642c 100644
--- a/patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0643-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0a954a84079cda9f79d897ba97e4e882652d0a6c..6cef84775f3b20564181a2ba562b8cd1a127da57 100644
+index e3d62889d7a985289d20ada6b42cc008aee7f353..9f93ce18a0406321462fb5e4c4dbfab720b87da8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2474,7 +2474,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2475,7 +2475,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              case PERFORM_RESPAWN:
                  if (this.player.wonGame) {
                      this.player.wonGame = false;
diff --git a/patches/server/0646-Add-Channel-initialization-listeners.patch b/patches/server/0644-Add-Channel-initialization-listeners.patch
similarity index 98%
rename from patches/server/0646-Add-Channel-initialization-listeners.patch
rename to patches/server/0644-Add-Channel-initialization-listeners.patch
index 0efca8f11f..81ee12be00 100644
--- a/patches/server/0646-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0644-Add-Channel-initialization-listeners.patch
@@ -106,7 +106,7 @@ index 0000000000000000000000000000000000000000..30e62719e0a83525daa33cf41cb61df3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 6bf39699700075e295a693b56d237391de4e4f58..940b52e0b22b009f819de0dc05436a1820390bde 100644
+index 7fe08a998b4067f9f67c7e7a2244c1de0b194093..3d78b1f06839fa6534c84979a32bb80ec5de6d84 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -112,6 +112,7 @@ public class ServerConnectionListener {
diff --git a/patches/server/0647-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0647-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0645-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0648-Add-more-WanderingTrader-API.patch b/patches/server/0646-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0648-Add-more-WanderingTrader-API.patch
rename to patches/server/0646-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0649-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0647-Add-EntityBlockStorage-clearEntities.patch
similarity index 94%
rename from patches/server/0649-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0647-Add-EntityBlockStorage-clearEntities.patch
index 71da98f3c3..2ed1fae3bf 100644
--- a/patches/server/0649-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0647-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 93f17997ac3f36d0a72e5d4e85c7e748d615801f..5c784e1155c16dbbe1b75bb5bcb3d73793d146a3 100644
+index 0dca7b0f40af9337bdda75ba40cb064f39723bf8..e5e65bb68a92fffbf765eb140fe1e1ec77059c49 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/0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0648-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0649-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0652-Inventory-close.patch b/patches/server/0650-Inventory-close.patch
similarity index 100%
rename from patches/server/0652-Inventory-close.patch
rename to patches/server/0650-Inventory-close.patch
diff --git a/patches/server/0653-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from patches/server/0653-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0651-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/patches/server/0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0652-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0655-Fix-CraftPotionBrewer-cache.patch b/patches/server/0653-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0655-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0653-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0656-Add-basic-Datapack-API.patch b/patches/server/0654-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0656-Add-basic-Datapack-API.patch
rename to patches/server/0654-Add-basic-Datapack-API.patch
diff --git a/patches/server/0657-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0655-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0657-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0655-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch
similarity index 98%
rename from patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch
index 88885774e4..9fd9c5ce5d 100644
--- a/patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0656-additions-to-PlayerGameModeChangeEvent.patch
@@ -126,10 +126,10 @@ index e39e16f0b3a0d168b3049c37f5a2a9dc8f15a652..1ca6dc1e9334bf7e03eab4c2a75f4c86
      }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 6cef84775f3b20564181a2ba562b8cd1a127da57..985f6102bf84f661d57af622ae168840f3252ab1 100644
+index 9f93ce18a0406321462fb5e4c4dbfab720b87da8..b12d7f8ac2ac446eb0cdfa1e73de6690255752e5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2483,7 +2483,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2484,7 +2484,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                      this.player = this.server.getPlayerList().respawn(this.player, false);
                      if (this.server.isHardcore()) {
diff --git a/patches/server/0659-ItemStack-repair-check-API.patch b/patches/server/0657-ItemStack-repair-check-API.patch
similarity index 95%
rename from patches/server/0659-ItemStack-repair-check-API.patch
rename to patches/server/0657-ItemStack-repair-check-API.patch
index 30ed4e85e6..8337bee581 100644
--- a/patches/server/0659-ItemStack-repair-check-API.patch
+++ b/patches/server/0657-ItemStack-repair-check-API.patch
@@ -5,10 +5,10 @@ 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 ca44ec3e2bb62f9ac029c854257bdae79a62531d..a2567ee56b985321894d35a5edc338bd949b6d10 100644
+index 7af823c7d3192f7fbd9be5ee32c91e5b4ba9e2ee..43cd04e8d7299d961108e9a51a012a2021b20ee7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -496,6 +496,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -518,6 +518,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
          return io.papermc.paper.inventory.ItemRarity.values()[getItem(itemStack.getType()).getRarity(CraftItemStack.asNMSCopy(itemStack)).ordinal()];
      }
  
diff --git a/patches/server/0660-More-Enchantment-API.patch b/patches/server/0658-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0660-More-Enchantment-API.patch
rename to patches/server/0658-More-Enchantment-API.patch
diff --git a/patches/server/0661-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0659-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0661-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0659-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0662-Add-Mob-lookAt-API.patch b/patches/server/0660-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0662-Add-Mob-lookAt-API.patch
rename to patches/server/0660-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0663-Add-Unix-domain-socket-support.patch b/patches/server/0661-Add-Unix-domain-socket-support.patch
similarity index 97%
rename from patches/server/0663-Add-Unix-domain-socket-support.patch
rename to patches/server/0661-Add-Unix-domain-socket-support.patch
index 35fbd12a48..5c0940448b 100644
--- a/patches/server/0663-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0661-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
 Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index a6eadf71957b37e2acc5d09f0ce4ee961810891f..16954170ffeeedf18d8f8079b5e75915e0c682ba 100644
+index ea7444d5d242e15fe3fb1d87ddb98f3074d3e979..2a9d5d977932e63ff7cae2fb8a7cfe7860172a39 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -614,6 +614,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -69,7 +69,7 @@ index 331c85d236922d7a4b5732cb09aa708830e1393c..82cee660a029547eda8abdf4188b9d1f
              DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
              DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 940b52e0b22b009f819de0dc05436a1820390bde..f7aa0125e4724f1efddf28814f926289c1ae37d4 100644
+index 3d78b1f06839fa6534c84979a32bb80ec5de6d84..70b0c7fea72397f7bbdf02ce2794e7fb6fbd3742 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -78,7 +78,12 @@ public class ServerConnectionListener {
diff --git a/patches/server/0664-Add-EntityInsideBlockEvent.patch b/patches/server/0662-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0664-Add-EntityInsideBlockEvent.patch
rename to patches/server/0662-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0663-Attributes-API-for-item-defaults.patch b/patches/server/0663-Attributes-API-for-item-defaults.patch
new file mode 100644
index 0000000000..5150fbd9ac
--- /dev/null
+++ b/patches/server/0663-Attributes-API-for-item-defaults.patch
@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Sat, 8 May 2021 15:01:54 -0700
+Subject: [PATCH] Attributes API for item defaults
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+index 43cd04e8d7299d961108e9a51a012a2021b20ee7..e714b42cf97b1a9ec5a8e68678541ea734bc78fe 100644
+--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+@@ -526,6 +526,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
+         return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
+     }
+ 
++    @Override
++    public Multimap<Attribute, AttributeModifier> getItemAttributes(Material material, EquipmentSlot equipmentSlot) {
++        Item item = CraftMagicNumbers.getItem(material);
++        if (item == null) {
++            throw new IllegalArgumentException(material + " is not an item and therefore does not have attributes");
++        }
++        ImmutableMultimap.Builder<Attribute, AttributeModifier> attributeMapBuilder = ImmutableMultimap.builder();
++        item.getDefaultAttributeModifiers(CraftEquipmentSlot.getNMS(equipmentSlot)).forEach((attributeBase, attributeModifier) -> {
++            attributeMapBuilder.put(CraftAttributeMap.fromMinecraft(net.minecraft.core.Registry.ATTRIBUTE.getKey(attributeBase).toString()), CraftAttributeInstance.convert(attributeModifier, equipmentSlot));
++        });
++        return attributeMapBuilder.build();
++    }
++
+     @Override
+     public int getProtocolVersion() {
+         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
diff --git a/patches/server/0666-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0664-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0666-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0664-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0665-Attributes-API-for-item-defaults.patch b/patches/server/0665-Attributes-API-for-item-defaults.patch
deleted file mode 100644
index 3749be6c5f..0000000000
--- a/patches/server/0665-Attributes-API-for-item-defaults.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Sat, 8 May 2021 15:01:54 -0700
-Subject: [PATCH] Attributes API for item defaults
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
-index 7e3826b271b2db3b48e6e21ac2e66911bf8993aa..393a19335c52b6e63d37aacdfbeff93e1795c421 100644
---- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
-+++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeInstance.java
-@@ -72,4 +72,10 @@ public class CraftAttributeInstance implements AttributeInstance {
-     public static AttributeModifier convert(net.minecraft.world.entity.ai.attributes.AttributeModifier nms) {
-         return new AttributeModifier(nms.getId(), nms.getName(), nms.getAmount(), AttributeModifier.Operation.values()[nms.getOperation().ordinal()]);
-     }
-+
-+    // Paper start - construct using slot
-+    public static AttributeModifier convert(net.minecraft.world.entity.ai.attributes.AttributeModifier nms, org.bukkit.inventory.EquipmentSlot slot) {
-+        return new AttributeModifier(nms.getId(), nms.getName(), nms.getAmount(), AttributeModifier.Operation.values()[nms.getOperation().ordinal()], slot);
-+    }
-+    // 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 a2567ee56b985321894d35a5edc338bd949b6d10..45f8519052a9fd7b9afcb84fb889e0efde92c8c6 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -504,6 +504,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
-     }
- 
-+    @Override
-+    public com.google.common.collect.Multimap<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getItemAttributes(org.bukkit.Material material, org.bukkit.inventory.EquipmentSlot equipmentSlot) {
-+        Item item = CraftMagicNumbers.getItem(material);
-+        if (item == null) {
-+            throw new IllegalArgumentException(material + " is not an item and therefore does not have attributes");
-+        }
-+        com.google.common.collect.ImmutableMultimap.Builder<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> attributeMapBuilder = com.google.common.collect.ImmutableMultimap.builder();
-+        item.getDefaultAttributeModifiers(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(equipmentSlot)).forEach((attributeBase, attributeModifier) -> {
-+            attributeMapBuilder.put(org.bukkit.Registry.ATTRIBUTE.get(CraftNamespacedKey.fromMinecraft(net.minecraft.core.Registry.ATTRIBUTE.getKey(attributeBase))), org.bukkit.craftbukkit.attribute.CraftAttributeInstance.convert(attributeModifier, equipmentSlot));
-+        });
-+        return attributeMapBuilder.build();
-+    }
-+
-     @Override
-     public int getProtocolVersion() {
-         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
diff --git a/patches/server/0667-More-Lidded-Block-API.patch b/patches/server/0665-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0667-More-Lidded-Block-API.patch
rename to patches/server/0665-More-Lidded-Block-API.patch
diff --git a/patches/server/0668-Limit-item-frame-cursors-on-maps.patch b/patches/server/0666-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0668-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0666-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0669-Add-PlayerKickEvent-causes.patch b/patches/server/0667-Add-PlayerKickEvent-causes.patch
similarity index 94%
rename from patches/server/0669-Add-PlayerKickEvent-causes.patch
rename to patches/server/0667-Add-PlayerKickEvent-causes.patch
index 0ca9f8a832..849e5fd8b4 100644
--- a/patches/server/0669-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0667-Add-PlayerKickEvent-causes.patch
@@ -57,10 +57,10 @@ index 708ac03d5a849bf09c49547306e4a8c5a5ef8d91..5a8df368a4a25839cd4ac9be6972da2e
          }
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e564e49c9 100644
+index b12d7f8ac2ac446eb0cdfa1e73de6690255752e5..a12685a383ffd8431e172e46fcc9b95d0472b9a2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -320,7 +320,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -321,7 +321,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          if (this.clientIsFloating && !this.player.isSleeping()) {
              if (++this.aboveGroundTickCount > 80) {
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating too long!", this.player.getName().getString());
@@ -69,7 +69,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                  return;
              }
          } else {
-@@ -339,7 +339,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -340,7 +340,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              if (this.clientVehicleIsFloating && this.player.getRootVehicle().getControllingPassenger() == this.player) {
                  if (++this.aboveGroundVehicleTickCount > 80) {
                      ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked for floating a vehicle too long!", this.player.getName().getString());
@@ -78,7 +78,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                      return;
                  }
              } else {
-@@ -361,7 +361,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -362,7 +362,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -87,7 +87,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
              }
          } else {
              if (elapsedTime >= 15000L) { // 15 seconds
-@@ -391,7 +391,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -392,7 +392,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
          if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) (this.server.getPlayerIdleTimeout() * 1000 * 60)) {
              this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
@@ -96,7 +96,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
          }
  
      }
-@@ -416,14 +416,22 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -417,14 +417,22 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      public void disconnect(String s) {
          // Paper start
@@ -122,7 +122,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
          // Paper end
          // CraftBukkit start - fire PlayerKickEvent
          if (this.processedDisconnect) {
-@@ -431,7 +439,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -432,7 +440,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
          net.kyori.adventure.text.Component leaveMessage = net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, this.player.getBukkitEntity().displayName()); // Paper - Adventure
  
@@ -131,7 +131,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
  
          if (this.cserver.getServer().isRunning()) {
              this.cserver.getPluginManager().callEvent(event);
-@@ -503,7 +511,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -504,7 +512,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      public void handleMoveVehicle(ServerboundMoveVehiclePacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (ServerGamePacketListenerImpl.containsInvalidValues(packet.getX(), packet.getY(), packet.getZ(), packet.getYRot(), packet.getXRot())) {
@@ -140,7 +140,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
          } else {
              Entity entity = this.player.getRootVehicle();
  
-@@ -744,13 +752,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -745,13 +753,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
          // CraftBukkit start
          if (this.chatSpamTickCount.addAndGet(com.destroystokyo.paper.PaperConfig.tabSpamIncrement) > com.destroystokyo.paper.PaperConfig.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
@@ -156,7 +156,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
              return;
          }
          // Paper end
-@@ -902,7 +910,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -903,7 +911,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          // Paper start - validate pick item position
          if (!(packet.getSlot() >= 0 && packet.getSlot() < this.player.getInventory().items.size())) {
              ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
@@ -165,7 +165,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
              return;
          }
          this.player.getInventory().pickSlot(packet.getSlot()); // Paper - Diff above if changed
-@@ -1061,7 +1069,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1062,7 +1070,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
                  if (byteLength > 256 * 4) {
                      ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send a book with with a page too large!");
@@ -174,7 +174,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                      return;
                  }
                  byteTotal += byteLength;
-@@ -1084,14 +1092,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1085,14 +1093,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              if (byteTotal > byteAllowed) {
                  ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed:  "+ byteAllowed + " - Pages: " + pageList.size());
@@ -191,7 +191,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
              return;
          }
          this.lastBookTick = MinecraftServer.currentTick;
-@@ -1215,7 +1223,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1216,7 +1224,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (ServerGamePacketListenerImpl.containsInvalidValues(packet.getX(0.0D), packet.getY(0.0D), packet.getZ(0.0D), packet.getYRot(0.0F), packet.getXRot(0.0F))) {
@@ -200,7 +200,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
          } else {
              ServerLevel worldserver = this.player.getLevel();
  
-@@ -1641,7 +1649,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1642,7 +1650,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                          this.dropCount++;
                          if (this.dropCount >= 20) {
                              ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " dropped their items too quickly!");
@@ -209,7 +209,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                              return;
                          }
                      }
-@@ -1848,7 +1856,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1849,7 +1857,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
          if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) {
              ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName());
@@ -218,7 +218,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
          }
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action.ordinal()];
-@@ -1953,7 +1961,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1954,7 +1962,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              this.player.resetLastActionTime();
          } else {
              ServerGamePacketListenerImpl.LOGGER.warn("{} tried to set an invalid carried item", this.player.getName().getString());
@@ -227,7 +227,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
          }
      }
  
-@@ -1969,7 +1977,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1970,7 +1978,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
          for (int i = 0; i < s.length(); ++i) {
              if (!SharedConstants.isAllowedChatCharacter(s.charAt(i))) {
@@ -236,7 +236,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                  return;
              }
          }
-@@ -2042,7 +2050,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2043,7 +2051,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                      Waitable waitable = new Waitable() {
                          @Override
                          protected Object evaluate() {
@@ -245,7 +245,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                              return null;
                          }
                      };
-@@ -2057,7 +2065,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2058,7 +2066,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                          throw new RuntimeException(e);
                      }
                  } else {
@@ -254,7 +254,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                  }
                  // CraftBukkit end
              }
-@@ -2330,7 +2338,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2331,7 +2339,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          // Spigot Start
          if ( entity == this.player && !this.player.isSpectator() )
          {
@@ -263,7 +263,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
              return;
          }
          // Spigot End
-@@ -2425,7 +2433,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2426,7 +2434,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                              }
                              // CraftBukkit end
                          } else {
@@ -272,7 +272,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                              ServerGamePacketListenerImpl.LOGGER.warn("Player {} tried to attack an invalid entity", ServerGamePacketListenerImpl.this.player.getName().getString());
                          }
                      }
-@@ -2825,7 +2833,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2826,7 +2834,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (recipeSpamPackets.addAndGet(com.destroystokyo.paper.PaperConfig.autoRecipeIncrement) > com.destroystokyo.paper.PaperConfig.autoRecipeLimit) {
@@ -281,7 +281,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
                  return;
              }
          }
-@@ -3010,7 +3018,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3011,7 +3019,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          } else if (!this.isSingleplayerOwner()) {
              // Paper start - This needs to be handled on the main thread for plugins
              server.submit(() -> {
@@ -290,7 +290,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
              });
              // Paper end
          }
-@@ -3056,7 +3064,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3057,7 +3065,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  }
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
@@ -299,7 +299,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
              }
          } else if (packet.identifier.equals(CUSTOM_UNREGISTER)) {
              try {
-@@ -3066,7 +3074,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3067,7 +3075,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  }
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
@@ -308,7 +308,7 @@ index 985f6102bf84f661d57af622ae168840f3252ab1..73137c51df60df0ead588a585098cf3e
              }
          } else {
              try {
-@@ -3084,7 +3092,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3085,7 +3093,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
              } catch (Exception ex) {
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
diff --git a/patches/server/0670-Add-PufferFishStateChangeEvent.patch b/patches/server/0668-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0670-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0668-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0669-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0670-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0673-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0673-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0671-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0674-Add-BellRevealRaiderEvent.patch b/patches/server/0672-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0674-Add-BellRevealRaiderEvent.patch
rename to patches/server/0672-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0675-Fix-invulnerable-end-crystals.patch b/patches/server/0673-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0675-Fix-invulnerable-end-crystals.patch
rename to patches/server/0673-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0676-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0674-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0676-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0674-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0677-Fix-dangerous-end-portal-logic.patch b/patches/server/0675-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0677-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0675-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0676-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0679-Make-item-validations-configurable.patch b/patches/server/0677-Make-item-validations-configurable.patch
similarity index 98%
rename from patches/server/0679-Make-item-validations-configurable.patch
rename to patches/server/0677-Make-item-validations-configurable.patch
index 9f77b3d2dd..4c135437dc 100644
--- a/patches/server/0679-Make-item-validations-configurable.patch
+++ b/patches/server/0677-Make-item-validations-configurable.patch
@@ -56,7 +56,7 @@ index 0f753f4868141ecc383877ea3a666a383f2e3339..ebb643fc0477409d1efb4e9af5967504
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index bfede0c5dac43e063d465e386a080d2ffb89eb6f..fcd61bcf69518047fec7d838207e7d36e477f9c7 100644
+index 4506438ac75ca3724d096a454e07fb7e950228f6..086dde0e023f032cd5635dd227a79f6bc1ab39f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -357,18 +357,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
diff --git a/patches/server/0680-Line-Of-Sight-Changes.patch b/patches/server/0678-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0680-Line-Of-Sight-Changes.patch
rename to patches/server/0678-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0681-add-per-world-spawn-limits.patch b/patches/server/0679-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0681-add-per-world-spawn-limits.patch
rename to patches/server/0679-add-per-world-spawn-limits.patch
diff --git a/patches/server/0682-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0680-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0682-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0680-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0683-Add-more-LimitedRegion-API.patch b/patches/server/0681-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0683-Add-more-LimitedRegion-API.patch
rename to patches/server/0681-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 94%
rename from patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 2f4982d5d8..48d78de6bd 100644
--- a/patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0682-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -18,7 +18,7 @@ index 77ba7fe43ceffcb816d209da45ab0c5de2112ee3..6f5be46ae4c4f53695cdc5954352a258
  
                  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 a67a04cbb94edd02918809d5654399952d2597a2..56110f0022c99dad562e9398f4f34b993eda4923 100644
+index ec44db1e6a6c92d8aff241b5f9acf743d3088fea..ef18f69b54b68da84f6ab9f70aa47e2f716cf9a5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -703,6 +703,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0685-Missing-Entity-Behavior-API.patch b/patches/server/0683-Missing-Entity-Behavior-API.patch
similarity index 97%
rename from patches/server/0685-Missing-Entity-Behavior-API.patch
rename to patches/server/0683-Missing-Entity-Behavior-API.patch
index 130dd2939f..d76fb77f09 100644
--- a/patches/server/0685-Missing-Entity-Behavior-API.patch
+++ b/patches/server/0683-Missing-Entity-Behavior-API.patch
@@ -36,10 +36,10 @@ index cd278a859c87fc89c421378ffab1bd36a45bd65d..a726006888bbbdb290bcda3ac4fd45d6
          if (angry) {
              this.setEating(false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 32c7dc33ac0a41902bc841692a8b64b18e4355b6..1aa2f9c537f908807c7f323112c8cde27c34306c 100644
+index 254d4f2e45d7c8f572a4368eccd84560d4d0d836..299ab868252c8f326e3a56e878c9ee230c9635dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-@@ -105,4 +105,36 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
+@@ -115,4 +115,36 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
      public AbstractHorseInventory getInventory() {
          return new CraftSaddledInventory(getHandle().inventory);
      }
diff --git a/patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 88%
rename from patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch
index 6c7f6fb6e6..54e5b7aa39 100644
--- a/patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch
+++ b/patches/server/0684-Ensure-disconnect-for-book-edit-is-called-on-main.patch
@@ -5,10 +5,10 @@ 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 1c303677bac4df134ee7eeda71bd0b5118358cb3..61a0c9ffd7a5f156c4274a2425451c4a8ebdc5b8 100644
+index a12685a383ffd8431e172e46fcc9b95d0472b9a2..87fd9e456bdef1becbadb0f368ccb39160986e37 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1099,7 +1099,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1100,7 +1100,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          // Paper end
          // CraftBukkit start
          if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
diff --git a/patches/server/0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0685-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 96%
rename from patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch
index 7b1716dae9..3db2578e52 100644
--- a/patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0686-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -21,10 +21,10 @@ index 2c8acd5610e873d64470b0e4b0373566357d885d..4f3719e77e008cbd3d2bd9262a03a526
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 61a0c9ffd7a5f156c4274a2425451c4a8ebdc5b8..818d3b0d149354381be896b294d2be1901c8af10 100644
+index 87fd9e456bdef1becbadb0f368ccb39160986e37..b4d0b792f5476d567e317927c312f4db637c122a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1310,7 +1310,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1311,7 +1311,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                                  speed = this.player.getAbilities().walkingSpeed * 10f;
                              }
                              // Paper start - Prevent moving into unloaded chunks
diff --git a/patches/server/0689-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0689-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0687-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0690-Adds-PlayerArmSwingEvent.patch b/patches/server/0688-Adds-PlayerArmSwingEvent.patch
similarity index 87%
rename from patches/server/0690-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0688-Adds-PlayerArmSwingEvent.patch
index 462a915d92..90c5563ad2 100644
--- a/patches/server/0690-Adds-PlayerArmSwingEvent.patch
+++ b/patches/server/0688-Adds-PlayerArmSwingEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Adds PlayerArmSwingEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 61569455eeb264f82096f563078967b2f4908f88..de02aa3c97b68f03c1f09c5b56eed3ac9ec96227 100644
+index b4d0b792f5476d567e317927c312f4db637c122a..a9f56903e7ef18dfa3c640510334dbf50110cf26 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2234,7 +2234,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2235,7 +2235,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
  
          // Arm swing animation
diff --git a/patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 94%
rename from patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch
index aeb033827e..ae0a827bc6 100644
--- a/patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0689-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fixes kick event leave message not being sent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index de02aa3c97b68f03c1f09c5b56eed3ac9ec96227..0a4d39f25e8ffe82a6a2f4e27a25bc34df9ce560 100644
+index a9f56903e7ef18dfa3c640510334dbf50110cf26..afed4675ebedb13bb313815580fe14c06445ba0a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -457,7 +457,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -458,7 +458,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          this.connection.send(new ClientboundDisconnectPacket(ichatbasecomponent), (future) -> {
              this.connection.disconnect(ichatbasecomponent);
          });
@@ -17,7 +17,7 @@ index de02aa3c97b68f03c1f09c5b56eed3ac9ec96227..0a4d39f25e8ffe82a6a2f4e27a25bc34
          this.connection.setReadOnly();
          MinecraftServer minecraftserver = this.server;
          Connection networkmanager = this.connection;
-@@ -1881,6 +1881,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1882,6 +1882,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void onDisconnect(Component reason) {
@@ -29,7 +29,7 @@ index de02aa3c97b68f03c1f09c5b56eed3ac9ec96227..0a4d39f25e8ffe82a6a2f4e27a25bc34
          // CraftBukkit start - Rarely it would send a disconnect line twice
          if (this.processedDisconnect) {
              return;
-@@ -1897,7 +1902,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1898,7 +1903,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
          this.player.disconnect();
          // Paper start - Adventure
diff --git a/patches/server/0692-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0692-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0690-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0693-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0691-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0693-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0691-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0694-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0692-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0694-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0692-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0693-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 79%
rename from patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch
index 8e3b6ad7b3..e81626d650 100644
--- a/patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch
+++ b/patches/server/0694-Add-a-bunch-of-missing-forceDrop-toggles.patch
@@ -4,20 +4,6 @@ Date: Tue, 20 Jul 2021 21:25:35 -0700
 Subject: [PATCH] Add a bunch of missing forceDrop toggles
 
 
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 0909d3cd41fa8c8fe971e1a6c5a67bab7e0a3dc9..6604cd4c65abd591a93620a1928e7b2635f0a38e 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1491,7 +1491,9 @@ public abstract class Mob extends LivingEntity {
-             }
- 
-             if (this.tickCount > 100) {
-+                this.forceDrops = true; // Paper
-                 this.spawnAtLocation((ItemLike) Items.LEAD);
-+                this.forceDrops = false; // Paper
-                 this.leashInfoTag = null;
-             }
-         }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
 index e47f3092b6bd6b86b577de705db1a575d0952348..490212cfe4e5cea7219eaf4304e14bfac0e6472d 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java
diff --git a/patches/server/0697-Stinger-API.patch b/patches/server/0695-Stinger-API.patch
similarity index 100%
rename from patches/server/0697-Stinger-API.patch
rename to patches/server/0695-Stinger-API.patch
diff --git a/patches/server/0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0696-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0699-Add-System.out-err-catcher.patch b/patches/server/0697-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0699-Add-System.out-err-catcher.patch
rename to patches/server/0697-Add-System.out-err-catcher.patch
diff --git a/patches/server/0700-Fix-test-not-bootstrapping.patch b/patches/server/0698-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0700-Fix-test-not-bootstrapping.patch
rename to patches/server/0698-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0699-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0702-Improve-boat-collision-performance.patch b/patches/server/0700-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0702-Improve-boat-collision-performance.patch
rename to patches/server/0700-Improve-boat-collision-performance.patch
diff --git a/patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 89%
rename from patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch
index 0a0996db8c..463ace35cd 100644
--- a/patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0701-Prevent-AFK-kick-while-watching-end-credits.patch
@@ -5,10 +5,10 @@ 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 5646f3ca3f2e0493a4d9d4feaacf1449f4a6a0c5..4281356d240be5bc0232645b6ac87dfdb8a7d49f 100644
+index afed4675ebedb13bb313815580fe14c06445ba0a..3d92d901007a406ddf5e85be5391fc451b2ea2ec 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -389,7 +389,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -390,7 +390,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              --this.dropSpamTickCount;
          }
  
diff --git a/patches/server/0704-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0704-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0702-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0705-Add-PlayerSetSpawnEvent.patch b/patches/server/0703-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0705-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0703-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0706-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0706-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0704-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0707-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0705-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0707-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0705-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0708-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0706-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0708-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0706-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0709-Added-EntityDamageItemEvent.patch b/patches/server/0707-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0709-Added-EntityDamageItemEvent.patch
rename to patches/server/0707-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0710-Optimize-indirect-passenger-iteration.patch b/patches/server/0708-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0710-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0708-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0711-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0711-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0709-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0710-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0713-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch
similarity index 96%
rename from patches/server/0713-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0711-Make-EntityUnleashEvent-cancellable.patch
index 76356ad122..daed1facee 100644
--- a/patches/server/0713-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/server/0711-Make-EntityUnleashEvent-cancellable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make EntityUnleashEvent cancellable
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 6604cd4c65abd591a93620a1928e7b2635f0a38e..0a559b658cd52a1cce2895c6d9f96aa665a85c7b 100644
+index 4566037b8772e81cc28ed3cb3a6b756da85c7260..72888f28583d89f5cc38b6d6628f6557df16638b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1465,7 +1465,7 @@ public abstract class Mob extends LivingEntity {
diff --git a/patches/server/0714-Clear-bucket-NBT-after-dispense.patch b/patches/server/0712-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0714-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0712-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0715-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch
similarity index 100%
rename from patches/server/0715-Respect-despawn-rate-in-item-merge-check.patch
rename to patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch
diff --git a/patches/server/0716-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0716-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0714-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0717-Add-BlockBreakBlockEvent.patch b/patches/server/0715-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0717-Add-BlockBreakBlockEvent.patch
rename to patches/server/0715-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0718-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0718-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0716-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0719-More-CommandBlock-API.patch b/patches/server/0717-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0719-More-CommandBlock-API.patch
rename to patches/server/0717-More-CommandBlock-API.patch
diff --git a/patches/server/0720-Add-missing-team-sidebar-display-slots.patch b/patches/server/0718-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0720-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0718-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0721-Add-back-EntityPortalExitEvent.patch b/patches/server/0719-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0721-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0719-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0722-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0722-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0720-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0723-Get-entity-default-attributes.patch b/patches/server/0721-Get-entity-default-attributes.patch
similarity index 97%
rename from patches/server/0723-Get-entity-default-attributes.patch
rename to patches/server/0721-Get-entity-default-attributes.patch
index d5f35b8186..0a2928c80d 100644
--- a/patches/server/0723-Get-entity-default-attributes.patch
+++ b/patches/server/0721-Get-entity-default-attributes.patch
@@ -90,10 +90,10 @@ index 0000000000000000000000000000000000000000..4ecba0b02c2813a890aecc5586987879
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 45f8519052a9fd7b9afcb84fb889e0efde92c8c6..f9cb81313d6c894a2023123f4088ef0e0b7dbeff 100644
+index e714b42cf97b1a9ec5a8e68678541ea734bc78fe..965d15f4596b8ebf07d89829088b94146cb6a302 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -521,6 +521,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -543,6 +543,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public int getProtocolVersion() {
          return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
      }
diff --git a/patches/server/0724-Left-handed-API.patch b/patches/server/0722-Left-handed-API.patch
similarity index 100%
rename from patches/server/0724-Left-handed-API.patch
rename to patches/server/0722-Left-handed-API.patch
diff --git a/patches/server/0725-Add-advancement-display-API.patch b/patches/server/0723-Add-advancement-display-API.patch
similarity index 100%
rename from patches/server/0725-Add-advancement-display-API.patch
rename to patches/server/0723-Add-advancement-display-API.patch
diff --git a/patches/server/0726-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch
similarity index 100%
rename from patches/server/0726-Add-ItemFactory-getMonsterEgg-API.patch
rename to patches/server/0724-Add-ItemFactory-getMonsterEgg-API.patch
diff --git a/patches/server/0727-Add-critical-damage-API.patch b/patches/server/0725-Add-critical-damage-API.patch
similarity index 98%
rename from patches/server/0727-Add-critical-damage-API.patch
rename to patches/server/0725-Add-critical-damage-API.patch
index e9da7c9a2f..63490d0847 100644
--- a/patches/server/0727-Add-critical-damage-API.patch
+++ b/patches/server/0725-Add-critical-damage-API.patch
@@ -29,7 +29,7 @@ index 80d19af2ad423bd3de0e039c5bb8f97af536aaa9..a828cad27fcd39f8bfbaefa97052a2a3
      public static DamageSource sting(LivingEntity attacker) {
          return new EntityDamageSource("sting", attacker);
 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 56110f0022c99dad562e9398f4f34b993eda4923..8eafe216a942956d97ad36a2fe0dbaccd9aa87a5 100644
+index ef18f69b54b68da84f6ab9f70aa47e2f716cf9a5..2a61de30508266768fc2b55420d5272ab538330c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1215,7 +1215,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0728-Fix-issues-with-mob-conversion.patch b/patches/server/0726-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0728-Fix-issues-with-mob-conversion.patch
rename to patches/server/0726-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0729-Add-isCollidable-methods-to-various-places.patch b/patches/server/0727-Add-isCollidable-methods-to-various-places.patch
similarity index 94%
rename from patches/server/0729-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0727-Add-isCollidable-methods-to-various-places.patch
index 8c299e59bc..3606edad86 100644
--- a/patches/server/0729-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0727-Add-isCollidable-methods-to-various-places.patch
@@ -37,10 +37,10 @@ index 7b9e943b391c061782fccd2b8d705ceec8db50fe..966ac60daebb7bb211ab8096fc0c5f33
 +    // 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 f9cb81313d6c894a2023123f4088ef0e0b7dbeff..3118ba28e59c341c1210b6fadaa14b4f66f4facc 100644
+index 965d15f4596b8ebf07d89829088b94146cb6a302..42f70f0def442d636d83d315121451015b0d2fda 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -533,6 +533,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -555,6 +555,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
          var supplier = net.minecraft.world.entity.ai.attributes.DefaultAttributes.getSupplier((net.minecraft.world.entity.EntityType<? extends net.minecraft.world.entity.LivingEntity>) net.minecraft.core.Registry.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(bukkitEntityKey)));
          return new io.papermc.paper.attribute.UnmodifiableAttributeMap(supplier);
      }
diff --git a/patches/server/0730-Goat-ram-API.patch b/patches/server/0728-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0730-Goat-ram-API.patch
rename to patches/server/0728-Goat-ram-API.patch
diff --git a/patches/server/0731-Add-API-for-resetting-a-single-score.patch b/patches/server/0729-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0731-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0729-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0732-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch
similarity index 93%
rename from patches/server/0732-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch
index 4c4006a860..2849042e18 100644
--- a/patches/server/0732-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0730-Add-Raw-Byte-Entity-Serialization.patch
@@ -25,10 +25,10 @@ index 1869eb6067da68e7c43b3749738c8376d18ed4cf..8963bc6cfd3edfd493cc73918513478a
          return this.isPassenger() ? false : this.saveAsPassenger(nbt);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ee50ea695585639d0ff184b675f3fb3b205b9f86..5aae88e20bc04560d6ad52cfcaa872d28bfcee8f 100644
+index dd1a86ddbe54aa6c26fd81cfe42a7f89eca5899d..135e2992e394095814e47126b28ab5c2426c38ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1276,5 +1276,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1277,5 +1277,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
          return set;
      }
@@ -45,10 +45,10 @@ index ee50ea695585639d0ff184b675f3fb3b205b9f86..5aae88e20bc04560d6ad52cfcaa872d2
      // 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 3118ba28e59c341c1210b6fadaa14b4f66f4facc..9679b17b19e208c82570e1769efb18e23b5b3778 100644
+index 42f70f0def442d636d83d315121451015b0d2fda..4be7b18b4e794734439d1e8bec4304d88328c91e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -426,6 +426,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -448,6 +448,30 @@ public final class CraftMagicNumbers implements UnsafeValues {
          return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of((CompoundTag) converted.getValue()));
      }
  
diff --git a/patches/server/0733-Vanilla-command-permission-fixes.patch b/patches/server/0731-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0733-Vanilla-command-permission-fixes.patch
rename to patches/server/0731-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0734-Make-CallbackExecutor-strict-again.patch b/patches/server/0732-Make-CallbackExecutor-strict-again.patch
similarity index 95%
rename from patches/server/0734-Make-CallbackExecutor-strict-again.patch
rename to patches/server/0732-Make-CallbackExecutor-strict-again.patch
index 48a552aa64..85598f01ba 100644
--- a/patches/server/0734-Make-CallbackExecutor-strict-again.patch
+++ b/patches/server/0732-Make-CallbackExecutor-strict-again.patch
@@ -10,7 +10,7 @@ schedules. Effectively, use the callback executor as a tool of
 finding issues rather than hiding these issues.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index a97bf06a0e8ba1cd612f7e8be2585bfdfbdfa969..2af478902b528f335797c691730afb2657d4e6c4 100644
+index b44f1dc663dc3c081ec85941a2cd73e522e3c348..23aeeea2b05941d8f31c720567532510bea5abb3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -160,17 +160,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0735-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 92%
rename from patches/server/0735-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
index 0f9c3bedf6..17cc7a7420 100644
--- a/patches/server/0735-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
+++ b/patches/server/0733-Do-not-allow-the-server-to-unload-chunks-at-request-.patch
@@ -10,7 +10,7 @@ to be unloaded will simply be unloaded next tick, rather than
 immediately.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 761bd290d5a041d56ce6be98443107b8f87137aa..ef6e4dddc699c05a5f3d4b2dc29db0d1fa79b0ef 100644
+index dcb65eb4e5790e12ebe83b0d25b5a8c7a8bfbb6b..d1d6f4b75e807c8ea485cadd04a3ad1fc7d587bf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -884,6 +884,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0736-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0736-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 04bbf92438..54c4441f22 100644
--- a/patches/server/0736-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0734-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -51,7 +51,7 @@ index 6c0c1f7f4f3407164ee39abf4c87ffcc057994fd..a3274d3506b90422e4acdf6446e351b2
      public void doCloseContainer() {
          this.containerMenu.removed(this);
 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 8eafe216a942956d97ad36a2fe0dbaccd9aa87a5..2c00a766130a7f682fc6c4c74321e10637ca7932 100644
+index 2a61de30508266768fc2b55420d5272ab538330c..570d2325997e2465a8e17803ea882bc07ca64c38 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -496,6 +496,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0737-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch
similarity index 100%
rename from patches/server/0737-Correctly-handle-recursion-for-chunkholder-updates.patch
rename to patches/server/0735-Correctly-handle-recursion-for-chunkholder-updates.patch
diff --git a/patches/server/0738-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch
similarity index 100%
rename from patches/server/0738-Separate-lookup-locking-from-state-access-in-UserCac.patch
rename to patches/server/0736-Separate-lookup-locking-from-state-access-in-UserCac.patch
diff --git a/patches/server/0739-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch
similarity index 100%
rename from patches/server/0739-Fix-chunks-refusing-to-unload-at-low-TPS.patch
rename to patches/server/0737-Fix-chunks-refusing-to-unload-at-low-TPS.patch
diff --git a/patches/server/0740-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
similarity index 97%
rename from patches/server/0740-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
rename to patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
index 7b026cce91..5d0b400297 100644
--- a/patches/server/0740-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
+++ b/patches/server/0738-Do-not-allow-ticket-level-changes-while-unloading-pl.patch
@@ -49,7 +49,7 @@ index 4a36952d81b92ed3cf8b5be8cbb6f0353d64a6d7..65b58b8a88a72c27bd10387a46dd3822
              }
          };
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index ef6e4dddc699c05a5f3d4b2dc29db0d1fa79b0ef..74836552406743c16ef9e510ad22f7ba5520ea7f 100644
+index d1d6f4b75e807c8ea485cadd04a3ad1fc7d587bf..f871b8569f9812ee93b16fe9e45ea1a1c4f8f4aa 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -820,6 +820,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0741-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch
similarity index 100%
rename from patches/server/0741-Do-not-allow-ticket-level-changes-when-updating-chun.patch
rename to patches/server/0739-Do-not-allow-ticket-level-changes-when-updating-chun.patch
diff --git a/patches/server/0742-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch
similarity index 100%
rename from patches/server/0742-Do-not-submit-profile-lookups-to-worldgen-threads.patch
rename to patches/server/0740-Do-not-submit-profile-lookups-to-worldgen-threads.patch
diff --git a/patches/server/0743-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0741-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0743-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0741-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0744-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 99%
rename from patches/server/0744-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 2983360250..79ed1c8447 100644
--- a/patches/server/0744-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0742-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -272,7 +272,7 @@ index f436ab35798c9b6e6cb2eb60d2c02cbf9b742e69..4d7575087947f3b199dd895cd9aa02a7
          List<org.bukkit.World> worlds;
          if (args.length < 2 || args[1].equals("*")) {
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index c88bd5bc044b5f9722cb5826936e31811a8312c7..9b13244571807907fc0e14463d746724b0713c19 100644
+index 3a9e20bdf445c019e60a814ea6fc267758df10ed..4e18272192fc3bbb22cc98f2640480c30a056239 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -148,32 +148,16 @@ public final class NaturalSpawner {
diff --git a/patches/server/0745-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
similarity index 98%
rename from patches/server/0745-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
rename to patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
index 2c13e7604d..613b2742ad 100644
--- a/patches/server/0745-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
+++ b/patches/server/0743-Prevent-unload-calls-removing-tickets-for-sync-loads.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent unload() calls removing tickets for sync loads
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 74836552406743c16ef9e510ad22f7ba5520ea7f..280ca8758cbaf710c2bf357e41dd2af6e14b49bc 100644
+index f871b8569f9812ee93b16fe9e45ea1a1c4f8f4aa..e306dbf3487676e01c483d121c1f26e141358e3f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -725,6 +725,8 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0746-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0744-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0746-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0744-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0747-Optimise-general-POI-access.patch b/patches/server/0745-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0747-Optimise-general-POI-access.patch
rename to patches/server/0745-Optimise-general-POI-access.patch
diff --git a/patches/server/0748-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0746-Allow-controlled-flushing-for-network-manager.patch
similarity index 98%
rename from patches/server/0748-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0746-Allow-controlled-flushing-for-network-manager.patch
index c52730c1df..8423c76c9c 100644
--- a/patches/server/0748-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0746-Allow-controlled-flushing-for-network-manager.patch
@@ -9,7 +9,7 @@ This patch will be used to optimise out flush calls in later
 patches.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 16954170ffeeedf18d8f8079b5e75915e0c682ba..a6b438543a12f5ecf05fb631ef53b18d4d253dff 100644
+index 2a9d5d977932e63ff7cae2fb8a7cfe7860172a39..4ed1373fdd8f39b3d8d9b4d5cd88f70d3259e2e4 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -94,6 +94,39 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0749-Add-more-async-catchers.patch b/patches/server/0747-Add-more-async-catchers.patch
similarity index 100%
rename from patches/server/0749-Add-more-async-catchers.patch
rename to patches/server/0747-Add-more-async-catchers.patch
diff --git a/patches/server/0750-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch
similarity index 99%
rename from patches/server/0750-Rewrite-entity-bounding-box-lookup-calls.patch
rename to patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch
index 1643085a3e..419ae30b24 100644
--- a/patches/server/0750-Rewrite-entity-bounding-box-lookup-calls.patch
+++ b/patches/server/0748-Rewrite-entity-bounding-box-lookup-calls.patch
@@ -1231,7 +1231,7 @@ index aa3217425a64fdd691f255dcc5529a29b8c2c86b..a0c66689c954823e7c20664594557dc2
              Visibility visibility = PersistentEntitySectionManager.getEffectiveStatus(this.entity, this.currentSection.getStatus());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index d6efa18ba9c032858071f6c87f1bdc0ce2ddb20f..d51833b1ad40ab234e2a2b2a61f093628ee1ea40 100644
+index 155933ef7c324ea17c2349a1f73ede29169ec4f2..7a042de919fc8335455bc45f7749648ca2f00735 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -132,9 +132,7 @@ public class CraftChunk implements Chunk {
@@ -1282,10 +1282,10 @@ index 9ab8159975f58a0014edbe3a368490b3590882ea..4c6cbfbcb5a7876e6b556b59c54e9a4c
 +    // Paper end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index d0e697138ec1a2a0570d4cf46e4f28b4a7eaa946..feec2b3b832fd2c490276e4360fcf6e2b40f01cf 100644
+index ec9907947b13ca3367c7ef5cb006bbabec3f2293..1732e753ea7748a66abecafb2136f93383f5ec4e 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -205,7 +205,13 @@ public class ActivationRange
+@@ -206,7 +206,13 @@ public class ActivationRange
              ActivationType.VILLAGER.boundingBox = player.getBoundingBox().inflate( villagerActivationRange, 256, villagerActivationRange );
              // Paper end
  
diff --git a/patches/server/0751-Optimise-chunk-tick-iteration.patch b/patches/server/0749-Optimise-chunk-tick-iteration.patch
similarity index 98%
rename from patches/server/0751-Optimise-chunk-tick-iteration.patch
rename to patches/server/0749-Optimise-chunk-tick-iteration.patch
index c381730e4a..1f7e35fe3a 100644
--- a/patches/server/0751-Optimise-chunk-tick-iteration.patch
+++ b/patches/server/0749-Optimise-chunk-tick-iteration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise chunk tick iteration
 Use a dedicated list of entity ticking chunks to reduce the cost
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 280ca8758cbaf710c2bf357e41dd2af6e14b49bc..ad352b4b67632f9984c4d10994a9acfe434a4996 100644
+index e306dbf3487676e01c483d121c1f26e141358e3f..482676d325a7d502fd74a67236eb05d97fac1d85 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -999,34 +999,46 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0752-Execute-chunk-tasks-mid-tick.patch b/patches/server/0750-Execute-chunk-tasks-mid-tick.patch
similarity index 98%
rename from patches/server/0752-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0750-Execute-chunk-tasks-mid-tick.patch
index 9f14b511e7..ee3d082d78 100644
--- a/patches/server/0752-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0750-Execute-chunk-tasks-mid-tick.patch
@@ -108,7 +108,7 @@ index 088334869cb62797a1e1d1bbb6187f03189d852d..c245c1f4611f7273c8da629f774e0c64
          } else {
              if (this.haveTime()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index ad352b4b67632f9984c4d10994a9acfe434a4996..df415f79dfd2ae9a709747b112022b38437daac4 100644
+index 482676d325a7d502fd74a67236eb05d97fac1d85..1560a58aa32d281870a9cc8213ec7b089e4cf4ba 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -1023,6 +1023,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0753-Do-not-copy-visible-chunks.patch b/patches/server/0751-Do-not-copy-visible-chunks.patch
similarity index 100%
rename from patches/server/0753-Do-not-copy-visible-chunks.patch
rename to patches/server/0751-Do-not-copy-visible-chunks.patch
diff --git a/patches/server/0754-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0754-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0752-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0755-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0755-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0753-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0756-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch
similarity index 99%
rename from patches/server/0756-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0754-Detail-more-information-in-watchdog-dumps.patch
index d0b6b6fd2e..48475d9d97 100644
--- a/patches/server/0756-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/0754-Detail-more-information-in-watchdog-dumps.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Detail more information in watchdog dumps
 - Dump player name, player uuid, position, and world for packet handling
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index a6b438543a12f5ecf05fb631ef53b18d4d253dff..c2642f798c49f79d34e599517d64d73b6e7676c6 100644
+index 4ed1373fdd8f39b3d8d9b4d5cd88f70d3259e2e4..3cb89b76887e46f82a660c3832474bd7dbee5f57 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -452,7 +452,14 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0757-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0755-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0757-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0755-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0758-Distance-manager-tick-timings.patch b/patches/server/0756-Distance-manager-tick-timings.patch
similarity index 96%
rename from patches/server/0758-Distance-manager-tick-timings.patch
rename to patches/server/0756-Distance-manager-tick-timings.patch
index c12b5b8d05..ff8e1591fe 100644
--- a/patches/server/0758-Distance-manager-tick-timings.patch
+++ b/patches/server/0756-Distance-manager-tick-timings.patch
@@ -19,7 +19,7 @@ index eada966d7f108a6081be7a848f5c1dfcb1eed676..a977f7483f37df473096b2234dc1308b
      public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks");
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index df415f79dfd2ae9a709747b112022b38437daac4..69de466c627f91cb4ee67c1015ead2502f3f7500 100644
+index 1560a58aa32d281870a9cc8213ec7b089e4cf4ba..54a9cd342f7c5720388906abf4485594bea57021 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -834,6 +834,7 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0759-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0759-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0757-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0760-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0760-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0758-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0761-Add-packet-limiter-config.patch b/patches/server/0759-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0761-Add-packet-limiter-config.patch
rename to patches/server/0759-Add-packet-limiter-config.patch
diff --git a/patches/server/0762-Lag-compensate-block-breaking.patch b/patches/server/0760-Lag-compensate-block-breaking.patch
similarity index 100%
rename from patches/server/0762-Lag-compensate-block-breaking.patch
rename to patches/server/0760-Lag-compensate-block-breaking.patch
diff --git a/patches/server/0763-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch
similarity index 100%
rename from patches/server/0763-Use-correct-LevelStem-registry-when-loading-default-.patch
rename to patches/server/0761-Use-correct-LevelStem-registry-when-loading-default-.patch
diff --git a/patches/server/0764-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 93%
rename from patches/server/0764-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index b201e36d10..c5bd6526f7 100644
--- a/patches/server/0764-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0762-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
@@ -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 a99a0ea2d04ebee66982a7da9422ae7a64127d3b..d44154ba43e06934d7889f2f20d1a27765504574 100644
+index f706058877dc3f88aab4e7028665ca53376beac1..a5a45118644fc1bc8caeefa59b5f897ed590e7ae 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
 @@ -44,6 +44,7 @@ public class ChunkStorage implements AutoCloseable {
diff --git a/patches/server/0765-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 96%
rename from patches/server/0765-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch
index faa1b46041..0692af7e78 100644
--- a/patches/server/0765-Consolidate-flush-calls-for-entity-tracker-packets.patch
+++ b/patches/server/0763-Consolidate-flush-calls-for-entity-tracker-packets.patch
@@ -22,7 +22,7 @@ With this change I could get all 200 on at 0ms ping.
 So in general this patch should reduce Netty I/O thread load.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 69de466c627f91cb4ee67c1015ead2502f3f7500..e7e110b53e79e0606262982555dd9eb096c7c4a8 100644
+index 54a9cd342f7c5720388906abf4485594bea57021..37e38abe5fd375d93f6a74add23b5a939a7a9994 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -1070,7 +1070,24 @@ public class ServerChunkCache extends ChunkSource {
diff --git a/patches/server/0766-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0764-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0766-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0764-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0767-Time-scoreboard-search.patch b/patches/server/0765-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0767-Time-scoreboard-search.patch
rename to patches/server/0765-Time-scoreboard-search.patch
diff --git a/patches/server/0768-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0768-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0766-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0769-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0767-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0769-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0767-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0770-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0768-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0770-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0768-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0771-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0769-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0771-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0769-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0772-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch
similarity index 100%
rename from patches/server/0772-Allow-removal-addition-of-entities-to-entity-ticklis.patch
rename to patches/server/0770-Allow-removal-addition-of-entities-to-entity-ticklis.patch
diff --git a/patches/server/0773-Optimise-random-block-ticking.patch b/patches/server/0771-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0773-Optimise-random-block-ticking.patch
rename to patches/server/0771-Optimise-random-block-ticking.patch
diff --git a/patches/server/0774-Optimise-non-flush-packet-sending.patch b/patches/server/0772-Optimise-non-flush-packet-sending.patch
similarity index 96%
rename from patches/server/0774-Optimise-non-flush-packet-sending.patch
rename to patches/server/0772-Optimise-non-flush-packet-sending.patch
index f8dc75ba8c..f23ce220df 100644
--- a/patches/server/0774-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0772-Optimise-non-flush-packet-sending.patch
@@ -20,7 +20,7 @@ up on this optimisation before he came along.
 Locally this patch drops the entity tracker tick by a full 1.5x.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 241b086bd096a4bc2175835b2505deda1c143f09..a1aafb037fd340dc93dd2afb758ffc7457d15f84 100644
+index 201ddfa8fe6231265dcc1a7c8141badbdadbea47..c14294923a0c15aafe98bf5006866acaa9803280 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -49,6 +49,8 @@ import org.apache.logging.log4j.Logger;
diff --git a/patches/server/0775-Optimise-nearby-player-lookups.patch b/patches/server/0773-Optimise-nearby-player-lookups.patch
similarity index 99%
rename from patches/server/0775-Optimise-nearby-player-lookups.patch
rename to patches/server/0773-Optimise-nearby-player-lookups.patch
index 40e9691583..e12b800e8a 100644
--- a/patches/server/0775-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0773-Optimise-nearby-player-lookups.patch
@@ -195,7 +195,7 @@ index 83517c4eaf419770178f0520210218e0a70c4642..0918bb28fd058e6b79f45993a46738a5
  
          this.handlingTick = true;
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 0a559b658cd52a1cce2895c6d9f96aa665a85c7b..8200e33ed4ebcae8a27cccf2a28daba5e10cf75d 100644
+index 72888f28583d89f5cc38b6d6628f6557df16638b..153d866a09f598ae08cab7dedbcddfc9ce969d4b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -792,7 +792,12 @@ public abstract class Mob extends LivingEntity {
@@ -287,7 +287,7 @@ index 103428df78d1efe805ab425f1b4085077239bdf6..4247dcb003626535dbb997f48ad9f613
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, final DimensionType dimensionmanager, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 9b13244571807907fc0e14463d746724b0713c19..49a0ceaf9a08f64f84f3925cfba3fab6bb034bae 100644
+index 4e18272192fc3bbb22cc98f2640480c30a056239..4286a4b3e2dabcc4c512d250d909e7b074cbfae7 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -275,7 +275,7 @@ public final class NaturalSpawner {
diff --git a/patches/server/0776-Optimise-WorldServer-notify.patch b/patches/server/0774-Optimise-WorldServer-notify.patch
similarity index 100%
rename from patches/server/0776-Optimise-WorldServer-notify.patch
rename to patches/server/0774-Optimise-WorldServer-notify.patch
diff --git a/patches/server/0777-Remove-streams-for-villager-AI.patch b/patches/server/0775-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0777-Remove-streams-for-villager-AI.patch
rename to patches/server/0775-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0778-Rewrite-dataconverter-system.patch b/patches/server/0776-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0778-Rewrite-dataconverter-system.patch
rename to patches/server/0776-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0779-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch
similarity index 98%
rename from patches/server/0779-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch
index eb2878182d..c7f736331b 100644
--- a/patches/server/0779-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0777-Use-Velocity-compression-and-cipher-natives.patch
@@ -268,7 +268,7 @@ index 792883afe53d2b7989c25a81c2f9a639d5e21d20..c04379ca8a4db0f4de46ad2b3b338431
          return this.threshold;
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index a1aafb037fd340dc93dd2afb758ffc7457d15f84..a7e7fe4be2784ff34f7f8d0b6c2f82d65de8c145 100644
+index c14294923a0c15aafe98bf5006866acaa9803280..81dde0efc1a06420c0791520b9e40b24dd1f0318 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -628,11 +628,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -325,7 +325,7 @@ index a1aafb037fd340dc93dd2afb758ffc7457d15f84..a7e7fe4be2784ff34f7f8d0b6c2f82d6
          } else {
              if (this.channel.pipeline().get("decompress") instanceof CompressionDecoder) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index f7aa0125e4724f1efddf28814f926289c1ae37d4..477aa83c3b342705a8a9b7ab41b2f77008e2e281 100644
+index 70b0c7fea72397f7bbdf02ce2794e7fb6fbd3742..bce781b645cc95f399eacf65edad5ad321fd68a4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -104,6 +104,11 @@ public class ServerConnectionListener {
diff --git a/patches/server/0780-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0780-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0778-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0781-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
similarity index 97%
rename from patches/server/0781-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
rename to patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
index ddc57c0d3a..e323782a39 100644
--- a/patches/server/0781-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
+++ b/patches/server/0779-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch
@@ -16,7 +16,7 @@ of a chance that we're about to eat a dirtload of chunk load callbacks, thus
 making this issue much more of an issue
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index d51833b1ad40ab234e2a2b2a61f093628ee1ea40..db344e5b9f96f317a232304587e6b1673fc6067d 100644
+index 7a042de919fc8335455bc45f7749648ca2f00735..ee6887111b591f174b9f871ce8680a30dc9e2725 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -128,46 +128,6 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0782-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0780-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0782-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0780-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0783-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0781-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0783-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0781-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0784-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0784-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0782-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0785-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0783-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0785-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0783-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0786-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 86%
rename from patches/server/0786-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 1b40cf1c18..12a317ac9c 100644
--- a/patches/server/0786-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0784-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
@@ -6,10 +6,10 @@ 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 4281356d240be5bc0232645b6ac87dfdb8a7d49f..1816c3aa0573928c0845b0a23d4dfc078317184e 100644
+index 3d92d901007a406ddf5e85be5391fc451b2ea2ec..f1a1ae33d41a08a0614c3e50e854e5a26f8a94f7 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -763,6 +763,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -764,6 +764,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
          // Paper end
          // CraftBukkit end
diff --git a/patches/server/0787-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0787-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0785-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0788-Ensure-valid-vehicle-status.patch b/patches/server/0786-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0788-Ensure-valid-vehicle-status.patch
rename to patches/server/0786-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0789-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0787-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0789-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0787-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0790-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0790-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0788-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0791-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0789-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0791-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0789-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0792-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
similarity index 100%
rename from patches/server/0792-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
rename to patches/server/0790-Mark-fish-and-axolotls-from-buckets-as-persistent.patch
diff --git a/patches/server/0793-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0791-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0793-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0791-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0794-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
similarity index 100%
rename from patches/server/0794-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
rename to patches/server/0792-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch
diff --git a/patches/server/0795-Preserve-overstacked-loot.patch b/patches/server/0793-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0795-Preserve-overstacked-loot.patch
rename to patches/server/0793-Preserve-overstacked-loot.patch
diff --git a/patches/server/0796-Update-head-rotation-in-missing-places.patch b/patches/server/0794-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0796-Update-head-rotation-in-missing-places.patch
rename to patches/server/0794-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0797-prevent-unintended-light-block-manipulation.patch b/patches/server/0795-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0797-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0795-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0798-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
similarity index 93%
rename from patches/server/0798-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
rename to patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
index 17215f32f2..9bda515c66 100644
--- a/patches/server/0798-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
+++ b/patches/server/0796-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dont count named piglins and hoglins towards mob cap
 
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 49a0ceaf9a08f64f84f3925cfba3fab6bb034bae..3ce14f26abb890e0d3fbf9b02747c4614ec46b47 100644
+index 4286a4b3e2dabcc4c512d250d909e7b074cbfae7..17a52bef19e361483a490ca83ced08ddbb9df3b4 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -83,7 +83,7 @@ public final class NaturalSpawner {
diff --git a/patches/server/0799-Fix-CraftCriteria-defaults-map.patch b/patches/server/0797-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0799-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0797-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0800-Fix-upstreams-block-state-factories.patch b/patches/server/0798-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0800-Fix-upstreams-block-state-factories.patch
rename to patches/server/0798-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0801-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 97%
rename from patches/server/0801-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch
index 39b64883ac..133f139610 100644
--- a/patches/server/0801-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0799-Add-config-option-for-logging-player-ip-addresses.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for logging player ip addresses
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index eaa1d5491ef3f5caf156d16fa7544741e53c6bab..cd918cec00d8202252af0d20b1a8891371c538e3 100644
+index 31e057e16c04f6cb6a4fa42e6ac9e81198e24d79..609f7ff543353ede53dc46dafc5a2fd0b0622cd8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -91,6 +91,11 @@ public class PaperConfig {
@@ -52,7 +52,7 @@ index 3962e82d4e4c5f792a37e825891e6960e737452d..dddc97094f0a7847b2818e6ea3b3f6cd
          InetSocketAddress virtualHost = com.destroystokyo.paper.network.PaperNetworkClient.prepareVirtualHost(host, port);
          com.destroystokyo.paper.event.server.PaperServerListPingEvent event = PaperLegacyStatusClient.processRequest(
 diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 477aa83c3b342705a8a9b7ab41b2f77008e2e281..a821b68fbe7e172c08540e4b04c857b8b5929120 100644
+index bce781b645cc95f399eacf65edad5ad321fd68a4..54477f1d0d0e2f09fc2d2b1f4c57413e5a0736f9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
 @@ -204,7 +204,7 @@ public class ServerConnectionListener {
diff --git a/patches/server/0802-Configurable-feature-seeds.patch b/patches/server/0800-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0802-Configurable-feature-seeds.patch
rename to patches/server/0800-Configurable-feature-seeds.patch
diff --git a/patches/server/0803-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0803-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0801-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0804-Add-root-admin-user-detection.patch b/patches/server/0802-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0804-Add-root-admin-user-detection.patch
rename to patches/server/0802-Add-root-admin-user-detection.patch
diff --git a/patches/server/0805-Always-allow-item-changing-in-Fireball.patch b/patches/server/0803-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0805-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0803-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0806-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0806-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0804-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0807-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
similarity index 100%
rename from patches/server/0807-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
rename to patches/server/0805-Fix-anvil-prepare-event-not-working-with-zero-xp.patch
diff --git a/patches/server/0808-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0806-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0808-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0806-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0809-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0809-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0807-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0810-Rewrite-the-light-engine.patch b/patches/server/0808-Rewrite-the-light-engine.patch
similarity index 99%
rename from patches/server/0810-Rewrite-the-light-engine.patch
rename to patches/server/0808-Rewrite-the-light-engine.patch
index 15068b80c3..efc4295f5b 100644
--- a/patches/server/0810-Rewrite-the-light-engine.patch
+++ b/patches/server/0808-Rewrite-the-light-engine.patch
@@ -4432,7 +4432,7 @@ index 825fdb0336b0388dbbc54c8da99781900612031c..d271871563fa883efb77b35ec3b1dfbb
      private final DebugBuffer<ChunkHolder.ChunkSaveDebug> chunkToSaveHistory;
      public int oldTicketLevel;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 6e11040cdead829b1329ce0a95f5bf95a65bc6de..3be958576599995e083d4bea85e89099911795a6 100644
+index df785c230dde77eb8805872ccb506f882250547f..478054bde7fdaeed77f56ca4ead9e1740a439ce0 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -130,7 +130,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
diff --git a/patches/server/0811-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0811-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0809-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0812-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0812-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0810-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0813-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0813-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0811-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0814-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0814-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0812-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0815-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch
similarity index 100%
rename from patches/server/0815-Fix-kelp-modifier-changing-growth-for-other-crops.patch
rename to patches/server/0813-Fix-kelp-modifier-changing-growth-for-other-crops.patch
diff --git a/patches/server/0816-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0816-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0814-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0817-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0815-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0817-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0815-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0818-Add-player-health-update-API.patch b/patches/server/0816-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0818-Add-player-health-update-API.patch
rename to patches/server/0816-Add-player-health-update-API.patch
diff --git a/patches/server/0819-Optimize-HashMapPalette.patch b/patches/server/0817-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0819-Optimize-HashMapPalette.patch
rename to patches/server/0817-Optimize-HashMapPalette.patch
diff --git a/patches/server/0820-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0820-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0818-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0821-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0821-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0819-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0822-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 94%
rename from patches/server/0822-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch
index c5199df153..cd1af963f5 100644
--- a/patches/server/0822-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/0820-Optimise-collision-checking-in-player-move-packet-ha.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimise collision checking in player move packet handling
 Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1816c3aa0573928c0845b0a23d4dfc078317184e..057fcbc389e54e0c9f7a90a3e8b965cd46db9d58 100644
+index f1a1ae33d41a08a0614c3e50e854e5a26f8a94f7..d85f5817f1aaebff3d93ee472d4580af72f7eae2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -582,12 +582,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -583,12 +583,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                      return;
                  }
  
@@ -24,7 +24,7 @@ index 1816c3aa0573928c0845b0a23d4dfc078317184e..057fcbc389e54e0c9f7a90a3e8b965cd
                  double d11 = d7;
  
                  d6 = d3 - entity.getX();
-@@ -601,16 +602,23 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -602,16 +603,23 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  boolean flag1 = false;
  
                  if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
@@ -52,7 +52,7 @@ index 1816c3aa0573928c0845b0a23d4dfc078317184e..057fcbc389e54e0c9f7a90a3e8b965cd
                      entity.absMoveTo(d0, d1, d2, f, f1);
                      this.player.absMoveTo(d0, d1, d2, this.player.getYRot(), this.player.getXRot()); // CraftBukkit
                      this.connection.send(new ClientboundMoveVehiclePacket(entity));
-@@ -696,7 +704,32 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -697,7 +705,32 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      }
  
      private boolean noBlocksAround(Entity entity) {
@@ -86,7 +86,7 @@ index 1816c3aa0573928c0845b0a23d4dfc078317184e..057fcbc389e54e0c9f7a90a3e8b965cd
      }
  
      @Override
-@@ -1238,7 +1271,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1239,7 +1272,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  }
  
                  if (this.awaitingPositionFromClient != null) {
@@ -95,7 +95,7 @@ index 1816c3aa0573928c0845b0a23d4dfc078317184e..057fcbc389e54e0c9f7a90a3e8b965cd
                          this.awaitingTeleportTime = this.tickCount;
                          this.teleport(this.awaitingPositionFromClient.x, this.awaitingPositionFromClient.y, this.awaitingPositionFromClient.z, this.player.getYRot(), this.player.getXRot());
                      }
-@@ -1332,7 +1365,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1333,7 +1366,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                                  }
                              }
  
@@ -104,7 +104,7 @@ index 1816c3aa0573928c0845b0a23d4dfc078317184e..057fcbc389e54e0c9f7a90a3e8b965cd
  
                              d7 = d0 - this.lastGoodX; // Paper - diff on change, used for checking large move vectors above
                              d8 = d1 - this.lastGoodY; // Paper - diff on change, used for checking large move vectors above
-@@ -1371,6 +1404,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1372,6 +1405,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                              }
  
                              this.player.move(MoverType.PLAYER, new Vec3(d7, d8, d9));
@@ -112,7 +112,7 @@ index 1816c3aa0573928c0845b0a23d4dfc078317184e..057fcbc389e54e0c9f7a90a3e8b965cd
                              this.player.onGround = packet.isOnGround(); // CraftBukkit - SPIGOT-5810, SPIGOT-5835, SPIGOT-6828: reset by this.player.move
                              // Paper start - prevent position desync
                              if (this.awaitingPositionFromClient != null) {
-@@ -1390,12 +1424,23 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1391,12 +1425,23 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                              boolean flag1 = false;
  
                              if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
@@ -138,7 +138,7 @@ index 1816c3aa0573928c0845b0a23d4dfc078317184e..057fcbc389e54e0c9f7a90a3e8b965cd
                                  this.teleport(d3, d4, d5, f, f1);
                              } else {
                                  // CraftBukkit start - fire PlayerMoveEvent
-@@ -1482,6 +1527,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -1483,6 +1528,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          }
      }
  
diff --git a/patches/server/0823-Actually-unload-POI-data.patch b/patches/server/0821-Actually-unload-POI-data.patch
similarity index 100%
rename from patches/server/0823-Actually-unload-POI-data.patch
rename to patches/server/0821-Actually-unload-POI-data.patch
diff --git a/patches/server/0824-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 96%
rename from patches/server/0824-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 6f7e30efa6..cf3cbe1810 100644
--- a/patches/server/0824-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0822-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix ChunkSnapshot#isSectionEmpty(int) and optimize
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index db344e5b9f96f317a232304587e6b1673fc6067d..d51476ca2aad08a0dd93a2e772dd7750afc939dc 100644
+index ee6887111b591f174b9f871ce8680a30dc9e2725..f20293426b104ed0c02a931b5ab77f87590f0c18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -280,14 +280,17 @@ public class CraftChunk implements Chunk {
diff --git a/patches/server/0825-Update-Log4j.patch b/patches/server/0823-Update-Log4j.patch
similarity index 100%
rename from patches/server/0825-Update-Log4j.patch
rename to patches/server/0823-Update-Log4j.patch
diff --git a/patches/server/0826-Add-more-Campfire-API.patch b/patches/server/0824-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0826-Add-more-Campfire-API.patch
rename to patches/server/0824-Add-more-Campfire-API.patch
diff --git a/patches/server/0827-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch b/patches/server/0825-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch
similarity index 100%
rename from patches/server/0827-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch
rename to patches/server/0825-Fix-WorldGenRegion-leak-when-converting-pre-1.18-chu.patch
diff --git a/patches/server/0828-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0826-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0828-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0826-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0829-Fix-tripwire-state-inconsistency.patch b/patches/server/0827-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0829-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0827-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0830-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0828-Fix-fluid-logging-on-Block-breakNaturally.patch
similarity index 100%
rename from patches/server/0830-Fix-fluid-logging-on-Block-breakNaturally.patch
rename to patches/server/0828-Fix-fluid-logging-on-Block-breakNaturally.patch
diff --git a/patches/server/0831-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0829-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0831-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0829-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0832-Improve-scoreboard-entries.patch b/patches/server/0830-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0832-Improve-scoreboard-entries.patch
rename to patches/server/0830-Improve-scoreboard-entries.patch
diff --git a/patches/server/0833-Entity-powdered-snow-API.patch b/patches/server/0831-Entity-powdered-snow-API.patch
similarity index 90%
rename from patches/server/0833-Entity-powdered-snow-API.patch
rename to patches/server/0831-Entity-powdered-snow-API.patch
index 9531b9a5b8..d4e1b32690 100644
--- a/patches/server/0833-Entity-powdered-snow-API.patch
+++ b/patches/server/0831-Entity-powdered-snow-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 5aae88e20bc04560d6ad52cfcaa872d28bfcee8f..5893d2028679d23315a32433f6affa0c8d63c01c 100644
+index 135e2992e394095814e47126b28ab5c2426c38ef..69223b13e894d86d9529f2ef8b60a08a1f7a9267 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1286,5 +1286,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1287,5 +1287,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          entity.setRot(location.getYaw(), location.getPitch());
          return !entity.valid && entity.level.addFreshEntity(entity, reason);
      }
diff --git a/patches/server/0834-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0834-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0832-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0835-Add-API-for-item-entity-health.patch b/patches/server/0833-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0835-Add-API-for-item-entity-health.patch
rename to patches/server/0833-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0836-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0834-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0836-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0834-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0837-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0835-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0837-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0835-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0838-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0836-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0838-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0836-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0839-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0837-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0839-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0837-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0840-Fix-bees-aging-inside-hives.patch b/patches/server/0838-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0840-Fix-bees-aging-inside-hives.patch
rename to patches/server/0838-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0841-Bucketable-API.patch b/patches/server/0839-Bucketable-API.patch
similarity index 100%
rename from patches/server/0841-Bucketable-API.patch
rename to patches/server/0839-Bucketable-API.patch
diff --git a/patches/server/0842-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0840-Check-player-world-in-endPortalSoundRadius.patch
similarity index 100%
rename from patches/server/0842-Check-player-world-in-endPortalSoundRadius.patch
rename to patches/server/0840-Check-player-world-in-endPortalSoundRadius.patch
diff --git a/patches/server/0843-Fix-riding-distance-statistics.patch b/patches/server/0841-Fix-riding-distance-statistics.patch
similarity index 92%
rename from patches/server/0843-Fix-riding-distance-statistics.patch
rename to patches/server/0841-Fix-riding-distance-statistics.patch
index d4fab4f4b5..6cf437070b 100644
--- a/patches/server/0843-Fix-riding-distance-statistics.patch
+++ b/patches/server/0841-Fix-riding-distance-statistics.patch
@@ -7,10 +7,10 @@ Fixes entity ride distance stats not being awarded correctly.
 Based upon https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/pull-requests/900
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b9e0dc98243bee3de7eb291dd3fb25049c0a8f2b..3c7e3d5b06409bf2e98a35d678564f0e477481a9 100644
+index d85f5817f1aaebff3d93ee472d4580af72f7eae2..926d0a80cbb55184955ac6720948d2e86683cc57 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -608,7 +608,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -609,7 +609,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  Location curPos = this.getCraftPlayer().getLocation(); // Spigot
  
                  entity.absMoveTo(d3, d4, d5, f, f1);
@@ -26,7 +26,7 @@ index b9e0dc98243bee3de7eb291dd3fb25049c0a8f2b..3c7e3d5b06409bf2e98a35d678564f0e
                  // Paper start - optimise out extra getCubes
                  boolean teleportBack = flag1; // violating this is always a fail
                  if (!teleportBack) {
-@@ -620,10 +627,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -621,10 +628,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  }
                  if (teleportBack) { // Paper end - optimise out extra getCubes
                      entity.absMoveTo(d0, d1, d2, f, f1);
diff --git a/work/Bukkit b/work/Bukkit
index 031731e60e..7b1856bfe9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 031731e60ece4b3fe0468a0df94b89d339b4169d
+Subproject commit 7b1856bfe9bbf0ae0e1e9fee6759bd956f958e22
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 2a2caa7e25..c93fcba47a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 2a2caa7e25cfcf66c368b0098f320ac93d416d6a
+Subproject commit c93fcba47ab0e9c319a5c06e83e3f4b675fbe17c
diff --git a/work/Spigot b/work/Spigot
index 8965a50244..78a14d9d9c 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 8965a5024427f83a4e82ce3e3d4773fd78d22d76
+Subproject commit 78a14d9d9cc79fd5692226f74cad274c5052f4cd