From 57f11578714a6a52111130dbabb702b30cdc746f Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 7 Feb 2023 07:55:53 -0800
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#8823)

---
 patches/api/0005-Adventure.patch              | 46 +++++++++----------
 patches/api/0008-Timings-v2.patch             |  4 +-
 .../0010-Player-affects-spawning-API.patch    |  4 +-
 patches/api/0015-Add-view-distance-API.patch  |  8 ++--
 ...cord-chat-API-from-spigot-subclasses.patch |  4 +-
 .../0024-Player-Tab-List-and-Title-APIs.patch |  4 +-
 .../api/0026-Complete-resource-pack-API.patch |  6 +--
 ...0046-Add-String-based-Action-Bar-API.patch | 10 ++--
 patches/api/0055-Fix-upstream-javadocs.patch  |  8 ++--
 .../0061-Shoulder-Entities-Release-API.patch  |  4 +-
 ...1-Ability-to-apply-mending-to-XP-API.patch |  4 +-
 .../0092-Player.setPlayerProfile-API.patch    |  4 +-
 ...5-Add-openSign-method-to-HumanEntity.patch |  8 ++--
 ...96-Add-Ban-Methods-to-Player-Objects.patch |  6 +--
 ...ld.spawnParticle-API-and-add-Builder.patch |  4 +-
 ...ivingEntity-Hand-Raised-Item-Use-API.patch |  4 +-
 .../0121-InventoryCloseEvent-Reason-API.patch |  4 +-
 ...vide-Chunk-Coordinates-as-a-Long-API.patch |  6 +--
 ...ile-Entities-from-a-chunk-without-sn.patch | 23 ++--------
 ...e-attack-cooldown-methods-for-Player.patch |  4 +-
 ...CanPlaceOn-and-CanDestroy-NBT-values.patch |  6 +--
 .../0176-Fix-Spigot-annotation-mistakes.patch | 18 ++++----
 .../0195-Add-Player-Client-Options-API.patch  |  4 +-
 patches/api/0204-Potential-bed-API.patch      |  4 +-
 patches/api/0214-Brand-support.patch          |  4 +-
 ...al-open-container-api-to-HumanEntity.patch |  4 +-
 .../api/0228-Player-elytra-boost-API.patch    |  4 +-
 patches/api/0256-Add-sendOpLevel-API.patch    |  4 +-
 ...-add-isDeeplySleeping-to-HumanEntity.patch |  4 +-
 patches/api/0284-More-World-API.patch         |  4 +-
 .../0342-Add-player-health-update-API.patch   |  4 +-
 patches/api/0357-Multi-Block-Change-API.patch |  4 +-
 patches/api/0386-Add-Player-getFishHook.patch |  4 +-
 patches/api/0387-More-Teleport-API.patch      |  4 +-
 ...stom-Chat-Completion-Suggestions-API.patch |  4 +-
 ...destroyerIdentity-to-sendBlockDamage.patch |  6 +--
 .../0401-Elder-Guardian-appearance-API.patch  |  4 +-
 .../0409-Add-Player-Warden-Warning-API.patch  |  4 +-
 patches/api/0424-Flying-Fall-Damage-API.patch |  4 +-
 ...d-Player-sendEquipmentChange-Map-API.patch |  4 +-
 patches/api/0428-Win-Screen-API.patch         |  4 +-
 patches/server/0008-MC-Utils.patch            |  4 +-
 patches/server/0009-Adventure.patch           | 22 ++++-----
 patches/server/0012-Timings-v2.patch          |  4 +-
 .../server/0016-Rewrite-chunk-system.patch    |  8 ++--
 .../0028-Player-affects-spawning-API.patch    |  8 ++--
 ...030-Only-refresh-abilities-if-needed.patch |  4 +-
 ...43-Implement-PlayerLocaleChangeEvent.patch |  6 +--
 ...ble-inter-world-teleportation-safety.patch |  4 +-
 .../0064-Complete-resource-pack-API.patch     |  4 +-
 ...th-absorb-values-and-repair-bad-data.patch |  4 +-
 .../0143-Shoulder-Entities-Release-API.patch  |  6 +--
 ...0-Ability-to-apply-mending-to-XP-API.patch |  4 +-
 .../0183-Player.setPlayerProfile-API.patch    | 12 ++---
 ...88-Flag-to-disable-the-channel-limit.patch |  4 +-
 ...9-Add-openSign-method-to-HumanEntity.patch |  4 +-
 ...ld.spawnParticle-API-and-add-Builder.patch |  4 +-
 .../0217-InventoryCloseEvent-Reason-API.patch | 10 ++--
 ...e-attack-cooldown-methods-for-Player.patch |  4 +-
 .../server/0255-Improve-death-events.patch    |  8 ++--
 ...-replace-OfflinePlayer-getLastPlayed.patch | 12 ++---
 ...-remove-from-being-called-on-Players.patch |  4 +-
 ...-Plugin-Tickets-to-API-Chunk-Methods.patch |  4 +-
 patches/server/0458-Brand-support.patch       |  4 +-
 .../server/0487-Optimise-getType-calls.patch  |  4 +-
 ...r-spawnParticle-x-y-z-precision-loss.patch |  4 +-
 .../0536-Added-WorldGameRuleChangeEvent.patch |  6 +--
 ...x-checkReach-check-for-Shulker-boxes.patch | 18 --------
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ... => 0601-Added-PlayerDeepSleepEvent.patch} |  2 +-
 ...ld-API.patch => 0602-More-World-API.patch} |  4 +-
 ... 0603-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} |  0
 ...dd-Channel-initialization-listeners.patch} |  0
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0610-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0614-Inventory-close.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0616-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0617-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  4 +-
 ... => 0620-ItemStack-repair-check-API.patch} |  0
 ....patch => 0621-More-Enchantment-API.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0624-Add-Mob-lookAt-API.patch} |  0
 ...0625-Add-Unix-domain-socket-support.patch} |  0
 ... => 0626-Add-EntityInsideBlockEvent.patch} |  0
 ...27-Attributes-API-for-item-defaults.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  2 +-
 ...patch => 0629-More-Lidded-Block-API.patch} |  0
 ...30-Limit-item-frame-cursors-on-maps.patch} |  0
 ... => 0631-Add-PlayerKickEvent-causes.patch} |  2 +-
 ...0632-Add-PufferFishStateChangeEvent.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ThreadingDe.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0636-Add-BellRevealRaiderEvent.patch} |  0
 ... 0637-Fix-invulnerable-end-crystals.patch} |  0
 ...38-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0639-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...patch => 0642-Line-Of-Sight-Changes.patch} |  0
 ... => 0643-add-per-world-spawn-limits.patch} |  2 +-
 ...h => 0644-Fix-potions-splash-events.patch} |  0
 ... => 0645-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  2 +-
 ...=> 0647-Missing-Entity-Behavior-API.patch} |  0
 ...ect-for-book-edit-is-called-on-main.patch} |  0
 ...of-Block-applyBoneMeal-always-being.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...rom-signs-not-firing-command-events.patch} |  0
 ...ch => 0652-Adds-PlayerArmSwingEvent.patch} |  0
 ...-event-leave-message-not-being-sent.patch} |  0
 ...-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} |  0
 ...inger-API.patch => 0659-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0661-Add-System.out-err-catcher.patch} |  0
 ... => 0662-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} |  0
 ...iting-of-comments-to-server.propert.patch} |  0
 ...tch => 0667-Add-PlayerSetSpawnEvent.patch} |  4 +-
 ...rs-respect-inventory-max-stack-size.patch} |  0
 ...ize-entity-tracker-passenger-checks.patch} |  0
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...=> 0671-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} |  0
 ...676-Clear-bucket-NBT-after-dispense.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0678-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0680-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0682-Add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  2 +-
 ... 0684-Get-entity-default-attributes.patch} |  0
 ...d-API.patch => 0685-Left-handed-API.patch} |  0
 ...ch => 0686-Add-more-advancement-API.patch} |  0
 ...687-Add-ItemFactory-getSpawnEgg-API.patch} |  0
 ...tch => 0688-Add-critical-damage-API.patch} |  2 +-
 ...0689-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  0
 ...-ram-API.patch => 0691-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...3-Add-Raw-Byte-Entity-Serialization.patch} |  0
 ...94-Vanilla-command-permission-fixes.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} |  2 +-
 ...96-Fix-GameProfileCache-concurrency.patch} |  0
 ...g-when-the-async-catcher-is-tripped.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  2 +-
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...rolled-flushing-for-network-manager.patch} |  0
 ...=> 0701-Optimise-general-POI-access.patch} |  0
 ... 0702-Optimise-chunk-tick-iteration.patch} |  0
 ...> 0703-Execute-chunk-tasks-mid-tick.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  0
 ...lly-inline-methods-in-BlockPosition.patch} |  0
 ... 0708-Distance-manager-tick-timings.patch} |  0
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  0
 ...h => 0711-Add-packet-limiter-config.patch} |  0
 ...our-chunk-data-off-disk-when-conver.patch} |  0
 ...sh-calls-for-entity-tracker-packets.patch} |  0
 ...-lookup-fluid-state-when-raytracing.patch} |  0
 ...atch => 0715-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
 ... 0720-Optimise-random-block-ticking.patch} |  0
 ...1-Optimise-non-flush-packet-sending.patch} |  0
 ...0722-Optimise-nearby-player-lookups.patch} |  0
 ...0723-Remove-streams-for-villager-AI.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  0
 ...hread-worker-count-for-low-core-cou.patch} |  0
 ...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} |  0
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0732-Ensure-valid-vehicle-status.patch} |  0
 ...ftlocked-end-exit-portal-generation.patch} |  0
 ...r-causing-a-crash-when-trying-to-ge.patch} |  0
 ...-t-log-debug-logging-being-disabled.patch} |  0
 ...ous-menus-with-empty-level-accesses.patch} |  0
 ...h => 0737-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  0
 ...unintended-light-block-manipulation.patch} |  0
 ...0740-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ...ion-for-logging-player-ip-addresses.patch} |  0
 ... => 0743-Configurable-feature-seeds.patch} |  0
 ...pper-didnt-account-for-entity-sende.patch} |  0
 ... 0745-Add-root-admin-user-detection.patch} |  0
 ...ays-allow-item-changing-in-Fireball.patch} |  0
 ...t-attempt-to-teleport-dead-entities.patch} |  0
 ...ive-velocity-through-repeated-crits.patch} |  0
 ...e-code-using-deprecated-for-removal.patch} |  0
 ...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
 ...=> 0754-Fix-Spigot-growth-modifiers.patch} |  0
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0756-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0757-Add-player-health-update-API.patch} |  6 +--
 ...tch => 0758-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} |  0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} | 14 +++---
 ...patch => 0763-Add-more-Campfire-API.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} |  0
 ...65-Fix-tripwire-state-inconsistency.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0767-Improve-scoreboard-entries.patch} |  0
 ...ch => 0768-Entity-powdered-snow-API.patch} |  0
 ...0769-Add-API-for-item-entity-health.patch} |  0
 ...-type-tags-suggestions-in-selectors.patch} |  0
 ...ax-block-light-for-monster-spawning.patch} |  0
 ...pistons-and-BlockPistonRetractEvent.patch} |  0
 ...plifiers-greater-than-127-correctly.patch} |  0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...=> 0775-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0776-Bucketable-API.patch} |  0
 ...es.patch => 0777-Validate-usernames.patch} |  0
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  2 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...2-Multiple-Entries-with-Scoreboards.patch} |  0
 ...783-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...0786-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0787-Kick-on-main-for-illegal-chat.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  4 +-
 ...ent.patch => 0789-Fix-NotePlayEvent.patch} |  0
 ....patch => 0790-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0791-Dolphin-API.patch} |  0
 ...h => 0792-More-PotionEffectType-API.patch} |  0
 ...for-StructureTemplate.Pallete-cache.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  0
 ...-missing-structure-set-seed-configs.patch} |  0
 ...h => 0796-Implement-regenerateChunk.patch} |  2 +-
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0799-Add-GameEvent-tags.patch} |  0
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...tch => 0801-Furnace-RecipesUsed-API.patch} |  0
 ...gurable-sculk-sensor-listener-range.patch} |  0
 ...d-missing-block-data-mins-and-maxes.patch} |  0
 ...fault-CustomSpawners-in-custom-worl.patch} |  0
 ...-worldlist-before-initing-the-world.patch} |  0
 ... => 0806-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0807-Custom-Potion-Mixes.patch} |  0
 ...0808-Fix-Fluid-tags-isTagged-method.patch} |  0
 ...09-Force-close-world-loading-screen.patch} |  0
 ...810-Fix-falling-block-spawn-methods.patch} |  2 +-
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  0
 ...I.patch => 0813-More-Projectile-API.patch} |  0
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  0
 ...0816-Implement-getComputedBiome-API.patch} |  0
 ...> 0817-Make-some-itemstacks-nonnull.patch} |  0
 ...818-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0819-Fix-saving-in-unloadWorld.patch} |  0
 ...h => 0820-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0821-Add-TameableDeathMessageEvent.patch} |  0
 ...ock-data-for-EntityChangeBlockEvent.patch} |  0
 ...bles-running-when-mob-loot-gamerule.patch} |  0
 ...ssenger-world-matches-ridden-entity.patch} |  0
 ...rd-against-invalid-entity-positions.patch} |  0
 ...s.patch => 0826-cache-resource-keys.patch} |  0
 ...ange-the-podium-for-the-EnderDragon.patch} |  0
 ...erriding-a-block-entity-during-worl.patch} |  0
 ...eGrowEvent-species-for-RED_MUSHROOM.patch} |  0
 ...t-tile-entity-copies-loading-chunks.patch} |  0
 ...ead-of-display-name-in-PlayerList-g.patch} |  0
 ...s-not-spawning-outside-slime-chunks.patch} |  0
 ...-ServerLevel-for-gamerule-callbacks.patch} |  6 +--
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  0
 ...> 0835-WorldCreator-keepSpawnLoaded.patch} |  0
 ...-NPE-for-BlockDataMeta-getBlockData.patch} |  0
 ...destroyed-trigger-in-the-correct-pl.patch} |  0
 ...Event-and-CollarColorable-interface.patch} |  0
 ...CauldronLevelChange-on-initial-fill.patch} |  0
 ...snow-cauldrons-not-turning-to-water.patch} |  0
 ...> 0841-Add-PlayerStopUsingItemEvent.patch} |  0
 ...42-FallingBlock-auto-expire-setting.patch} |  0
 ...rs.patch => 0843-Don-t-tick-markers.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0845-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0848-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  0
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...-on-world-create-while-being-ticked.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...53-Dont-resent-entity-on-art-update.patch} |  0
 ... => 0854-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  0
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0857-Nameable-Banner-API.patch} |  0
 ...roadcast-messages-to-command-blocks.patch} |  0
 ...pty-items-from-being-added-to-world.patch} |  0
 ...hPotion-and-LingeringPotion-spawnin.patch} |  0
 ...nent-in-resource-pack-rejection-mes.patch} |  0
 ...atch => 0862-Add-Player-getFishHook.patch} |  2 +-
 ...chunk-for-dynamic-game-event-listen.patch} |  0
 ...s-missing-EntityDropItemEvent-calls.patch} |  0
 ...debug-information-to-chat-packet-er.patch} |  0
 ...PE.patch => 0866-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  0
 ...API.patch => 0868-More-Teleport-API.patch} | 10 ++--
 ... => 0869-Add-EntityPortalReadyEvent.patch} |  0
 ...level-random-in-entity-constructors.patch} |  0
 ...k-entities-after-destroy-prediction.patch} |  0
 ...on-plugins-accessing-faraway-chunks.patch} |  4 +-
 ...tom-Chat-Completion-Suggestions-API.patch} |  2 +-
 ...=> 0874-Add-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0875-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...-invalid-signature-login-stacktrace.patch} |  0
 ...-to-PlayerConnection-internalTelepo.patch} |  0
 ...API.patch => 0879-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...andom-in-ServerLoginPacketListenerI.patch} |  0
 ...882-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  0
 ...und-for-client-lag-spikes-MC-162253.patch} |  0
 ...ok-changes-from-crashing-the-server.patch} |  0
 ...estroyerIdentity-to-sendBlockDamage.patch} |  4 +-
 ...t-killed-statuses-should-be-false-f.patch} |  0
 ...tityChangeBlockEvent-in-more-places.patch} |  0
 ...> 0889-Missing-eating-regain-reason.patch} |  0
 ....patch => 0890-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...3-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0894-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  0
 ...re-player-sending-on-dimension-chan.patch} |  0
 ... 0897-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ...lockState-and-isPreferredTool-to-Bl.patch} |  0
 ...=> 0900-Fix-a-bunch-of-vanilla-bugs.patch} |  0
 ...y-onTrackingStart-during-navigation.patch} |  0
 ... 0902-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0903-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  0
 ... 0906-Elder-Guardian-appearance-API.patch} |  4 +-
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0908-Add-entity-knockback-API.patch} |  0
 ....patch => 0909-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...1-optimized-dirt-and-snow-spreading.patch} |  0
 ... => 0912-Added-EntityToggleSitEvent.patch} |  0
 ... => 0913-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0914-Add-Moving-Piston-API.patch} |  0
 ...> 0915-Ignore-impossible-spawn-tick.patch} |  0
 ...source-for-fireworks-from-dispenser.patch} |  0
 ...t-suggestion-permissions-to-align-w.patch} |  0
 ...Event-cancellation-cant-fully-preve.patch} |  0
 ...Prevent-compass-from-loading-chunks.patch} |  0
 ...0920-Add-PrePlayerAttackEntityEvent.patch} |  2 +-
 ...e-reset-EnderDragon-boss-event-name.patch} |  0
 ...-green-map-markers-do-not-disappear.patch} |  0
 ... 0923-Add-Player-Warden-Warning-API.patch} |  4 +-
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...925-Add-paper-dumplisteners-command.patch} |  0
 ...lobal-player-list-where-appropriate.patch} |  0
 ...sync-entity-add-due-to-fungus-trees.patch} |  0
 ....patch => 0928-ItemStack-damage-API.patch} |  0
 ...tion-API.patch => 0929-Friction-API.patch} |  0
 ...trol-player-s-insomnia-and-phantoms.patch} |  0
 ...=> 0931-Fix-player-kick-on-shutdown.patch} |  0
 ... => 0932-Sync-offhand-slot-in-menus.patch} |  0
 ... 0933-Player-Entity-Tracking-Events.patch} |  0
 ...tch => 0934-Limit-pet-look-distance.patch} |  0
 ...ch => 0935-Properly-resend-entities.patch} |  0
 ...nd-additions-to-the-SpawnReason-API.patch} |  0
 ...ments.patch => 0937-fix-Instruments.patch} |  2 +-
 ...938-Fix-chunk-snapshot-biome-getter.patch} |  6 +--
 ...for-some-hot-BlockBehavior-and-Flui.patch} |  0
 ...-MapLike-Codec-missing-key-selector.patch} |  0
 ...es-in-dispense-events-regarding-sta.patch} |  0
 ... => 0942-Improve-logging-and-errors.patch} |  0
 ...-explosion-yield-with-new-gamerules.patch} |  0
 ...tch => 0944-Add-BlockLockCheckEvent.patch} |  0
 ... 0945-Add-Sneaking-API-for-Entities.patch} |  0
 ....patch => 0946-Improve-PortalEvents.patch} |  0
 ...ed-block-state-to-BlockExplodeEvent.patch} |  0
 ...ion-for-spider-worldborder-climbing.patch} |  0
 ...sing-SpigotConfig-logCommands-check.patch} |  0
 ...Allay-stopDancing-while-not-dancing.patch} |  0
 ...ge.patch => 0951-Flying-Fall-Damage.patch} |  6 +--
 ...ion-moving-velocity-to-VehicleBlock.patch} |  0
 ...onfig-for-disabling-entity-tag-tags.patch} |  0
 ...e-player-info-update-packet-on-join.patch} |  0
 ...k-items-during-EntityResurrectEvent.patch} |  0
 ...-Player-sendEquipmentChange-Map-API.patch} |  4 +-
 ...en-API.patch => 0957-Win-Screen-API.patch} |  4 +-
 ...ItemStack-setAmount-null-assignment.patch} |  0
 ...ix-force-opening-enchantment-tables.patch} |  2 +-
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 430 files changed, 270 insertions(+), 303 deletions(-)
 delete mode 100644 patches/server/0600-Fix-checkReach-check-for-Shulker-boxes.patch
 rename patches/server/{0601-fix-PlayerItemHeldEvent-firing-twice.patch => 0600-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0602-Added-PlayerDeepSleepEvent.patch => 0601-Added-PlayerDeepSleepEvent.patch} (91%)
 rename patches/server/{0603-More-World-API.patch => 0602-More-World-API.patch} (96%)
 rename patches/server/{0604-Added-PlayerBedFailEnterEvent.patch => 0603-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0605-Implement-methods-to-convert-between-Component-and-B.patch => 0604-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0606-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0607-Introduce-beacon-activation-deactivation-events.patch => 0606-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0608-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0607-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0609-Add-Channel-initialization-listeners.patch => 0608-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0610-Send-empty-commands-if-tab-completion-is-disabled.patch => 0609-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0611-Add-more-WanderingTrader-API.patch => 0610-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0612-Add-EntityBlockStorage-clearEntities.patch => 0611-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0613-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0614-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0615-Inventory-close.patch => 0614-Inventory-close.patch} (100%)
 rename patches/server/{0616-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0617-Fix-CraftPotionBrewer-cache.patch => 0616-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0618-Add-basic-Datapack-API.patch => 0617-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0619-Add-environment-variable-to-disable-server-gui.patch => 0618-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0620-additions-to-PlayerGameModeChangeEvent.patch => 0619-additions-to-PlayerGameModeChangeEvent.patch} (98%)
 rename patches/server/{0621-ItemStack-repair-check-API.patch => 0620-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0622-More-Enchantment-API.patch => 0621-More-Enchantment-API.patch} (100%)
 rename patches/server/{0623-Move-range-check-for-block-placing-up.patch => 0622-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0624-Fix-and-optimise-world-force-upgrading.patch => 0623-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0625-Add-Mob-lookAt-API.patch => 0624-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0626-Add-Unix-domain-socket-support.patch => 0625-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0627-Add-EntityInsideBlockEvent.patch => 0626-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0628-Attributes-API-for-item-defaults.patch => 0627-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0629-Add-cause-to-Weather-ThunderChangeEvents.patch => 0628-Add-cause-to-Weather-ThunderChangeEvents.patch} (98%)
 rename patches/server/{0630-More-Lidded-Block-API.patch => 0629-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0631-Limit-item-frame-cursors-on-maps.patch => 0630-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0632-Add-PlayerKickEvent-causes.patch => 0631-Add-PlayerKickEvent-causes.patch} (99%)
 rename patches/server/{0633-Add-PufferFishStateChangeEvent.patch => 0632-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0634-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0635-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0636-Add-option-to-fix-items-merging-through-walls.patch => 0635-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0637-Add-BellRevealRaiderEvent.patch => 0636-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0638-Fix-invulnerable-end-crystals.patch => 0637-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0639-Add-ElderGuardianAppearanceEvent.patch => 0638-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0640-Fix-dangerous-end-portal-logic.patch => 0639-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0641-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0642-Make-item-validations-configurable.patch => 0641-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0643-Line-Of-Sight-Changes.patch => 0642-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0644-add-per-world-spawn-limits.patch => 0643-add-per-world-spawn-limits.patch} (91%)
 rename patches/server/{0645-Fix-potions-splash-events.patch => 0644-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0646-Add-more-LimitedRegion-API.patch => 0645-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0647-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0646-Fix-PlayerDropItemEvent-using-wrong-item.patch} (94%)
 rename patches/server/{0648-Missing-Entity-Behavior-API.patch => 0647-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/server/{0649-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0650-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0651-Use-getChunkIfLoadedImmediately-in-places.patch => 0650-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0652-Fix-commands-from-signs-not-firing-command-events.patch => 0651-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0653-Adds-PlayerArmSwingEvent.patch => 0652-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0654-Fixes-kick-event-leave-message-not-being-sent.patch => 0653-Fixes-kick-event-leave-message-not-being-sent.patch} (100%)
 rename patches/server/{0655-Add-config-for-mobs-immune-to-default-effects.patch => 0654-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0656-Fix-incorrect-message-for-outdated-client.patch => 0655-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0657-Don-t-apply-cramming-damage-to-players.patch => 0656-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0658-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0657-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0659-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0658-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0660-Stinger-API.patch => 0659-Stinger-API.patch} (100%)
 rename patches/server/{0661-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0662-Add-System.out-err-catcher.patch => 0661-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0663-Fix-test-not-bootstrapping.patch => 0662-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0664-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0665-Improve-boat-collision-performance.patch => 0664-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0666-Prevent-AFK-kick-while-watching-end-credits.patch => 0665-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0667-Allow-skipping-writing-of-comments-to-server.propert.patch => 0666-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0668-Add-PlayerSetSpawnEvent.patch => 0667-Add-PlayerSetSpawnEvent.patch} (98%)
 rename patches/server/{0669-Make-hoppers-respect-inventory-max-stack-size.patch => 0668-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0670-Optimize-entity-tracker-passenger-checks.patch => 0669-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0671-Config-option-for-Piglins-guarding-chests.patch => 0670-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0672-Added-EntityDamageItemEvent.patch => 0671-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0673-Optimize-indirect-passenger-iteration.patch => 0672-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0674-Fix-block-drops-position-losing-precision-millions-o.patch => 0673-Fix-block-drops-position-losing-precision-millions-o.patch} (100%)
 rename patches/server/{0675-Configurable-item-frame-map-cursor-update-interval.patch => 0674-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0676-Make-EntityUnleashEvent-cancellable.patch => 0675-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0677-Clear-bucket-NBT-after-dispense.patch => 0676-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0678-Change-EnderEye-target-without-changing-other-things.patch => 0677-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0679-Add-BlockBreakBlockEvent.patch => 0678-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0680-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0681-More-CommandBlock-API.patch => 0680-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0682-Add-missing-team-sidebar-display-slots.patch => 0681-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0683-Add-back-EntityPortalExitEvent.patch => 0682-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0684-Add-methods-to-find-targets-for-lightning-strikes.patch => 0683-Add-methods-to-find-targets-for-lightning-strikes.patch} (96%)
 rename patches/server/{0685-Get-entity-default-attributes.patch => 0684-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0686-Left-handed-API.patch => 0685-Left-handed-API.patch} (100%)
 rename patches/server/{0687-Add-more-advancement-API.patch => 0686-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0688-Add-ItemFactory-getSpawnEgg-API.patch => 0687-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0689-Add-critical-damage-API.patch => 0688-Add-critical-damage-API.patch} (98%)
 rename patches/server/{0690-Fix-issues-with-mob-conversion.patch => 0689-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0691-Add-isCollidable-methods-to-various-places.patch => 0690-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0692-Goat-ram-API.patch => 0691-Goat-ram-API.patch} (100%)
 rename patches/server/{0693-Add-API-for-resetting-a-single-score.patch => 0692-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0694-Add-Raw-Byte-Entity-Serialization.patch => 0693-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0695-Vanilla-command-permission-fixes.patch => 0694-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0696-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (97%)
 rename patches/server/{0697-Fix-GameProfileCache-concurrency.patch => 0696-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0698-Log-when-the-async-catcher-is-tripped.patch => 0697-Log-when-the-async-catcher-is-tripped.patch} (100%)
 rename patches/server/{0699-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0698-Add-paper-mobcaps-and-paper-playermobcaps.patch} (99%)
 rename patches/server/{0700-Sanitize-ResourceLocation-error-logging.patch => 0699-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0701-Allow-controlled-flushing-for-network-manager.patch => 0700-Allow-controlled-flushing-for-network-manager.patch} (100%)
 rename patches/server/{0702-Optimise-general-POI-access.patch => 0701-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0703-Optimise-chunk-tick-iteration.patch => 0702-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{0704-Execute-chunk-tasks-mid-tick.patch => 0703-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0705-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0706-Custom-table-implementation-for-blockstate-state-loo.patch => 0705-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0707-Detail-more-information-in-watchdog-dumps.patch => 0706-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0708-Manually-inline-methods-in-BlockPosition.patch => 0707-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0709-Distance-manager-tick-timings.patch => 0708-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0710-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0709-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0711-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0712-Add-packet-limiter-config.patch => 0711-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0713-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0714-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0713-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0715-Don-t-lookup-fluid-state-when-raytracing.patch => 0714-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0716-Time-scoreboard-search.patch => 0715-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0717-Send-full-pos-packets-for-hard-colliding-entities.patch => 0716-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0718-Do-not-run-raytrace-logic-for-AIR.patch => 0717-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0719-Oprimise-map-impl-for-tracked-players.patch => 0718-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0720-Optimise-BlockSoil-nearby-water-lookup.patch => 0719-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0721-Optimise-random-block-ticking.patch => 0720-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0722-Optimise-non-flush-packet-sending.patch => 0721-Optimise-non-flush-packet-sending.patch} (100%)
 rename patches/server/{0723-Optimise-nearby-player-lookups.patch => 0722-Optimise-nearby-player-lookups.patch} (100%)
 rename patches/server/{0724-Remove-streams-for-villager-AI.patch => 0723-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0725-Use-Velocity-compression-and-cipher-natives.patch => 0724-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{0726-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0727-Async-catch-modifications-to-critical-entity-state.patch => 0726-Async-catch-modifications-to-critical-entity-state.patch} (100%)
 rename patches/server/{0728-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0727-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0729-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0730-Check-requirement-before-suggesting-root-nodes.patch => 0729-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0731-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0732-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0733-Ensure-valid-vehicle-status.patch => 0732-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0734-Prevent-softlocked-end-exit-portal-generation.patch => 0733-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0735-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0736-Don-t-log-debug-logging-being-disabled.patch => 0735-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0737-fix-various-menus-with-empty-level-accesses.patch => 0736-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0738-Preserve-overstacked-loot.patch => 0737-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0739-Update-head-rotation-in-missing-places.patch => 0738-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0740-prevent-unintended-light-block-manipulation.patch => 0739-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0741-Fix-CraftCriteria-defaults-map.patch => 0740-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0742-Fix-upstreams-block-state-factories.patch => 0741-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0743-Add-config-option-for-logging-player-ip-addresses.patch => 0742-Add-config-option-for-logging-player-ip-addresses.patch} (100%)
 rename patches/server/{0744-Configurable-feature-seeds.patch => 0743-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0745-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0746-Add-root-admin-user-detection.patch => 0745-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0747-Always-allow-item-changing-in-Fireball.patch => 0746-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0748-don-t-attempt-to-teleport-dead-entities.patch => 0747-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0749-Prevent-excessive-velocity-through-repeated-crits.patch => 0748-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0750-Remove-client-side-code-using-deprecated-for-removal.patch => 0749-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0751-Always-parse-protochunk-light-sources-unless-it-is-m.patch => 0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch} (100%)
 rename patches/server/{0752-Fix-removing-recipes-from-RecipeIterator.patch => 0751-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0753-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0752-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0754-Hide-unnecessary-itemmeta-from-clients.patch => 0753-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0755-Fix-Spigot-growth-modifiers.patch => 0754-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0756-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0757-Add-PlayerItemFrameChangeEvent.patch => 0756-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0758-Add-player-health-update-API.patch => 0757-Add-player-health-update-API.patch} (88%)
 rename patches/server/{0759-Optimize-HashMapPalette.patch => 0758-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0760-Allow-delegation-to-vanilla-chunk-gen.patch => 0759-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0761-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (100%)
 rename patches/server/{0762-Optimise-collision-checking-in-player-move-packet-ha.patch => 0761-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0763-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (66%)
 rename patches/server/{0764-Add-more-Campfire-API.patch => 0763-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0765-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0766-Fix-tripwire-state-inconsistency.patch => 0765-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0767-Forward-CraftEntity-in-teleport-command.patch => 0766-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0768-Improve-scoreboard-entries.patch => 0767-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0769-Entity-powdered-snow-API.patch => 0768-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0770-Add-API-for-item-entity-health.patch => 0769-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0771-Fix-entity-type-tags-suggestions-in-selectors.patch => 0770-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0772-Configurable-max-block-light-for-monster-spawning.patch => 0771-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0773-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0774-Load-effect-amplifiers-greater-than-127-correctly.patch => 0773-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0775-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0776-Fix-bees-aging-inside-hives.patch => 0775-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0777-Bucketable-API.patch => 0776-Bucketable-API.patch} (100%)
 rename patches/server/{0778-Validate-usernames.patch => 0777-Validate-usernames.patch} (100%)
 rename patches/server/{0779-Make-water-animal-spawn-height-configurable.patch => 0778-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0780-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (98%)
 rename patches/server/{0781-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0780-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0782-Add-new-overload-to-PersistentDataContainer-has.patch => 0781-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0783-Multiple-Entries-with-Scoreboards.patch => 0782-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0784-Reset-placed-block-on-exception.patch => 0783-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0785-Add-configurable-height-for-slime-spawn.patch => 0784-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0786-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0787-Fix-xp-reward-for-baby-zombies.patch => 0786-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0788-Kick-on-main-for-illegal-chat.patch => 0787-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0789-Multi-Block-Change-API-Implementation.patch => 0788-Multi-Block-Change-API-Implementation.patch} (95%)
 rename patches/server/{0790-Fix-NotePlayEvent.patch => 0789-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0791-Freeze-Tick-Lock-API.patch => 0790-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0792-Dolphin-API.patch => 0791-Dolphin-API.patch} (100%)
 rename patches/server/{0793-More-PotionEffectType-API.patch => 0792-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0794-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0795-API-for-creating-command-sender-which-forwards-feedb.patch => 0794-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0796-Add-missing-structure-set-seed-configs.patch => 0795-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0797-Implement-regenerateChunk.patch => 0796-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0798-Fix-cancelled-powdered-snow-bucket-placement.patch => 0797-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0799-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0800-Add-GameEvent-tags.patch => 0799-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0801-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0802-Furnace-RecipesUsed-API.patch => 0801-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0803-Configurable-sculk-sensor-listener-range.patch => 0802-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0804-Add-missing-block-data-mins-and-maxes.patch => 0803-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0805-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0806-Put-world-into-worldlist-before-initing-the-world.patch => 0805-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0807-Fix-Entity-Position-Desync.patch => 0806-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0808-Custom-Potion-Mixes.patch => 0807-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0809-Fix-Fluid-tags-isTagged-method.patch => 0808-Fix-Fluid-tags-isTagged-method.patch} (100%)
 rename patches/server/{0810-Force-close-world-loading-screen.patch => 0809-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0811-Fix-falling-block-spawn-methods.patch => 0810-Fix-falling-block-spawn-methods.patch} (97%)
 rename patches/server/{0812-Expose-furnace-minecart-push-values.patch => 0811-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0813-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0814-More-Projectile-API.patch => 0813-More-Projectile-API.patch} (100%)
 rename patches/server/{0815-Fix-swamp-hut-cat-generation-deadlock.patch => 0814-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0816-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0817-Implement-getComputedBiome-API.patch => 0816-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0818-Make-some-itemstacks-nonnull.patch => 0817-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0819-Implement-enchantWithLevels-API.patch => 0818-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0820-Fix-saving-in-unloadWorld.patch => 0819-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0821-Buffer-OOB-setBlock-calls.patch => 0820-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0822-Add-TameableDeathMessageEvent.patch => 0821-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0823-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0822-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0824-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0823-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0825-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0824-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0826-Guard-against-invalid-entity-positions.patch => 0825-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0827-cache-resource-keys.patch => 0826-cache-resource-keys.patch} (100%)
 rename patches/server/{0828-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0827-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0829-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0828-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0830-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0829-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0831-Prevent-tile-entity-copies-loading-chunks.patch => 0830-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0832-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0831-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0833-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0832-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0834-Pass-ServerLevel-for-gamerule-callbacks.patch => 0833-Pass-ServerLevel-for-gamerule-callbacks.patch} (98%)
 rename patches/server/{0835-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0836-WorldCreator-keepSpawnLoaded.patch => 0835-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0837-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0836-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0838-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0837-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0839-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0838-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0840-Fire-CauldronLevelChange-on-initial-fill.patch => 0839-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0841-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0840-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0842-Add-PlayerStopUsingItemEvent.patch => 0841-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0843-FallingBlock-auto-expire-setting.patch => 0842-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0844-Don-t-tick-markers.patch => 0843-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0845-Do-not-accept-invalid-client-settings.patch => 0844-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0846-Add-support-for-Proxy-Protocol.patch => 0845-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0847-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0846-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0848-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0847-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0849-Sanitize-Sent-BlockEntity-NBT.patch => 0848-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0850-Prevent-entity-loading-causing-async-lookups.patch => 0849-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0851-Disable-component-selector-resolving-in-books-by-def.patch => 0850-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0852-Throw-exception-on-world-create-while-being-ticked.patch => 0851-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0853-Add-Alternate-Current-redstone-implementation.patch => 0852-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0854-Dont-resent-entity-on-art-update.patch => 0853-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0855-Add-WardenAngerChangeEvent.patch => 0854-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0856-Add-option-for-strict-advancement-dimension-checks.patch => 0855-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0857-Add-missing-important-BlockStateListPopulator-method.patch => 0856-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0858-Nameable-Banner-API.patch => 0857-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0859-Don-t-broadcast-messages-to-command-blocks.patch => 0858-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0860-Prevent-empty-items-from-being-added-to-world.patch => 0859-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0861-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0860-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0862-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0861-Don-t-print-component-in-resource-pack-rejection-mes.patch} (100%)
 rename patches/server/{0863-Add-Player-getFishHook.patch => 0862-Add-Player-getFishHook.patch} (92%)
 rename patches/server/{0864-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0863-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0865-Add-various-missing-EntityDropItemEvent-calls.patch => 0864-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0866-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0865-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0867-Fix-Bee-flower-NPE.patch => 0866-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0868-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0869-More-Teleport-API.patch => 0868-More-Teleport-API.patch} (96%)
 rename patches/server/{0870-Add-EntityPortalReadyEvent.patch => 0869-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0871-Don-t-use-level-random-in-entity-constructors.patch => 0870-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0872-Send-block-entities-after-destroy-prediction.patch => 0871-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0873-Warn-on-plugins-accessing-faraway-chunks.patch => 0872-Warn-on-plugins-accessing-faraway-chunks.patch} (97%)
 rename patches/server/{0874-Custom-Chat-Completion-Suggestions-API.patch => 0873-Custom-Chat-Completion-Suggestions-API.patch} (94%)
 rename patches/server/{0875-Add-missing-BlockFadeEvents.patch => 0874-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0876-Collision-API.patch => 0875-Collision-API.patch} (100%)
 rename patches/server/{0877-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0876-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0878-Remove-invalid-signature-login-stacktrace.patch => 0877-Remove-invalid-signature-login-stacktrace.patch} (100%)
 rename patches/server/{0879-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (100%)
 rename patches/server/{0880-Block-Ticking-API.patch => 0879-Block-Ticking-API.patch} (100%)
 rename patches/server/{0881-Add-Velocity-IP-Forwarding-Support.patch => 0880-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0882-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0881-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0883-Add-NamespacedKey-biome-methods.patch => 0882-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0884-Fix-plugin-loggers-on-server-shutdown.patch => 0883-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0885-Workaround-for-client-lag-spikes-MC-162253.patch => 0884-Workaround-for-client-lag-spikes-MC-162253.patch} (100%)
 rename patches/server/{0886-Stop-large-look-changes-from-crashing-the-server.patch => 0885-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0887-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (91%)
 rename patches/server/{0888-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch => 0887-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch} (100%)
 rename patches/server/{0889-Fire-EntityChangeBlockEvent-in-more-places.patch => 0888-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0890-Missing-eating-regain-reason.patch => 0889-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0891-Missing-effect-cause.patch => 0890-Missing-effect-cause.patch} (100%)
 rename patches/server/{0892-Added-byte-array-serialization-deserialization-for-P.patch => 0891-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0893-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0892-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0894-Call-BlockPhysicsEvent-more-often.patch => 0893-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0895-Configurable-chat-thread-limit.patch => 0894-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0896-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0895-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0897-Set-position-before-player-sending-on-dimension-chan.patch => 0896-Set-position-before-player-sending-on-dimension-chan.patch} (100%)
 rename patches/server/{0898-fix-Jigsaw-block-kicking-user.patch => 0897-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0899-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0898-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0900-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0899-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%)
 rename patches/server/{0901-Fix-a-bunch-of-vanilla-bugs.patch => 0900-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0902-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0901-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0903-Fix-custom-piglin-loved-items.patch => 0902-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0904-EntityPickupItemEvent-fixes.patch => 0903-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0905-Correctly-handle-interactions-with-items-on-cooldown.patch => 0904-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0906-Add-PlayerInventorySlotChangeEvent.patch => 0905-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0907-Elder-Guardian-appearance-API.patch => 0906-Elder-Guardian-appearance-API.patch} (84%)
 rename patches/server/{0908-Allow-changing-bed-s-occupied-property.patch => 0907-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0909-Add-entity-knockback-API.patch => 0908-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0910-Detect-headless-JREs.patch => 0909-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0911-fixed-entity-vehicle-collision-event-not-called.patch => 0910-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0912-optimized-dirt-and-snow-spreading.patch => 0911-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0913-Added-EntityToggleSitEvent.patch => 0912-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0914-Add-fire-tick-delay-option.patch => 0913-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0915-Add-Moving-Piston-API.patch => 0914-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0916-Ignore-impossible-spawn-tick.patch => 0915-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0917-Track-projectile-source-for-fireworks-from-dispenser.patch => 0916-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0918-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0917-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0919-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0918-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0920-Prevent-compass-from-loading-chunks.patch => 0919-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0921-Add-PrePlayerAttackEntityEvent.patch => 0920-Add-PrePlayerAttackEntityEvent.patch} (93%)
 rename patches/server/{0922-ensure-reset-EnderDragon-boss-event-name.patch => 0921-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0923-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0922-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0924-Add-Player-Warden-Warning-API.patch => 0923-Add-Player-Warden-Warning-API.patch} (93%)
 rename patches/server/{0925-More-vanilla-friendly-methods-to-update-trades.patch => 0924-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0926-Add-paper-dumplisteners-command.patch => 0925-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0927-check-global-player-list-where-appropriate.patch => 0926-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0928-Fix-async-entity-add-due-to-fungus-trees.patch => 0927-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0929-ItemStack-damage-API.patch => 0928-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0930-Friction-API.patch => 0929-Friction-API.patch} (100%)
 rename patches/server/{0931-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0930-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0932-Fix-player-kick-on-shutdown.patch => 0931-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0933-Sync-offhand-slot-in-menus.patch => 0932-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0934-Player-Entity-Tracking-Events.patch => 0933-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0935-Limit-pet-look-distance.patch => 0934-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0936-Properly-resend-entities.patch => 0935-Properly-resend-entities.patch} (100%)
 rename patches/server/{0937-Fixes-and-additions-to-the-SpawnReason-API.patch => 0936-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0938-fix-Instruments.patch => 0937-fix-Instruments.patch} (97%)
 rename patches/server/{0939-Fix-chunk-snapshot-biome-getter.patch => 0938-Fix-chunk-snapshot-biome-getter.patch} (91%)
 rename patches/server/{0940-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0939-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0941-Fix-MapLike-Codec-missing-key-selector.patch => 0940-Fix-MapLike-Codec-missing-key-selector.patch} (100%)
 rename patches/server/{0942-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0941-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0943-Improve-logging-and-errors.patch => 0942-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0944-Fix-explosion-yield-with-new-gamerules.patch => 0943-Fix-explosion-yield-with-new-gamerules.patch} (100%)
 rename patches/server/{0945-Add-BlockLockCheckEvent.patch => 0944-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0946-Add-Sneaking-API-for-Entities.patch => 0945-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0947-Improve-PortalEvents.patch => 0946-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0948-Add-exploded-block-state-to-BlockExplodeEvent.patch => 0947-Add-exploded-block-state-to-BlockExplodeEvent.patch} (100%)
 rename patches/server/{0949-Add-config-option-for-spider-worldborder-climbing.patch => 0948-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0950-Add-missing-SpigotConfig-logCommands-check.patch => 0949-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0951-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0950-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0952-Flying-Fall-Damage.patch => 0951-Flying-Fall-Damage.patch} (89%)
 rename patches/server/{0953-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0952-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0954-config-for-disabling-entity-tag-tags.patch => 0953-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0955-Use-single-player-info-update-packet-on-join.patch => 0954-Use-single-player-info-update-packet-on-join.patch} (100%)
 rename patches/server/{0956-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0955-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0957-Add-Player-sendEquipmentChange-Map-API.patch => 0956-Add-Player-sendEquipmentChange-Map-API.patch} (93%)
 rename patches/server/{0958-Win-Screen-API.patch => 0957-Win-Screen-API.patch} (85%)
 rename patches/server/{0959-Remove-CraftItemStack-setAmount-null-assignment.patch => 0958-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0960-Fix-force-opening-enchantment-tables.patch => 0959-Fix-force-opening-enchantment-tables.patch} (94%)

diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch
index 169e054512..d7b5109ff6 100644
--- a/patches/api/0005-Adventure.patch
+++ b/patches/api/0005-Adventure.patch
@@ -1048,10 +1048,10 @@ index fee814e01a653d2b53c56e8b566383ca44aa5346..b71b780792b672b37c8fe65d43489b86
      public void setCustomName(@Nullable String name);
  }
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af6427f1f030 100644
+index c559f38fdb92cfee9f2e0ffb7088d1cf74a7f73d..f4540ceee4937a496a10a08429093adf8ae2cfc0 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
-@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable;
   * underscores, hyphens, and forward slashes.
   *
   */
@@ -1060,7 +1060,7 @@ index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af64
  
      /**
       * The namespace representing all inbuilt keys.
-@@ -212,4 +212,24 @@ public final class NamespacedKey {
+@@ -246,4 +246,24 @@ public final class NamespacedKey {
      public static NamespacedKey fromString(@NotNull String key) {
          return fromString(key, null);
      }
@@ -1416,7 +1416,7 @@ index efb97712cc9dc7c1e12a59f5b94e4f2ad7c6b7d8..3024468af4c073324e536c1cb26beffb
                  return warning == null || warning.value();
              }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3a5251cb3b45f50d1ea4ab2c9b430e990cdfc8d5..425cad3b6c365560f6614767d763ad61a92e6722 100644
+index 98b9818fa10be7a36e862b3afafc9ed2d0a64209..ed57cd69d88504b78782271c9a3d423a29471674 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
@@ -1921,7 +1921,7 @@ index 8489a0b009223b727b0393840374550a1cc192ff..bdcf5219ff1e4d4c0dc8a3423bc17b45
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e606194b05b30 100644
+index 74152aa68883973c896c35f538c402fce377144b..4053c086a9ef9aa071402818672643bd800851d6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -39,7 +39,28 @@ import org.jetbrains.annotations.Nullable;
@@ -2099,7 +2099,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      /**
       * Says a message (or runs a command).
       *
-@@ -538,6 +624,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -563,6 +649,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull EquipmentSlot slot, @NotNull ItemStack item);
  
@@ -2190,7 +2190,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      /**
       * Send a sign change. This fakes a sign change packet for a user at
       * a certain location. This will not actually change the world in any way.
-@@ -552,7 +722,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -577,7 +747,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param lines the new text on the sign or null to clear it
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2200,7 +2200,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
  
      /**
-@@ -571,7 +743,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -596,7 +768,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2210,7 +2210,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
  
      /**
-@@ -591,7 +765,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -616,7 +790,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException if location is null
       * @throws IllegalArgumentException if dyeColor is null
       * @throws IllegalArgumentException if lines is non-null and has a length less than 4
@@ -2220,7 +2220,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
  
      /**
-@@ -1023,6 +1199,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1048,6 +1224,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
@@ -2228,7 +2228,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
       * @param url The URL from which the client will download the resource
       *     pack. The string must contain only US-ASCII characters and should
       *     be encoded as per RFC 1738.
-@@ -1079,8 +1256,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1104,8 +1281,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2239,7 +2239,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
-@@ -1116,6 +1295,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1141,6 +1320,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param hash The sha1 hash sum of the resource pack file which is used
       *     to apply a cached version of the pack directly without downloading
       *     if it is available. Hast to be 20 bytes long!
@@ -2294,7 +2294,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
       * @param force If true, the client will be disconnected from the server
       *     when it declines to use the resource pack.
       * @throws IllegalArgumentException Thrown if the URL is null.
-@@ -1170,8 +1397,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1195,8 +1422,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
       */
@@ -2352,7 +2352,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      /**
       * Gets the Scoreboard displayed to this player
       *
-@@ -1287,7 +1563,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1312,7 +1588,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param title Title text
       * @param subtitle Subtitle text
@@ -2361,7 +2361,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
       */
      @Deprecated
      public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1306,7 +1582,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1331,7 +1607,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param fadeIn time in ticks for titles to fade in. Defaults to 10.
       * @param stay time in ticks for titles to stay. Defaults to 70.
       * @param fadeOut time in ticks for titles to fade out. Defaults to 20.
@@ -2371,7 +2371,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
  
      /**
-@@ -1533,6 +1811,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1558,6 +1836,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public int getClientViewDistance();
  
@@ -2386,7 +2386,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      /**
       * Gets the player's estimated ping in milliseconds.
       *
-@@ -1558,8 +1844,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1583,8 +1869,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * they wish.
       *
       * @return the player's locale
@@ -2397,7 +2397,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      public String getLocale();
  
      /**
-@@ -1601,6 +1889,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1626,6 +1914,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public boolean isAllowingServerListings();
  
@@ -2412,7 +2412,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
      // Spigot start
      public class Spigot extends Entity.Spigot {
  
-@@ -1655,11 +1951,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1680,11 +1976,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
@@ -2426,7 +2426,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
          @Override
          public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
-@@ -1670,7 +1968,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1695,7 +1993,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param component the components to send
@@ -2436,7 +2436,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1680,7 +1980,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1705,7 +2005,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           *
           * @param position the screen position
           * @param components the components to send
@@ -2446,7 +2446,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1691,7 +1993,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1716,7 +2018,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param component the components to send
@@ -2456,7 +2456,7 @@ index a060b8b022c600e43aaef79a2942a384d47b300d..5a2c072c95cad8485e281e080e5e6061
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1702,7 +2006,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1727,7 +2031,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
           * @param position the screen position
           * @param sender the sender of the message
           * @param components the components to send
diff --git a/patches/api/0008-Timings-v2.patch b/patches/api/0008-Timings-v2.patch
index 9303d3c156..51af360b9f 100644
--- a/patches/api/0008-Timings-v2.patch
+++ b/patches/api/0008-Timings-v2.patch
@@ -3391,10 +3391,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5a2c072c95cad8485e281e080e5e606194b05b30..3f9236ce97adb4b724e18a5f05497681bed5d4d5 100644
+index 4053c086a9ef9aa071402818672643bd800851d6..705644a2e0d209ef717470da07d34fafc88a0640 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2011,7 +2011,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2036,7 +2036,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          @Deprecated // Paper
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
diff --git a/patches/api/0010-Player-affects-spawning-API.patch b/patches/api/0010-Player-affects-spawning-API.patch
index 59f6484c72..231bbfca9b 100644
--- a/patches/api/0010-Player-affects-spawning-API.patch
+++ b/patches/api/0010-Player-affects-spawning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 3f9236ce97adb4b724e18a5f05497681bed5d4d5..7c13de51561df662691a36ca1cc91ca7997d773a 100644
+index 705644a2e0d209ef717470da07d34fafc88a0640..1c3d9ac922c189adc139c2646b4bdc97dbfadb43 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1850,6 +1850,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1875,6 +1875,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Deprecated // Paper
      public String getLocale();
  
diff --git a/patches/api/0015-Add-view-distance-API.patch b/patches/api/0015-Add-view-distance-API.patch
index f1d1622670..9c146dfd15 100644
--- a/patches/api/0015-Add-view-distance-API.patch
+++ b/patches/api/0015-Add-view-distance-API.patch
@@ -8,10 +8,10 @@ Add per player no-tick, tick, and send view distances.
 Also add send/no-tick view distance to World.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 425cad3b6c365560f6614767d763ad61a92e6722..75a87b221cc0f6334c5283130a7b2bfdf4eedd03 100644
+index ed57cd69d88504b78782271c9a3d423a29471674..8a6a548314eef8d486be908e38e3a4562f26bdb4 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2673,6 +2673,62 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2698,6 +2698,62 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      int getSimulationDistance();
      // Spigot end
  
@@ -75,10 +75,10 @@ index 425cad3b6c365560f6614767d763ad61a92e6722..75a87b221cc0f6334c5283130a7b2bfd
      public class Spigot {
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7c13de51561df662691a36ca1cc91ca7997d773a..292f7827df666c10d7b82aa9b1688bf3f0da5c7b 100644
+index 1c3d9ac922c189adc139c2646b4bdc97dbfadb43..7efbc8540d3a42ae8ec9b4e4343e1352e0cfa993 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1864,6 +1864,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1889,6 +1889,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
diff --git a/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index 99ec6d6bc6..ba52e08d1b 100644
--- a/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/patches/api/0020-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -76,10 +76,10 @@ index 6a7b91af3e738613cf79c13e2844efe9a2efd254..bef555b3de44fed312b45a5d5cd811b1
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 292f7827df666c10d7b82aa9b1688bf3f0da5c7b..b91c12089ba0723356ef2d3d1b8b0c66ca8850bf 100644
+index 7efbc8540d3a42ae8ec9b4e4343e1352e0cfa993..6120eeefb8ffcb39bac81ba60ff3a5d9a3687dd5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -778,6 +778,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -803,6 +803,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/api/0024-Player-Tab-List-and-Title-APIs.patch b/patches/api/0024-Player-Tab-List-and-Title-APIs.patch
index c3924585b7..06d9807549 100644
--- a/patches/api/0024-Player-Tab-List-and-Title-APIs.patch
+++ b/patches/api/0024-Player-Tab-List-and-Title-APIs.patch
@@ -432,7 +432,7 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b91c12089ba0723356ef2d3d1b8b0c66ca8850bf..74a3abef2ff1be11427558293e81f3b7fe9fff16 100644
+index 6120eeefb8ffcb39bac81ba60ff3a5d9a3687dd5..5de2fbb69c8950a5f85476b60993b3d6b2164162 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -443,7 +443,7 @@ index b91c12089ba0723356ef2d3d1b8b0c66ca8850bf..74a3abef2ff1be11427558293e81f3b7
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -812,6 +813,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -837,6 +838,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
diff --git a/patches/api/0026-Complete-resource-pack-API.patch b/patches/api/0026-Complete-resource-pack-API.patch
index d7714d68dd..87a1f02236 100644
--- a/patches/api/0026-Complete-resource-pack-API.patch
+++ b/patches/api/0026-Complete-resource-pack-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 74a3abef2ff1be11427558293e81f3b7fe9fff16..bc3fc130b38bb9e102ab6a95e6ca75d815ba4902 100644
+index 5de2fbb69c8950a5f85476b60993b3d6b2164162..60bfbf979899df20e0f7ab5f1dcf79ff3cb483a9 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1329,7 +1329,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1354,7 +1354,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 74a3abef2ff1be11427558293e81f3b7fe9fff16..bc3fc130b38bb9e102ab6a95e6ca75d8
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -2145,6 +2147,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2170,6 +2172,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
          return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName())));
      }
diff --git a/patches/api/0046-Add-String-based-Action-Bar-API.patch b/patches/api/0046-Add-String-based-Action-Bar-API.patch
index 343e0ac46b..d2e11a89db 100644
--- a/patches/api/0046-Add-String-based-Action-Bar-API.patch
+++ b/patches/api/0046-Add-String-based-Action-Bar-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bc3fc130b38bb9e102ab6a95e6ca75d815ba4902..80910fcc46b62ee4974a659713a1a72b5b4c135b 100644
+index 60bfbf979899df20e0f7ab5f1dcf79ff3cb483a9..92d1f84e3fdd2c0d69239e1ddc77ff799a2897c1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -4,6 +4,7 @@ import java.net.InetSocketAddress;
@@ -16,7 +16,7 @@ index bc3fc130b38bb9e102ab6a95e6ca75d815ba4902..80910fcc46b62ee4974a659713a1a72b
  import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
-@@ -780,6 +781,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -805,6 +806,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -56,7 +56,7 @@ index bc3fc130b38bb9e102ab6a95e6ca75d815ba4902..80910fcc46b62ee4974a659713a1a72b
      /**
       * Sends the component to the player
       *
-@@ -807,9 +841,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -832,9 +866,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
@@ -68,7 +68,7 @@ index bc3fc130b38bb9e102ab6a95e6ca75d815ba4902..80910fcc46b62ee4974a659713a1a72b
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -2336,6 +2372,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2361,6 +2397,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -76,7 +76,7 @@ index bc3fc130b38bb9e102ab6a95e6ca75d815ba4902..80910fcc46b62ee4974a659713a1a72b
           * @param position the screen position
           * @param component the components to send
           * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component}
-@@ -2348,6 +2385,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2373,6 +2410,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch
index 3ef4db44fc..33f96dea90 100644
--- a/patches/api/0055-Fix-upstream-javadocs.patch
+++ b/patches/api/0055-Fix-upstream-javadocs.patch
@@ -19,7 +19,7 @@ index d3d8c5ac59cee2ec24e91223e0c994016a4f9752..82757d3013e01a6bfbb685929955d3e7
       * @return an array containing all previous players
       */
 diff --git a/src/main/java/org/bukkit/ChunkSnapshot.java b/src/main/java/org/bukkit/ChunkSnapshot.java
-index fb3e166ec48b8c0ebb7d541eaa1761b03a140610..cab63d678e56df0a090ee793d56def88b8c68079 100644
+index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f81413ed0dd1 100644
 --- a/src/main/java/org/bukkit/ChunkSnapshot.java
 +++ b/src/main/java/org/bukkit/ChunkSnapshot.java
 @@ -136,7 +136,7 @@ public interface ChunkSnapshot {
@@ -103,7 +103,7 @@ index 91fc11dda99de506be83d40df8929bf7cd8e8d85..7dc631ebd009f5f5c3ac1699c3f3515c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 652238659e0a6e0df11f2798773aea4fe7712360..9c57eda3b7af7026639afda9959bc5e5a720861a 100644
+index 09936f3a2376a46721bbc8365c989581c2a789ef..3845a726adbd0e75d7bf2aeeb6da8cb571d51a8f 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
 @@ -22,6 +22,11 @@ import org.jetbrains.annotations.Nullable;
@@ -134,7 +134,7 @@ index 2926fa6071bc7640cc10280b5c3962b0ce7686f1..4f63988848443aff55619bc12ef12c92
       * Instructs this Mob to set the specified LivingEntity as its target.
       * <p>
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 80910fcc46b62ee4974a659713a1a72b5b4c135b..50faa513411cdb611ae228f0c07a7dfe15807b85 100644
+index 92d1f84e3fdd2c0d69239e1ddc77ff799a2897c1..e15a9525b989abee62ca2d8ec924ee492118abb2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -312,15 +312,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -157,7 +157,7 @@ index 80910fcc46b62ee4974a659713a1a72b5b4c135b..50faa513411cdb611ae228f0c07a7dfe
       * <p>
       * Note: This will overwrite the players current inventory, health,
       * motion, etc, with the state from the saved dat file.
-@@ -798,7 +798,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -823,7 +823,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
diff --git a/patches/api/0061-Shoulder-Entities-Release-API.patch b/patches/api/0061-Shoulder-Entities-Release-API.patch
index a7f5fc1a48..5dbabdff87 100644
--- a/patches/api/0061-Shoulder-Entities-Release-API.patch
+++ b/patches/api/0061-Shoulder-Entities-Release-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 9c57eda3b7af7026639afda9959bc5e5a720861a..be3eaadbc768a306da68a15abcaa7a5d3ec760c7 100644
+index 3845a726adbd0e75d7bf2aeeb6da8cb571d51a8f..abdca9fe5acc90f167219eb769ece66c35682bb1 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -319,6 +319,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -339,6 +339,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getExpToLevel();
  
diff --git a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
index 2115648f1d..757c0b1d45 100644
--- a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch
@@ -10,10 +10,10 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1f29ed50c981fa262790a070722bbe9fecac5b02..f42ef55662b8cecd7383ae10424364da97c54453 100644
+index 7efa33336a6f6309cf11677185fd11a7c0757bb3..a2a207ea9aa7e6a09af75cf8975153b9abc10ec2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1064,12 +1064,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1089,12 +1089,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
diff --git a/patches/api/0092-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch
index f217438f07..2e0e0ff318 100644
--- a/patches/api/0092-Player.setPlayerProfile-API.patch
+++ b/patches/api/0092-Player.setPlayerProfile-API.patch
@@ -93,10 +93,10 @@ index bf1102b4481b8c9b9c4f5ba0c561556b75fea077..8539bac19bf9ba1a66689a9af90e088a
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f42ef55662b8cecd7383ae10424364da97c54453..d55104146a7a4668aa73ee0bf6f084471e8b85c2 100644
+index a2a207ea9aa7e6a09af75cf8975153b9abc10ec2..c2723b0e34f5d63b4b26ddb3b7c7e8b349a5521e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2322,6 +2322,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2347,6 +2347,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
diff --git a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
index 2b6b38993f..b0e1448977 100644
--- a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add openSign method to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index be3eaadbc768a306da68a15abcaa7a5d3ec760c7..13b74e942012169611f2791f8b4493d04710e4c0 100644
+index abdca9fe5acc90f167219eb769ece66c35682bb1..9715a9d36187e2eecfeab1a05087d27c28b8690e 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -480,6 +480,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -500,6 +500,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      @Deprecated
      public void setShoulderEntityRight(@Nullable Entity entity);
@@ -24,10 +24,10 @@ index be3eaadbc768a306da68a15abcaa7a5d3ec760c7..13b74e942012169611f2791f8b4493d0
      /**
       * Make the entity drop the item in their hand.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d55104146a7a4668aa73ee0bf6f084471e8b85c2..104171d7a75abf5c3ba5903c1fba4ca7a85369ae 100644
+index c2723b0e34f5d63b4b26ddb3b7c7e8b349a5521e..6a33b5d7fc34a78a131a0ef280cddd1b9718e125 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2177,7 +2177,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2202,7 +2202,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Open a Sign for editing by the Player.
       *
diff --git a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
index d5fa90406f..4c2078ecb1 100644
--- a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
+++ b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch
@@ -8,7 +8,7 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index c5eed3234a8c04bfa9d707685746fc2b40ec8bfc..93f86bb30725dff5dbfcccf15012ffd1cee237bf 100644
+index 3ba8ff1a41ac9fd96fd4dec5cbe0f714fef93022..b39ed4eb2e7d9e40805e201d77973877481db8fd 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -58,6 +58,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -74,10 +74,10 @@ index c5eed3234a8c04bfa9d707685746fc2b40ec8bfc..93f86bb30725dff5dbfcccf15012ffd1
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 104171d7a75abf5c3ba5903c1fba4ca7a85369ae..d3c3347fd08fd6e05d5b269aa50fa083c555a7e3 100644
+index 6a33b5d7fc34a78a131a0ef280cddd1b9718e125..41188fb005807f3adfcdd81e72da122309850383 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -781,6 +781,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -806,6 +806,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
diff --git a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
index c8a0f69c4b..2b43acd659 100644
--- a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -522,10 +522,10 @@ index 9f646171b3ac617fb5217d5ab9c106c3100a8c8d..2315fffc4a1a5bebc50a703e9df59df8
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 3539e63993cc21f9eecda9046b759cebdfec80ff..8b48ce606523528f4322296b61a64bd12067387c 100644
+index dad7de7246741d6f3f2a444cf0b88f396302a8af..ae102dddda30ff0e15f70bdb17385c8d9d4b9a08 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2787,7 +2787,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -2812,7 +2812,57 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
       */
diff --git a/patches/api/0118-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0118-LivingEntity-Hand-Raised-Item-Use-API.patch
index 9dadb94c46..95412562b4 100644
--- a/patches/api/0118-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/patches/api/0118-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 13b74e942012169611f2791f8b4493d04710e4c0..9c711d0b2c2f7b0c0603847590e8a1a94f091ff0 100644
+index 9715a9d36187e2eecfeab1a05087d27c28b8690e..12068d14af5731494a839b87b67ed3cc26bf8f36 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -308,7 +308,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -328,7 +328,9 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       *
       * @return the item being used by the player, or null if they are not using
       * an item
diff --git a/patches/api/0121-InventoryCloseEvent-Reason-API.patch b/patches/api/0121-InventoryCloseEvent-Reason-API.patch
index 45e9ab3f1f..3bda77d2a9 100644
--- a/patches/api/0121-InventoryCloseEvent-Reason-API.patch
+++ b/patches/api/0121-InventoryCloseEvent-Reason-API.patch
@@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 9c711d0b2c2f7b0c0603847590e8a1a94f091ff0..8f489abbb7e80d869ca0f6e8626cecbd453b625a 100644
+index 12068d14af5731494a839b87b67ed3cc26bf8f36..3b184a66d1aebe4501fbdfd78ddf7a4ef5378f9f 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -159,6 +159,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -179,6 +179,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public void closeInventory();
  
diff --git a/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch
index 401c96f1fa..286027b8ed 100644
--- a/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch
+++ b/patches/api/0136-Provide-Chunk-Coordinates-as-a-Long-API.patch
@@ -7,10 +7,10 @@ Allows you to easily access the chunks X/z as a long, and a method
 to look up by the long key too.
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index 15478355e0a4f7d247f1a051cbbf841c98a7688b..e596e5d372dba6ee1e44486659332b5a747e96d5 100644
+index a33379e6df0577ea149be473a647258a3bda99f1..fa14c276309fc113d5fda38dfdda1d6ee25b8787 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
-@@ -28,6 +28,32 @@ public interface Chunk extends PersistentDataHolder {
+@@ -29,6 +29,32 @@ public interface Chunk extends PersistentDataHolder {
       */
      int getZ();
  
@@ -44,7 +44,7 @@ index 15478355e0a4f7d247f1a051cbbf841c98a7688b..e596e5d372dba6ee1e44486659332b5a
       * Gets the world containing this chunk
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c58c9c7791eff28ba8f847f5bc60e0db757ababd..8c71be9c39ec6aae07b088a63e71cc2ae44b0412 100644
+index e0caac06b7f5459faefbbd5a6a3486dbb6bfa9ba..7d6c923ea603a3193865e6a34b41617ac7016d19 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -212,6 +212,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
diff --git a/patches/api/0137-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
index 5f7cd8a636..615d6cb623 100644
--- a/patches/api/0137-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
@@ -5,30 +5,15 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index e596e5d372dba6ee1e44486659332b5a747e96d5..e1e1bc868019f715370490719ef887e0eee3ddec 100644
+index fa14c276309fc113d5fda38dfdda1d6ee25b8787..eccc357cabd8317afc5666c3347936d50eb34015 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
-@@ -1,6 +1,8 @@
- package org.bukkit;
- 
- import java.util.Collection;
-+import java.util.function.Predicate;
-+
- import org.bukkit.block.Block;
- import org.bukkit.block.BlockState;
- import org.bukkit.block.data.BlockData;
-@@ -111,13 +113,36 @@ public interface Chunk extends PersistentDataHolder {
-     @NotNull
-     Entity[] getEntities();
- 
-+    // Paper start
-     /**
-      * Get a list of all tile entities in the chunk.
-      *
+@@ -118,7 +118,30 @@ public interface Chunk extends PersistentDataHolder {
       * @return The tile entities.
       */
      @NotNull
 -    BlockState[] getTileEntities();
++    // Paper start
 +    default BlockState[] getTileEntities() {
 +        return getTileEntities(true);
 +    }
@@ -50,7 +35,7 @@ index e596e5d372dba6ee1e44486659332b5a747e96d5..e1e1bc868019f715370490719ef887e0
 +     * @return The tile entities.
 +     */
 +    @NotNull
-+    Collection<BlockState> getTileEntities(@NotNull Predicate<Block> blockPredicate, boolean useSnapshot);
++    Collection<BlockState> getTileEntities(java.util.function.@NotNull Predicate<Block> blockPredicate, boolean useSnapshot);
 +    // Paper end
  
      /**
diff --git a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
index c7c1cb413e..fe319a1efb 100644
--- a/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d3c3347fd08fd6e05d5b269aa50fa083c555a7e3..90982225ad78d8005961895102800b6a20bb42a0 100644
+index 41188fb005807f3adfcdd81e72da122309850383..01c530297bfdb7a0279be7af7eecef3eb95cd369 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2492,6 +2492,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2517,6 +2517,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);
diff --git a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 0e894e6763..d2844e4b57 100644
--- a/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
@@ -199,10 +199,10 @@ index 0000000000000000000000000000000000000000..28f3fda950999a9c964a3608042ca605
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index c65f0d6569c130b4920a9e71ad24af6427f1f030..01bcb3a1bdb5accdf844d0178cec3d25746b3eaa 100644
+index f4540ceee4937a496a10a08429093adf8ae2cfc0..81acf8bb6f8c2f5b67aca6f2ea78fff5d55c4763 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
-@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable;
   * underscores, hyphens, and forward slashes.
   *
   */
@@ -211,7 +211,7 @@ index c65f0d6569c130b4920a9e71ad24af6427f1f030..01bcb3a1bdb5accdf844d0178cec3d25
  
      /**
       * The namespace representing all inbuilt keys.
-@@ -84,11 +84,13 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap
+@@ -118,11 +118,13 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key { // Pap
      }
  
      @NotNull
diff --git a/patches/api/0176-Fix-Spigot-annotation-mistakes.patch b/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
index 4135cb4d0d..8999c40c36 100644
--- a/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
@@ -108,10 +108,10 @@ index cd09fa22e6322770bcb582ba00a384c5ca0fd8d8..a7d36ef22724f0ce3add61ab314e09e6
          Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material");
          return ctor.getDeclaringClass();
 diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
-index 01bcb3a1bdb5accdf844d0178cec3d25746b3eaa..236c9aea9ffc36269e5c32eacc9f1fd6bd039c88 100644
+index 81acf8bb6f8c2f5b67aca6f2ea78fff5d55c4763..32479109d90571368fd66da7dcb45ddf54eb404e 100644
 --- a/src/main/java/org/bukkit/NamespacedKey.java
 +++ b/src/main/java/org/bukkit/NamespacedKey.java
-@@ -39,12 +39,14 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
+@@ -73,12 +73,14 @@ public final class NamespacedKey implements net.kyori.adventure.key.Key, com.des
  
      /**
       * Create a key in a specific namespace.
@@ -126,8 +126,8 @@ index 01bcb3a1bdb5accdf844d0178cec3d25746b3eaa..236c9aea9ffc36269e5c32eacc9f1fd6
       */
 -    @Deprecated
      public NamespacedKey(@NotNull String namespace, @NotNull String key) {
-         Preconditions.checkArgument(namespace != null && VALID_NAMESPACE.matcher(namespace).matches(), "Invalid namespace. Must be [a-z0-9._-]: %s", namespace);
-         Preconditions.checkArgument(key != null && VALID_KEY.matcher(key).matches(), "Invalid key. Must be [a-z0-9/._-]: %s", key);
+         Preconditions.checkArgument(namespace != null && isValidNamespace(namespace), "Invalid namespace. Must be [a-z0-9._-]: %s", namespace);
+         Preconditions.checkArgument(key != null && isValidKey(key), "Invalid key. Must be [a-z0-9/._-]: %s", key);
 diff --git a/src/main/java/org/bukkit/NetherWartsState.java b/src/main/java/org/bukkit/NetherWartsState.java
 index f43209cf7b752c26718c303ca8c3e1c7d9912ad3..f0094e6fb05e526736629ad3181c8d2c16ba6ca4 100644
 --- a/src/main/java/org/bukkit/NetherWartsState.java
@@ -227,7 +227,7 @@ index e455eb21abf121dc6ff10ff8a13dd06f67096a8f..bbc01e7c192ae6689c301670047ff114
          return origin;
      }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 24a14005cb9c2fe7e97ba0fbd948c0c1110c52ce..891b25c84f6cc86ac3ccf61eca1d4398f31ba6b5 100644
+index 0ece998826c8e5d5a02a4a348172274b82bb2086..f57e59dd5db687fb4feb13e8283e4ff327c3e8c4 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -430,9 +430,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -341,10 +341,10 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 90982225ad78d8005961895102800b6a20bb42a0..fc8dd3af9fcb083b483da19a80234d668c2fcffc 100644
+index 01c530297bfdb7a0279be7af7eecef3eb95cd369..0dd3fcd86099e5a032b09b46309894d5c3e6f39d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1399,9 +1399,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1424,9 +1424,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param plugin Plugin that wants to hide the entity
       * @param entity Entity to hide
@@ -355,7 +355,7 @@ index 90982225ad78d8005961895102800b6a20bb42a0..fc8dd3af9fcb083b483da19a80234d66
      public void hideEntity(@NotNull Plugin plugin, @NotNull Entity entity);
  
      /**
-@@ -1411,9 +1410,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1436,9 +1435,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param plugin Plugin that wants to show the entity
       * @param entity Entity to show
@@ -366,7 +366,7 @@ index 90982225ad78d8005961895102800b6a20bb42a0..fc8dd3af9fcb083b483da19a80234d66
      public void showEntity(@NotNull Plugin plugin, @NotNull Entity entity);
  
      /**
-@@ -1422,9 +1420,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1447,9 +1445,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param entity Entity to check
       * @return True if the provided entity is not being hidden from this
       *     player
diff --git a/patches/api/0195-Add-Player-Client-Options-API.patch b/patches/api/0195-Add-Player-Client-Options-API.patch
index b67161dbb9..c04d29472e 100644
--- a/patches/api/0195-Add-Player-Client-Options-API.patch
+++ b/patches/api/0195-Add-Player-Client-Options-API.patch
@@ -229,7 +229,7 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fc8dd3af9fcb083b483da19a80234d668c2fcffc..5a84c4c5644f5d82896c693939ddc7d30a69cc97 100644
+index 0dd3fcd86099e5a032b09b46309894d5c3e6f39d..e277cf56c8c2c005efdbe1dd450c158debf46569 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -240,7 +240,7 @@ index fc8dd3af9fcb083b483da19a80234d668c2fcffc..5a84c4c5644f5d82896c693939ddc7d3
  import com.destroystokyo.paper.Title; // Paper
  import net.kyori.adventure.text.Component;
  import org.bukkit.DyeColor;
-@@ -2509,6 +2510,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2534,6 +2535,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the cooldown counter to 0, effectively starting the cooldown period.
       */
      void resetCooldown();
diff --git a/patches/api/0204-Potential-bed-API.patch b/patches/api/0204-Potential-bed-API.patch
index 102eb79e40..7fda003ff2 100644
--- a/patches/api/0204-Potential-bed-API.patch
+++ b/patches/api/0204-Potential-bed-API.patch
@@ -8,10 +8,10 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 8f489abbb7e80d869ca0f6e8626cecbd453b625a..0775c1061a72af66344ec45248b50072c394da38 100644
+index 3b184a66d1aebe4501fbdfd78ddf7a4ef5378f9f..5e4d1fdb18cc9df9a6ef558cfba5bc3ec4bd2315 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -249,6 +249,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -269,6 +269,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public int getSleepTicks();
  
diff --git a/patches/api/0214-Brand-support.patch b/patches/api/0214-Brand-support.patch
index ce8d4fade7..fb38631c64 100644
--- a/patches/api/0214-Brand-support.patch
+++ b/patches/api/0214-Brand-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 5a84c4c5644f5d82896c693939ddc7d30a69cc97..8f7667562187a141ec037eaafa2e3e8d1abd6bff 100644
+index e277cf56c8c2c005efdbe1dd450c158debf46569..91a5ddaee8b5e4581e3cdef7aecf21788d21bbba 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2644,6 +2644,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2669,6 +2669,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          // Paper end
      }
  
diff --git a/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch
index 2d427236be..aa221f2256 100644
--- a/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add additional open container api to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 0775c1061a72af66344ec45248b50072c394da38..7e23e157eb70e6bf94d0ac4a0196cc5c943dcac4 100644
+index 5e4d1fdb18cc9df9a6ef558cfba5bc3ec4bd2315..b0de996c7cbfc36a3f749091068a70885b009832 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -154,6 +154,92 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -174,6 +174,92 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
      @Nullable
      public InventoryView openMerchant(@NotNull Merchant merchant, boolean force);
  
diff --git a/patches/api/0228-Player-elytra-boost-API.patch b/patches/api/0228-Player-elytra-boost-API.patch
index 40d4cad6f1..8ab8153eac 100644
--- a/patches/api/0228-Player-elytra-boost-API.patch
+++ b/patches/api/0228-Player-elytra-boost-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8f7667562187a141ec037eaafa2e3e8d1abd6bff..8d4a010d826fb84feb3d6b927275c49d8eec9f71 100644
+index 91a5ddaee8b5e4581e3cdef7aecf21788d21bbba..ea824a19e3e75bbfd7382c977a5409c9d6ed03ab 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2516,6 +2516,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2541,6 +2541,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @NotNull
      <T> T getClientOption(@NotNull ClientOption<T> option);
diff --git a/patches/api/0256-Add-sendOpLevel-API.patch b/patches/api/0256-Add-sendOpLevel-API.patch
index b3bdaac090..30329ebd74 100644
--- a/patches/api/0256-Add-sendOpLevel-API.patch
+++ b/patches/api/0256-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8d4a010d826fb84feb3d6b927275c49d8eec9f71..9bae45ea3097e328594dcaefac87c55d2c27498d 100644
+index ea824a19e3e75bbfd7382c977a5409c9d6ed03ab..c3db4783a05020cf91e2fd314dddf22d1ccfc02b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2529,6 +2529,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2554,6 +2554,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @Nullable
      Firework boostElytra(@NotNull ItemStack firework);
diff --git a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
index 85ca92bd05..6519681c65 100644
--- a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 7e23e157eb70e6bf94d0ac4a0196cc5c943dcac4..29885c7184dbec82a6de69c39878276392779d71 100644
+index b0de996c7cbfc36a3f749091068a70885b009832..a82eee24439989bb0180e3d0b1cc33f277d5305b 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -328,6 +328,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -348,6 +348,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
       */
      public void setCooldown(@NotNull Material material, int ticks);
  
diff --git a/patches/api/0284-More-World-API.patch b/patches/api/0284-More-World-API.patch
index 11fd4e80e2..cb5bd8b1d2 100644
--- a/patches/api/0284-More-World-API.patch
+++ b/patches/api/0284-More-World-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 79b1015c56aab88ee8bf70cef0a2ab05c910d991..82eb04abe67e05f1bb6fd2a0350d5b2574a01d4b 100644
+index 30d5ed45df901a4931a35cc62aec08818307ec99..6da379edbf35321f7265606228695f40a9ea6977 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3709,6 +3709,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -3734,6 +3734,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
  
diff --git a/patches/api/0342-Add-player-health-update-API.patch b/patches/api/0342-Add-player-health-update-API.patch
index 83a3545f84..49930e7153 100644
--- a/patches/api/0342-Add-player-health-update-API.patch
+++ b/patches/api/0342-Add-player-health-update-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 19d23f2995322e1710741b58e5c7bc2f3880fc0d..b5519cf329485a2ec72586e66a8a88617c09312e 100644
+index ba45de407168f34511af34bcd1a0e209ddfe2374..0c3a4a3ebd6f16c1c45c2b82620d5ca6cdace8a1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1917,6 +1917,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1942,6 +1942,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public double getHealthScale();
  
diff --git a/patches/api/0357-Multi-Block-Change-API.patch b/patches/api/0357-Multi-Block-Change-API.patch
index 1d9a1f89d4..09612ae46c 100644
--- a/patches/api/0357-Multi-Block-Change-API.patch
+++ b/patches/api/0357-Multi-Block-Change-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Multi Block Change API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b5519cf329485a2ec72586e66a8a88617c09312e..82d9cfadb00da9b7c2034938780354a573801728 100644
+index 0c3a4a3ebd6f16c1c45c2b82620d5ca6cdace8a1..17ad43c24dc2e18f5cde0ac0bfae1de9fe415964 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -624,6 +624,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -649,6 +649,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendBlockDamage(@NotNull Location loc, float progress);
  
diff --git a/patches/api/0386-Add-Player-getFishHook.patch b/patches/api/0386-Add-Player-getFishHook.patch
index 9c96c813ae..e1bc389488 100644
--- a/patches/api/0386-Add-Player-getFishHook.patch
+++ b/patches/api/0386-Add-Player-getFishHook.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getFishHook
 
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 29885c7184dbec82a6de69c39878276392779d71..3b204144e2d245098b3dc23b8779f9ed817bb6d1 100644
+index a82eee24439989bb0180e3d0b1cc33f277d5305b..127c82c36bd37ef61385a758785bffc6ec1f4b5c 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -356,6 +356,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
+@@ -376,6 +376,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
      @Nullable
      public Location getPotentialBedLocation();
      // Paper end
diff --git a/patches/api/0387-More-Teleport-API.patch b/patches/api/0387-More-Teleport-API.patch
index e4eb33f55e..5dad416fa4 100644
--- a/patches/api/0387-More-Teleport-API.patch
+++ b/patches/api/0387-More-Teleport-API.patch
@@ -159,10 +159,10 @@ index b878509ff536f2d728c800a0ae6cd36802570b31..9bfe62185acb2a208268a2db3aa81dad
       * Teleports this entity to the given location. If this entity is riding a
       * vehicle, it will be dismounted prior to teleportation.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 82d9cfadb00da9b7c2034938780354a573801728..8bac7b0b762a75a6535b50351850192a9568b578 100644
+index 17ad43c24dc2e18f5cde0ac0bfae1de9fe415964..6fbdcf6e5df2e613db022d38fc1e170578ef5e8a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2732,6 +2732,71 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2757,6 +2757,71 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch
index 0afdd4aa9a..61ef59a573 100644
--- a/patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0389-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8bac7b0b762a75a6535b50351850192a9568b578..cde9dfaba913e18d2efc6003d5209ba3cfb02945 100644
+index 6fbdcf6e5df2e613db022d38fc1e170578ef5e8a..30e8f60762235e87db0445c041e47969223ce570 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2594,6 +2594,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2619,6 +2619,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}).
       */
      void sendOpLevel(byte level);
diff --git a/patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
index 31fa2bff14..04accb0303 100644
--- a/patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
+++ b/patches/api/0393-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index cde9dfaba913e18d2efc6003d5209ba3cfb02945..1d98abff1ad0116f7a2599f078aa730cb84843c1 100644
+index 30e8f60762235e87db0445c041e47969223ce570..478c175d1fcb9a6d1211c50618eec4b9b14bc0ba 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -616,7 +616,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -641,7 +641,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Send block damage. This fakes block break progress for a user at a
       * certain location. This will not actually change the block's break
@@ -17,7 +17,7 @@ index cde9dfaba913e18d2efc6003d5209ba3cfb02945..1d98abff1ad0116f7a2599f078aa730c
       *
       * @param loc the location of the damaged block
       * @param progress the progress from 0.0 - 1.0 where 0 is no damage and
-@@ -625,6 +625,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -650,6 +650,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendBlockDamage(@NotNull Location loc, float progress);
  
      // Paper start
diff --git a/patches/api/0401-Elder-Guardian-appearance-API.patch b/patches/api/0401-Elder-Guardian-appearance-API.patch
index ca33de41db..026b673fa5 100644
--- a/patches/api/0401-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0401-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1d98abff1ad0116f7a2599f078aa730cb84843c1..ecb8b4cf48c7d6151ffec92bc6855d1fc57a2b51 100644
+index 478c175d1fcb9a6d1211c50618eec4b9b14bc0ba..9ac0f78d1bf434e501c32382ad2e517a1e19fbfa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2828,6 +2828,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2853,6 +2853,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor);
      // Paper end - Teleport API
  
diff --git a/patches/api/0409-Add-Player-Warden-Warning-API.patch b/patches/api/0409-Add-Player-Warden-Warning-API.patch
index 5360645a3a..634b1dc4ab 100644
--- a/patches/api/0409-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0409-Add-Player-Warden-Warning-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player Warden Warning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ecb8b4cf48c7d6151ffec92bc6855d1fc57a2b51..1e27b9de47f111b9c000243214e22890e323f7fc 100644
+index 9ac0f78d1bf434e501c32382ad2e517a1e19fbfa..3a450af12df6c71e91eab34237dcbf870708f3c6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2844,6 +2844,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2869,6 +2869,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param silent whether sound should be silenced
       */
      void showElderGuardian(boolean silent);
diff --git a/patches/api/0424-Flying-Fall-Damage-API.patch b/patches/api/0424-Flying-Fall-Damage-API.patch
index 37e1c1b503..4ef427e75e 100644
--- a/patches/api/0424-Flying-Fall-Damage-API.patch
+++ b/patches/api/0424-Flying-Fall-Damage-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9f762cf670bf5db9138e468e72e57781d8d22f54..de960716478477ce199526b8f860cfafa1541ee9 100644
+index b27d7414f34f1d49c56dbc33d6d23bc822adf721..b06f759b6188d87cf406072b6d7ef8266512ce50 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1391,6 +1391,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1416,6 +1416,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void setAllowFlight(boolean flight);
  
diff --git a/patches/api/0427-Add-Player-sendEquipmentChange-Map-API.patch b/patches/api/0427-Add-Player-sendEquipmentChange-Map-API.patch
index af8d147f90..b62f95da72 100644
--- a/patches/api/0427-Add-Player-sendEquipmentChange-Map-API.patch
+++ b/patches/api/0427-Add-Player-sendEquipmentChange-Map-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#sendEquipmentChange(Map) API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index de960716478477ce199526b8f860cfafa1541ee9..eb2fd6f0e09e50eeacfe4ceccf8fdede55c135a3 100644
+index b06f759b6188d87cf406072b6d7ef8266512ce50..1604351236f748b5009eed29f6051e68092d6090 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -666,7 +666,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -691,7 +691,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param slot The slot of the spoofed equipment change
       * @param item The ItemStack to display for the player
       */
diff --git a/patches/api/0428-Win-Screen-API.patch b/patches/api/0428-Win-Screen-API.patch
index b36ae9abfa..6027d25e3d 100644
--- a/patches/api/0428-Win-Screen-API.patch
+++ b/patches/api/0428-Win-Screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Win Screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index eb2fd6f0e09e50eeacfe4ceccf8fdede55c135a3..c68df5e5cc63b26da8623cf27e257ef07a61897d 100644
+index 1604351236f748b5009eed29f6051e68092d6090..b0bd8194d263f6986e80b7d9848297a2bf27a112 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -836,6 +836,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -861,6 +861,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
diff --git a/patches/server/0008-MC-Utils.patch b/patches/server/0008-MC-Utils.patch
index 79db606372..b5ecb78a33 100644
--- a/patches/server/0008-MC-Utils.patch
+++ b/patches/server/0008-MC-Utils.patch
@@ -7297,7 +7297,7 @@ index f66369ddaeab5c5ac643c0979dac3ed21337ff71..038abf2ac104ceecaab11b10d466ea69
              return false;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6ca724889789f9ed3244991517b2d6ecb3bf8af8..1220c2f67ead85fdc0ca26a2fbee6a483a876975 100644
+index dc8f094dea2fd46fe4d860536908a42e4b5806a1..57ed87689c7cb709d54e611bfbdbb70890021df2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -233,8 +233,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -7320,7 +7320,7 @@ index 6ca724889789f9ed3244991517b2d6ecb3bf8af8..1220c2f67ead85fdc0ca26a2fbee6a48
          if (playerChunk == null) return false;
  
          playerChunk.getTickingChunkFuture().thenAccept(either -> {
-@@ -1943,4 +1943,32 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1959,4 +1959,32 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch
index 0904ed2ccc..b282c7ff0b 100644
--- a/patches/server/0009-Adventure.patch
+++ b/patches/server/0009-Adventure.patch
@@ -2772,7 +2772,7 @@ index f29395b6bf9eebd4830bbcda7d96085fb8e3d8b0..877a104e3899debd387544b740896ffb
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1220c2f67ead85fdc0ca26a2fbee6a483a876975..d0476e736610c8afb21c7b1fcfc17cf44309fd68 100644
+index 57ed87689c7cb709d54e611bfbdbb70890021df2..fd1da8431578832bcd1f3ca7890dd2150b916ebd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -149,6 +149,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2783,7 +2783,7 @@ index 1220c2f67ead85fdc0ca26a2fbee6a483a876975..d0476e736610c8afb21c7b1fcfc17cf4
  
      private static final Random rand = new Random();
  
-@@ -1970,5 +1971,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1986,5 +1987,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          return ret;
      }
@@ -3233,7 +3233,7 @@ index 5f6d4f553cab8f20c2049c706e69de3d79701dfd..55bf95017d58bb61f9c6af27335c8842
      @Override
      public boolean isPermissionSet(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index ef3d6450b2ae2274b7e40c621aa30da279313669..19549dda26c24388bd13a5a2579789e2d1e3ad88 100644
+index aea8bdbfe0c16c664d787e8abcd189f1019fccce..e38c32708ac7969dbc342989d2a5a767e26e4c3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -321,9 +321,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -3285,7 +3285,7 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa
      public boolean isOp() {
          return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d2be98416529aea3bdbedd0ea7131bd8de2a0162..6bf9efe1f6c06fd2adaf68cd360482f252903c8c 100644
+index 87c9e95a184e316d1273debc9fc5f3ff6a5aa91f..934782ef67940710389f9eb5763e0a2e937534a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -277,14 +277,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3404,7 +3404,7 @@ index d2be98416529aea3bdbedd0ea7131bd8de2a0162..6bf9efe1f6c06fd2adaf68cd360482f2
      @Override
      public void setCompassTarget(Location loc) {
          if (this.getHandle().connection == null) return;
-@@ -670,6 +712,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -683,6 +725,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
@@ -3440,7 +3440,7 @@ index d2be98416529aea3bdbedd0ea7131bd8de2a0162..6bf9efe1f6c06fd2adaf68cd360482f2
      @Override
      public void sendSignChange(Location loc, String[] lines) {
          this.sendSignChange(loc, lines, DyeColor.BLACK);
-@@ -697,14 +768,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -710,14 +781,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          Component[] components = CraftSign.sanitizeLines(lines);
@@ -3458,7 +3458,7 @@ index d2be98416529aea3bdbedd0ea7131bd8de2a0162..6bf9efe1f6c06fd2adaf68cd360482f2
      }
  
      @Override
-@@ -1475,7 +1547,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1488,7 +1560,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url) {
@@ -3467,7 +3467,7 @@ index d2be98416529aea3bdbedd0ea7131bd8de2a0162..6bf9efe1f6c06fd2adaf68cd360482f2
      }
  
      @Override
-@@ -1490,7 +1562,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1503,7 +1575,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setResourcePack(String url, byte[] hash, boolean force) {
@@ -3476,7 +3476,7 @@ index d2be98416529aea3bdbedd0ea7131bd8de2a0162..6bf9efe1f6c06fd2adaf68cd360482f2
      }
  
      @Override
-@@ -1506,6 +1578,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1519,6 +1591,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -3498,7 +3498,7 @@ index d2be98416529aea3bdbedd0ea7131bd8de2a0162..6bf9efe1f6c06fd2adaf68cd360482f2
      public void addChannel(String channel) {
          Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
          channel = StandardMessenger.validateAndCorrectChannel(channel);
-@@ -1910,6 +1997,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1923,6 +2010,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (this.getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : this.getHandle().clientViewDistance;
      }
  
@@ -3511,7 +3511,7 @@ index d2be98416529aea3bdbedd0ea7131bd8de2a0162..6bf9efe1f6c06fd2adaf68cd360482f2
      @Override
      public int getPing() {
          return this.getHandle().latency;
-@@ -1955,6 +2048,254 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1968,6 +2061,254 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  
diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0012-Timings-v2.patch
index 0f5f5e5a81..9ba9d3def5 100644
--- a/patches/server/0012-Timings-v2.patch
+++ b/patches/server/0012-Timings-v2.patch
@@ -1825,10 +1825,10 @@ index b0ffa23faf62629043dfd613315eaf9c5fcc2cfe..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6bf9efe1f6c06fd2adaf68cd360482f252903c8c..a7609957da493c5e79771f9ff48e94acadca8bfc 100644
+index 934782ef67940710389f9eb5763e0a2e937534a5..c0b89ccf7b7776d010e6e3632a43b2114ac6c128 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2382,6 +2382,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2395,6 +2395,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
              CraftPlayer.this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundSystemChatPacket(components, position == net.md_5.bungee.api.ChatMessageType.ACTION_BAR));
          }
diff --git a/patches/server/0016-Rewrite-chunk-system.patch b/patches/server/0016-Rewrite-chunk-system.patch
index 5b6209662c..db676c1afc 100644
--- a/patches/server/0016-Rewrite-chunk-system.patch
+++ b/patches/server/0016-Rewrite-chunk-system.patch
@@ -17788,7 +17788,7 @@ index 9f6c2e5b5d9e8d714a47c770e255d06c0ef7c190..ac807277a6b26d140ea9873d17c7aa4f
  
              for(SavedTick<T> savedTick : this.pendingTicks) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index d58f6b48befbc637a58e669c83e994bae8872adf..cda6277a3a8eefc80de00ffc98687ce0afca7bf2 100644
+index 738d3ce38a42ff8cd53eec042ef8bc74f2b8d059..a895c81ea6af0822c8371ae93cfe4b72d419439d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 @@ -120,7 +120,7 @@ public class CraftChunk implements Chunk {
@@ -17885,7 +17885,7 @@ index c684460c91ad41ba9741616c25dae5c3efede704..720a078acfe770dba76413a8cfa4ef15
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e91305263fcf6929fe62e5e8da46721707b51517..3ad15c0909d14c6f974e9bf82055c3c332577526 100644
+index fd1da8431578832bcd1f3ca7890dd2150b916ebd..958c5faeddd3ee54ac2880eb3eb9e4ab2bba2540 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -313,10 +313,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -17947,7 +17947,7 @@ index e91305263fcf6929fe62e5e8da46721707b51517..3ad15c0909d14c6f974e9bf82055c3c3
              long chunkKey = chunkTickets.getLongKey();
              SortedArraySet<Ticket<?>> tickets = chunkTickets.getValue();
  
-@@ -1904,14 +1894,53 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1920,14 +1910,53 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Spigot start
      @Override
      public int getViewDistance() {
@@ -18004,7 +18004,7 @@ index e91305263fcf6929fe62e5e8da46721707b51517..3ad15c0909d14c6f974e9bf82055c3c3
      // Spigot start
      private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a7609957da493c5e79771f9ff48e94acadca8bfc..f3cc8a410616c33c0bcbbfeba698139130d5831f 100644
+index c0b89ccf7b7776d010e6e3632a43b2114ac6c128..8dc5aeaf9525dca447f718153d6210a039aa080e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -176,6 +176,81 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0028-Player-affects-spawning-API.patch b/patches/server/0028-Player-affects-spawning-API.patch
index a29b8baf79..ae3861063f 100644
--- a/patches/server/0028-Player-affects-spawning-API.patch
+++ b/patches/server/0028-Player-affects-spawning-API.patch
@@ -73,7 +73,7 @@ index 8ea60d388fff4a6368652ff96f648e5880053a2b..8ecbb64f9db9346757c5597404489496
                              entityzombie.finalizeSpawn(worldserver, this.level.getCurrentDifficultyAt(entityzombie.blockPosition()), MobSpawnType.REINFORCEMENT, (SpawnGroupData) null, (CompoundTag) null);
                              worldserver.addFreshEntityWithPassengers(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 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 dbe7588d4ea992155e3ff3b7d31af04181b01521..08c76c56e493f01bc159312aef512886631682f3 100644
+index 47b5ef810348f8c702acb09b280b41b6b7227b6f..60fb74537fdc96005cbf6aa1670e773c0faa2f26 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -179,6 +179,9 @@ public abstract class Player extends LivingEntity {
@@ -87,7 +87,7 @@ index dbe7588d4ea992155e3ff3b7d31af04181b01521..08c76c56e493f01bc159312aef512886
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 068d01c749a86954915fdad1b7499720613e5af3..d172f4e00b064c6c8fb5b1f6b0b68fd44a6efb62 100644
+index f035206f2f59cb293d503c638ff06333a797a7a9..3e83bff81a0656d5e1d079ad9e63c7d27561c8e3 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -54,7 +54,7 @@ public abstract class BaseSpawner {
@@ -137,10 +137,10 @@ index be6e3e21ad62da01e5e2dd78e300cbc8efdbeb42..ea98625fe7c00743b8df74a24e6d4b75
          for(Player player : this.players()) {
              if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index af45674e2aff3756813834e866a0e4f9e4b361f5..524e57251951d719eed227d779e3c420a9f38787 100644
+index 8dc5aeaf9525dca447f718153d6210a039aa080e..019091af54c04832ac1969a584b1532b52b22d81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2086,8 +2086,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2099,8 +2099,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return this.getHandle().locale;
diff --git a/patches/server/0030-Only-refresh-abilities-if-needed.patch b/patches/server/0030-Only-refresh-abilities-if-needed.patch
index 7bc762b039..3925e1f8f2 100644
--- a/patches/server/0030-Only-refresh-abilities-if-needed.patch
+++ b/patches/server/0030-Only-refresh-abilities-if-needed.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 524e57251951d719eed227d779e3c420a9f38787..99b61f733551af788aaadd74dbcd4c40521e294e 100644
+index 019091af54c04832ac1969a584b1532b52b22d81..59a7caff4b85b5b37b92b9bae7a817532f912e10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1755,12 +1755,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1768,12 +1768,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
diff --git a/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
index cc64ae113a..8a921d7558 100644
--- a/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
+++ b/patches/server/0043-Implement-PlayerLocaleChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 38f40851a5927a2f71fb3126d554770ff6cb1107..fe1cf92644809b9aed5f74235166a21771893b72 100644
+index dadd073ff8df18c0ba2bcadbb631f93ee11181a4..a64bf2c4eab6ddb3d135bea245fa099e34534086 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1787,7 +1787,7 @@ public class ServerPlayer extends Player {
@@ -30,10 +30,10 @@ index 38f40851a5927a2f71fb3126d554770ff6cb1107..fe1cf92644809b9aed5f74235166a217
          this.locale = packet.language;
          // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 99b61f733551af788aaadd74dbcd4c40521e294e..30bbfb2bf6aeaf311453ccdd72eeee43ae89b972 100644
+index 59a7caff4b85b5b37b92b9bae7a817532f912e10..5b3c430ba9b2b6779d51df8348de3fe4e6cd101b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2086,8 +2086,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2099,8 +2099,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
diff --git a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch b/patches/server/0058-Configurable-inter-world-teleportation-safety.patch
index 6ee3cd0a03..f81dbd9a5f 100644
--- a/patches/server/0058-Configurable-inter-world-teleportation-safety.patch
+++ b/patches/server/0058-Configurable-inter-world-teleportation-safety.patch
@@ -16,10 +16,10 @@ The wanted destination was on top of the emerald block however the player ended
 This only is the case if the player is teleporting between worlds.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3a2fe558d04959dce225b889c0e700134bd677b6..854983a0bc0be2920aa22add675fef0ed507f0a2 100644
+index b03d7b6f05801efa7257df5da0d8666d2bf66050..0145f97947028b87f00ba652b9af6bdcbd3afe9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1132,7 +1132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1145,7 +1145,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.connection.teleport(to);
          } else {
diff --git a/patches/server/0064-Complete-resource-pack-API.patch b/patches/server/0064-Complete-resource-pack-API.patch
index bf21a9fcc9..e4e64b32bb 100644
--- a/patches/server/0064-Complete-resource-pack-API.patch
+++ b/patches/server/0064-Complete-resource-pack-API.patch
@@ -23,7 +23,7 @@ index 4acffc3c509ca247a31a10099829a36a15d044a6..8bdf7adb60206a87216b503ead0758ca
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 854983a0bc0be2920aa22add675fef0ed507f0a2..79ade05094db16acc07bec28b6b0fd8038fc7a10 100644
+index 0145f97947028b87f00ba652b9af6bdcbd3afe9c..5beaac2b0f4ae8fff8cea54f4c7759b3e7e45c71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -152,6 +152,7 @@ import org.bukkit.plugin.Plugin;
@@ -45,7 +45,7 @@ index 854983a0bc0be2920aa22add675fef0ed507f0a2..79ade05094db16acc07bec28b6b0fd80
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2209,6 +2214,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2222,6 +2227,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
diff --git a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
index 1fecd6adc9..96992737ce 100644
--- a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@@ -44,10 +44,10 @@ index 29495ff2d2c31f6b6ef6e2817662d143e538f926..b2871726eb4dd7f16d161097cbf0f287
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 79ade05094db16acc07bec28b6b0fd8038fc7a10..2d6dc2dd74e8461bb379f64ebd40f2189844a8ec 100644
+index 5beaac2b0f4ae8fff8cea54f4c7759b3e7e45c71..290ddb5d297ba597cb38a64374aca35f7f841c5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2014,6 +2014,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2027,6 +2027,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
diff --git a/patches/server/0143-Shoulder-Entities-Release-API.patch b/patches/server/0143-Shoulder-Entities-Release-API.patch
index ba498b66ee..f20c39ec01 100644
--- a/patches/server/0143-Shoulder-Entities-Release-API.patch
+++ b/patches/server/0143-Shoulder-Entities-Release-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a07ca7eca7ca38c47ae2c23f048c02a7869197aa..05b32ac76dbc3c0a16380cab82415dac6aff25de 100644
+index dbfb979a9ee826ed771da8d0593732ac74bc167b..095d459962841f7247a9365aff3bdf83bc0b3589 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2008,20 +2008,44 @@ public abstract class Player extends LivingEntity {
@@ -58,10 +58,10 @@ index a07ca7eca7ca38c47ae2c23f048c02a7869197aa..05b32ac76dbc3c0a16380cab82415dac
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 19549dda26c24388bd13a5a2579789e2d1e3ad88..3ca0d08a9e6511b8a96abcf0807a77d52f303a44 100644
+index e38c32708ac7969dbc342989d2a5a767e26e4c3d..139c4310a31b6cc149de140751cb8bf3d8226010 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -507,6 +507,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -517,6 +517,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          this.getHandle().getCooldowns().addCooldown(CraftMagicNumbers.getItem(material), ticks);
      }
  
diff --git a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
index 6c92cd787b..797b38aaf2 100644
--- a/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
+++ b/patches/server/0170-Ability-to-apply-mending-to-XP-API.patch
@@ -14,10 +14,10 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0cac7dea99a60bf393b8e41f0c05ec79d4b7c658..d2803455c9456523f8cc324e79c692595fa2420e 100644
+index 6a8241e0def767a0ae17a11df81357022086d8bb..a3eb4c8fbeb9ba708b00ddf06255a2e13692d07c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1447,7 +1447,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1460,7 +1460,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0183-Player.setPlayerProfile-API.patch b/patches/server/0183-Player.setPlayerProfile-API.patch
index 1ddfc47237..75289356ab 100644
--- a/patches/server/0183-Player.setPlayerProfile-API.patch
+++ b/patches/server/0183-Player.setPlayerProfile-API.patch
@@ -9,7 +9,7 @@ This can be useful for changing name or skins after a player has logged in.
 public-f net.minecraft.world.entity.player.Player gameProfile
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index bb5c4ecd43aa344dfe9cca8ab7c2ebf9760e94cf..203786383387765d1f5a2d2ccce79d792fd5b187 100644
+index b1fa2b95e161996cb62f05b67d710c0f9a98b1b2..9d3ea20adba300a38a544c3454eff2edd9b4bbb9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -330,11 +330,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -42,7 +42,7 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..69a1852905dd4724c30ac8ab88c14251
  
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fb157165d46f2f2d9bbaa6f7c8199885051060a8..c9a016af654fb73bd95c1f2d5704c12dcd62241b 100644
+index a3eb4c8fbeb9ba708b00ddf06255a2e13692d07c..8d6145797f36b48a033c8c0ada6d43749411d3b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -81,6 +81,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
@@ -65,7 +65,7 @@ index fb157165d46f2f2d9bbaa6f7c8199885051060a8..c9a016af654fb73bd95c1f2d5704c12d
      @Override
      public InetSocketAddress getAddress() {
          if (this.getHandle().connection == null) return null;
-@@ -1580,8 +1576,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1593,8 +1589,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.hiddenEntities.put(entity.getUniqueId(), hidingPlugins);
  
          // Remove this entity from the hidden player's EntityTrackerEntry
@@ -82,7 +82,7 @@ index fb157165d46f2f2d9bbaa6f7c8199885051060a8..c9a016af654fb73bd95c1f2d5704c12d
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
-@@ -1594,8 +1597,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1607,8 +1610,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.getHandle().connection.send(new ClientboundPlayerInfoRemovePacket(List.of(otherPlayer.getUUID())));
              }
          }
@@ -91,7 +91,7 @@ index fb157165d46f2f2d9bbaa6f7c8199885051060a8..c9a016af654fb73bd95c1f2d5704c12d
      }
  
      @Override
-@@ -1632,8 +1633,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1645,8 +1646,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          this.hiddenEntities.remove(entity.getUniqueId());
  
@@ -108,7 +108,7 @@ index fb157165d46f2f2d9bbaa6f7c8199885051060a8..c9a016af654fb73bd95c1f2d5704c12d
  
          if (other instanceof ServerPlayer) {
              ServerPlayer otherPlayer = (ServerPlayer) other;
-@@ -1644,9 +1652,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1657,9 +1665,51 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
              entry.updatePlayer(this.getHandle());
          }
diff --git a/patches/server/0188-Flag-to-disable-the-channel-limit.patch b/patches/server/0188-Flag-to-disable-the-channel-limit.patch
index ee83cbbeed..3dbcdf1b61 100644
--- a/patches/server/0188-Flag-to-disable-the-channel-limit.patch
+++ b/patches/server/0188-Flag-to-disable-the-channel-limit.patch
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index afa2e62732ba7b9c08fc24bc95b81b0f30d0ad05..bc8738811465d61e41580c5718d85c34e11b609b 100644
+index 8d6145797f36b48a033c8c0ada6d43749411d3b9..da074da1847757b975111c79bd3fbe21fb294859 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -175,6 +175,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -20,7 +20,7 @@ index afa2e62732ba7b9c08fc24bc95b81b0f30d0ad05..bc8738811465d61e41580c5718d85c34
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -1896,7 +1897,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1909,7 +1910,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper end
  
      public void addChannel(String channel) {
diff --git a/patches/server/0189-Add-openSign-method-to-HumanEntity.patch b/patches/server/0189-Add-openSign-method-to-HumanEntity.patch
index 22941024b7..579b73b9c6 100644
--- a/patches/server/0189-Add-openSign-method-to-HumanEntity.patch
+++ b/patches/server/0189-Add-openSign-method-to-HumanEntity.patch
@@ -28,10 +28,10 @@ index 749f8c6eb39e9cedeec472fc176b6a2a17900201..cdc9474d37028324d39037a456be07fd
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 3ca0d08a9e6511b8a96abcf0807a77d52f303a44..7ea4a2d4e691e0a0a4d9ef3189a29a4a4ca4374b 100644
+index 139c4310a31b6cc149de140751cb8bf3d8226010..787ccb37a39bb506cf9fd8d54cf772b346981f85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -617,6 +617,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -627,6 +627,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          }
      }
  
diff --git a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
index c7c7d7c202..bf6a558cc9 100644
--- a/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/patches/server/0195-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -34,10 +34,10 @@ index 45485383943f1ae0d4c5b5064cbaa8f56181dad3..d17808f6c565712dac31b0db7a4b6bae
  
              if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5a17b0c2e185bd50201a5d954322e41d42e2dae3..164b54410ecfe68a6d6239baf6e0e3699fbafbde 100644
+index 3f6e5e4d36e8170def4ce50e29cdfcc7e25f4f4d..68e3a09bf4adb4fe9fc3c32fdec85d90af4354bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1808,11 +1808,17 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1824,11 +1824,17 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
diff --git a/patches/server/0217-InventoryCloseEvent-Reason-API.patch b/patches/server/0217-InventoryCloseEvent-Reason-API.patch
index e72831e1c2..916ffbc8c5 100644
--- a/patches/server/0217-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0217-InventoryCloseEvent-Reason-API.patch
@@ -104,7 +104,7 @@ index 217961627f32d19e1b4ebe56d7132613fa613fe4..6c74c37f396459d25672b6ad7574393d
          this.player.doCloseContainer();
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 591cf187fb23bb2319e89b5ad0021aa9ec2af012..195f7969e9fbe2469701cf127219e8f6145e6f40 100644
+index 5b5f7aefd2e2a7c977605c84a9c005eb4afe4ba3..590cffbbccb1f6ce4bd9abfe036c081972b31086 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -516,7 +516,7 @@ public abstract class PlayerList {
@@ -117,7 +117,7 @@ index 591cf187fb23bb2319e89b5ad0021aa9ec2af012..195f7969e9fbe2469701cf127219e8f6
  
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(entityplayer.getBukkitEntity(), net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName()))); // Paper - Adventure
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 26709e64ffbe1a41516908e4b3fc9d21d4c0dff0..a46a6b76b6821be9d8983633cd0c6b9fa3aa349c 100644
+index e68586fcabc31f9085fe6e49cf05b76c45a9bcf5..db0b9884455e1d0f374ad802f6bc549d8640f511 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -265,7 +265,7 @@ public abstract class Player extends LivingEntity {
@@ -144,7 +144,7 @@ index 26709e64ffbe1a41516908e4b3fc9d21d4c0dff0..a46a6b76b6821be9d8983633cd0c6b9f
          this.containerMenu = this.inventoryMenu;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 7ea4a2d4e691e0a0a4d9ef3189a29a4a4ca4374b..883b6245f44f3fb82d7678e1092177ca646d484a 100644
+index 787ccb37a39bb506cf9fd8d54cf772b346981f85..f5b3190ffb9e9f92977afc9e40ddfa155d054865 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -377,7 +377,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -173,10 +173,10 @@ index 7ea4a2d4e691e0a0a4d9ef3189a29a4a4ca4374b..883b6245f44f3fb82d7678e1092177ca
      @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 4bd0bf1afef245976082287b7e3a5b758fefdcf4..e9c8148495dcea8c6ba143ee2d5bd0430a5c94dd 100644
+index da074da1847757b975111c79bd3fbe21fb294859..d9c746d01f7ac325ade610a438645df5f795653d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1161,7 +1161,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1174,7 +1174,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {
diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
index 71c18f0150..a0464b16df 100644
--- a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
+++ b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch
@@ -5,10 +5,10 @@ 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 e9c8148495dcea8c6ba143ee2d5bd0430a5c94dd..1ce6638a98acbfadcde649363d6703d050e377fe 100644
+index d9c746d01f7ac325ade610a438645df5f795653d..06ca78e5b4b9da5d932a0fb1b53abe4811522547 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2653,6 +2653,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2666,6 +2666,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          return this.adventure$pointers;
      }
diff --git a/patches/server/0255-Improve-death-events.patch b/patches/server/0255-Improve-death-events.patch
index ff761ea696..4876d185c4 100644
--- a/patches/server/0255-Improve-death-events.patch
+++ b/patches/server/0255-Improve-death-events.patch
@@ -74,7 +74,7 @@ index cd392d316f35ac488c49ad8c34c0273bbccc6a1c..db02d7938c79995b8acc4184c1be2fe3
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index dc78b04128c5eb2375a049948133aa05fff2c022..d9b2f2e230abd3ee5b7d77c76472a86cb38255a4 100644
+index 49ae203d493b1d43ee5c3623f5317499ffe55523..24a07ef9f5cbed34d1aefccda9fe655b7dfef7ec 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity {
@@ -314,10 +314,10 @@ index f70f75867a8f03d42f240a0d007d2221269f2fdb..e463ae13ce6f65675c2b6d553ecf91db
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7465d8de698d9eed71c96019fc55d6efdd13269c..03f9d58fa5158b50e12edd6a91ff263e08555870 100644
+index 06ca78e5b4b9da5d932a0fb1b53abe4811522547..d37d33b0c522235c063887e45a77edbde9e0b064 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2156,7 +2156,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2169,7 +2169,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void sendHealthUpdate() {
@@ -334,7 +334,7 @@ index 7465d8de698d9eed71c96019fc55d6efdd13269c..03f9d58fa5158b50e12edd6a91ff263e
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b653121dc16ce4ab3f32456e0c8690e022aa263c..2d55260f4c753bfdd9f7fca69f1a9a1df0d28d1c 100644
+index 67d820fb9aa00a3275cc3e23461864b496d738aa..6e533fdcd0671892a0e9dbfc99662feb433a5cf8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -807,9 +807,16 @@ public class CraftEventFactory {
diff --git a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 99ec23fe62..6ac46ca620 100644
--- a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -28,7 +28,7 @@ index 5be2158d720014fb2088351edeb692acb5d933ab..1cce4fabcf635d4d7600fc1b931f3789
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 52708bcdc046cc0a7f3798bfef06e49a6215acfd..43ab48c7f11592c6f0c82243a1d88f48ef175aae 100644
+index 6675b5f156533e59fd7cc139bcb06962ec3c705b..e0edee2d769b9fa0caa5f6ced7852560d4e01ba9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -185,6 +185,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index 52708bcdc046cc0a7f3798bfef06e49a6215acfd..43ab48c7f11592c6f0c82243a1d88f48
          GameProfileCache usercache = this.server.getProfileCache();
          Optional<GameProfile> optional = usercache.get(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index e7442952ef1f03969949014492a7ddc6d0796ba5..d7823d7dc88cfba6f6ac9dae220e03dea4a0bcdd 100644
+index 69a1852905dd4724c30ac8ab88c14251eee2c371..17b3d5de58a9ef3acc67624c46cd6bbd96394f87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -250,6 +250,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index e7442952ef1f03969949014492a7ddc6d0796ba5..d7823d7dc88cfba6f6ac9dae220e03de
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 03f9d58fa5158b50e12edd6a91ff263e08555870..e693b7c94bd0c35260969266a7fa9c606d91f5b4 100644
+index d37d33b0c522235c063887e45a77edbde9e0b064..30898fb54f028abc1f23a05534060ef68f173e32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -176,6 +176,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -117,7 +117,7 @@ index 03f9d58fa5158b50e12edd6a91ff263e08555870..e693b7c94bd0c35260969266a7fa9c60
      // Paper end
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -1768,6 +1769,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1781,6 +1782,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
  
@@ -136,7 +136,7 @@ index 03f9d58fa5158b50e12edd6a91ff263e08555870..e693b7c94bd0c35260969266a7fa9c60
      public void readExtraData(CompoundTag nbttagcompound) {
          this.hasPlayedBefore = true;
          if (nbttagcompound.contains("bukkit")) {
-@@ -1790,6 +1803,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1803,6 +1816,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
@@ -145,7 +145,7 @@ index 03f9d58fa5158b50e12edd6a91ff263e08555870..e693b7c94bd0c35260969266a7fa9c60
          if (!nbttagcompound.contains("bukkit")) {
              nbttagcompound.put("bukkit", new CompoundTag());
          }
-@@ -1804,6 +1819,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1817,6 +1832,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("firstPlayed", this.getFirstPlayed());
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());
diff --git a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
index dc2ea9101d..2dcf18d6a0 100644
--- a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
+++ b/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch
@@ -12,10 +12,10 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9c8b9829ab06c45ae8fdd921118ed20077a9655b..77a68059288835619ce78ada0cdadc3d6bd761f4 100644
+index 30898fb54f028abc1f23a05534060ef68f173e32..216a152c93572d91255d5e4e60f2cf3bf93072c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2700,6 +2700,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2713,6 +2713,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetCooldown() {
          getHandle().resetAttackStrengthTicker();
      }
diff --git a/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index cb982c6bd0..cab8016ff6 100644
--- a/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -44,7 +44,7 @@ index a67e158bad42086aec237a822ec252fd26f80e3c..829105771a06deca2a85e2f27b68d96c
          this.printSaveWarning = false;
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b6c66b8ee015847c962eb504bf4a88a5331e0944..21051093bc65d30f32c6a5ea3ee07086e10d57c1 100644
+index d294af725e4df2109e486cee6a38f4872064bc7f..a25dbc2bd3005cb3d1aee61fb48522b13e7c4922 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -281,8 +281,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -111,7 +111,7 @@ index b6c66b8ee015847c962eb504bf4a88a5331e0944..21051093bc65d30f32c6a5ea3ee07086
          world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
          return true;
          // Paper end
-@@ -2148,6 +2164,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2164,6 +2180,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> {
              net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
                  net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)c;
diff --git a/patches/server/0458-Brand-support.patch b/patches/server/0458-Brand-support.patch
index da35073674..501df3ad53 100644
--- a/patches/server/0458-Brand-support.patch
+++ b/patches/server/0458-Brand-support.patch
@@ -56,10 +56,10 @@ index f07b584d1d7a97e242c7699fa277d0c642da1857..d06d1e00b42dd9474ec834e0bafa9432
          return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7c9c31073c052df76d5f209a23896c4b020413ff..e807cfbeecce04e87d30652a58e9eba372b9d8aa 100644
+index 2b93144f6e10bd6a8cd09a9a5353465add7981cc..404e0c8ee4a383718b69d81b59fdb0c0fe9278a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2828,6 +2828,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2841,6 +2841,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      };
  
diff --git a/patches/server/0487-Optimise-getType-calls.patch b/patches/server/0487-Optimise-getType-calls.patch
index aed2530314..67393fc6a5 100644
--- a/patches/server/0487-Optimise-getType-calls.patch
+++ b/patches/server/0487-Optimise-getType-calls.patch
@@ -28,10 +28,10 @@ index da878e180c6b94f98dc82c6e8395f63ecc9b2c1e..a9b0f5950b6f97ea4c2a1075946b9200
          super(block, propertyMap, codec);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-index 0511ac55c4e6d9736ec12e94c9899eb04d5cd2e3..75193684a71d694736087d1a368b8fb6a8c8363b 100644
+index 484e5d5a2793d18eb49b73898d944776a1ec48e8..05512cc19eb213b6be5c869e133376ee42827806 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-@@ -84,7 +84,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
+@@ -98,7 +98,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
      public Material getBlockType(int x, int y, int z) {
          this.validateChunkCoordinates(x, y, z);
  
diff --git a/patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index ba6264a3b8..69f8633b78 100644
--- a/patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d1d4b656ec2decef8ce4ab5344af75b59c62a0e7..a70f67b791218f9460acb7e0f42b64905e8deb99 100644
+index 18c2620a78db26b8c17624a0d7e8184364fc09cf..5e24ac7d6ff23c1a2d80e74c094d366c8aebbac4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2349,7 +2349,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2362,7 +2362,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null && !particle.getDataType().isInstance(data)) {
              throw new IllegalArgumentException("data should be " + particle.getDataType() + " got " + data.getClass());
          }
diff --git a/patches/server/0536-Added-WorldGameRuleChangeEvent.patch b/patches/server/0536-Added-WorldGameRuleChangeEvent.patch
index 9b22f164a0..5d45d328aa 100644
--- a/patches/server/0536-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0536-Added-WorldGameRuleChangeEvent.patch
@@ -64,10 +64,10 @@ index 694a2f685cb46a5391da012f4d7e3bd3e6e88f4c..fa8cd4438c19a262272da47985a57f7e
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 05599db0ed0da4d5055188722b9d15adfe4e4dec..f3d78ba340d92a482fd3d54cbe16983ec9766eed 100644
+index b3c28849841a0dd661ce81235914670ce6cbbfef..b0935a5ddb0e3b0105fbfb946076248c3bfaccf6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1792,8 +1792,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1808,8 +1808,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule)) return false;
  
@@ -82,7 +82,7 @@ index 05599db0ed0da4d5055188722b9d15adfe4e4dec..f3d78ba340d92a482fd3d54cbe16983e
          handle.onChanged(this.getHandle().getServer());
          return true;
      }
-@@ -1828,8 +1833,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1844,8 +1849,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          if (!this.isGameRule(rule.getName())) return false;
  
diff --git a/patches/server/0600-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0600-Fix-checkReach-check-for-Shulker-boxes.patch
deleted file mode 100644
index aff97b0125..0000000000
--- a/patches/server/0600-Fix-checkReach-check-for-Shulker-boxes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
-Date: Sun, 4 Apr 2021 14:25:04 -0400
-Subject: [PATCH] Fix checkReach check for Shulker boxes
-
-
-diff --git a/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java b/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java
-index 9923bc95e2268ea4af3d4e8b75fbb83195012ea1..8d18f6debb694962f3ea8056a7563f71e8684afa 100644
---- a/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java
-+++ b/src/main/java/net/minecraft/world/inventory/ShulkerBoxMenu.java
-@@ -66,6 +66,7 @@ public class ShulkerBoxMenu extends AbstractContainerMenu {
- 
-     @Override
-     public boolean stillValid(Player player) {
-+        if (!this.checkReachable) return true; // Paper - Add reachable override for ContainerShulkerBox
-         return this.container.stillValid(player);
-     }
- 
diff --git a/patches/server/0601-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0601-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0600-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0602-Added-PlayerDeepSleepEvent.patch b/patches/server/0601-Added-PlayerDeepSleepEvent.patch
similarity index 91%
rename from patches/server/0602-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0601-Added-PlayerDeepSleepEvent.patch
index f9da9ab71d..103d8fbae0 100644
--- a/patches/server/0602-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0601-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 3de169fea4121804de381ee7fa96b36c174c599d..f018533ecfd662532cf2658701be6d452ba774f4 100644
+index 95d354bbe1e54893b3a39dae9a6414564c322fbb..f480718d3f86094f839b7dffe30871982717569e 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -248,6 +248,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0603-More-World-API.patch b/patches/server/0602-More-World-API.patch
similarity index 96%
rename from patches/server/0603-More-World-API.patch
rename to patches/server/0602-More-World-API.patch
index 8f7bc53890..10973dc80b 100644
--- a/patches/server/0603-More-World-API.patch
+++ b/patches/server/0602-More-World-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f3d78ba340d92a482fd3d54cbe16983ec9766eed..6ef1abea28f67704a308282b4addf645245e2595 100644
+index b0935a5ddb0e3b0105fbfb946076248c3bfaccf6..066130e1651d05018e4e73e5b9879187e80e01e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2034,6 +2034,69 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2050,6 +2050,69 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value(), this.getHandle().registryAccess()), new Location(this, found.getFirst().getX(), found.getFirst().getY(), found.getFirst().getZ()));
      }
  
diff --git a/patches/server/0604-Added-PlayerBedFailEnterEvent.patch b/patches/server/0603-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0604-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0603-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0605-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0604-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0605-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0604-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0606-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0606-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0605-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0607-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0606-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0607-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0606-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0608-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0608-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0607-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0609-Add-Channel-initialization-listeners.patch b/patches/server/0608-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0609-Add-Channel-initialization-listeners.patch
rename to patches/server/0608-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0610-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0610-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0609-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0611-Add-more-WanderingTrader-API.patch b/patches/server/0610-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0611-Add-more-WanderingTrader-API.patch
rename to patches/server/0610-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0612-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0611-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0612-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0611-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0613-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0613-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0612-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0614-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0614-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0613-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0615-Inventory-close.patch b/patches/server/0614-Inventory-close.patch
similarity index 100%
rename from patches/server/0615-Inventory-close.patch
rename to patches/server/0614-Inventory-close.patch
diff --git a/patches/server/0616-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0616-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0615-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0617-Fix-CraftPotionBrewer-cache.patch b/patches/server/0616-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0617-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0616-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0618-Add-basic-Datapack-API.patch b/patches/server/0617-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0618-Add-basic-Datapack-API.patch
rename to patches/server/0617-Add-basic-Datapack-API.patch
diff --git a/patches/server/0619-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0618-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0619-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0618-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0620-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch
similarity index 98%
rename from patches/server/0620-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch
index 98aefb6b29..4f560ab526 100644
--- a/patches/server/0620-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0619-additions-to-PlayerGameModeChangeEvent.patch
@@ -142,10 +142,10 @@ index 7dd27fc7a539ab0cbf06936ba4daa37ea607845d..69780a4a69048291b4898c2d0ecc57ce
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 55c206d2bff70fd7febd5f635ea0d7a5e779a058..e225ef6eb6f061c3bdeebf824aa884611f79020e 100644
+index 776cffb34dddd03b91588d71363fda248e1bc681..2949711dcb5a71ac41f24f798568425ca8d87972 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1472,7 +1472,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1485,7 +1485,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              throw new IllegalArgumentException("Mode cannot be null");
          }
  
diff --git a/patches/server/0621-ItemStack-repair-check-API.patch b/patches/server/0620-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0621-ItemStack-repair-check-API.patch
rename to patches/server/0620-ItemStack-repair-check-API.patch
diff --git a/patches/server/0622-More-Enchantment-API.patch b/patches/server/0621-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0622-More-Enchantment-API.patch
rename to patches/server/0621-More-Enchantment-API.patch
diff --git a/patches/server/0623-Move-range-check-for-block-placing-up.patch b/patches/server/0622-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0623-Move-range-check-for-block-placing-up.patch
rename to patches/server/0622-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0624-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0623-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0624-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0623-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0625-Add-Mob-lookAt-API.patch b/patches/server/0624-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0625-Add-Mob-lookAt-API.patch
rename to patches/server/0624-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0626-Add-Unix-domain-socket-support.patch b/patches/server/0625-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0626-Add-Unix-domain-socket-support.patch
rename to patches/server/0625-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0627-Add-EntityInsideBlockEvent.patch b/patches/server/0626-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0627-Add-EntityInsideBlockEvent.patch
rename to patches/server/0626-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0628-Attributes-API-for-item-defaults.patch b/patches/server/0627-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0628-Attributes-API-for-item-defaults.patch
rename to patches/server/0627-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0629-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0629-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch
index 13cadbfcb4..9ac0554d81 100644
--- a/patches/server/0629-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0628-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -95,7 +95,7 @@ index 274c8eb1f76fb7cb8a16b438e7e1b14804f3dc51..b6218626bad7f8ddfba91b216ac1e106
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6ef1abea28f67704a308282b4addf645245e2595..8a81b0011d80d320a75308d18dc09a5f365e097a 100644
+index 066130e1651d05018e4e73e5b9879187e80e01e4..945a8f61eec02043008e31e3fe64a66f76ba715a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1183,7 +1183,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0630-More-Lidded-Block-API.patch b/patches/server/0629-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0630-More-Lidded-Block-API.patch
rename to patches/server/0629-More-Lidded-Block-API.patch
diff --git a/patches/server/0631-Limit-item-frame-cursors-on-maps.patch b/patches/server/0630-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0631-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0630-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0632-Add-PlayerKickEvent-causes.patch b/patches/server/0631-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0632-Add-PlayerKickEvent-causes.patch
rename to patches/server/0631-Add-PlayerKickEvent-causes.patch
index 4b8fd7912f..71fec9a7d2 100644
--- a/patches/server/0632-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0631-Add-PlayerKickEvent-causes.patch
@@ -491,7 +491,7 @@ index a24e7a66d52eddbdad8db71cf5e45f1a458c389f..e1c13ac7b11fb0080435fc34502208c8
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e225ef6eb6f061c3bdeebf824aa884611f79020e..f425ba131dffd03d19ffb5c58373d19f097c75de 100644
+index 2949711dcb5a71ac41f24f798568425ca8d87972..382878be59535bca2dd053e0f3b91d2f1e5ad7e1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -599,7 +599,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0633-Add-PufferFishStateChangeEvent.patch b/patches/server/0632-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0633-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0632-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0634-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0634-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0633-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0635-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0635-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0634-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0636-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0635-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0636-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0635-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0637-Add-BellRevealRaiderEvent.patch b/patches/server/0636-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0637-Add-BellRevealRaiderEvent.patch
rename to patches/server/0636-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0638-Fix-invulnerable-end-crystals.patch b/patches/server/0637-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0638-Fix-invulnerable-end-crystals.patch
rename to patches/server/0637-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0639-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0638-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0639-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0638-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0640-Fix-dangerous-end-portal-logic.patch b/patches/server/0639-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0640-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0639-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0641-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0641-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0640-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0642-Make-item-validations-configurable.patch b/patches/server/0641-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0642-Make-item-validations-configurable.patch
rename to patches/server/0641-Make-item-validations-configurable.patch
diff --git a/patches/server/0643-Line-Of-Sight-Changes.patch b/patches/server/0642-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0643-Line-Of-Sight-Changes.patch
rename to patches/server/0642-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0644-add-per-world-spawn-limits.patch b/patches/server/0643-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0644-add-per-world-spawn-limits.patch
rename to patches/server/0643-add-per-world-spawn-limits.patch
index 1246c6fe62..daa9b82035 100644
--- a/patches/server/0644-add-per-world-spawn-limits.patch
+++ b/patches/server/0643-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8a81b0011d80d320a75308d18dc09a5f365e097a..7d57bf8ca060d6c3dcf8ef4201c7e4ff78ecabb3 100644
+index 945a8f61eec02043008e31e3fe64a66f76ba715a..6b7e77c35ae737551859e9e7515cd5c189ec7313 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -209,6 +209,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0645-Fix-potions-splash-events.patch b/patches/server/0644-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0645-Fix-potions-splash-events.patch
rename to patches/server/0644-Fix-potions-splash-events.patch
diff --git a/patches/server/0646-Add-more-LimitedRegion-API.patch b/patches/server/0645-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0646-Add-more-LimitedRegion-API.patch
rename to patches/server/0645-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0647-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 94%
rename from patches/server/0647-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 30c41221b3..54e33cc866 100644
--- a/patches/server/0647-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0646-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -18,7 +18,7 @@ index 5428a5ee4097e29922d48564714998604ba07dbb..77a3fa81d94005de4c5b7c130e893487
  
                  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 f018533ecfd662532cf2658701be6d452ba774f4..321feaea3bd8c082151302fe7d93294a6bf5dec6 100644
+index f480718d3f86094f839b7dffe30871982717569e..6ab5b6cfe0f0e9a6f837ef009e883b0eceb816c5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -718,6 +718,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0648-Missing-Entity-Behavior-API.patch b/patches/server/0647-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0648-Missing-Entity-Behavior-API.patch
rename to patches/server/0647-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0649-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0649-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0648-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0650-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0650-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0649-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0651-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0651-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0650-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0652-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0651-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0652-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0651-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0653-Adds-PlayerArmSwingEvent.patch b/patches/server/0652-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0653-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0652-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0654-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0654-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0653-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0655-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0655-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0654-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0656-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0655-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0656-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0655-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0657-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0656-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0657-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0656-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0658-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0658-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0657-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0659-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0659-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0658-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0660-Stinger-API.patch b/patches/server/0659-Stinger-API.patch
similarity index 100%
rename from patches/server/0660-Stinger-API.patch
rename to patches/server/0659-Stinger-API.patch
diff --git a/patches/server/0661-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0661-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0660-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0662-Add-System.out-err-catcher.patch b/patches/server/0661-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0662-Add-System.out-err-catcher.patch
rename to patches/server/0661-Add-System.out-err-catcher.patch
diff --git a/patches/server/0663-Fix-test-not-bootstrapping.patch b/patches/server/0662-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0663-Fix-test-not-bootstrapping.patch
rename to patches/server/0662-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0664-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0664-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0663-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0665-Improve-boat-collision-performance.patch b/patches/server/0664-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0665-Improve-boat-collision-performance.patch
rename to patches/server/0664-Improve-boat-collision-performance.patch
diff --git a/patches/server/0666-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0666-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0665-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0667-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0667-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0666-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0668-Add-PlayerSetSpawnEvent.patch b/patches/server/0667-Add-PlayerSetSpawnEvent.patch
similarity index 98%
rename from patches/server/0668-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0667-Add-PlayerSetSpawnEvent.patch
index 791cd532aa..38b1f2f05e 100644
--- a/patches/server/0668-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0667-Add-PlayerSetSpawnEvent.patch
@@ -129,10 +129,10 @@ index 37e111589134d80fdfd7a04d624b8c1d58a2d664..53b35f003034e7f4c9dd8ccfaf773891
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f425ba131dffd03d19ffb5c58373d19f097c75de..3dbd458caf6098c57ca654fd17783e231abcfd43 100644
+index 382878be59535bca2dd053e0f3b91d2f1e5ad7e1..6698798935e8e72a791aca6119a8e05588c13aee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1292,9 +1292,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1305,9 +1305,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0669-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0669-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0668-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0670-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0669-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0670-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0669-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0671-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0670-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0671-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0670-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0672-Added-EntityDamageItemEvent.patch b/patches/server/0671-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0672-Added-EntityDamageItemEvent.patch
rename to patches/server/0671-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0673-Optimize-indirect-passenger-iteration.patch b/patches/server/0672-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0673-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0672-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0674-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0674-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0673-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0675-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0674-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0675-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0674-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0676-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0675-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0676-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0675-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0677-Clear-bucket-NBT-after-dispense.patch b/patches/server/0676-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0677-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0676-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0678-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0677-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0678-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0677-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0679-Add-BlockBreakBlockEvent.patch b/patches/server/0678-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0679-Add-BlockBreakBlockEvent.patch
rename to patches/server/0678-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0680-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0680-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0679-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0681-More-CommandBlock-API.patch b/patches/server/0680-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0681-More-CommandBlock-API.patch
rename to patches/server/0680-More-CommandBlock-API.patch
diff --git a/patches/server/0682-Add-missing-team-sidebar-display-slots.patch b/patches/server/0681-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0682-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0681-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0683-Add-back-EntityPortalExitEvent.patch b/patches/server/0682-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0683-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0682-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0684-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 96%
rename from patches/server/0684-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch
index bf202bd38a..f48066d564 100644
--- a/patches/server/0684-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0683-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -31,7 +31,7 @@ index 17e77f727b0cd3da788bf5593762f2930e98a609..2de60a2f3da7f8d30295def7045cd753
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7d57bf8ca060d6c3dcf8ef4201c7e4ff78ecabb3..9942c1de6d8e087520c9e795a9f775f59bfa8942 100644
+index 6b7e77c35ae737551859e9e7515cd5c189ec7313..17351379ddea082c7b6792b21220eb086d9d1906 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -685,6 +685,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0685-Get-entity-default-attributes.patch b/patches/server/0684-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0685-Get-entity-default-attributes.patch
rename to patches/server/0684-Get-entity-default-attributes.patch
diff --git a/patches/server/0686-Left-handed-API.patch b/patches/server/0685-Left-handed-API.patch
similarity index 100%
rename from patches/server/0686-Left-handed-API.patch
rename to patches/server/0685-Left-handed-API.patch
diff --git a/patches/server/0687-Add-more-advancement-API.patch b/patches/server/0686-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0687-Add-more-advancement-API.patch
rename to patches/server/0686-Add-more-advancement-API.patch
diff --git a/patches/server/0688-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0687-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0688-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0687-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0689-Add-critical-damage-API.patch b/patches/server/0688-Add-critical-damage-API.patch
similarity index 98%
rename from patches/server/0689-Add-critical-damage-API.patch
rename to patches/server/0688-Add-critical-damage-API.patch
index 4f802fd238..b2eae6d53c 100644
--- a/patches/server/0689-Add-critical-damage-API.patch
+++ b/patches/server/0688-Add-critical-damage-API.patch
@@ -29,7 +29,7 @@ index ed8bad446a1845befa6d5d75c40cf281fa47a9d9..8795c94e6b6474addddbb0b337a962e8
      public static DamageSource fallingBlock(Entity attacker) {
          return (new EntityDamageSource("fallingBlock", attacker)).damageHelmet();
 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 321feaea3bd8c082151302fe7d93294a6bf5dec6..72b11ea489becaee3aaeb644347142b62adfbf28 100644
+index 6ab5b6cfe0f0e9a6f837ef009e883b0eceb816c5..de9302110d5a123ededb39a0b8afcfe2a13cb158 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1256,7 +1256,7 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0690-Fix-issues-with-mob-conversion.patch b/patches/server/0689-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0690-Fix-issues-with-mob-conversion.patch
rename to patches/server/0689-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0691-Add-isCollidable-methods-to-various-places.patch b/patches/server/0690-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0691-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0690-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0692-Goat-ram-API.patch b/patches/server/0691-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0692-Goat-ram-API.patch
rename to patches/server/0691-Goat-ram-API.patch
diff --git a/patches/server/0693-Add-API-for-resetting-a-single-score.patch b/patches/server/0692-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0693-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0692-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0694-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0693-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0694-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0693-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0695-Vanilla-command-permission-fixes.patch b/patches/server/0694-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0695-Vanilla-command-permission-fixes.patch
rename to patches/server/0694-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0696-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0696-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 53f3c7e439..a786a02109 100644
--- a/patches/server/0696-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0695-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -51,7 +51,7 @@ index 36330e5a2b59cf4d5eb45b3d0840440a2991fc5e..5015076ff1ac2b13203588db4566b9cf
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 72b11ea489becaee3aaeb644347142b62adfbf28..23ef09683ff506996c45aa8a3b84c72055960f03 100644
+index de9302110d5a123ededb39a0b8afcfe2a13cb158..9f217694da600166cadf72f09266735891b7cd03 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -499,6 +499,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0697-Fix-GameProfileCache-concurrency.patch b/patches/server/0696-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0697-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0696-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0698-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0697-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0698-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0697-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0699-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 99%
rename from patches/server/0699-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 229c8c9124..32fc9d3302 100644
--- a/patches/server/0699-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0698-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -302,7 +302,7 @@ index caa9885dd942fc5b82ba6b820d89f1b1a7ffda20..9ab3f3a490e55211670e2847f03bd4f8
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9942c1de6d8e087520c9e795a9f775f59bfa8942..c093401834d7111857a0d49e60faa36ee22aae40 100644
+index 17351379ddea082c7b6792b21220eb086d9d1906..c8e798cb13ffc1800fb04cdf0516a1f787f1da56 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1700,9 +1700,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0700-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0699-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0700-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0699-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0701-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0700-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0701-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0700-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0702-Optimise-general-POI-access.patch b/patches/server/0701-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0702-Optimise-general-POI-access.patch
rename to patches/server/0701-Optimise-general-POI-access.patch
diff --git a/patches/server/0703-Optimise-chunk-tick-iteration.patch b/patches/server/0702-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0703-Optimise-chunk-tick-iteration.patch
rename to patches/server/0702-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0704-Execute-chunk-tasks-mid-tick.patch b/patches/server/0703-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0704-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0703-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0705-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0705-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0704-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0706-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0706-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0705-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0707-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0706-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0707-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0706-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0708-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0707-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0708-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0707-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0709-Distance-manager-tick-timings.patch b/patches/server/0708-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0709-Distance-manager-tick-timings.patch
rename to patches/server/0708-Distance-manager-tick-timings.patch
diff --git a/patches/server/0710-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0710-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0709-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0711-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0711-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0710-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0712-Add-packet-limiter-config.patch b/patches/server/0711-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0712-Add-packet-limiter-config.patch
rename to patches/server/0711-Add-packet-limiter-config.patch
diff --git a/patches/server/0713-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0713-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0712-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0714-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0714-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0713-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0715-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0715-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0714-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0716-Time-scoreboard-search.patch b/patches/server/0715-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0716-Time-scoreboard-search.patch
rename to patches/server/0715-Time-scoreboard-search.patch
diff --git a/patches/server/0717-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0717-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0716-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0718-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0717-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0718-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0717-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0719-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0718-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0719-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0718-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0720-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0720-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0719-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0721-Optimise-random-block-ticking.patch b/patches/server/0720-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0721-Optimise-random-block-ticking.patch
rename to patches/server/0720-Optimise-random-block-ticking.patch
diff --git a/patches/server/0722-Optimise-non-flush-packet-sending.patch b/patches/server/0721-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0722-Optimise-non-flush-packet-sending.patch
rename to patches/server/0721-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0723-Optimise-nearby-player-lookups.patch b/patches/server/0722-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0723-Optimise-nearby-player-lookups.patch
rename to patches/server/0722-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0724-Remove-streams-for-villager-AI.patch b/patches/server/0723-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0724-Remove-streams-for-villager-AI.patch
rename to patches/server/0723-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0725-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0725-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0724-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0726-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0726-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0725-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0727-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0726-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0727-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0726-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0728-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0728-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0727-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0729-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0729-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0728-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0730-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0729-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0730-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0729-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0731-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0731-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0730-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0732-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0732-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0731-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0733-Ensure-valid-vehicle-status.patch b/patches/server/0732-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0733-Ensure-valid-vehicle-status.patch
rename to patches/server/0732-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0734-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0733-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0734-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0733-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0735-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0735-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0734-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0736-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0735-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0736-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0735-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0737-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0736-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0737-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0736-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0738-Preserve-overstacked-loot.patch b/patches/server/0737-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0738-Preserve-overstacked-loot.patch
rename to patches/server/0737-Preserve-overstacked-loot.patch
diff --git a/patches/server/0739-Update-head-rotation-in-missing-places.patch b/patches/server/0738-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0739-Update-head-rotation-in-missing-places.patch
rename to patches/server/0738-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0740-prevent-unintended-light-block-manipulation.patch b/patches/server/0739-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0740-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0739-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0741-Fix-CraftCriteria-defaults-map.patch b/patches/server/0740-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0741-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0740-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0742-Fix-upstreams-block-state-factories.patch b/patches/server/0741-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0742-Fix-upstreams-block-state-factories.patch
rename to patches/server/0741-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0743-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0742-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0743-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0742-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0744-Configurable-feature-seeds.patch b/patches/server/0743-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0744-Configurable-feature-seeds.patch
rename to patches/server/0743-Configurable-feature-seeds.patch
diff --git a/patches/server/0745-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0745-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0744-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0746-Add-root-admin-user-detection.patch b/patches/server/0745-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0746-Add-root-admin-user-detection.patch
rename to patches/server/0745-Add-root-admin-user-detection.patch
diff --git a/patches/server/0747-Always-allow-item-changing-in-Fireball.patch b/patches/server/0746-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0747-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0746-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0748-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0747-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0748-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0747-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0749-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0749-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0748-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0750-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0750-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0749-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0751-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0751-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0750-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0752-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0751-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0752-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0751-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0753-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0753-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0752-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0754-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0754-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0753-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0755-Fix-Spigot-growth-modifiers.patch b/patches/server/0754-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0755-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0754-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0756-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0756-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0755-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0757-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0756-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0757-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0756-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0758-Add-player-health-update-API.patch b/patches/server/0757-Add-player-health-update-API.patch
similarity index 88%
rename from patches/server/0758-Add-player-health-update-API.patch
rename to patches/server/0757-Add-player-health-update-API.patch
index 012de4570c..97feba0618 100644
--- a/patches/server/0758-Add-player-health-update-API.patch
+++ b/patches/server/0757-Add-player-health-update-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3dbd458caf6098c57ca654fd17783e231abcfd43..9b3d37e408522cad6eb3cca280b7078a73794f1f 100644
+index 6698798935e8e72a791aca6119a8e05588c13aee..bf6b08931b756b8ae59117dcb3b6cabc8456fe98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2228,9 +2228,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2241,9 +2241,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().maxHealthCache = getMaxHealth();
      }
  
@@ -22,7 +22,7 @@ index 3dbd458caf6098c57ca654fd17783e231abcfd43..9b3d37e408522cad6eb3cca280b7078a
          if (this.getHandle().queueHealthUpdatePacket) {
              this.getHandle().queuedHealthUpdatePacket = packet;
          } else {
-@@ -2238,7 +2240,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2251,7 +2253,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          // Paper end
      }
diff --git a/patches/server/0759-Optimize-HashMapPalette.patch b/patches/server/0758-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0759-Optimize-HashMapPalette.patch
rename to patches/server/0758-Optimize-HashMapPalette.patch
diff --git a/patches/server/0760-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0760-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0759-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0761-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0761-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0760-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0762-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0762-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0761-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0763-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 66%
rename from patches/server/0763-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index f62838aadb..13937bc043 100644
--- a/patches/server/0763-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0762-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
@@ -6,14 +6,14 @@ 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 1ac0778fba70ba9f09487c76e086b5a873c6c12a..f7e19bb7d2ff8f8aaf061cec16462913d77c10d5 100644
+index 0fadc763fb482cf9f3b51ed44427029bec9f7f63..edb726d7db0c2e1c276458c997bbfed9b76b69d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -284,13 +284,17 @@ public class CraftChunk implements Chunk {
-         PalettedContainerRO<Holder<Biome>>[] biome = (includeBiome || includeBiomeTempRain) ? new PalettedContainer[cs.length] : null;
+@@ -298,13 +298,17 @@ public class CraftChunk implements Chunk {
+         PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>>[] biome = (includeBiome || includeBiomeTempRain) ? new PalettedContainer[cs.length] : null;
  
-         Registry<Biome> iregistry = this.worldServer.registryAccess().registryOrThrow(Registries.BIOME);
--        Codec<PalettedContainerRO<Holder<Biome>>> biomeCodec = PalettedContainer.codecRO(iregistry.asHolderIdMap(), iregistry.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, iregistry.getHolderOrThrow(Biomes.PLAINS));
+         Registry<net.minecraft.world.level.biome.Biome> iregistry = this.worldServer.registryAccess().registryOrThrow(Registries.BIOME);
+-        Codec<PalettedContainerRO<Holder<net.minecraft.world.level.biome.Biome>>> biomeCodec = PalettedContainer.codecRO(iregistry.asHolderIdMap(), iregistry.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, iregistry.getHolderOrThrow(Biomes.PLAINS));
  
          for (int i = 0; i < cs.length; i++) {
 -            CompoundTag data = new CompoundTag();
@@ -31,13 +31,13 @@ index 1ac0778fba70ba9f09487c76e086b5a873c6c12a..f7e19bb7d2ff8f8aaf061cec16462913
  
              LevelLightEngine lightengine = chunk.level.getLightEngine();
              DataLayer skyLightArray = lightengine.getLayerListener(LightLayer.SKY).getDataLayerData(SectionPos.of(x, i, z));
-@@ -309,8 +313,7 @@ public class CraftChunk implements Chunk {
+@@ -323,8 +327,7 @@ public class CraftChunk implements Chunk {
              }
  
              if (biome != null) {
 -                data.put("biomes", biomeCodec.encodeStart(NbtOps.INSTANCE, cs[i].getBiomes()).get().left().get());
 -                biome[i] = biomeCodec.parse(NbtOps.INSTANCE, data.getCompound("biomes")).get().left().get();
-+                biome[i] = ((PalettedContainer<Holder<Biome>>) cs[i].getBiomes()).copy(); // Paper - use copy instead of round tripping with codecs
++                biome[i] = ((PalettedContainer<Holder<net.minecraft.world.level.biome.Biome>>) cs[i].getBiomes()).copy(); // Paper - use copy instead of round tripping with codecs
              }
          }
  
diff --git a/patches/server/0764-Add-more-Campfire-API.patch b/patches/server/0763-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0764-Add-more-Campfire-API.patch
rename to patches/server/0763-Add-more-Campfire-API.patch
diff --git a/patches/server/0765-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0765-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0764-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0766-Fix-tripwire-state-inconsistency.patch b/patches/server/0765-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0766-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0765-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0767-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0766-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0767-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0766-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0768-Improve-scoreboard-entries.patch b/patches/server/0767-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0768-Improve-scoreboard-entries.patch
rename to patches/server/0767-Improve-scoreboard-entries.patch
diff --git a/patches/server/0769-Entity-powdered-snow-API.patch b/patches/server/0768-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0769-Entity-powdered-snow-API.patch
rename to patches/server/0768-Entity-powdered-snow-API.patch
diff --git a/patches/server/0770-Add-API-for-item-entity-health.patch b/patches/server/0769-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0770-Add-API-for-item-entity-health.patch
rename to patches/server/0769-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0771-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0771-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0770-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0772-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0771-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0772-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0771-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0773-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0773-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0772-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0774-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0774-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0773-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0775-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0775-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0774-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0776-Fix-bees-aging-inside-hives.patch b/patches/server/0775-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0776-Fix-bees-aging-inside-hives.patch
rename to patches/server/0775-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0777-Bucketable-API.patch b/patches/server/0776-Bucketable-API.patch
similarity index 100%
rename from patches/server/0777-Bucketable-API.patch
rename to patches/server/0776-Bucketable-API.patch
diff --git a/patches/server/0778-Validate-usernames.patch b/patches/server/0777-Validate-usernames.patch
similarity index 100%
rename from patches/server/0778-Validate-usernames.patch
rename to patches/server/0777-Validate-usernames.patch
diff --git a/patches/server/0779-Make-water-animal-spawn-height-configurable.patch b/patches/server/0778-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0779-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0778-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0780-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0780-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 868eef4b9d..48f5027b97 100644
--- a/patches/server/0780-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0779-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -31,7 +31,7 @@ index 74c2bb3de8b5bfc3b285a19a322cfe308a9b88f2..9d8b856132f20d94b928d4e343ede2e0
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c093401834d7111857a0d49e60faa36ee22aae40..bbef20b0be264b429bcb037ae6740120d4113bb0 100644
+index c8e798cb13ffc1800fb04cdf0516a1f787f1da56..24366ba6c95284b18d6caa3205efd86efe61aadd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -199,6 +199,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0781-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0781-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0780-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0782-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0782-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0781-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0783-Multiple-Entries-with-Scoreboards.patch b/patches/server/0782-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0783-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0782-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0784-Reset-placed-block-on-exception.patch b/patches/server/0783-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0784-Reset-placed-block-on-exception.patch
rename to patches/server/0783-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0785-Add-configurable-height-for-slime-spawn.patch b/patches/server/0784-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0785-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0784-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0786-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0786-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0785-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0787-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0786-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0787-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0786-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0788-Kick-on-main-for-illegal-chat.patch b/patches/server/0787-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0788-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0787-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0789-Multi-Block-Change-API-Implementation.patch b/patches/server/0788-Multi-Block-Change-API-Implementation.patch
similarity index 95%
rename from patches/server/0789-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0788-Multi-Block-Change-API-Implementation.patch
index bd09f7eab0..a837a38a59 100644
--- a/patches/server/0789-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0788-Multi-Block-Change-API-Implementation.patch
@@ -25,10 +25,10 @@ index 0d851e197e65ec79386ad1f981f6d1d38b65124a..24c677e80af652952263253409c05064
      public void write(FriendlyByteBuf buf) {
          buf.writeLong(this.sectionPos.asLong());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9b3d37e408522cad6eb3cca280b7078a73794f1f..1ca03597ce9ca9b47017979d919f9082c21cdd45 100644
+index bf6b08931b756b8ae59117dcb3b6cabc8456fe98..a0184fe1e61160542094d9effa59386ff1c3a4bf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -930,6 +930,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -943,6 +943,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0790-Fix-NotePlayEvent.patch b/patches/server/0789-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0790-Fix-NotePlayEvent.patch
rename to patches/server/0789-Fix-NotePlayEvent.patch
diff --git a/patches/server/0791-Freeze-Tick-Lock-API.patch b/patches/server/0790-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0791-Freeze-Tick-Lock-API.patch
rename to patches/server/0790-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0792-Dolphin-API.patch b/patches/server/0791-Dolphin-API.patch
similarity index 100%
rename from patches/server/0792-Dolphin-API.patch
rename to patches/server/0791-Dolphin-API.patch
diff --git a/patches/server/0793-More-PotionEffectType-API.patch b/patches/server/0792-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0793-More-PotionEffectType-API.patch
rename to patches/server/0792-More-PotionEffectType-API.patch
diff --git a/patches/server/0794-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0794-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0793-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0795-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0795-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0794-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0796-Add-missing-structure-set-seed-configs.patch b/patches/server/0795-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0796-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0795-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0797-Implement-regenerateChunk.patch b/patches/server/0796-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0797-Implement-regenerateChunk.patch
rename to patches/server/0796-Implement-regenerateChunk.patch
index 65c36cccb0..1fe79c280b 100644
--- a/patches/server/0797-Implement-regenerateChunk.patch
+++ b/patches/server/0796-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bbef20b0be264b429bcb037ae6740120d4113bb0..36bdc4aa5356ddcf9353c28a6ef15cd8c6aa4a47 100644
+index 24366ba6c95284b18d6caa3205efd86efe61aadd..0f13354db729fbc5ad299dd36ba54f64332ca21f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -138,6 +138,7 @@ import org.bukkit.util.Vector;
diff --git a/patches/server/0798-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0798-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0797-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0799-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0799-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0798-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0800-Add-GameEvent-tags.patch b/patches/server/0799-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0800-Add-GameEvent-tags.patch
rename to patches/server/0799-Add-GameEvent-tags.patch
diff --git a/patches/server/0801-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0801-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0800-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0802-Furnace-RecipesUsed-API.patch b/patches/server/0801-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0802-Furnace-RecipesUsed-API.patch
rename to patches/server/0801-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0803-Configurable-sculk-sensor-listener-range.patch b/patches/server/0802-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0803-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0802-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0804-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0803-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0804-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0803-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0805-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0805-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0804-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0806-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0805-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0806-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0805-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0807-Fix-Entity-Position-Desync.patch b/patches/server/0806-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0807-Fix-Entity-Position-Desync.patch
rename to patches/server/0806-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0808-Custom-Potion-Mixes.patch b/patches/server/0807-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0808-Custom-Potion-Mixes.patch
rename to patches/server/0807-Custom-Potion-Mixes.patch
diff --git a/patches/server/0809-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0808-Fix-Fluid-tags-isTagged-method.patch
similarity index 100%
rename from patches/server/0809-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0808-Fix-Fluid-tags-isTagged-method.patch
diff --git a/patches/server/0810-Force-close-world-loading-screen.patch b/patches/server/0809-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0810-Force-close-world-loading-screen.patch
rename to patches/server/0809-Force-close-world-loading-screen.patch
diff --git a/patches/server/0811-Fix-falling-block-spawn-methods.patch b/patches/server/0810-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0811-Fix-falling-block-spawn-methods.patch
rename to patches/server/0810-Fix-falling-block-spawn-methods.patch
index 68ca552a02..39a43ccd7e 100644
--- a/patches/server/0811-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0810-Fix-falling-block-spawn-methods.patch
@@ -24,7 +24,7 @@ index bb486249d409743b0fc9891ac5ae76a38034800b..e365081bf532488f2b41b22deb2fb234
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 36bdc4aa5356ddcf9353c28a6ef15cd8c6aa4a47..bfc9badadd90303cd9042d85697c95bd5b4f6f9c 100644
+index 0f13354db729fbc5ad299dd36ba54f64332ca21f..aa6a2f8fff6d2f4978cee2ae2ed0d0ee2fffb950 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1394,7 +1394,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0812-Expose-furnace-minecart-push-values.patch b/patches/server/0811-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0812-Expose-furnace-minecart-push-values.patch
rename to patches/server/0811-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0813-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0813-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0812-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0814-More-Projectile-API.patch b/patches/server/0813-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0814-More-Projectile-API.patch
rename to patches/server/0813-More-Projectile-API.patch
diff --git a/patches/server/0815-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0814-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0815-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0814-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0816-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0816-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0815-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0817-Implement-getComputedBiome-API.patch b/patches/server/0816-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0817-Implement-getComputedBiome-API.patch
rename to patches/server/0816-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0818-Make-some-itemstacks-nonnull.patch b/patches/server/0817-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0818-Make-some-itemstacks-nonnull.patch
rename to patches/server/0817-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0819-Implement-enchantWithLevels-API.patch b/patches/server/0818-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0819-Implement-enchantWithLevels-API.patch
rename to patches/server/0818-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0820-Fix-saving-in-unloadWorld.patch b/patches/server/0819-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0820-Fix-saving-in-unloadWorld.patch
rename to patches/server/0819-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0821-Buffer-OOB-setBlock-calls.patch b/patches/server/0820-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0821-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0820-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0822-Add-TameableDeathMessageEvent.patch b/patches/server/0821-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0822-Add-TameableDeathMessageEvent.patch
rename to patches/server/0821-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0823-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0822-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0823-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0822-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0824-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0823-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0824-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0823-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0825-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0824-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0825-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0824-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0826-Guard-against-invalid-entity-positions.patch b/patches/server/0825-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0826-Guard-against-invalid-entity-positions.patch
rename to patches/server/0825-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0827-cache-resource-keys.patch b/patches/server/0826-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0827-cache-resource-keys.patch
rename to patches/server/0826-cache-resource-keys.patch
diff --git a/patches/server/0828-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0827-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0828-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0827-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0829-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0828-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0829-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0828-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0830-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0829-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0830-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0829-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0831-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0830-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0831-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0830-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0832-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0831-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0832-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0831-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0833-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0832-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0833-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0832-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0834-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0833-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 98%
rename from patches/server/0834-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0833-Pass-ServerLevel-for-gamerule-callbacks.patch
index e222a0da56..b2b405b645 100644
--- a/patches/server/0834-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0833-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -158,10 +158,10 @@ index fa8cd4438c19a262272da47985a57f7e84654f1b..663c1d8c1611af915a1bae733920dd75
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bfc9badadd90303cd9042d85697c95bd5b4f6f9c..346348eb37f6026931a864d2dc9926db8d4321bc 100644
+index aa6a2f8fff6d2f4978cee2ae2ed0d0ee2fffb950..8100b2f7627b667fee57504755c8b9fc71e77a74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1898,7 +1898,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1914,7 +1914,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper end
          GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule));
          handle.deserialize(event.getValue()); // Paper
@@ -170,7 +170,7 @@ index bfc9badadd90303cd9042d85697c95bd5b4f6f9c..346348eb37f6026931a864d2dc9926db
          return true;
      }
  
-@@ -1938,7 +1938,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1954,7 +1954,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          // Paper end
          GameRules.Value<?> handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule.getName()));
          handle.deserialize(event.getValue()); // Paper
diff --git a/patches/server/0835-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0835-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0834-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0836-WorldCreator-keepSpawnLoaded.patch b/patches/server/0835-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0836-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0835-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0837-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0836-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0837-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0836-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0838-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0837-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0838-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0837-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0839-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0838-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0839-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0838-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0840-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0839-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0840-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0839-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0841-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0840-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0841-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0840-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0842-Add-PlayerStopUsingItemEvent.patch b/patches/server/0841-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0842-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0841-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0843-FallingBlock-auto-expire-setting.patch b/patches/server/0842-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0843-FallingBlock-auto-expire-setting.patch
rename to patches/server/0842-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0844-Don-t-tick-markers.patch b/patches/server/0843-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0844-Don-t-tick-markers.patch
rename to patches/server/0843-Don-t-tick-markers.patch
diff --git a/patches/server/0845-Do-not-accept-invalid-client-settings.patch b/patches/server/0844-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0845-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0844-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0846-Add-support-for-Proxy-Protocol.patch b/patches/server/0845-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0846-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0845-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0847-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0846-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0847-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0846-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0848-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0847-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0848-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0847-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0849-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0848-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0849-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0848-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0850-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0849-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0850-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0849-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0851-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0850-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0851-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0850-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0852-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0851-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0852-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0851-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0853-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0852-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0853-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0852-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0854-Dont-resent-entity-on-art-update.patch b/patches/server/0853-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0854-Dont-resent-entity-on-art-update.patch
rename to patches/server/0853-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0855-Add-WardenAngerChangeEvent.patch b/patches/server/0854-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0855-Add-WardenAngerChangeEvent.patch
rename to patches/server/0854-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0856-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0855-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0856-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0855-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0857-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0856-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0857-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0856-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0858-Nameable-Banner-API.patch b/patches/server/0857-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0858-Nameable-Banner-API.patch
rename to patches/server/0857-Nameable-Banner-API.patch
diff --git a/patches/server/0859-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0858-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0859-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0858-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0860-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0859-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0860-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0859-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0861-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0860-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0861-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0860-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0862-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0861-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0862-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0861-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0863-Add-Player-getFishHook.patch b/patches/server/0862-Add-Player-getFishHook.patch
similarity index 92%
rename from patches/server/0863-Add-Player-getFishHook.patch
rename to patches/server/0862-Add-Player-getFishHook.patch
index bf5ccb5986..5870dbdcdc 100644
--- a/patches/server/0863-Add-Player-getFishHook.patch
+++ b/patches/server/0862-Add-Player-getFishHook.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Player#getFishHook
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 44dab523264c594aa9c619e3ee2e0d7f93982ddc..e779dcc4982ff51e4d450265fd61bc26e8e74d3a 100644
+index 73d8f4af09689eb549047bf1fa79254cc7736158..d69c05223fca71fc5e282095d02bc39fee7ec757 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -153,6 +153,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/patches/server/0864-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0863-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0864-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0863-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0865-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0864-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0865-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0864-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0866-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0865-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0866-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0865-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0867-Fix-Bee-flower-NPE.patch b/patches/server/0866-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0867-Fix-Bee-flower-NPE.patch
rename to patches/server/0866-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0868-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0868-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0867-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0869-More-Teleport-API.patch b/patches/server/0868-More-Teleport-API.patch
similarity index 96%
rename from patches/server/0869-More-Teleport-API.patch
rename to patches/server/0868-More-Teleport-API.patch
index 97ec340118..657a397ad0 100644
--- a/patches/server/0869-More-Teleport-API.patch
+++ b/patches/server/0868-More-Teleport-API.patch
@@ -71,10 +71,10 @@ index 32b9816283c8c1de929d5664733553277cf6bf3c..32c724060a532e551f0ab4e7277831bb
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1ca03597ce9ca9b47017979d919f9082c21cdd45..2f184121d1b6e037c5dd7f30eb075e6fe01c1973 100644
+index a0184fe1e61160542094d9effa59386ff1c3a4bf..a4f451b6322dc1246ff222f68efab6b49003d0f4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1185,13 +1185,92 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1198,13 +1198,92 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setRotation(float yaw, float pitch) {
@@ -168,7 +168,7 @@ index 1ca03597ce9ca9b47017979d919f9082c21cdd45..2f184121d1b6e037c5dd7f30eb075e6f
          location.checkFinite();
  
          ServerPlayer entity = this.getHandle();
-@@ -1204,7 +1283,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1217,7 +1296,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             return false;
          }
  
@@ -177,7 +177,7 @@ index 1ca03597ce9ca9b47017979d919f9082c21cdd45..2f184121d1b6e037c5dd7f30eb075e6f
              return false;
          }
  
-@@ -1222,7 +1301,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1235,7 +1314,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -186,7 +186,7 @@ index 1ca03597ce9ca9b47017979d919f9082c21cdd45..2f184121d1b6e037c5dd7f30eb075e6f
  
          // SPIGOT-5509: Wakeup, similar to riding
          if (this.isSleeping()) {
-@@ -1244,7 +1323,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1257,7 +1336,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Check if the fromWorld and toWorld are the same.
          if (fromWorld == toWorld) {
diff --git a/patches/server/0870-Add-EntityPortalReadyEvent.patch b/patches/server/0869-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0870-Add-EntityPortalReadyEvent.patch
rename to patches/server/0869-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0871-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0870-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0871-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0870-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0872-Send-block-entities-after-destroy-prediction.patch b/patches/server/0871-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0872-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0871-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0873-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0872-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 97%
rename from patches/server/0873-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0872-Warn-on-plugins-accessing-faraway-chunks.patch
index 361a384ff4..efbd4c3920 100644
--- a/patches/server/0873-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0872-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -18,7 +18,7 @@ index bb411f4efc550ed7872f0252373be81bd8e99b76..3cbf801b2e5420c0e870f73788deb550
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 346348eb37f6026931a864d2dc9926db8d4321bc..4cb0307935aa63d44aac55c80ee50be074d7913c 100644
+index 8100b2f7627b667fee57504755c8b9fc71e77a74..54932d92b13b890b07f827c5f09bd137383d4ab5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -312,9 +312,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -86,7 +86,7 @@ index 346348eb37f6026931a864d2dc9926db8d4321bc..4cb0307935aa63d44aac55c80ee50be0
          // Transient load for this tick
          return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z);
      }
-@@ -2318,6 +2338,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2334,6 +2354,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      // Spigot end
      // Paper start
      public java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
diff --git a/patches/server/0874-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0873-Custom-Chat-Completion-Suggestions-API.patch
similarity index 94%
rename from patches/server/0874-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0873-Custom-Chat-Completion-Suggestions-API.patch
index 146c452af0..804e6f36f8 100644
--- a/patches/server/0874-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0873-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2f184121d1b6e037c5dd7f30eb075e6fe01c1973..a96a3e459e27a6b5c84f0e4550241e66df0505c5 100644
+index a4f451b6322dc1246ff222f68efab6b49003d0f4..65dc4cf2d4e607a0b28a96af4e89a049858e2c84 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -665,6 +665,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0875-Add-missing-BlockFadeEvents.patch b/patches/server/0874-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0875-Add-missing-BlockFadeEvents.patch
rename to patches/server/0874-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0876-Collision-API.patch b/patches/server/0875-Collision-API.patch
similarity index 100%
rename from patches/server/0876-Collision-API.patch
rename to patches/server/0875-Collision-API.patch
diff --git a/patches/server/0877-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0876-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0877-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0876-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0878-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0877-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0878-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0877-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0879-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 100%
rename from patches/server/0879-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0878-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
diff --git a/patches/server/0880-Block-Ticking-API.patch b/patches/server/0879-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0880-Block-Ticking-API.patch
rename to patches/server/0879-Block-Ticking-API.patch
diff --git a/patches/server/0881-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0880-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0881-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0880-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0882-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0881-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0882-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0881-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0883-Add-NamespacedKey-biome-methods.patch b/patches/server/0882-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0883-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0882-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0884-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0883-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0884-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0883-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0885-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0884-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 100%
rename from patches/server/0885-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0884-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0886-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0885-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0886-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0885-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0887-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 91%
rename from patches/server/0887-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
index 3013d553e5..5edd0d4903 100644
--- a/patches/server/0887-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
+++ b/patches/server/0886-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a96a3e459e27a6b5c84f0e4550241e66df0505c5..cd439593d050fb157fae3575207a285a48d71783 100644
+index 65dc4cf2d4e607a0b28a96af4e89a049858e2c84..4d17cbc9cee3bc9578912f9329af20edb1542fe7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1015,13 +1015,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1028,13 +1028,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void sendBlockDamage(Location loc, float progress) {
diff --git a/patches/server/0888-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0887-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0888-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0887-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0889-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0888-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0889-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0888-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0890-Missing-eating-regain-reason.patch b/patches/server/0889-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0890-Missing-eating-regain-reason.patch
rename to patches/server/0889-Missing-eating-regain-reason.patch
diff --git a/patches/server/0891-Missing-effect-cause.patch b/patches/server/0890-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0891-Missing-effect-cause.patch
rename to patches/server/0890-Missing-effect-cause.patch
diff --git a/patches/server/0892-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0891-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0892-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0891-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0893-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0892-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0893-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0892-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0894-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0893-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0894-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0893-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0895-Configurable-chat-thread-limit.patch b/patches/server/0894-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0895-Configurable-chat-thread-limit.patch
rename to patches/server/0894-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0896-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0895-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0896-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0895-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0897-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0896-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 100%
rename from patches/server/0897-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0896-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0898-fix-Jigsaw-block-kicking-user.patch b/patches/server/0897-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0898-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0897-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0899-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0898-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0899-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0898-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0900-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0899-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0900-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0899-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0901-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0900-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0901-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0900-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0902-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0901-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0902-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0901-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0903-Fix-custom-piglin-loved-items.patch b/patches/server/0902-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0903-Fix-custom-piglin-loved-items.patch
rename to patches/server/0902-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0904-EntityPickupItemEvent-fixes.patch b/patches/server/0903-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0904-EntityPickupItemEvent-fixes.patch
rename to patches/server/0903-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0905-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0904-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0905-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0904-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0906-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0905-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0906-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0905-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0907-Elder-Guardian-appearance-API.patch b/patches/server/0906-Elder-Guardian-appearance-API.patch
similarity index 84%
rename from patches/server/0907-Elder-Guardian-appearance-API.patch
rename to patches/server/0906-Elder-Guardian-appearance-API.patch
index 269dd69fd7..eeb4d080c5 100644
--- a/patches/server/0907-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0906-Elder-Guardian-appearance-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cd439593d050fb157fae3575207a285a48d71783..009150ece99c039c7e92ac89c8069a2e378db34a 100644
+index 4d17cbc9cee3bc9578912f9329af20edb1542fe7..c1daec05d7d3f0dd1588917b86af5b69d59364f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3000,6 +3000,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3013,6 +3013,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0908-Allow-changing-bed-s-occupied-property.patch b/patches/server/0907-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0908-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0907-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0909-Add-entity-knockback-API.patch b/patches/server/0908-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0909-Add-entity-knockback-API.patch
rename to patches/server/0908-Add-entity-knockback-API.patch
diff --git a/patches/server/0910-Detect-headless-JREs.patch b/patches/server/0909-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0910-Detect-headless-JREs.patch
rename to patches/server/0909-Detect-headless-JREs.patch
diff --git a/patches/server/0911-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0910-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0911-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0910-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0912-optimized-dirt-and-snow-spreading.patch b/patches/server/0911-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0912-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0911-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0913-Added-EntityToggleSitEvent.patch b/patches/server/0912-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0913-Added-EntityToggleSitEvent.patch
rename to patches/server/0912-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0914-Add-fire-tick-delay-option.patch b/patches/server/0913-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0914-Add-fire-tick-delay-option.patch
rename to patches/server/0913-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0915-Add-Moving-Piston-API.patch b/patches/server/0914-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0915-Add-Moving-Piston-API.patch
rename to patches/server/0914-Add-Moving-Piston-API.patch
diff --git a/patches/server/0916-Ignore-impossible-spawn-tick.patch b/patches/server/0915-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0916-Ignore-impossible-spawn-tick.patch
rename to patches/server/0915-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0917-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0916-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0917-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0916-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0918-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0917-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0918-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0917-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0919-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0918-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0919-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0918-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0920-Prevent-compass-from-loading-chunks.patch b/patches/server/0919-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0920-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0919-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0921-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0920-Add-PrePlayerAttackEntityEvent.patch
similarity index 93%
rename from patches/server/0921-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0920-Add-PrePlayerAttackEntityEvent.patch
index 8b93056f79..04f9a29ce3 100644
--- a/patches/server/0921-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0920-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 23ef09683ff506996c45aa8a3b84c72055960f03..0dcae10fd05a8fe963fdedda8199aa09dc717c9a 100644
+index 9f217694da600166cadf72f09266735891b7cd03..9db2a97aca111862caec47220d5f13f7e5013fc7 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1233,8 +1233,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0922-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0921-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0922-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0921-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0923-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0922-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0923-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0922-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0924-Add-Player-Warden-Warning-API.patch b/patches/server/0923-Add-Player-Warden-Warning-API.patch
similarity index 93%
rename from patches/server/0924-Add-Player-Warden-Warning-API.patch
rename to patches/server/0923-Add-Player-Warden-Warning-API.patch
index 85ac22f070..6f18abec00 100644
--- a/patches/server/0924-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0923-Add-Player-Warden-Warning-API.patch
@@ -10,10 +10,10 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 009150ece99c039c7e92ac89c8069a2e378db34a..d87b6ccc57be06739a0105805735feb1800ada69 100644
+index c1daec05d7d3f0dd1588917b86af5b69d59364f0..05fbdba6bc87e5c7f192a061a8ea6cf12b19a216 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3005,6 +3005,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3018,6 +3018,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void showElderGuardian(boolean silent) {
          if (getHandle().connection != null) getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.GUARDIAN_ELDER_EFFECT, silent ? 0F : 1F));
      }
diff --git a/patches/server/0925-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0924-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0925-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0924-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0926-Add-paper-dumplisteners-command.patch b/patches/server/0925-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0926-Add-paper-dumplisteners-command.patch
rename to patches/server/0925-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0927-check-global-player-list-where-appropriate.patch b/patches/server/0926-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0927-check-global-player-list-where-appropriate.patch
rename to patches/server/0926-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0928-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0927-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0928-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0927-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0929-ItemStack-damage-API.patch b/patches/server/0928-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0929-ItemStack-damage-API.patch
rename to patches/server/0928-ItemStack-damage-API.patch
diff --git a/patches/server/0930-Friction-API.patch b/patches/server/0929-Friction-API.patch
similarity index 100%
rename from patches/server/0930-Friction-API.patch
rename to patches/server/0929-Friction-API.patch
diff --git a/patches/server/0931-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0930-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0931-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0930-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0932-Fix-player-kick-on-shutdown.patch b/patches/server/0931-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0932-Fix-player-kick-on-shutdown.patch
rename to patches/server/0931-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0933-Sync-offhand-slot-in-menus.patch b/patches/server/0932-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0933-Sync-offhand-slot-in-menus.patch
rename to patches/server/0932-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0934-Player-Entity-Tracking-Events.patch b/patches/server/0933-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0934-Player-Entity-Tracking-Events.patch
rename to patches/server/0933-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0935-Limit-pet-look-distance.patch b/patches/server/0934-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0935-Limit-pet-look-distance.patch
rename to patches/server/0934-Limit-pet-look-distance.patch
diff --git a/patches/server/0936-Properly-resend-entities.patch b/patches/server/0935-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0936-Properly-resend-entities.patch
rename to patches/server/0935-Properly-resend-entities.patch
diff --git a/patches/server/0937-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0936-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0937-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0936-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0938-fix-Instruments.patch b/patches/server/0937-fix-Instruments.patch
similarity index 97%
rename from patches/server/0938-fix-Instruments.patch
rename to patches/server/0937-fix-Instruments.patch
index 7d9a7d5a08..7d7b3a088f 100644
--- a/patches/server/0938-fix-Instruments.patch
+++ b/patches/server/0937-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d87b6ccc57be06739a0105805735feb1800ada69..99bf1485ddecb5fc88850242e9c32850781c4b36 100644
+index 05fbdba6bc87e5c7f192a061a8ea6cf12b19a216..0e65d674a73d7c31ba3c6d504bd724ccb5068264 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -767,62 +767,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0939-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0938-Fix-chunk-snapshot-biome-getter.patch
similarity index 91%
rename from patches/server/0939-Fix-chunk-snapshot-biome-getter.patch
rename to patches/server/0938-Fix-chunk-snapshot-biome-getter.patch
index 2028401dca..dad6f12e28 100644
--- a/patches/server/0939-Fix-chunk-snapshot-biome-getter.patch
+++ b/patches/server/0938-Fix-chunk-snapshot-biome-getter.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix chunk snapshot biome getter
 Fixes SPIGOT-7188: https://hub.spigotmc.org/jira/browse/SPIGOT-7188
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-index 75193684a71d694736087d1a368b8fb6a8c8363b..f39cf8e90d955c83471363e7dc5097c04894785b 100644
+index 05512cc19eb213b6be5c869e133376ee42827806..c6416b3db0166374065d537e379d05da0f093b21 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-@@ -135,7 +135,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
+@@ -149,7 +149,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
          Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
          this.validateChunkCoordinates(x, y, z);
  
@@ -18,7 +18,7 @@ index 75193684a71d694736087d1a368b8fb6a8c8363b..f39cf8e90d955c83471363e7dc5097c0
          return CraftBlock.biomeBaseToBiome(biomeRegistry, biome.get(x >> 2, (y & 0xF) >> 2, z >> 2));
      }
  
-@@ -149,7 +149,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
+@@ -163,7 +163,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
          Preconditions.checkState(this.biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
          this.validateChunkCoordinates(x, y, z);
  
diff --git a/patches/server/0940-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0939-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0940-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0939-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0941-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0940-Fix-MapLike-Codec-missing-key-selector.patch
similarity index 100%
rename from patches/server/0941-Fix-MapLike-Codec-missing-key-selector.patch
rename to patches/server/0940-Fix-MapLike-Codec-missing-key-selector.patch
diff --git a/patches/server/0942-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0941-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0942-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0941-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0943-Improve-logging-and-errors.patch b/patches/server/0942-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0943-Improve-logging-and-errors.patch
rename to patches/server/0942-Improve-logging-and-errors.patch
diff --git a/patches/server/0944-Fix-explosion-yield-with-new-gamerules.patch b/patches/server/0943-Fix-explosion-yield-with-new-gamerules.patch
similarity index 100%
rename from patches/server/0944-Fix-explosion-yield-with-new-gamerules.patch
rename to patches/server/0943-Fix-explosion-yield-with-new-gamerules.patch
diff --git a/patches/server/0945-Add-BlockLockCheckEvent.patch b/patches/server/0944-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0945-Add-BlockLockCheckEvent.patch
rename to patches/server/0944-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0946-Add-Sneaking-API-for-Entities.patch b/patches/server/0945-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0946-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0945-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0947-Improve-PortalEvents.patch b/patches/server/0946-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0947-Improve-PortalEvents.patch
rename to patches/server/0946-Improve-PortalEvents.patch
diff --git a/patches/server/0948-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0947-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/server/0948-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/server/0947-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0949-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0948-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0949-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0948-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0950-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0949-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0950-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0949-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0951-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0950-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0951-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0950-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0952-Flying-Fall-Damage.patch b/patches/server/0951-Flying-Fall-Damage.patch
similarity index 89%
rename from patches/server/0952-Flying-Fall-Damage.patch
rename to patches/server/0951-Flying-Fall-Damage.patch
index 5739229ed0..e05bb0d2ab 100644
--- a/patches/server/0952-Flying-Fall-Damage.patch
+++ b/patches/server/0951-Flying-Fall-Damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0dcae10fd05a8fe963fdedda8199aa09dc717c9a..61597ebe2f9faff43994c475074b87d11905e582 100644
+index 9db2a97aca111862caec47220d5f13f7e5013fc7..f6e4194856d4a2710a169b5823e74da1ba2c9130 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -181,6 +181,7 @@ public abstract class Player extends LivingEntity {
@@ -26,10 +26,10 @@ index 0dcae10fd05a8fe963fdedda8199aa09dc717c9a..61597ebe2f9faff43994c475074b87d1
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 99bf1485ddecb5fc88850242e9c32850781c4b36..b32f44beab2c9790ee2da8403e362e8b3ecc6175 100644
+index 0e65d674a73d7c31ba3c6d504bd724ccb5068264..0da6a1a688a67868472143a254942eddc5a91b49 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2167,6 +2167,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2180,6 +2180,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().onUpdateAbilities();
      }
  
diff --git a/patches/server/0953-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0952-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0953-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0952-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0954-config-for-disabling-entity-tag-tags.patch b/patches/server/0953-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0954-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0953-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0955-Use-single-player-info-update-packet-on-join.patch b/patches/server/0954-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0955-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0954-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0956-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0955-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0956-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0955-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0957-Add-Player-sendEquipmentChange-Map-API.patch b/patches/server/0956-Add-Player-sendEquipmentChange-Map-API.patch
similarity index 93%
rename from patches/server/0957-Add-Player-sendEquipmentChange-Map-API.patch
rename to patches/server/0956-Add-Player-sendEquipmentChange-Map-API.patch
index f0d56a5f8d..20b4734f7b 100644
--- a/patches/server/0957-Add-Player-sendEquipmentChange-Map-API.patch
+++ b/patches/server/0956-Add-Player-sendEquipmentChange-Map-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#sendEquipmentChange(Map) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b32f44beab2c9790ee2da8403e362e8b3ecc6175..7b795a8f23a617d1d80f72f3262e11a1c9f806be 100644
+index 0da6a1a688a67868472143a254942eddc5a91b49..ded1f3034da67d89efaf4b31620ea2e43002f41d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1055,17 +1055,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1068,17 +1068,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.sendSignChange0(components, loc, dyeColor, hasGlowingText); // Paper
      }
  
diff --git a/patches/server/0958-Win-Screen-API.patch b/patches/server/0957-Win-Screen-API.patch
similarity index 85%
rename from patches/server/0958-Win-Screen-API.patch
rename to patches/server/0957-Win-Screen-API.patch
index 7444d0544e..6247fb86f4 100644
--- a/patches/server/0958-Win-Screen-API.patch
+++ b/patches/server/0957-Win-Screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Win Screen API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7b795a8f23a617d1d80f72f3262e11a1c9f806be..7c43de6ad6bd7259c6bcb2a55e312e8abfcf546b 100644
+index ded1f3034da67d89efaf4b31620ea2e43002f41d..616d0c3b72c7a5fcc67981c1919a4dece904d017 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1166,6 +1166,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1179,6 +1179,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0959-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0958-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0959-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0958-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0960-Fix-force-opening-enchantment-tables.patch b/patches/server/0959-Fix-force-opening-enchantment-tables.patch
similarity index 94%
rename from patches/server/0960-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0959-Fix-force-opening-enchantment-tables.patch
index fe70d01f06..8f0bd48367 100644
--- a/patches/server/0960-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0959-Fix-force-opening-enchantment-tables.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index e779dcc4982ff51e4d450265fd61bc26e8e74d3a..ed22e6f17f48db71cc283afc8b71d85682cd7d3a 100644
+index d69c05223fca71fc5e282095d02bc39fee7ec757..11a06cd0a9cee01107941a2294fbcb493a11ab63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -396,7 +396,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/work/Bukkit b/work/Bukkit
index 79e3967192..22f8c20898 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 79e3967192566bce29eb6688fc3abafa69a2be24
+Subproject commit 22f8c20898698bdd5fe348404a49d0cad36fef0b
diff --git a/work/CraftBukkit b/work/CraftBukkit
index ab8ace6857..39462a8985 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit ab8ace68577ab6c0eb2f84b19bbf1adf3ad4a01d
+Subproject commit 39462a898595280d1a1c6197c2ad66082434ba80