From bffb08c2f99a5527b7357d005cb10ba21cf048d9 Mon Sep 17 00:00:00 2001
From: Tamion <70228790+notTamion@users.noreply.github.com>
Date: Sat, 4 Nov 2023 21:20:13 +0100
Subject: [PATCH] Deprecate Player#boostElytra (#9899)

The Paper method was chosen for deprecation because it was more
restrictive in that it has an isGliding check.
---
 .../api/0217-Player-elytra-boost-API.patch    | 11 +++++--
 patches/api/0244-Add-sendOpLevel-API.patch    | 18 ++++++-----
 patches/api/0369-More-Teleport-API.patch      |  4 +--
 ...stom-Chat-Completion-Suggestions-API.patch | 16 +++++-----
 .../0381-Elder-Guardian-appearance-API.patch  |  4 +--
 .../0389-Add-Player-Warden-Warning-API.patch  |  4 +--
 .../0442-Add-player-idle-duration-API.patch   |  4 +--
 ...78-Fixed-TileEntityBell-memory-leak.patch} |  0
 .../server/0478-Player-elytra-boost-API.patch | 31 -------------------
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  2 +-
 ...ch => 0481-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  0
 ...> 0484-Item-no-age-no-player-pickup.patch} |  2 +-
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...486-Beacon-API-custom-effect-ranges.patch} |  2 +-
 ...tch => 0487-Add-API-for-quit-reason.patch} |  6 ++--
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...ch => 0489-Expose-world-spawn-angle.patch} |  2 +-
 ...patch => 0490-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  4 +--
 ...92-Add-LivingEntity-clearActiveItem.patch} |  2 +-
 ...=> 0493-Add-PlayerItemCooldownEvent.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...PI.patch => 0495-More-lightning-API.patch} |  2 +-
 ...should-not-bypass-cramming-gamerule.patch} |  6 ++--
 ...-missing-default-perms-for-commands.patch} |  2 +-
 ...h => 0498-Add-PlayerShearBlockEvent.patch} |  0
 ....patch => 0499-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ...501-Player-Chunk-Load-Unload-Events.patch} |  0
 ...2-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...-invalid-ingredient-lists-in-Villag.patch} |  0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |  0
 ...ch => 0507-Implement-TargetHitEvent.patch} |  0
 ... 0508-MC-4-Fix-item-position-desync.patch} |  0
 ...509-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0510-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0512-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...ct-event-not-being-called-sometimes.patch} |  0
 ...h => 0517-Zombie-API-breaking-doors.patch} |  0
 ...518-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0519-Add-EntityLoadCrossbowEvent.patch} |  0
 ...0520-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...mplemented-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  0
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...OIs.patch => 0528-Remove-stale-POIs.patch} |  0
 ...h => 0529-Fix-villager-boat-exploit.patch} |  0
 ...I.patch => 0530-Add-sendOpLevel-API.patch} | 16 +++++-----
 ...0531-TODO-Registry-Modification-API.patch} |  0
 ...h => 0532-Add-StructuresLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  0
 ...leHitEvent-call-when-fireballs-dead.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...536-Make-schedule-command-per-world.patch} |  0
 ...537-Configurable-max-leash-distance.patch} |  0
 ...538-Implement-BlockPreDispenseEvent.patch} |  0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  0
 ...shield-blocking-on-dimension-change.patch} |  0
 ...atch => 0544-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0545-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0547-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...ix-dead-slime-setSize-invincibility.patch} |  0
 ...pes-should-return-an-immutable-list.patch} |  0
 ...atch => 0553-Expose-Tracked-Players.patch} |  0
 ...4-Remove-streams-from-SensorNearest.patch} |  0
 ...GUI.patch => 0555-Improve-ServerGUI.patch} |  0
 ...556-fix-converting-txt-to-json-file.patch} |  0
 ...atch => 0557-Add-worldborder-events.patch} |  0
 ...=> 0558-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0560-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0561-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ....patch => 0563-Expand-world-key-API.patch} |  0
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0565-Item-Rarity-API.patch} |  0
 ...d-item-when-player-has-disconnected.patch} |  0
 ...elist-use-configurable-kick-message.patch} |  0
 ...gnore-result-of-PlayerEditBookEvent.patch} |  0
 ...tch => 0569-Expose-protocol-version.patch} |  0
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  0
 ...patch => 0572-Add-bypass-host-check.patch} |  0
 ...0573-Set-area-affect-cloud-rotation.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ...ix-PigZombieAngerEvent-cancellation.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ... => 0579-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0580-More-World-API.patch} |  0
 ... 0581-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
 ...> 0588-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...90-Entity-load-save-limit-per-chunk.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0593-Inventory-close.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...atch => 0595-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  4 +--
 ... => 0598-ItemStack-repair-check-API.patch} |  0
 ....patch => 0599-More-Enchantment-API.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0602-Add-Mob-lookAt-API.patch} |  0
 ...0603-Add-Unix-domain-socket-support.patch} |  0
 ... => 0604-Add-EntityInsideBlockEvent.patch} |  0
 ...05-Attributes-API-for-item-defaults.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...patch => 0607-More-Lidded-Block-API.patch} |  0
 ...08-Limit-item-frame-cursors-on-maps.patch} |  0
 ... => 0609-Add-PlayerKickEvent-causes.patch} |  4 +--
 ...0610-Add-PufferFishStateChangeEvent.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ThreadingDe.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0614-Add-BellRevealRaiderEvent.patch} |  0
 ... 0615-Fix-invulnerable-end-crystals.patch} |  0
 ...16-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0617-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...patch => 0620-Line-Of-Sight-Changes.patch} |  0
 ... => 0621-add-per-world-spawn-limits.patch} |  0
 ...h => 0622-Fix-potions-splash-events.patch} |  0
 ... => 0623-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  0
 ...PI.patch => 0625-Missing-Entity-API.patch} |  0
 ...ect-for-book-edit-is-called-on-main.patch} |  0
 ...of-Block-applyBoneMeal-always-being.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...rom-signs-not-firing-command-events.patch} |  0
 ...ch => 0630-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 => 0637-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0639-Add-System.out-err-catcher.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 => 0644-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
 ...=> 0648-Added-EntityDamageItemEvent.patch} |  0
 ...timize-indirect-passenger-iteration.patch} |  0
 ...em-frame-map-cursor-update-interval.patch} |  0
 ...Make-EntityUnleashEvent-cancellable.patch} |  0
 ...652-Clear-bucket-NBT-after-dispense.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0654-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0656-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0658-Add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  0
 ... 0660-Get-entity-default-attributes.patch} |  0
 ...d-API.patch => 0661-Left-handed-API.patch} |  0
 ...ch => 0662-Add-more-advancement-API.patch} |  0
 ...663-Add-ItemFactory-getSpawnEgg-API.patch} |  0
 ...tch => 0664-Add-critical-damage-API.patch} |  0
 ...0665-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  0
 ...-ram-API.patch => 0667-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...9-Add-Raw-Byte-Entity-Serialization.patch} |  0
 ...70-Vanilla-command-permission-fixes.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} |  0
 ...72-Fix-GameProfileCache-concurrency.patch} |  0
 ...673-Improve-and-expand-AsyncCatcher.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  0
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...=> 0676-Optimise-general-POI-access.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...lly-inline-methods-in-BlockPosition.patch} |  0
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  0
 ...our-chunk-data-off-disk-when-conver.patch} |  0
 ...-lookup-fluid-state-when-raytracing.patch} |  0
 ...atch => 0683-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  0
 ...5-Do-not-run-raytrace-logic-for-AIR.patch} |  0
 ...> 0686-Execute-chunk-tasks-mid-tick.patch} |  0
 ...rimise-map-impl-for-tracked-players.patch} |  0
 ...imise-BlockSoil-nearby-water-lookup.patch} |  0
 ... 0689-Optimise-random-block-ticking.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  0
 ...hread-worker-count-for-low-core-cou.patch} |  0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |  0
 ... 0695-Distance-manager-tick-timings.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  0
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  0
 ...h => 0699-Add-packet-limiter-config.patch} |  0
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0701-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 => 0706-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  0
 ...unintended-light-block-manipulation.patch} |  0
 ...0709-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ... => 0711-Configurable-feature-seeds.patch} |  0
 ... 0712-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
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  0
 ...e-unnecessary-itemmeta-from-clients.patch} |  0
 ...=> 0720-Fix-Spigot-growth-modifiers.patch} |  0
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0722-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...tch => 0723-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...tch => 0725-Collision-optimisations.patch} |  0
 ...n-checking-in-player-move-packet-ha.patch} |  0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  0
 ...patch => 0728-Add-more-Campfire-API.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} |  0
 ...30-Fix-tripwire-state-inconsistency.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0732-Improve-scoreboard-entries.patch} |  0
 ...ch => 0733-Entity-powdered-snow-API.patch} |  0
 ...0734-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
 ...=> 0740-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0741-Bucketable-API.patch} |  0
 ...es.patch => 0742-Validate-usernames.patch} |  0
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  0
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...7-Multiple-Entries-with-Scoreboards.patch} |  0
 ...748-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...0751-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0752-Kick-on-main-for-illegal-chat.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  4 +--
 ...ent.patch => 0754-Fix-NotePlayEvent.patch} |  0
 ....patch => 0755-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0756-Dolphin-API.patch} |  0
 ...h => 0757-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 => 0761-Implement-regenerateChunk.patch} |  0
 ...lled-powdered-snow-bucket-placement.patch} |  0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0764-Add-GameEvent-tags.patch} |  0
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...tch => 0766-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
 ... => 0771-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0772-Custom-Potion-Mixes.patch} |  0
 ...73-Force-close-world-loading-screen.patch} |  0
 ...774-Fix-falling-block-spawn-methods.patch} |  0
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  0
 ...I.patch => 0777-More-Projectile-API.patch} |  0
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  0
 ...0780-Implement-getComputedBiome-API.patch} |  0
 ...> 0781-Make-some-itemstacks-nonnull.patch} |  0
 ...782-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0783-Fix-saving-in-unloadWorld.patch} |  0
 ...h => 0784-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0785-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 => 0790-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} |  0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  0
 ...> 0799-WorldCreator-keepSpawnLoaded.patch} |  0
 ...-in-CraftPersistentDataTypeRegistry.patch} |  0
 ...destroyed-trigger-in-the-correct-pl.patch} |  0
 ...Event-and-CollarColorable-interface.patch} |  0
 ...CauldronLevelChange-on-initial-fill.patch} |  0
 ...snow-cauldrons-not-turning-to-water.patch} |  0
 ...> 0805-Add-PlayerStopUsingItemEvent.patch} |  0
 ...rs.patch => 0806-Don-t-tick-markers.patch} |  0
 ...tch => 0807-Expand-FallingBlock-API.patch} |  0
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0809-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  0
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0812-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  0
 ...-on-world-create-while-being-ticked.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...17-Dont-resent-entity-on-art-update.patch} |  0
 ... => 0818-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  0
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0821-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
 ...atch => 0825-Add-Player-getFishHook.patch} |  0
 ...chunk-for-dynamic-game-event-listen.patch} |  0
 ...s-missing-EntityDropItemEvent-calls.patch} |  0
 ...debug-information-to-chat-packet-er.patch} |  0
 ...PE.patch => 0829-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  0
 ...API.patch => 0831-More-Teleport-API.patch} | 10 +++---
 ... => 0832-Add-EntityPortalReadyEvent.patch} |  0
 ...level-random-in-entity-constructors.patch} |  0
 ...k-entities-after-destroy-prediction.patch} |  0
 ...on-plugins-accessing-faraway-chunks.patch} |  0
 ...tom-Chat-Completion-Suggestions-API.patch} | 16 +++++-----
 ...Add-and-fix-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0838-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...API.patch => 0840-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...andom-in-ServerLoginPacketListenerI.patch} |  0
 ...843-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  0
 ...ok-changes-from-crashing-the-server.patch} |  0
 ...tityChangeBlockEvent-in-more-places.patch} |  0
 ...> 0847-Missing-eating-regain-reason.patch} |  0
 ....patch => 0848-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...1-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0852-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  0
 ... 0854-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ... => 0856-Add-getDrops-to-BlockState.patch} |  0
 ...=> 0857-Fix-a-bunch-of-vanilla-bugs.patch} |  0
 ...y-onTrackingStart-during-navigation.patch} |  0
 ... 0859-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0860-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  0
 ... 0863-Elder-Guardian-appearance-API.patch} |  4 +--
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0865-Add-entity-knockback-API.patch} |  0
 ....patch => 0866-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...8-optimized-dirt-and-snow-spreading.patch} |  0
 ... => 0869-Added-EntityToggleSitEvent.patch} |  0
 ... => 0870-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0871-Add-Moving-Piston-API.patch} |  0
 ...> 0872-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
 ...0877-Add-PrePlayerAttackEntityEvent.patch} |  0
 ...e-reset-EnderDragon-boss-event-name.patch} |  0
 ...-green-map-markers-do-not-disappear.patch} |  0
 ... 0880-Add-Player-Warden-Warning-API.patch} |  4 +--
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...882-Add-paper-dumplisteners-command.patch} |  0
 ...lobal-player-list-where-appropriate.patch} |  0
 ...sync-entity-add-due-to-fungus-trees.patch} |  0
 ....patch => 0885-ItemStack-damage-API.patch} |  0
 ...tion-API.patch => 0886-Friction-API.patch} |  0
 ...trol-player-s-insomnia-and-phantoms.patch} |  0
 ...=> 0888-Fix-player-kick-on-shutdown.patch} |  0
 ... => 0889-Sync-offhand-slot-in-menus.patch} |  0
 ... 0890-Player-Entity-Tracking-Events.patch} |  0
 ...tch => 0891-Limit-pet-look-distance.patch} |  0
 ...ch => 0892-Properly-resend-entities.patch} |  0
 ...nd-additions-to-the-SpawnReason-API.patch} |  0
 ...ments.patch => 0894-fix-Instruments.patch} |  4 +--
 ...for-some-hot-BlockBehavior-and-Flui.patch} |  0
 ...es-in-dispense-events-regarding-sta.patch} |  0
 ...tch => 0897-Add-BlockLockCheckEvent.patch} |  0
 ... 0898-Add-Sneaking-API-for-Entities.patch} |  0
 ... => 0899-Improve-logging-and-errors.patch} |  0
 ....patch => 0900-Improve-PortalEvents.patch} |  0
 ...ion-for-spider-worldborder-climbing.patch} |  0
 ...sing-SpigotConfig-logCommands-check.patch} |  0
 ...Allay-stopDancing-while-not-dancing.patch} |  0
 ...ge.patch => 0904-Flying-Fall-Damage.patch} |  4 +--
 ...k-state-to-BlockExplodeEvent-and-En.patch} |  0
 ...ion-moving-velocity-to-VehicleBlock.patch} |  0
 ...onfig-for-disabling-entity-tag-tags.patch} |  0
 ...e-player-info-update-packet-on-join.patch} |  0
 ...k-items-during-EntityResurrectEvent.patch} |  0
 ...en-API.patch => 0910-Win-Screen-API.patch} |  4 +--
 ...ItemStack-setAmount-null-assignment.patch} |  0
 ...ix-force-opening-enchantment-tables.patch} |  0
 ...tch => 0913-Add-Entity-Body-Yaw-API.patch} |  0
 ...vent-sleeping-villagers-moving-towa.patch} |  0
 ...hen-a-captured-block-state-is-outda.patch} |  0
 ...=> 0916-Add-EntityFertilizeEggEvent.patch} |  0
 ...ty-drop-not-updating-the-client-inv.patch} |  0
 ...temEvent-and-EntityCompostItemEvent.patch} |  0
 ...ctly-handle-ArmorStand-invisibility.patch} |  0
 ...ancement-triggers-for-entity-damage.patch} |  0
 ...921-Fix-text-display-error-on-spawn.patch} |  0
 ...nventories-returning-null-Locations.patch} |  0
 ...API.patch => 0923-Add-Shearable-API.patch} |  0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |  0
 ...pers.patch => 0925-Optimize-Hoppers.patch} |  0
 ...ives-generating-from-using-bonemeal.patch} |  0
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |  0
 ...ence-violations-like-they-should-be.patch} |  0
 ...uplicate-animate-packet-for-records.patch} |  0
 ...xpired-keys-from-impacting-new-join.patch} |  0
 ...ts-being-fired-from-unloaded-chunks.patch} |  0
 ...0932-Use-array-for-gamerule-storage.patch} |  0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |  0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |  0
 ... 0935-Add-Mob-Experience-reward-API.patch} |  0
 ...redstone-on-top-of-trap-doors-early.patch} |  0
 ...-Fix-DamageCause-for-Falling-Blocks.patch} |  0
 ...Lazy-Initialization-for-Enum-Fields.patch} |  0
 ...39-More-accurate-isInOpenWater-impl.patch} |  0
 ...ccess-to-lookups-field-in-RegistryO.patch} |  0
 ...ecalcBlockCounts-for-empty-sections.patch} |  0
 ... => 0942-Expand-PlayerItemMendEvent.patch} |  4 +--
 ...sh-ProjectileSource-for-projectiles.patch} |  0
 ... => 0944-Add-transient-modifier-API.patch} |  0
 ...patch => 0945-Fix-block-place-logic.patch} |  0
 ...nd-playing-for-BlockItem-ItemStacks.patch} |  0
 ...efinitions-of-trim-material-pattern.patch} |  0
 ...l-BlockGrowEvent-for-missing-blocks.patch} |  0
 ...nhasbukkit-default-if-alias-block-e.patch} |  0
 ...pLike-spam-for-missing-key-selector.patch} |  0
 ...-Fix-sniffer-removeExploredLocation.patch} |  0
 ...to-remove-all-active-potion-effects.patch} |  0
 ...yerChunkLoaderData-in-order-to-prep.patch} |  0
 ...rafting-result-amount-for-fireworks.patch} |  0
 ...> 0955-Properly-Cancel-Usable-Items.patch} |  0
 ...6-Add-event-for-player-editing-sign.patch} |  0
 ...k-item-frames-if-players-can-see-it.patch} |  0
 ...-command-function-perm-level-checks.patch} |  0
 ...Add-option-to-disable-block-updates.patch} |  0
 ...960-Call-missing-BlockDispenseEvent.patch} |  0
 ...-chunks-for-supporting-block-checks.patch} |  0
 ...Optimize-player-lookups-for-beacons.patch} |  0
 ...963-Add-Sign-getInteractableSideFor.patch} |  0
 ...64-Array-backed-synched-entity-data.patch} |  0
 ...5-fix-item-meta-for-tadpole-buckets.patch} |  0
 ...uppress-Item-Meta-Validation-Checks.patch} |  0
 ...t-API.patch => 0967-Fix-BanList-API.patch} |  6 ++--
 ...d-water-fluid-explosion-resistance-.patch} |  0
 ...x-possible-NPE-on-painting-creation.patch} |  0
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...nceOrb-should-call-EntitySpawnEvent.patch} |  0
 ...igns.patch => 0972-Don-t-tick-signs.patch} |  0
 ...t-throw-both-Spread-and-Grow-Events.patch} |  0
 ....patch => 0974-Add-whitelist-events.patch} |  0
 ... 0975-Implement-PlayerFailMoveEvent.patch} |  0
 ...olia-scheduler-and-owned-region-API.patch} |  0
 ...se-allay-memory-on-non-item-targets.patch} |  0
 ...API-for-updating-recipes-on-clients.patch} |  0
 ...tion-when-spawning-display-entities.patch} |  0
 ...980-Only-capture-actual-tree-growth.patch} |  0
 ...rce-for-mushroom-block-spread-event.patch} |  0
 ...Data-on-more-entities-when-spawning.patch} |  0
 ...-Use-correct-seed-on-api-world-load.patch} |  0
 ...ta-neighbour-ticks-outside-of-range.patch} |  0
 ...> 0985-Cache-map-ids-on-item-frames.patch} |  0
 ...-custom-statistic-criteria-creation.patch} |  0
 ...atch => 0987-Bandaid-fix-for-Effect.patch} |  4 +--
 ...tch => 0988-SculkCatalyst-bloom-API.patch} |  0
 ...API-for-an-entity-s-scoreboard-name.patch} |  0
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |  0
 ...lace-methods-with-old-StructureType.patch} |  0
 ...e-namespaced-commands-if-send-names.patch} |  0
 ...-handle-BlockBreakEvent-isDropItems.patch} |  0
 ...entity-death-event-for-ender-dragon.patch} |  0
 ...tity-tracking-range-by-Y-coordinate.patch} |  0
 ... => 0996-Add-Listing-API-for-Player.patch} |  6 ++--
 ...figurable-Region-Compression-Format.patch} |  0
 ...d-BlockFace-during-BlockDamageEvent.patch} |  0
 ...h => 0999-Fix-NPE-on-Boat-getStatus.patch} |  0
 ...e-API.patch => 1000-Expand-Pose-API.patch} |  0
 ...patch => 1001-More-DragonBattle-API.patch} |  0
 ... 1002-Deep-clone-unhandled-nbt-tags.patch} |  0
 ...tch => 1003-Add-PlayerPickItemEvent.patch} |  0
 ...-Improve-performance-of-mass-crafts.patch} |  0
 ...=> 1005-Allow-trident-custom-damage.patch} |  0
 ...pose-hand-during-BlockCanBuildEvent.patch} |  0
 ...-nearest-structure-border-iteration.patch} |  0
 ...Implement-OfflinePlayer-isConnected.patch} |  2 +-
 ....patch => 1009-Fix-inventory-desync.patch} |  0
 ...titleOverride-to-InventoryOpenEvent.patch} |  0
 ...11-Configure-sniffer-egg-hatch-time.patch} |  0
 ...-proximity-check-before-entity-look.patch} |  0
 ...kip-POI-finding-if-stuck-in-vehicle.patch} |  0
 ...t-sanity-checks-in-container-clicks.patch} |  0
 ...ll-BlockRedstoneEvents-for-lecterns.patch} |  0
 ...roper-checking-of-empty-item-stacks.patch} |  0
 ...ix-silent-equipment-change-for-mobs.patch} |  0
 ...h => 1018-Fix-spigot-s-Forced-Stats.patch} |  0
 ...ing-InventoryHolders-to-inventories.patch} |  0
 ...entities-in-chunks-that-are-positio.patch} |  0
 ...> 1021-Actually-optimise-explosions.patch} |  0
 ...sing-logs-for-log-ips-config-option.patch} |  0
 ...Remove-Spigot-Bug-Fix-for-MC-109346.patch} |  0
 ...atch => 1024-Fix-SuspiciousStewMeta.patch} |  0
 ... 1025-Optimise-chunk-tick-iteration.patch} |  0
 ...atch => 1026-Lag-compensation-ticks.patch} |  0
 ...n-on-UpgradeData.BlockFixers-class-.patch} |  0
 ...-AdvancementProgress-getDateAwarded.patch} |  0
 ...idebar-objectives-not-being-cleared.patch} |  0
 ...30-Optimise-nearby-player-retrieval.patch} |  0
 ...1031-Remove-streams-for-villager-AI.patch} |  0
 ...x-missing-map-initialize-event-call.patch} |  0
 ...a-when-attaching-firework-to-entity.patch} |  0
 ...ble-for-initializing-CraftLootTable.patch} |  0
 ...method-of-Fireballs-change-the-trav.patch} |  0
 ...36-Fix-UnsafeValues-loadAdvancement.patch} |  0
 ...> 1037-Add-player-idle-duration-API.patch} |  4 +--
 ...-if-we-can-see-non-visible-entities.patch} |  0
 ...NPE-in-SculkBloomEvent-world-access.patch} |  0
 ...tack-for-Player-sendEquipmentChange.patch} |  4 +--
 ...Ints.patch => 1041-Optimize-VarInts.patch} |  0
 ...alid-world-is-found-on-legacy-Playe.patch} |  0
 573 files changed, 106 insertions(+), 124 deletions(-)
 rename patches/server/{0479-Fixed-TileEntityBell-memory-leak.patch => 0478-Fixed-TileEntityBell-memory-leak.patch} (100%)
 delete mode 100644 patches/server/0478-Player-elytra-boost-API.patch
 rename patches/server/{0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0481-Add-getOfflinePlayerIfCached-String.patch => 0480-Add-getOfflinePlayerIfCached-String.patch} (93%)
 rename patches/server/{0482-Add-ignore-discounts-API.patch => 0481-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0483-Toggle-for-removing-existing-dragon.patch => 0482-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0484-Fix-client-lag-on-advancement-loading.patch => 0483-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0485-Item-no-age-no-player-pickup.patch => 0484-Item-no-age-no-player-pickup.patch} (94%)
 rename patches/server/{0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0487-Beacon-API-custom-effect-ranges.patch => 0486-Beacon-API-custom-effect-ranges.patch} (98%)
 rename patches/server/{0488-Add-API-for-quit-reason.patch => 0487-Add-API-for-quit-reason.patch} (94%)
 rename patches/server/{0489-Add-Wandering-Trader-spawn-rate-config-options.patch => 0488-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0490-Expose-world-spawn-angle.patch => 0489-Expose-world-spawn-angle.patch} (91%)
 rename patches/server/{0491-Add-Destroy-Speed-API.patch => 0490-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (89%)
 rename patches/server/{0493-Add-LivingEntity-clearActiveItem.patch => 0492-Add-LivingEntity-clearActiveItem.patch} (90%)
 rename patches/server/{0494-Add-PlayerItemCooldownEvent.patch => 0493-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0495-Significantly-improve-performance-of-the-end-generat.patch => 0494-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0496-More-lightning-API.patch => 0495-More-lightning-API.patch} (93%)
 rename patches/server/{0497-Climbing-should-not-bypass-cramming-gamerule.patch => 0496-Climbing-should-not-bypass-cramming-gamerule.patch} (96%)
 rename patches/server/{0498-Added-missing-default-perms-for-commands.patch => 0497-Added-missing-default-perms-for-commands.patch} (99%)
 rename patches/server/{0499-Add-PlayerShearBlockEvent.patch => 0498-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0500-Limit-recipe-packets.patch => 0499-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0501-Fix-CraftSound-backwards-compatibility.patch => 0500-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0502-Player-Chunk-Load-Unload-Events.patch => 0501-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0503-Optimize-Dynamic-get-Missing-Keys.patch => 0502-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0504-Expose-LivingEntity-hurt-direction.patch => 0503-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0508-Implement-TargetHitEvent.patch => 0507-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0509-MC-4-Fix-item-position-desync.patch => 0508-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0510-Additional-Block-Material-API-s.patch => 0509-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0511-Fix-harming-potion-dupe.patch => 0510-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0513-Cache-burn-durations.patch => 0512-Cache-burn-durations.patch} (100%)
 rename patches/server/{0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0515-Fix-Not-a-string-Map-Conversion-spam.patch => 0514-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0516-Implement-PlayerFlowerPotManipulateEvent.patch => 0515-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0517-Fix-interact-event-not-being-called-sometimes.patch => 0516-Fix-interact-event-not-being-called-sometimes.patch} (100%)
 rename patches/server/{0518-Zombie-API-breaking-doors.patch => 0517-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0519-Fix-nerfed-slime-when-splitting.patch => 0518-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0520-Add-EntityLoadCrossbowEvent.patch => 0519-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0521-Added-WorldGameRuleChangeEvent.patch => 0520-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0522-Added-ServerResourcesReloadedEvent.patch => 0521-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0523-Added-world-settings-for-mobs-picking-up-loot.patch => 0522-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0524-Implemented-BlockFailedDispenseEvent.patch => 0523-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0525-Added-PlayerLecternPageChangeEvent.patch => 0524-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0526-Added-PlayerLoomPatternSelectEvent.patch => 0525-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0527-Configurable-door-breaking-difficulty.patch => 0526-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0528-Empty-commands-shall-not-be-dispatched.patch => 0527-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0529-Remove-stale-POIs.patch => 0528-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0530-Fix-villager-boat-exploit.patch => 0529-Fix-villager-boat-exploit.patch} (100%)
 rename patches/server/{0531-Add-sendOpLevel-API.patch => 0530-Add-sendOpLevel-API.patch} (85%)
 rename patches/server/{0532-TODO-Registry-Modification-API.patch => 0531-TODO-Registry-Modification-API.patch} (100%)
 rename patches/server/{0533-Add-StructuresLocateEvent.patch => 0532-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0534-Collision-option-for-requiring-a-player-participant.patch => 0533-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename patches/server/{0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0536-Return-chat-component-with-empty-text-instead-of-thr.patch => 0535-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0537-Make-schedule-command-per-world.patch => 0536-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0538-Configurable-max-leash-distance.patch => 0537-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0539-Implement-BlockPreDispenseEvent.patch => 0538-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0541-Add-toggle-for-always-placing-the-dragon-egg.patch => 0540-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0542-Added-PlayerStonecutterRecipeSelectEvent.patch => 0541-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0544-Reset-shield-blocking-on-dimension-change.patch => 0543-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0545-add-DragonEggFormEvent.patch => 0544-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0546-EntityMoveEvent.patch => 0545-EntityMoveEvent.patch} (100%)
 rename patches/server/{0547-added-option-to-disable-pathfinding-updates-on-block.patch => 0546-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0548-Inline-shift-direction-fields.patch => 0547-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0549-Allow-adding-items-to-BlockDropItemEvent.patch => 0548-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0551-living-entity-allow-attribute-registration.patch => 0550-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0552-fix-dead-slime-setSize-invincibility.patch => 0551-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0553-Merchant-getRecipes-should-return-an-immutable-list.patch => 0552-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0554-Expose-Tracked-Players.patch => 0553-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0555-Remove-streams-from-SensorNearest.patch => 0554-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0556-Improve-ServerGUI.patch => 0555-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0557-fix-converting-txt-to-json-file.patch => 0556-fix-converting-txt-to-json-file.patch} (100%)
 rename patches/server/{0558-Add-worldborder-events.patch => 0557-Add-worldborder-events.patch} (100%)
 rename patches/server/{0559-added-PlayerNameEntityEvent.patch => 0558-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0560-Prevent-grindstones-from-overstacking-items.patch => 0559-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0561-Add-recipe-to-cook-events.patch => 0560-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0562-Add-Block-isValidTool.patch => 0561-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0563-Allow-using-signs-inside-spawn-protection.patch => 0562-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0564-Expand-world-key-API.patch => 0563-Expand-world-key-API.patch} (100%)
 rename patches/server/{0565-Add-fast-alternative-constructor-for-Rotations.patch => 0564-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0566-Item-Rarity-API.patch => 0565-Item-Rarity-API.patch} (100%)
 rename patches/server/{0567-Drop-carried-item-when-player-has-disconnected.patch => 0566-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename patches/server/{0568-forced-whitelist-use-configurable-kick-message.patch => 0567-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0570-Expose-protocol-version.patch => 0569-Expose-protocol-version.patch} (100%)
 rename patches/server/{0571-Enhance-console-tab-completions-for-brigadier-comman.patch => 0570-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0573-Add-bypass-host-check.patch => 0572-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0574-Set-area-affect-cloud-rotation.patch => 0573-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0575-add-isDeeplySleeping-to-HumanEntity.patch => 0574-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0576-add-consumeFuel-to-FurnaceBurnEvent.patch => 0575-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0577-add-get-set-drop-chance-to-EntityEquipment.patch => 0576-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0578-fix-PigZombieAngerEvent-cancellation.patch => 0577-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0579-fix-PlayerItemHeldEvent-firing-twice.patch => 0578-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0580-Added-PlayerDeepSleepEvent.patch => 0579-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0581-More-World-API.patch => 0580-More-World-API.patch} (100%)
 rename patches/server/{0582-Added-PlayerBedFailEnterEvent.patch => 0581-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0583-Implement-methods-to-convert-between-Component-and-B.patch => 0582-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename patches/server/{0585-Introduce-beacon-activation-deactivation-events.patch => 0584-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0586-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0585-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/server/{0587-Add-Channel-initialization-listeners.patch => 0586-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0588-Send-empty-commands-if-tab-completion-is-disabled.patch => 0587-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0589-Add-more-WanderingTrader-API.patch => 0588-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0590-Add-EntityBlockStorage-clearEntities.patch => 0589-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0591-Entity-load-save-limit-per-chunk.patch => 0590-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0594-Inventory-close.patch => 0593-Inventory-close.patch} (100%)
 rename patches/server/{0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0596-Add-basic-Datapack-API.patch => 0595-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0597-Add-environment-variable-to-disable-server-gui.patch => 0596-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0598-additions-to-PlayerGameModeChangeEvent.patch => 0597-additions-to-PlayerGameModeChangeEvent.patch} (98%)
 rename patches/server/{0599-ItemStack-repair-check-API.patch => 0598-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0600-More-Enchantment-API.patch => 0599-More-Enchantment-API.patch} (100%)
 rename patches/server/{0601-Move-range-check-for-block-placing-up.patch => 0600-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0602-Fix-and-optimise-world-force-upgrading.patch => 0601-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0603-Add-Mob-lookAt-API.patch => 0602-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0604-Add-Unix-domain-socket-support.patch => 0603-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0605-Add-EntityInsideBlockEvent.patch => 0604-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0606-Attributes-API-for-item-defaults.patch => 0605-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0607-Add-cause-to-Weather-ThunderChangeEvents.patch => 0606-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0608-More-Lidded-Block-API.patch => 0607-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0609-Limit-item-frame-cursors-on-maps.patch => 0608-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0610-Add-PlayerKickEvent-causes.patch => 0609-Add-PlayerKickEvent-causes.patch} (99%)
 rename patches/server/{0611-Add-PufferFishStateChangeEvent.patch => 0610-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0614-Add-option-to-fix-items-merging-through-walls.patch => 0613-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0615-Add-BellRevealRaiderEvent.patch => 0614-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0616-Fix-invulnerable-end-crystals.patch => 0615-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0617-Add-ElderGuardianAppearanceEvent.patch => 0616-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0618-Fix-dangerous-end-portal-logic.patch => 0617-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0620-Make-item-validations-configurable.patch => 0619-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0621-Line-Of-Sight-Changes.patch => 0620-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0622-add-per-world-spawn-limits.patch => 0621-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0623-Fix-potions-splash-events.patch => 0622-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0624-Add-more-LimitedRegion-API.patch => 0623-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0625-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0624-Fix-PlayerDropItemEvent-using-wrong-item.patch} (100%)
 rename patches/server/{0626-Missing-Entity-API.patch => 0625-Missing-Entity-API.patch} (100%)
 rename patches/server/{0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0629-Use-getChunkIfLoadedImmediately-in-places.patch => 0628-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0630-Fix-commands-from-signs-not-firing-command-events.patch => 0629-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0631-Adds-PlayerArmSwingEvent.patch => 0630-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0632-Fixes-kick-event-leave-message-not-being-sent.patch => 0631-Fixes-kick-event-leave-message-not-being-sent.patch} (100%)
 rename patches/server/{0633-Add-config-for-mobs-immune-to-default-effects.patch => 0632-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0634-Fix-incorrect-message-for-outdated-client.patch => 0633-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0635-Don-t-apply-cramming-damage-to-players.patch => 0634-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0636-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0635-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0637-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0636-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0638-Stinger-API.patch => 0637-Stinger-API.patch} (100%)
 rename patches/server/{0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0640-Add-System.out-err-catcher.patch => 0639-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0642-Improve-boat-collision-performance.patch => 0641-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{0643-Prevent-AFK-kick-while-watching-end-credits.patch => 0642-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0644-Allow-skipping-writing-of-comments-to-server.propert.patch => 0643-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0645-Add-PlayerSetSpawnEvent.patch => 0644-Add-PlayerSetSpawnEvent.patch} (98%)
 rename patches/server/{0646-Make-hoppers-respect-inventory-max-stack-size.patch => 0645-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0647-Optimize-entity-tracker-passenger-checks.patch => 0646-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0648-Config-option-for-Piglins-guarding-chests.patch => 0647-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0649-Added-EntityDamageItemEvent.patch => 0648-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0650-Optimize-indirect-passenger-iteration.patch => 0649-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0651-Configurable-item-frame-map-cursor-update-interval.patch => 0650-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0652-Make-EntityUnleashEvent-cancellable.patch => 0651-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0653-Clear-bucket-NBT-after-dispense.patch => 0652-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0654-Change-EnderEye-target-without-changing-other-things.patch => 0653-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0655-Add-BlockBreakBlockEvent.patch => 0654-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0657-More-CommandBlock-API.patch => 0656-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0658-Add-missing-team-sidebar-display-slots.patch => 0657-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0659-Add-back-EntityPortalExitEvent.patch => 0658-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0660-Add-methods-to-find-targets-for-lightning-strikes.patch => 0659-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/server/{0661-Get-entity-default-attributes.patch => 0660-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0662-Left-handed-API.patch => 0661-Left-handed-API.patch} (100%)
 rename patches/server/{0663-Add-more-advancement-API.patch => 0662-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0664-Add-ItemFactory-getSpawnEgg-API.patch => 0663-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0665-Add-critical-damage-API.patch => 0664-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0666-Fix-issues-with-mob-conversion.patch => 0665-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0667-Add-isCollidable-methods-to-various-places.patch => 0666-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0668-Goat-ram-API.patch => 0667-Goat-ram-API.patch} (100%)
 rename patches/server/{0669-Add-API-for-resetting-a-single-score.patch => 0668-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0670-Add-Raw-Byte-Entity-Serialization.patch => 0669-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0671-Vanilla-command-permission-fixes.patch => 0670-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (100%)
 rename patches/server/{0673-Fix-GameProfileCache-concurrency.patch => 0672-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0674-Improve-and-expand-AsyncCatcher.patch => 0673-Improve-and-expand-AsyncCatcher.patch} (100%)
 rename patches/server/{0675-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0674-Add-paper-mobcaps-and-paper-playermobcaps.patch} (100%)
 rename patches/server/{0676-Sanitize-ResourceLocation-error-logging.patch => 0675-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0677-Optimise-general-POI-access.patch => 0676-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0678-Custom-table-implementation-for-blockstate-state-loo.patch => 0677-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0679-Manually-inline-methods-in-BlockPosition.patch => 0678-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0680-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0679-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0683-Don-t-lookup-fluid-state-when-raytracing.patch => 0682-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0684-Time-scoreboard-search.patch => 0683-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0685-Send-full-pos-packets-for-hard-colliding-entities.patch => 0684-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0686-Do-not-run-raytrace-logic-for-AIR.patch => 0685-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0687-Execute-chunk-tasks-mid-tick.patch => 0686-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0688-Oprimise-map-impl-for-tracked-players.patch => 0687-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0689-Optimise-BlockSoil-nearby-water-lookup.patch => 0688-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0690-Optimise-random-block-ticking.patch => 0689-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0692-Use-Velocity-compression-and-cipher-natives.patch => 0691-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{0693-Detail-more-information-in-watchdog-dumps.patch => 0692-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0695-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0694-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0696-Distance-manager-tick-timings.patch => 0695-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0698-Check-requirement-before-suggesting-root-nodes.patch => 0697-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0700-Add-packet-limiter-config.patch => 0699-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0702-Ensure-valid-vehicle-status.patch => 0701-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0703-Prevent-softlocked-end-exit-portal-generation.patch => 0702-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0705-Don-t-log-debug-logging-being-disabled.patch => 0704-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0706-fix-various-menus-with-empty-level-accesses.patch => 0705-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0707-Preserve-overstacked-loot.patch => 0706-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0708-Update-head-rotation-in-missing-places.patch => 0707-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0709-prevent-unintended-light-block-manipulation.patch => 0708-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0710-Fix-CraftCriteria-defaults-map.patch => 0709-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0711-Fix-upstreams-block-state-factories.patch => 0710-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0712-Configurable-feature-seeds.patch => 0711-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0713-Add-root-admin-user-detection.patch => 0712-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0714-Always-allow-item-changing-in-Fireball.patch => 0713-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0715-don-t-attempt-to-teleport-dead-entities.patch => 0714-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0716-Prevent-excessive-velocity-through-repeated-crits.patch => 0715-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0717-Remove-client-side-code-using-deprecated-for-removal.patch => 0716-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0718-Fix-removing-recipes-from-RecipeIterator.patch => 0717-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0719-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0718-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0720-Hide-unnecessary-itemmeta-from-clients.patch => 0719-Hide-unnecessary-itemmeta-from-clients.patch} (100%)
 rename patches/server/{0721-Fix-Spigot-growth-modifiers.patch => 0720-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0723-Add-PlayerItemFrameChangeEvent.patch => 0722-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0724-Optimize-HashMapPalette.patch => 0723-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0725-Allow-delegation-to-vanilla-chunk-gen.patch => 0724-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0726-Collision-optimisations.patch => 0725-Collision-optimisations.patch} (100%)
 rename patches/server/{0727-Optimise-collision-checking-in-player-move-packet-ha.patch => 0726-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0729-Add-more-Campfire-API.patch => 0728-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0731-Fix-tripwire-state-inconsistency.patch => 0730-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0732-Forward-CraftEntity-in-teleport-command.patch => 0731-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0733-Improve-scoreboard-entries.patch => 0732-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0734-Entity-powdered-snow-API.patch => 0733-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0735-Add-API-for-item-entity-health.patch => 0734-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0736-Fix-entity-type-tags-suggestions-in-selectors.patch => 0735-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0737-Configurable-max-block-light-for-monster-spawning.patch => 0736-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0739-Load-effect-amplifiers-greater-than-127-correctly.patch => 0738-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0741-Fix-bees-aging-inside-hives.patch => 0740-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0742-Bucketable-API.patch => 0741-Bucketable-API.patch} (100%)
 rename patches/server/{0743-Validate-usernames.patch => 0742-Validate-usernames.patch} (100%)
 rename patches/server/{0744-Make-water-animal-spawn-height-configurable.patch => 0743-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/server/{0746-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0745-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0747-Add-new-overload-to-PersistentDataContainer-has.patch => 0746-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0748-Multiple-Entries-with-Scoreboards.patch => 0747-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0749-Reset-placed-block-on-exception.patch => 0748-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0750-Add-configurable-height-for-slime-spawn.patch => 0749-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0752-Fix-xp-reward-for-baby-zombies.patch => 0751-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0753-Kick-on-main-for-illegal-chat.patch => 0752-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0754-Multi-Block-Change-API-Implementation.patch => 0753-Multi-Block-Change-API-Implementation.patch} (95%)
 rename patches/server/{0755-Fix-NotePlayEvent.patch => 0754-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0756-Freeze-Tick-Lock-API.patch => 0755-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0757-Dolphin-API.patch => 0756-Dolphin-API.patch} (100%)
 rename patches/server/{0758-More-PotionEffectType-API.patch => 0757-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0760-API-for-creating-command-sender-which-forwards-feedb.patch => 0759-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0761-Add-missing-structure-set-seed-configs.patch => 0760-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0762-Implement-regenerateChunk.patch => 0761-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0763-Fix-cancelled-powdered-snow-bucket-placement.patch => 0762-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0765-Add-GameEvent-tags.patch => 0764-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0767-Furnace-RecipesUsed-API.patch => 0766-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0768-Configurable-sculk-sensor-listener-range.patch => 0767-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0769-Add-missing-block-data-mins-and-maxes.patch => 0768-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0771-Put-world-into-worldlist-before-initing-the-world.patch => 0770-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0772-Fix-Entity-Position-Desync.patch => 0771-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0773-Custom-Potion-Mixes.patch => 0772-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0774-Force-close-world-loading-screen.patch => 0773-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0775-Fix-falling-block-spawn-methods.patch => 0774-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0776-Expose-furnace-minecart-push-values.patch => 0775-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0778-More-Projectile-API.patch => 0777-More-Projectile-API.patch} (100%)
 rename patches/server/{0779-Fix-swamp-hut-cat-generation-deadlock.patch => 0778-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0781-Implement-getComputedBiome-API.patch => 0780-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0782-Make-some-itemstacks-nonnull.patch => 0781-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0783-Implement-enchantWithLevels-API.patch => 0782-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0784-Fix-saving-in-unloadWorld.patch => 0783-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0785-Buffer-OOB-setBlock-calls.patch => 0784-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0786-Add-TameableDeathMessageEvent.patch => 0785-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0788-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0787-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0789-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0788-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0790-Guard-against-invalid-entity-positions.patch => 0789-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0791-cache-resource-keys.patch => 0790-cache-resource-keys.patch} (100%)
 rename patches/server/{0792-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0791-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0795-Prevent-tile-entity-copies-loading-chunks.patch => 0794-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0796-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0795-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0798-Pass-ServerLevel-for-gamerule-callbacks.patch => 0797-Pass-ServerLevel-for-gamerule-callbacks.patch} (100%)
 rename patches/server/{0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0800-WorldCreator-keepSpawnLoaded.patch => 0799-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0804-Fire-CauldronLevelChange-on-initial-fill.patch => 0803-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0805-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0804-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0806-Add-PlayerStopUsingItemEvent.patch => 0805-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0807-Don-t-tick-markers.patch => 0806-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0808-Expand-FallingBlock-API.patch => 0807-Expand-FallingBlock-API.patch} (100%)
 rename patches/server/{0809-Do-not-accept-invalid-client-settings.patch => 0808-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0810-Add-support-for-Proxy-Protocol.patch => 0809-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0811-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0810-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0813-Sanitize-Sent-BlockEntity-NBT.patch => 0812-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0814-Disable-component-selector-resolving-in-books-by-def.patch => 0813-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0815-Prevent-entity-loading-causing-async-lookups.patch => 0814-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0816-Throw-exception-on-world-create-while-being-ticked.patch => 0815-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0817-Add-Alternate-Current-redstone-implementation.patch => 0816-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0818-Dont-resent-entity-on-art-update.patch => 0817-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0819-Add-WardenAngerChangeEvent.patch => 0818-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0820-Add-option-for-strict-advancement-dimension-checks.patch => 0819-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0821-Add-missing-important-BlockStateListPopulator-method.patch => 0820-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0822-Nameable-Banner-API.patch => 0821-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0823-Don-t-broadcast-messages-to-command-blocks.patch => 0822-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0824-Prevent-empty-items-from-being-added-to-world.patch => 0823-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0826-Add-Player-getFishHook.patch => 0825-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0828-Add-various-missing-EntityDropItemEvent-calls.patch => 0827-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0829-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0828-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0830-Fix-Bee-flower-NPE.patch => 0829-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0832-More-Teleport-API.patch => 0831-More-Teleport-API.patch} (97%)
 rename patches/server/{0833-Add-EntityPortalReadyEvent.patch => 0832-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0834-Don-t-use-level-random-in-entity-constructors.patch => 0833-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0835-Send-block-entities-after-destroy-prediction.patch => 0834-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0836-Warn-on-plugins-accessing-faraway-chunks.patch => 0835-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0837-Custom-Chat-Completion-Suggestions-API.patch => 0836-Custom-Chat-Completion-Suggestions-API.patch} (76%)
 rename patches/server/{0838-Add-and-fix-missing-BlockFadeEvents.patch => 0837-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0839-Collision-API.patch => 0838-Collision-API.patch} (100%)
 rename patches/server/{0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0841-Block-Ticking-API.patch => 0840-Block-Ticking-API.patch} (100%)
 rename patches/server/{0842-Add-Velocity-IP-Forwarding-Support.patch => 0841-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (100%)
 rename patches/server/{0844-Add-NamespacedKey-biome-methods.patch => 0843-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0845-Fix-plugin-loggers-on-server-shutdown.patch => 0844-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0846-Stop-large-look-changes-from-crashing-the-server.patch => 0845-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0847-Fire-EntityChangeBlockEvent-in-more-places.patch => 0846-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0848-Missing-eating-regain-reason.patch => 0847-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0849-Missing-effect-cause.patch => 0848-Missing-effect-cause.patch} (100%)
 rename patches/server/{0850-Added-byte-array-serialization-deserialization-for-P.patch => 0849-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0852-Call-BlockPhysicsEvent-more-often.patch => 0851-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0853-Configurable-chat-thread-limit.patch => 0852-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0855-fix-Jigsaw-block-kicking-user.patch => 0854-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0856-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0855-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0857-Add-getDrops-to-BlockState.patch => 0856-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0858-Fix-a-bunch-of-vanilla-bugs.patch => 0857-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0859-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0858-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0860-Fix-custom-piglin-loved-items.patch => 0859-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0861-EntityPickupItemEvent-fixes.patch => 0860-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0862-Correctly-handle-interactions-with-items-on-cooldown.patch => 0861-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0863-Add-PlayerInventorySlotChangeEvent.patch => 0862-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0864-Elder-Guardian-appearance-API.patch => 0863-Elder-Guardian-appearance-API.patch} (84%)
 rename patches/server/{0865-Allow-changing-bed-s-occupied-property.patch => 0864-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0866-Add-entity-knockback-API.patch => 0865-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0867-Detect-headless-JREs.patch => 0866-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0868-fixed-entity-vehicle-collision-event-not-called.patch => 0867-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0869-optimized-dirt-and-snow-spreading.patch => 0868-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0870-Added-EntityToggleSitEvent.patch => 0869-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0871-Add-fire-tick-delay-option.patch => 0870-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0872-Add-Moving-Piston-API.patch => 0871-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0873-Ignore-impossible-spawn-tick.patch => 0872-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0874-Track-projectile-source-for-fireworks-from-dispenser.patch => 0873-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0877-Prevent-compass-from-loading-chunks.patch => 0876-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0878-Add-PrePlayerAttackEntityEvent.patch => 0877-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0879-ensure-reset-EnderDragon-boss-event-name.patch => 0878-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0880-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0879-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0881-Add-Player-Warden-Warning-API.patch => 0880-Add-Player-Warden-Warning-API.patch} (93%)
 rename patches/server/{0882-More-vanilla-friendly-methods-to-update-trades.patch => 0881-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0883-Add-paper-dumplisteners-command.patch => 0882-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0884-check-global-player-list-where-appropriate.patch => 0883-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0885-Fix-async-entity-add-due-to-fungus-trees.patch => 0884-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0886-ItemStack-damage-API.patch => 0885-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0887-Friction-API.patch => 0886-Friction-API.patch} (100%)
 rename patches/server/{0888-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0887-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0889-Fix-player-kick-on-shutdown.patch => 0888-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0890-Sync-offhand-slot-in-menus.patch => 0889-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0891-Player-Entity-Tracking-Events.patch => 0890-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0892-Limit-pet-look-distance.patch => 0891-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0893-Properly-resend-entities.patch => 0892-Properly-resend-entities.patch} (100%)
 rename patches/server/{0894-Fixes-and-additions-to-the-SpawnReason-API.patch => 0893-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0895-fix-Instruments.patch => 0894-fix-Instruments.patch} (94%)
 rename patches/server/{0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0898-Add-BlockLockCheckEvent.patch => 0897-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0899-Add-Sneaking-API-for-Entities.patch => 0898-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0900-Improve-logging-and-errors.patch => 0899-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0901-Improve-PortalEvents.patch => 0900-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0902-Add-config-option-for-spider-worldborder-climbing.patch => 0901-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0903-Add-missing-SpigotConfig-logCommands-check.patch => 0902-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0905-Flying-Fall-Damage.patch => 0904-Flying-Fall-Damage.patch} (93%)
 rename patches/server/{0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/server/{0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0908-config-for-disabling-entity-tag-tags.patch => 0907-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0909-Use-single-player-info-update-packet-on-join.patch => 0908-Use-single-player-info-update-packet-on-join.patch} (100%)
 rename patches/server/{0910-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0909-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0911-Win-Screen-API.patch => 0910-Win-Screen-API.patch} (88%)
 rename patches/server/{0912-Remove-CraftItemStack-setAmount-null-assignment.patch => 0911-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0913-Fix-force-opening-enchantment-tables.patch => 0912-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0914-Add-Entity-Body-Yaw-API.patch => 0913-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0916-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0915-Update-the-flag-when-a-captured-block-state-is-outda.patch} (100%)
 rename patches/server/{0917-Add-EntityFertilizeEggEvent.patch => 0916-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/server/{0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0920-Correctly-handle-ArmorStand-invisibility.patch => 0919-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0921-Fix-advancement-triggers-for-entity-damage.patch => 0920-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0922-Fix-text-display-error-on-spawn.patch => 0921-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0923-Fix-certain-inventories-returning-null-Locations.patch => 0922-Fix-certain-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0924-Add-Shearable-API.patch => 0923-Add-Shearable-API.patch} (100%)
 rename patches/server/{0925-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0924-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0926-Optimize-Hoppers.patch => 0925-Optimize-Hoppers.patch} (100%)
 rename patches/server/{0927-Fix-beehives-generating-from-using-bonemeal.patch => 0926-Fix-beehives-generating-from-using-bonemeal.patch} (100%)
 rename patches/server/{0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0927-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0929-Treat-sequence-violations-like-they-should-be.patch => 0928-Treat-sequence-violations-like-they-should-be.patch} (100%)
 rename patches/server/{0930-remove-duplicate-animate-packet-for-records.patch => 0929-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0931-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0930-Prevent-causing-expired-keys-from-impacting-new-join.patch} (100%)
 rename patches/server/{0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0931-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (100%)
 rename patches/server/{0933-Use-array-for-gamerule-storage.patch => 0932-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0934-Fix-a-couple-of-upstream-bed-issues.patch => 0933-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0935-Fix-demo-flag-not-enabling-demo-mode.patch => 0934-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0936-Add-Mob-Experience-reward-API.patch => 0935-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0937-Break-redstone-on-top-of-trap-doors-early.patch => 0936-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0938-Fix-DamageCause-for-Falling-Blocks.patch => 0937-Fix-DamageCause-for-Falling-Blocks.patch} (100%)
 rename patches/server/{0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0938-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0940-More-accurate-isInOpenWater-impl.patch => 0939-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0940-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%)
 rename patches/server/{0942-Optimise-recalcBlockCounts-for-empty-sections.patch => 0941-Optimise-recalcBlockCounts-for-empty-sections.patch} (100%)
 rename patches/server/{0943-Expand-PlayerItemMendEvent.patch => 0942-Expand-PlayerItemMendEvent.patch} (96%)
 rename patches/server/{0944-Refresh-ProjectileSource-for-projectiles.patch => 0943-Refresh-ProjectileSource-for-projectiles.patch} (100%)
 rename patches/server/{0945-Add-transient-modifier-API.patch => 0944-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0946-Fix-block-place-logic.patch => 0945-Fix-block-place-logic.patch} (100%)
 rename patches/server/{0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0946-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0948-Ignore-inline-definitions-of-trim-material-pattern.patch => 0947-Ignore-inline-definitions-of-trim-material-pattern.patch} (100%)
 rename patches/server/{0949-Call-BlockGrowEvent-for-missing-blocks.patch => 0948-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0949-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (100%)
 rename patches/server/{0951-fix-MapLike-spam-for-missing-key-selector.patch => 0950-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0952-Fix-sniffer-removeExploredLocation.patch => 0951-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0953-Add-method-to-remove-all-active-potion-effects.patch => 0952-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch => 0953-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch} (100%)
 rename patches/server/{0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0954-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0956-Properly-Cancel-Usable-Items.patch => 0955-Properly-Cancel-Usable-Items.patch} (100%)
 rename patches/server/{0957-Add-event-for-player-editing-sign.patch => 0956-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0958-Only-tick-item-frames-if-players-can-see-it.patch => 0957-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0959-Improve-command-function-perm-level-checks.patch => 0958-Improve-command-function-perm-level-checks.patch} (100%)
 rename patches/server/{0960-Add-option-to-disable-block-updates.patch => 0959-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0961-Call-missing-BlockDispenseEvent.patch => 0960-Call-missing-BlockDispenseEvent.patch} (100%)
 rename patches/server/{0962-Don-t-load-chunks-for-supporting-block-checks.patch => 0961-Don-t-load-chunks-for-supporting-block-checks.patch} (100%)
 rename patches/server/{0963-Optimize-player-lookups-for-beacons.patch => 0962-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0964-Add-Sign-getInteractableSideFor.patch => 0963-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0965-Array-backed-synched-entity-data.patch => 0964-Array-backed-synched-entity-data.patch} (100%)
 rename patches/server/{0966-fix-item-meta-for-tadpole-buckets.patch => 0965-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0967-Suppress-Item-Meta-Validation-Checks.patch => 0966-Suppress-Item-Meta-Validation-Checks.patch} (100%)
 rename patches/server/{0968-Fix-BanList-API.patch => 0967-Fix-BanList-API.patch} (98%)
 rename patches/server/{0969-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0968-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0970-Fix-possible-NPE-on-painting-creation.patch => 0969-Fix-possible-NPE-on-painting-creation.patch} (100%)
 rename patches/server/{0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0970-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0972-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0971-ExperienceOrb-should-call-EntitySpawnEvent.patch} (100%)
 rename patches/server/{0973-Don-t-tick-signs.patch => 0972-Don-t-tick-signs.patch} (100%)
 rename patches/server/{0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0973-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0975-Add-whitelist-events.patch => 0974-Add-whitelist-events.patch} (100%)
 rename patches/server/{0976-Implement-PlayerFailMoveEvent.patch => 0975-Implement-PlayerFailMoveEvent.patch} (100%)
 rename patches/server/{0977-Folia-scheduler-and-owned-region-API.patch => 0976-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/server/{0978-Only-erase-allay-memory-on-non-item-targets.patch => 0977-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0979-API-for-updating-recipes-on-clients.patch => 0978-API-for-updating-recipes-on-clients.patch} (100%)
 rename patches/server/{0980-Fix-rotation-when-spawning-display-entities.patch => 0979-Fix-rotation-when-spawning-display-entities.patch} (100%)
 rename patches/server/{0981-Only-capture-actual-tree-growth.patch => 0980-Only-capture-actual-tree-growth.patch} (100%)
 rename patches/server/{0982-Use-correct-source-for-mushroom-block-spread-event.patch => 0981-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0983-Respect-randomizeData-on-more-entities-when-spawning.patch => 0982-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0984-Use-correct-seed-on-api-world-load.patch => 0983-Use-correct-seed-on-api-world-load.patch} (100%)
 rename patches/server/{0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0984-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0986-Cache-map-ids-on-item-frames.patch => 0985-Cache-map-ids-on-item-frames.patch} (100%)
 rename patches/server/{0987-Fix-custom-statistic-criteria-creation.patch => 0986-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{0988-Bandaid-fix-for-Effect.patch => 0987-Bandaid-fix-for-Effect.patch} (97%)
 rename patches/server/{0989-SculkCatalyst-bloom-API.patch => 0988-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0990-API-for-an-entity-s-scoreboard-name.patch => 0989-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0990-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%)
 rename patches/server/{0992-Deprecate-and-replace-methods-with-old-StructureType.patch => 0991-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/server/{0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0992-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (100%)
 rename patches/server/{0994-Properly-handle-BlockBreakEvent-isDropItems.patch => 0993-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{0995-Fire-entity-death-event-for-ender-dragon.patch => 0994-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{0996-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0995-Configurable-entity-tracking-range-by-Y-coordinate.patch} (100%)
 rename patches/server/{0997-Add-Listing-API-for-Player.patch => 0996-Add-Listing-API-for-Player.patch} (98%)
 rename patches/server/{0998-Configurable-Region-Compression-Format.patch => 0997-Configurable-Region-Compression-Format.patch} (100%)
 rename patches/server/{0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0998-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%)
 rename patches/server/{1000-Fix-NPE-on-Boat-getStatus.patch => 0999-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{1001-Expand-Pose-API.patch => 1000-Expand-Pose-API.patch} (100%)
 rename patches/server/{1002-More-DragonBattle-API.patch => 1001-More-DragonBattle-API.patch} (100%)
 rename patches/server/{1003-Deep-clone-unhandled-nbt-tags.patch => 1002-Deep-clone-unhandled-nbt-tags.patch} (100%)
 rename patches/server/{1004-Add-PlayerPickItemEvent.patch => 1003-Add-PlayerPickItemEvent.patch} (100%)
 rename patches/server/{1005-Improve-performance-of-mass-crafts.patch => 1004-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{1006-Allow-trident-custom-damage.patch => 1005-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{1007-Expose-hand-during-BlockCanBuildEvent.patch => 1006-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{1008-Optimize-nearest-structure-border-iteration.patch => 1007-Optimize-nearest-structure-border-iteration.patch} (100%)
 rename patches/server/{1009-Implement-OfflinePlayer-isConnected.patch => 1008-Implement-OfflinePlayer-isConnected.patch} (94%)
 rename patches/server/{1010-Fix-inventory-desync.patch => 1009-Fix-inventory-desync.patch} (100%)
 rename patches/server/{1011-Add-titleOverride-to-InventoryOpenEvent.patch => 1010-Add-titleOverride-to-InventoryOpenEvent.patch} (100%)
 rename patches/server/{1012-Configure-sniffer-egg-hatch-time.patch => 1011-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{1013-Do-crystal-portal-proximity-check-before-entity-look.patch => 1012-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 rename patches/server/{1014-Skip-POI-finding-if-stuck-in-vehicle.patch => 1013-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{1015-Add-slot-sanity-checks-in-container-clicks.patch => 1014-Add-slot-sanity-checks-in-container-clicks.patch} (100%)
 rename patches/server/{1016-Call-BlockRedstoneEvents-for-lecterns.patch => 1015-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{1017-Allow-proper-checking-of-empty-item-stacks.patch => 1016-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/server/{1018-Fix-silent-equipment-change-for-mobs.patch => 1017-Fix-silent-equipment-change-for-mobs.patch} (100%)
 rename patches/server/{1019-Fix-spigot-s-Forced-Stats.patch => 1018-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{1020-Add-missing-InventoryHolders-to-inventories.patch => 1019-Add-missing-InventoryHolders-to-inventories.patch} (100%)
 rename patches/server/{1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 1020-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (100%)
 rename patches/server/{1022-Actually-optimise-explosions.patch => 1021-Actually-optimise-explosions.patch} (100%)
 rename patches/server/{1023-Add-missing-logs-for-log-ips-config-option.patch => 1022-Add-missing-logs-for-log-ips-config-option.patch} (100%)
 rename patches/server/{1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch => 1023-Remove-Spigot-Bug-Fix-for-MC-109346.patch} (100%)
 rename patches/server/{1025-Fix-SuspiciousStewMeta.patch => 1024-Fix-SuspiciousStewMeta.patch} (100%)
 rename patches/server/{1026-Optimise-chunk-tick-iteration.patch => 1025-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{1027-Lag-compensation-ticks.patch => 1026-Lag-compensation-ticks.patch} (100%)
 rename patches/server/{1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 1027-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%)
 rename patches/server/{1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%)
 rename patches/server/{1030-Fix-team-sidebar-objectives-not-being-cleared.patch => 1029-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%)
 rename patches/server/{1031-Optimise-nearby-player-retrieval.patch => 1030-Optimise-nearby-player-retrieval.patch} (100%)
 rename patches/server/{1032-Remove-streams-for-villager-AI.patch => 1031-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{1033-Fix-missing-map-initialize-event-call.patch => 1032-Fix-missing-map-initialize-event-call.patch} (100%)
 rename patches/server/{1034-Update-entity-data-when-attaching-firework-to-entity.patch => 1033-Update-entity-data-when-attaching-firework-to-entity.patch} (100%)
 rename patches/server/{1035-Use-correct-variable-for-initializing-CraftLootTable.patch => 1034-Use-correct-variable-for-initializing-CraftLootTable.patch} (100%)
 rename patches/server/{1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch => 1035-Make-setVelocity-method-of-Fireballs-change-the-trav.patch} (100%)
 rename patches/server/{1037-Fix-UnsafeValues-loadAdvancement.patch => 1036-Fix-UnsafeValues-loadAdvancement.patch} (100%)
 rename patches/server/{1038-Add-player-idle-duration-API.patch => 1037-Add-player-idle-duration-API.patch} (85%)
 rename patches/server/{1039-Don-t-check-if-we-can-see-non-visible-entities.patch => 1038-Don-t-check-if-we-can-see-non-visible-entities.patch} (100%)
 rename patches/server/{1040-Fix-NPE-in-SculkBloomEvent-world-access.patch => 1039-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%)
 rename patches/server/{1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (84%)
 rename patches/server/{1042-Optimize-VarInts.patch => 1041-Optimize-VarInts.patch} (100%)
 rename patches/server/{1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch => 1042-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch} (100%)

diff --git a/patches/api/0217-Player-elytra-boost-API.patch b/patches/api/0217-Player-elytra-boost-API.patch
index 1e1555551d..59f6d90234 100644
--- a/patches/api/0217-Player-elytra-boost-API.patch
+++ b/patches/api/0217-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 81e8bfbe4380090830591274025a026de740fd05..e9df321980d0744a50edf2d5f978340013588803 100644
+index 81e8bfbe4380090830591274025a026de740fd05..36e3f86f463cd7b6bca4c8b63739a06f17d7e28a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2880,6 +2880,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2880,6 +2880,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      @NotNull
      <T> T getClientOption(@NotNull com.destroystokyo.paper.ClientOption<T> option);
@@ -22,9 +22,14 @@ index 81e8bfbe4380090830591274025a026de740fd05..e9df321980d0744a50edf2d5f9783400
 +     * @return The {@link Firework} boosting the Player or null if the spawning of the entity was cancelled
 +     * @throws IllegalArgumentException if {@link #isGliding()} is false
 +     * or if the {@code firework} isn't a {@link Material#FIREWORK_ROCKET}
++     * @deprecated use {@link HumanEntity#fireworkBoost(ItemStack)} instead. Note that this method <b>does not</b>
++     * check if the player is gliding or not.
 +     */
 +    @Nullable
-+    Firework boostElytra(@NotNull ItemStack firework);
++    default Firework boostElytra(@NotNull ItemStack firework) {
++        com.google.common.base.Preconditions.checkState(this.isGliding(), "Player must be gliding");
++        return this.fireworkBoost(firework);
++    }
      // Paper end
  
      // Spigot start
diff --git a/patches/api/0244-Add-sendOpLevel-API.patch b/patches/api/0244-Add-sendOpLevel-API.patch
index bc8064f6cd..84102bed82 100644
--- a/patches/api/0244-Add-sendOpLevel-API.patch
+++ b/patches/api/0244-Add-sendOpLevel-API.patch
@@ -5,14 +5,14 @@ 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 e9df321980d0744a50edf2d5f978340013588803..8a6cab8df1f1947bbdc4d11ba24b982a8483b2cc 100644
+index 36e3f86f463cd7b6bca4c8b63739a06f17d7e28a..a46bc40bf101df46843311684f232b4b5b6f9127 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2893,6 +2893,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      */
-     @Nullable
-     Firework boostElytra(@NotNull ItemStack firework);
-+
+@@ -2900,6 +2900,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+     }
+     // Paper end
+ 
++    // Paper start - sendOpLevel API
 +    /**
 +     * Send a packet to the player indicating its operator status level.
 +     * <p>
@@ -23,6 +23,8 @@ index e9df321980d0744a50edf2d5f978340013588803..8a6cab8df1f1947bbdc4d11ba24b982a
 +     * @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}).
 +     */
 +    void sendOpLevel(byte level);
-     // Paper end
- 
++    // Paper end - sendOpLevel API
++
      // Spigot start
+     public class Spigot extends Entity.Spigot {
+ 
diff --git a/patches/api/0369-More-Teleport-API.patch b/patches/api/0369-More-Teleport-API.patch
index d76458bbf1..b8c95b2bc5 100644
--- a/patches/api/0369-More-Teleport-API.patch
+++ b/patches/api/0369-More-Teleport-API.patch
@@ -165,10 +165,10 @@ index 77e29cada05da8946d718fe331e28e7553922033..5607404fa0132febdbdaad051a4e9426
       * 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 fe1c58a20de699d869a3f86295c8446991cce399..6a53097f308955dc063daf96aa367c2cb2945ca1 100644
+index ccc7077f66d96b85478545a89c94b7466c3cdb77..3d64f8c3071495ec95350e09843d8e140b6a9af3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3053,6 +3053,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3060,6 +3060,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
index 6855546ed2..05790dfeb1 100644
--- a/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0371-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,14 +5,14 @@ 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 6a53097f308955dc063daf96aa367c2cb2945ca1..470d47d6ffaf04805439d043fbb04bf2342d1db8 100644
+index 3d64f8c3071495ec95350e09843d8e140b6a9af3..58498426c6ec697091a7a8ceeae6b85525ef39b7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2935,6 +2935,29 @@ 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]}).
-      */
+@@ -2944,6 +2944,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void sendOpLevel(byte level);
-+
+     // Paper end - sendOpLevel API
+ 
++    // Paper start - custom chat completions API
 +    /**
 +     * Adds custom chat completion suggestions that the client will
 +     * suggest when typing in chat.
@@ -35,6 +35,8 @@ index 6a53097f308955dc063daf96aa367c2cb2945ca1..470d47d6ffaf04805439d043fbb04bf2
 +     */
 +    @Deprecated(since = "1.20.1")
 +    void removeAdditionalChatCompletions(@NotNull java.util.Collection<String> completions);
-     // Paper end
- 
++    // Paper end - custom chat completions API
++
      // Spigot start
+     public class Spigot extends Entity.Spigot {
+ 
diff --git a/patches/api/0381-Elder-Guardian-appearance-API.patch b/patches/api/0381-Elder-Guardian-appearance-API.patch
index 254bf53ceb..0e572b6907 100644
--- a/patches/api/0381-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0381-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 470d47d6ffaf04805439d043fbb04bf2342d1db8..93a8db0a1f7fa0a06315a9ec9f58c62c6faa4fb8 100644
+index 58498426c6ec697091a7a8ceeae6b85525ef39b7..ef2e523e7571be791e37a66c2f859bd5e04d16ab 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3119,6 +3119,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3128,6 +3128,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/0389-Add-Player-Warden-Warning-API.patch b/patches/api/0389-Add-Player-Warden-Warning-API.patch
index c230bcf1dc..092341a502 100644
--- a/patches/api/0389-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0389-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 93a8db0a1f7fa0a06315a9ec9f58c62c6faa4fb8..4d1d81ddc7638e958f9cd1b10fd26227efc1578d 100644
+index ef2e523e7571be791e37a66c2f859bd5e04d16ab..1746e646ccf73efddd62eb7522f2560fdef32c49 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3135,6 +3135,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3144,6 +3144,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/0442-Add-player-idle-duration-API.patch b/patches/api/0442-Add-player-idle-duration-API.patch
index 5be2c8d0eb..aa1ff4414c 100644
--- a/patches/api/0442-Add-player-idle-duration-API.patch
+++ b/patches/api/0442-Add-player-idle-duration-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 20fa1024f9ad8f478a347be5c554b5e45b398a1c..2996db88343060624d6aab7889290ae74a973fe8 100644
+index 91919b2d06d544be9a09c486791de7dff599f75a..087898a50909a40aabec09f1e52cefed6565ba4c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3274,6 +3274,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3283,6 +3283,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void increaseWardenWarningLevel();
      // Paper end
  
diff --git a/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0479-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0478-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0478-Player-elytra-boost-API.patch b/patches/server/0478-Player-elytra-boost-API.patch
deleted file mode 100644
index 192b0e99e2..0000000000
--- a/patches/server/0478-Player-elytra-boost-API.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Trigary <trigary0@gmail.com>
-Date: Tue, 14 Apr 2020 12:05:22 +0200
-Subject: [PATCH] Player elytra boost API
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0656ea43e1d508d8f6af308475942c28d77655a4..aef0fa6fd575c08c75c75463abcc43089aada9e3 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -626,6 +626,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         }
-         throw new RuntimeException("Unknown settings type");
-     }
-+
-+    @Override
-+    public org.bukkit.entity.Firework boostElytra(ItemStack firework) {
-+        Preconditions.checkState(this.isGliding(), "Player must be gliding");
-+        Preconditions.checkArgument(firework != null, "firework == null");
-+        Preconditions.checkArgument(firework.getType() == Material.FIREWORK_ROCKET, "Firework must be Material.FIREWORK_ROCKET");
-+
-+        net.minecraft.world.item.ItemStack item = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(firework);
-+        net.minecraft.world.level.Level world = ((CraftWorld) getWorld()).getHandle();
-+        net.minecraft.world.entity.projectile.FireworkRocketEntity entity = new net.minecraft.world.entity.projectile.FireworkRocketEntity(world, item, getHandle());
-+        return world.addFreshEntity(entity)
-+            ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
-+            : null;
-+    }
-     // Paper end
- 
-     @Override
diff --git a/patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
similarity index 93%
rename from patches/server/0481-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
index b71a0f1eba..f2e0ca17ed 100644
--- a/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b1761300567e0e36ed17caed76f2aaa0ddb949d3..dac43bcd9dc796ffec983013291530f3bc541a26 100644
+index b1162c638a87714ba9e54a24f10f229d303123bd..98fe64fcab9d0f8497794ccb8df563be782798d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1814,6 +1814,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0482-Add-ignore-discounts-API.patch b/patches/server/0481-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0482-Add-ignore-discounts-API.patch
rename to patches/server/0481-Add-ignore-discounts-API.patch
diff --git a/patches/server/0483-Toggle-for-removing-existing-dragon.patch b/patches/server/0482-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0483-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0482-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0484-Fix-client-lag-on-advancement-loading.patch b/patches/server/0483-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0484-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0483-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0485-Item-no-age-no-player-pickup.patch b/patches/server/0484-Item-no-age-no-player-pickup.patch
similarity index 94%
rename from patches/server/0485-Item-no-age-no-player-pickup.patch
rename to patches/server/0484-Item-no-age-no-player-pickup.patch
index 09109439e5..8ab619bbbd 100644
--- a/patches/server/0485-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0484-Item-no-age-no-player-pickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item no age & no player pickup
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index b1be6c99ebff90ff98a7d5cafec4a856b9704b66..43f6422fedae4304801c7be21990725eca11fc62 100644
+index 7b11db70668951e5331b6d6b99f616e163d7d7d6..953d3762292a4c15b063f9e237edf2f5c5362cb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;
diff --git a/patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0487-Beacon-API-custom-effect-ranges.patch b/patches/server/0486-Beacon-API-custom-effect-ranges.patch
similarity index 98%
rename from patches/server/0487-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0486-Beacon-API-custom-effect-ranges.patch
index 6dd6575eb1..f3b72c6e9c 100644
--- a/patches/server/0487-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0486-Beacon-API-custom-effect-ranges.patch
@@ -95,7 +95,7 @@ index cd28ee0cbc69713a641a21c9a626c694a4bcbfc9..3a50fe20294048a1c818ae717a918bb1
  
      public void setCustomName(@Nullable Component customName) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
-index 57925335811f814fbd6010e58dc0566401cae21d..7aa4c30149289412991f54b1e730857a8e120eb3 100644
+index c4890927419e27fd35e4e373fb09dcb182234fbf..7d90360bac08d6ec796ba44f1809793f3a3c1b3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
 @@ -32,7 +32,7 @@ public class CraftBeacon extends CraftBlockEntityState<BeaconBlockEntity> implem
diff --git a/patches/server/0488-Add-API-for-quit-reason.patch b/patches/server/0487-Add-API-for-quit-reason.patch
similarity index 94%
rename from patches/server/0488-Add-API-for-quit-reason.patch
rename to patches/server/0487-Add-API-for-quit-reason.patch
index 0a76db357f..ef1802dc67 100644
--- a/patches/server/0488-Add-API-for-quit-reason.patch
+++ b/patches/server/0487-Add-API-for-quit-reason.patch
@@ -25,7 +25,7 @@ index f9d7fec242a059a3b056c569ffaf214a361716d6..33a3c657bd390b9e8bc23af93c1107f5
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          if (this.getSending() == PacketFlow.CLIENTBOUND) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 48985c0577fe1a09838137286e32128b29a60552..9c74a7e1dc74873c16a0fc474de459ccec4d372d 100644
+index 567bfcdf5c946d09bb8188435ee13930082dccf5..bf637aae0dcd701dd31568b3c84851349c4c5a0a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -272,6 +272,7 @@ public class ServerPlayer extends Player {
@@ -37,7 +37,7 @@ index 48985c0577fe1a09838137286e32128b29a60552..9c74a7e1dc74873c16a0fc474de459cc
      // Paper start - replace player chunk loader
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index e8133a1ec975b7f63926acc7d6ab9291a2107084..95d37df1b51453722d47eb07e2e0247f308fa171 100644
+index 96ee68e6656a59d959ad7a7e78f5a3752d6e3dbb..d660041805bcd1bb97cf347d8b1cfe5c65469f56 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -302,6 +302,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -49,7 +49,7 @@ index e8133a1ec975b7f63926acc7d6ab9291a2107084..95d37df1b51453722d47eb07e2e0247f
              this.connection.disconnect(ichatbasecomponent);
          }));
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1c95c4ff3f4b1811ff60ecb9518e0ef90c5120a5..f5df936cd96688758a1acd8d3ff743e507bc2001 100644
+index cedc6b1e4255336b610ab9ba88a04d8dfde433cf..2c3ff91a7275158cdffa828e133a131b138bfa7c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -560,7 +560,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0490-Expose-world-spawn-angle.patch b/patches/server/0489-Expose-world-spawn-angle.patch
similarity index 91%
rename from patches/server/0490-Expose-world-spawn-angle.patch
rename to patches/server/0489-Expose-world-spawn-angle.patch
index d4805d01c0..8910923479 100644
--- a/patches/server/0490-Expose-world-spawn-angle.patch
+++ b/patches/server/0489-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f5df936cd96688758a1acd8d3ff743e507bc2001..303e207e6819e77cf489dd47fb9450c629b70975 100644
+index 2c3ff91a7275158cdffa828e133a131b138bfa7c..3f6e0319c1580dface0a175ebb93321ae4f45a35 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -832,7 +832,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0491-Add-Destroy-Speed-API.patch b/patches/server/0490-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0491-Add-Destroy-Speed-API.patch
rename to patches/server/0490-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 89%
rename from patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index defbf49445..28a718b3b8 100644
--- a/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0491-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 e3d6fd978f1f64e980e5729a2ad2712f44923786..192981678ad54bf1b71db4d1f15e6884e88ecebb 100644
+index 7b1404ac481ea9a059197b9f752327ef0bf72c5c..1f742a39d1f31ef27cb4e662a6c3935600728d0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2538,7 +2538,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2524,7 +2524,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (data != null) {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
diff --git a/patches/server/0493-Add-LivingEntity-clearActiveItem.patch b/patches/server/0492-Add-LivingEntity-clearActiveItem.patch
similarity index 90%
rename from patches/server/0493-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0492-Add-LivingEntity-clearActiveItem.patch
index 3c5a99d1c4..ee851be253 100644
--- a/patches/server/0493-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0492-Add-LivingEntity-clearActiveItem.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8ed8bd2c539af20aa97bff1c0f719c4c2f793fc5..66a4d3d3626e4382e07617d0af464e6fbd8a9427 100644
+index c8e729e949e7a8301f17768d6ae3f3ce940bb73a..a654f22a6c331cd69290b99e6c73f3ed611c58a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -887,6 +887,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0494-Add-PlayerItemCooldownEvent.patch b/patches/server/0493-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0494-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0493-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0496-More-lightning-API.patch b/patches/server/0495-More-lightning-API.patch
similarity index 93%
rename from patches/server/0496-More-lightning-API.patch
rename to patches/server/0495-More-lightning-API.patch
index 0a4adb0107..bda291858a 100644
--- a/patches/server/0496-More-lightning-API.patch
+++ b/patches/server/0495-More-lightning-API.patch
@@ -8,7 +8,7 @@ public net.minecraft.world.entity.LightningBolt life
 public net.minecraft.world.entity.LightningBolt flashes
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
-index b9a8a39fed91aa5bbcd3c9c05ba9f10e2b7ec889..ef5a5aed9e1b15a29fd3a97ccd502c40b1d865ac 100644
+index 849c7d1e4eabfaea491b6c9004f764307ad1b9c6..cd9bd7f06e55e970b7791e635610bb5e7491d102 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
 @@ -66,4 +66,23 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
diff --git a/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 96%
rename from patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch
index cebad4dbb1..4bfcf1a94b 100644
--- a/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 658e47bf5aff1e56462cc3f0a87eeb7349654176..c35d22e4d54abcb16b7ec932729d2f177fd4a14b 100644
+index d4f89c87b989be9cfb4bd991bc69b85760df4bb2..9068a9646a7e436a5a0d9ea9deb52b78a316ba4a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2057,6 +2057,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -45,7 +45,7 @@ index d15e62da0307728a7c2be191a27f87da1bb29f49..de06ae3e8757c923a6f3f475a34885d2
              } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) {
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b2383510e00dcd68dee1a1f48aab873ae09f4d97..f767d1d98574fc847c495baee1bf369444443aad 100644
+index 2b0178507a39c95fff94bea382bacebb8c40f1b7..7b68fd746338fadba2b3e9aee4df5fb965299f1a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3424,7 +3424,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -117,7 +117,7 @@ index e7a8120a7d8bc9d668050c7f8fe94df90133b36c..9f46eb8417ad19e6f1bbf369f4c6b94f
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 7e996a527a632a2b382f5eea6df6be839a7a0ef4..25bf917fae922b34cc639148993bac39a50b4ce5 100644
+index e4e734e0f4c43c1687c8e3a8bbe15441e0bd8e76..d972c59ec98e73d7ccd774e0f06c686251ffe4cf 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -343,7 +343,7 @@ public class ArmorStand extends LivingEntity {
diff --git a/patches/server/0498-Added-missing-default-perms-for-commands.patch b/patches/server/0497-Added-missing-default-perms-for-commands.patch
similarity index 99%
rename from patches/server/0498-Added-missing-default-perms-for-commands.patch
rename to patches/server/0497-Added-missing-default-perms-for-commands.patch
index 96adf6f379..9a4184db30 100644
--- a/patches/server/0498-Added-missing-default-perms-for-commands.patch
+++ b/patches/server/0497-Added-missing-default-perms-for-commands.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added missing default perms for commands
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-index ca30f9c590f792caa8f1b76d7219e9121d932673..74ffea16027ba8eaa26716c3b6b78a8e83c9ed79 100644
+index a9ea2e38e4673686c9994a58c94ad19e59fd423c..ea732f8fe7b5dd56aab5d3a061a1cad19c49ae0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 @@ -24,13 +24,73 @@ public final class CommandPermissions {
diff --git a/patches/server/0499-Add-PlayerShearBlockEvent.patch b/patches/server/0498-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0499-Add-PlayerShearBlockEvent.patch
rename to patches/server/0498-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0500-Limit-recipe-packets.patch b/patches/server/0499-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0500-Limit-recipe-packets.patch
rename to patches/server/0499-Limit-recipe-packets.patch
diff --git a/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0501-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0500-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0502-Player-Chunk-Load-Unload-Events.patch b/patches/server/0501-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0502-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0501-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0504-Expose-LivingEntity-hurt-direction.patch b/patches/server/0503-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0504-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0503-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0508-Implement-TargetHitEvent.patch b/patches/server/0507-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0508-Implement-TargetHitEvent.patch
rename to patches/server/0507-Implement-TargetHitEvent.patch
diff --git a/patches/server/0509-MC-4-Fix-item-position-desync.patch b/patches/server/0508-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0509-MC-4-Fix-item-position-desync.patch
rename to patches/server/0508-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0510-Additional-Block-Material-API-s.patch b/patches/server/0509-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0510-Additional-Block-Material-API-s.patch
rename to patches/server/0509-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0511-Fix-harming-potion-dupe.patch b/patches/server/0510-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0511-Fix-harming-potion-dupe.patch
rename to patches/server/0510-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0513-Cache-burn-durations.patch b/patches/server/0512-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0513-Cache-burn-durations.patch
rename to patches/server/0512-Cache-burn-durations.patch
diff --git a/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
similarity index 100%
rename from patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch
rename to patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0518-Zombie-API-breaking-doors.patch b/patches/server/0517-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0518-Zombie-API-breaking-doors.patch
rename to patches/server/0517-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0519-Fix-nerfed-slime-when-splitting.patch b/patches/server/0518-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0519-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0518-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0520-Add-EntityLoadCrossbowEvent.patch b/patches/server/0519-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0520-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0519-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0521-Added-WorldGameRuleChangeEvent.patch b/patches/server/0520-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0521-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0520-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0522-Added-ServerResourcesReloadedEvent.patch b/patches/server/0521-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0522-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0521-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0524-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0523-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0525-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0524-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0527-Configurable-door-breaking-difficulty.patch b/patches/server/0526-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0527-Configurable-door-breaking-difficulty.patch
rename to patches/server/0526-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0528-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0527-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0529-Remove-stale-POIs.patch b/patches/server/0528-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0529-Remove-stale-POIs.patch
rename to patches/server/0528-Remove-stale-POIs.patch
diff --git a/patches/server/0530-Fix-villager-boat-exploit.patch b/patches/server/0529-Fix-villager-boat-exploit.patch
similarity index 100%
rename from patches/server/0530-Fix-villager-boat-exploit.patch
rename to patches/server/0529-Fix-villager-boat-exploit.patch
diff --git a/patches/server/0531-Add-sendOpLevel-API.patch b/patches/server/0530-Add-sendOpLevel-API.patch
similarity index 85%
rename from patches/server/0531-Add-sendOpLevel-API.patch
rename to patches/server/0530-Add-sendOpLevel-API.patch
index ae6be27473..9278d614ff 100644
--- a/patches/server/0531-Add-sendOpLevel-API.patch
+++ b/patches/server/0530-Add-sendOpLevel-API.patch
@@ -32,20 +32,22 @@ index 9b56415f1a03423f29822839ce27bbdf33bb91d5..89d18ae87029b82beea5e1bd69580f54
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 192981678ad54bf1b71db4d1f15e6884e88ecebb..47f3bd3be8da2c79d3655823ac0f2f4a8f9d7efe 100644
+index 1f742a39d1f31ef27cb4e662a6c3935600728d0b..69d0694f2f25ce51f40c7cd283e1591fe05ffe2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -640,6 +640,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             ? (org.bukkit.entity.Firework) entity.getBukkitEntity()
-             : null;
+@@ -628,6 +628,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
-+
+     // Paper end
+ 
++    // Paper start - sendOpLevel API
 +    @Override
 +    public void sendOpLevel(byte level) {
 +        Preconditions.checkArgument(level >= 0 && level <= 4, "Level must be within [0, 4]");
 +
 +        this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
 +    }
-     // Paper end
- 
++    // Paper end - sendOpLevel API
++
      @Override
+     public void setCompassTarget(Location loc) {
+         Preconditions.checkArgument(loc != null, "Location cannot be null");
diff --git a/patches/server/0532-TODO-Registry-Modification-API.patch b/patches/server/0531-TODO-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/0532-TODO-Registry-Modification-API.patch
rename to patches/server/0531-TODO-Registry-Modification-API.patch
diff --git a/patches/server/0533-Add-StructuresLocateEvent.patch b/patches/server/0532-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0533-Add-StructuresLocateEvent.patch
rename to patches/server/0532-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from patches/server/0534-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0533-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0537-Make-schedule-command-per-world.patch b/patches/server/0536-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0537-Make-schedule-command-per-world.patch
rename to patches/server/0536-Make-schedule-command-per-world.patch
diff --git a/patches/server/0538-Configurable-max-leash-distance.patch b/patches/server/0537-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0538-Configurable-max-leash-distance.patch
rename to patches/server/0537-Configurable-max-leash-distance.patch
diff --git a/patches/server/0539-Implement-BlockPreDispenseEvent.patch b/patches/server/0538-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0539-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0538-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0544-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0543-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0545-add-DragonEggFormEvent.patch b/patches/server/0544-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0545-add-DragonEggFormEvent.patch
rename to patches/server/0544-add-DragonEggFormEvent.patch
diff --git a/patches/server/0546-EntityMoveEvent.patch b/patches/server/0545-EntityMoveEvent.patch
similarity index 100%
rename from patches/server/0546-EntityMoveEvent.patch
rename to patches/server/0545-EntityMoveEvent.patch
diff --git a/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0548-Inline-shift-direction-fields.patch b/patches/server/0547-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0548-Inline-shift-direction-fields.patch
rename to patches/server/0547-Inline-shift-direction-fields.patch
diff --git a/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0551-living-entity-allow-attribute-registration.patch b/patches/server/0550-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0551-living-entity-allow-attribute-registration.patch
rename to patches/server/0550-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0552-fix-dead-slime-setSize-invincibility.patch b/patches/server/0551-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0552-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0551-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0554-Expose-Tracked-Players.patch b/patches/server/0553-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0554-Expose-Tracked-Players.patch
rename to patches/server/0553-Expose-Tracked-Players.patch
diff --git a/patches/server/0555-Remove-streams-from-SensorNearest.patch b/patches/server/0554-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0555-Remove-streams-from-SensorNearest.patch
rename to patches/server/0554-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0556-Improve-ServerGUI.patch b/patches/server/0555-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0556-Improve-ServerGUI.patch
rename to patches/server/0555-Improve-ServerGUI.patch
diff --git a/patches/server/0557-fix-converting-txt-to-json-file.patch b/patches/server/0556-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from patches/server/0557-fix-converting-txt-to-json-file.patch
rename to patches/server/0556-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0558-Add-worldborder-events.patch b/patches/server/0557-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0558-Add-worldborder-events.patch
rename to patches/server/0557-Add-worldborder-events.patch
diff --git a/patches/server/0559-added-PlayerNameEntityEvent.patch b/patches/server/0558-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0559-added-PlayerNameEntityEvent.patch
rename to patches/server/0558-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0560-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0559-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0561-Add-recipe-to-cook-events.patch b/patches/server/0560-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0561-Add-recipe-to-cook-events.patch
rename to patches/server/0560-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0562-Add-Block-isValidTool.patch b/patches/server/0561-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0562-Add-Block-isValidTool.patch
rename to patches/server/0561-Add-Block-isValidTool.patch
diff --git a/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0563-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0562-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0564-Expand-world-key-API.patch b/patches/server/0563-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0564-Expand-world-key-API.patch
rename to patches/server/0563-Expand-world-key-API.patch
diff --git a/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0566-Item-Rarity-API.patch b/patches/server/0565-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0566-Item-Rarity-API.patch
rename to patches/server/0565-Item-Rarity-API.patch
diff --git a/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0568-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0567-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0570-Expose-protocol-version.patch b/patches/server/0569-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0570-Expose-protocol-version.patch
rename to patches/server/0569-Expose-protocol-version.patch
diff --git a/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0573-Add-bypass-host-check.patch b/patches/server/0572-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0573-Add-bypass-host-check.patch
rename to patches/server/0572-Add-bypass-host-check.patch
diff --git a/patches/server/0574-Set-area-affect-cloud-rotation.patch b/patches/server/0573-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0574-Set-area-affect-cloud-rotation.patch
rename to patches/server/0573-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0580-Added-PlayerDeepSleepEvent.patch b/patches/server/0579-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0580-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0579-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0581-More-World-API.patch b/patches/server/0580-More-World-API.patch
similarity index 100%
rename from patches/server/0581-More-World-API.patch
rename to patches/server/0580-More-World-API.patch
diff --git a/patches/server/0582-Added-PlayerBedFailEnterEvent.patch b/patches/server/0581-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0582-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0581-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0585-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0584-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/server/0587-Add-Channel-initialization-listeners.patch b/patches/server/0586-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0587-Add-Channel-initialization-listeners.patch
rename to patches/server/0586-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0589-Add-more-WanderingTrader-API.patch b/patches/server/0588-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0589-Add-more-WanderingTrader-API.patch
rename to patches/server/0588-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0590-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0589-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0591-Entity-load-save-limit-per-chunk.patch b/patches/server/0590-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/0591-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0590-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0594-Inventory-close.patch b/patches/server/0593-Inventory-close.patch
similarity index 100%
rename from patches/server/0594-Inventory-close.patch
rename to patches/server/0593-Inventory-close.patch
diff --git a/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0596-Add-basic-Datapack-API.patch b/patches/server/0595-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0596-Add-basic-Datapack-API.patch
rename to patches/server/0595-Add-basic-Datapack-API.patch
diff --git a/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0596-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0597-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0596-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
similarity index 98%
rename from patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
index d3be632fee..f5ea880338 100644
--- a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0597-additions-to-PlayerGameModeChangeEvent.patch
@@ -144,10 +144,10 @@ index 1c795202f3b5be8f7ee41724258b509aa5b1947d..bca39612af8c9bed1e97697c42825fb7
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 47f3bd3be8da2c79d3655823ac0f2f4a8f9d7efe..a4869668643bcfe11c4a0f33d02e4b800da29a48 100644
+index 69d0694f2f25ce51f40c7cd283e1591fe05ffe2c..ba6c3e838fd486a5b68a224c1c32ef38908e3125 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1564,7 +1564,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1552,7 +1552,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(mode != null, "GameMode cannot be null");
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0599-ItemStack-repair-check-API.patch b/patches/server/0598-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0599-ItemStack-repair-check-API.patch
rename to patches/server/0598-ItemStack-repair-check-API.patch
diff --git a/patches/server/0600-More-Enchantment-API.patch b/patches/server/0599-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0600-More-Enchantment-API.patch
rename to patches/server/0599-More-Enchantment-API.patch
diff --git a/patches/server/0601-Move-range-check-for-block-placing-up.patch b/patches/server/0600-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0601-Move-range-check-for-block-placing-up.patch
rename to patches/server/0600-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0601-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0602-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0601-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0603-Add-Mob-lookAt-API.patch b/patches/server/0602-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0603-Add-Mob-lookAt-API.patch
rename to patches/server/0602-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0604-Add-Unix-domain-socket-support.patch b/patches/server/0603-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0604-Add-Unix-domain-socket-support.patch
rename to patches/server/0603-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0605-Add-EntityInsideBlockEvent.patch b/patches/server/0604-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0605-Add-EntityInsideBlockEvent.patch
rename to patches/server/0604-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0606-Attributes-API-for-item-defaults.patch b/patches/server/0605-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0606-Attributes-API-for-item-defaults.patch
rename to patches/server/0605-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0606-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0608-More-Lidded-Block-API.patch b/patches/server/0607-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0608-More-Lidded-Block-API.patch
rename to patches/server/0607-More-Lidded-Block-API.patch
diff --git a/patches/server/0609-Limit-item-frame-cursors-on-maps.patch b/patches/server/0608-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0609-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0608-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0610-Add-PlayerKickEvent-causes.patch b/patches/server/0609-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0610-Add-PlayerKickEvent-causes.patch
rename to patches/server/0609-Add-PlayerKickEvent-causes.patch
index d90f5b0d02..a992c7d6f6 100644
--- a/patches/server/0610-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0609-Add-PlayerKickEvent-causes.patch
@@ -488,7 +488,7 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a4869668643bcfe11c4a0f33d02e4b800da29a48..dad0a07790579bc3d8b018e1c5e281d4fe9633ba 100644
+index ba6c3e838fd486a5b68a224c1c32ef38908e3125..34377bef2b359292d184ec89311f49dd234be53e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -586,7 +586,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -517,7 +517,7 @@ index a4869668643bcfe11c4a0f33d02e4b800da29a48..dad0a07790579bc3d8b018e1c5e281d4
          }
      }
  
-@@ -672,7 +677,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -660,7 +665,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Paper start - Improve chat handling
          if (ServerGamePacketListenerImpl.isChatMessageIllegal(msg)) {
diff --git a/patches/server/0611-Add-PufferFishStateChangeEvent.patch b/patches/server/0610-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0611-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0610-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0611-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0612-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0613-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0615-Add-BellRevealRaiderEvent.patch b/patches/server/0614-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0615-Add-BellRevealRaiderEvent.patch
rename to patches/server/0614-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0616-Fix-invulnerable-end-crystals.patch b/patches/server/0615-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0616-Fix-invulnerable-end-crystals.patch
rename to patches/server/0615-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0616-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0617-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0616-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0618-Fix-dangerous-end-portal-logic.patch b/patches/server/0617-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0618-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0617-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0618-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0620-Make-item-validations-configurable.patch b/patches/server/0619-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0620-Make-item-validations-configurable.patch
rename to patches/server/0619-Make-item-validations-configurable.patch
diff --git a/patches/server/0621-Line-Of-Sight-Changes.patch b/patches/server/0620-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0621-Line-Of-Sight-Changes.patch
rename to patches/server/0620-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0622-add-per-world-spawn-limits.patch b/patches/server/0621-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0622-add-per-world-spawn-limits.patch
rename to patches/server/0621-add-per-world-spawn-limits.patch
diff --git a/patches/server/0623-Fix-potions-splash-events.patch b/patches/server/0622-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0623-Fix-potions-splash-events.patch
rename to patches/server/0622-Fix-potions-splash-events.patch
diff --git a/patches/server/0624-Add-more-LimitedRegion-API.patch b/patches/server/0623-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0624-Add-more-LimitedRegion-API.patch
rename to patches/server/0623-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0624-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0626-Missing-Entity-API.patch b/patches/server/0625-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0626-Missing-Entity-API.patch
rename to patches/server/0625-Missing-Entity-API.patch
diff --git a/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0626-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0627-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0628-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0629-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0631-Adds-PlayerArmSwingEvent.patch b/patches/server/0630-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0631-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0630-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0631-Fixes-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0632-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0633-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0634-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0633-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0635-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0634-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0635-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0636-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0638-Stinger-API.patch b/patches/server/0637-Stinger-API.patch
similarity index 100%
rename from patches/server/0638-Stinger-API.patch
rename to patches/server/0637-Stinger-API.patch
diff --git a/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0638-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0640-Add-System.out-err-catcher.patch b/patches/server/0639-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0640-Add-System.out-err-catcher.patch
rename to patches/server/0639-Add-System.out-err-catcher.patch
diff --git a/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0640-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0642-Improve-boat-collision-performance.patch b/patches/server/0641-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/0642-Improve-boat-collision-performance.patch
rename to patches/server/0641-Improve-boat-collision-performance.patch
diff --git a/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0642-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0643-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0645-Add-PlayerSetSpawnEvent.patch b/patches/server/0644-Add-PlayerSetSpawnEvent.patch
similarity index 98%
rename from patches/server/0645-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0644-Add-PlayerSetSpawnEvent.patch
index b0c4474c88..c3b686909c 100644
--- a/patches/server/0645-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0644-Add-PlayerSetSpawnEvent.patch
@@ -187,10 +187,10 @@ index 1a27b7faa22e6b3dc5fce329ed06425de56c4315..b9903c29bdea8d1e3b6fce0e97be6bd9
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dad0a07790579bc3d8b018e1c5e281d4fe9633ba..529792ac8f17ffd4960e67638e87974474cd776c 100644
+index 34377bef2b359292d184ec89311f49dd234be53e..4b167b30275a4dd180c4b88f453e5d2ff935a857 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1323,9 +1323,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1311,9 +1311,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void setBedSpawnLocation(Location location, boolean override) {
          if (location == null) {
diff --git a/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0645-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0646-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0647-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0646-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0647-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0648-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0647-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0649-Added-EntityDamageItemEvent.patch b/patches/server/0648-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0649-Added-EntityDamageItemEvent.patch
rename to patches/server/0648-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0650-Optimize-indirect-passenger-iteration.patch b/patches/server/0649-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0650-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0649-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0650-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0651-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0652-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0651-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0653-Clear-bucket-NBT-after-dispense.patch b/patches/server/0652-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0653-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0652-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0653-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0655-Add-BlockBreakBlockEvent.patch b/patches/server/0654-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0655-Add-BlockBreakBlockEvent.patch
rename to patches/server/0654-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0655-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0657-More-CommandBlock-API.patch b/patches/server/0656-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0657-More-CommandBlock-API.patch
rename to patches/server/0656-More-CommandBlock-API.patch
diff --git a/patches/server/0658-Add-missing-team-sidebar-display-slots.patch b/patches/server/0657-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0658-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0657-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0659-Add-back-EntityPortalExitEvent.patch b/patches/server/0658-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0659-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0658-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0659-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0661-Get-entity-default-attributes.patch b/patches/server/0660-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0661-Get-entity-default-attributes.patch
rename to patches/server/0660-Get-entity-default-attributes.patch
diff --git a/patches/server/0662-Left-handed-API.patch b/patches/server/0661-Left-handed-API.patch
similarity index 100%
rename from patches/server/0662-Left-handed-API.patch
rename to patches/server/0661-Left-handed-API.patch
diff --git a/patches/server/0663-Add-more-advancement-API.patch b/patches/server/0662-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0663-Add-more-advancement-API.patch
rename to patches/server/0662-Add-more-advancement-API.patch
diff --git a/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0663-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0665-Add-critical-damage-API.patch b/patches/server/0664-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0665-Add-critical-damage-API.patch
rename to patches/server/0664-Add-critical-damage-API.patch
diff --git a/patches/server/0666-Fix-issues-with-mob-conversion.patch b/patches/server/0665-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0666-Fix-issues-with-mob-conversion.patch
rename to patches/server/0665-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0667-Add-isCollidable-methods-to-various-places.patch b/patches/server/0666-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0667-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0666-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0668-Goat-ram-API.patch b/patches/server/0667-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0668-Goat-ram-API.patch
rename to patches/server/0667-Goat-ram-API.patch
diff --git a/patches/server/0669-Add-API-for-resetting-a-single-score.patch b/patches/server/0668-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0669-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0668-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0669-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0671-Vanilla-command-permission-fixes.patch b/patches/server/0670-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0671-Vanilla-command-permission-fixes.patch
rename to patches/server/0670-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0671-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0673-Fix-GameProfileCache-concurrency.patch b/patches/server/0672-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0673-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0672-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0674-Improve-and-expand-AsyncCatcher.patch b/patches/server/0673-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0674-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0673-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0674-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0675-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0676-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0675-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0677-Optimise-general-POI-access.patch b/patches/server/0676-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0677-Optimise-general-POI-access.patch
rename to patches/server/0676-Optimise-general-POI-access.patch
diff --git a/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0677-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0678-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0679-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0678-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0679-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0680-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0681-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0682-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0684-Time-scoreboard-search.patch b/patches/server/0683-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0684-Time-scoreboard-search.patch
rename to patches/server/0683-Time-scoreboard-search.patch
diff --git a/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0684-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0685-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch b/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0687-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0686-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0687-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0688-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0687-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0688-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0690-Optimise-random-block-ticking.patch b/patches/server/0689-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0690-Optimise-random-block-ticking.patch
rename to patches/server/0689-Optimise-random-block-ticking.patch
diff --git a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0690-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0691-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0693-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0692-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0693-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0694-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0696-Distance-manager-tick-timings.patch b/patches/server/0695-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0696-Distance-manager-tick-timings.patch
rename to patches/server/0695-Distance-manager-tick-timings.patch
diff --git a/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0696-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0697-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0698-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0700-Add-packet-limiter-config.patch b/patches/server/0699-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0700-Add-packet-limiter-config.patch
rename to patches/server/0699-Add-packet-limiter-config.patch
diff --git a/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0700-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0702-Ensure-valid-vehicle-status.patch b/patches/server/0701-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0702-Ensure-valid-vehicle-status.patch
rename to patches/server/0701-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0702-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0703-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0704-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0705-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0704-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0705-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0706-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0705-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0707-Preserve-overstacked-loot.patch b/patches/server/0706-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0707-Preserve-overstacked-loot.patch
rename to patches/server/0706-Preserve-overstacked-loot.patch
diff --git a/patches/server/0708-Update-head-rotation-in-missing-places.patch b/patches/server/0707-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0708-Update-head-rotation-in-missing-places.patch
rename to patches/server/0707-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0709-prevent-unintended-light-block-manipulation.patch b/patches/server/0708-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0709-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0708-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0710-Fix-CraftCriteria-defaults-map.patch b/patches/server/0709-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0710-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0709-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0711-Fix-upstreams-block-state-factories.patch b/patches/server/0710-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0711-Fix-upstreams-block-state-factories.patch
rename to patches/server/0710-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0712-Configurable-feature-seeds.patch b/patches/server/0711-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0712-Configurable-feature-seeds.patch
rename to patches/server/0711-Configurable-feature-seeds.patch
diff --git a/patches/server/0713-Add-root-admin-user-detection.patch b/patches/server/0712-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0713-Add-root-admin-user-detection.patch
rename to patches/server/0712-Add-root-admin-user-detection.patch
diff --git a/patches/server/0714-Always-allow-item-changing-in-Fireball.patch b/patches/server/0713-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0714-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0713-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0714-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0715-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0716-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0717-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0718-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0719-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0721-Fix-Spigot-growth-modifiers.patch b/patches/server/0720-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0721-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0720-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0721-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0722-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0723-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0722-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0724-Optimize-HashMapPalette.patch b/patches/server/0723-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0724-Optimize-HashMapPalette.patch
rename to patches/server/0723-Optimize-HashMapPalette.patch
diff --git a/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0724-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0726-Collision-optimisations.patch b/patches/server/0725-Collision-optimisations.patch
similarity index 100%
rename from patches/server/0726-Collision-optimisations.patch
rename to patches/server/0725-Collision-optimisations.patch
diff --git a/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0726-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0727-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0729-Add-more-Campfire-API.patch b/patches/server/0728-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0729-Add-more-Campfire-API.patch
rename to patches/server/0728-Add-more-Campfire-API.patch
diff --git a/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0729-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0731-Fix-tripwire-state-inconsistency.patch b/patches/server/0730-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0731-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0730-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0731-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0732-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0731-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0733-Improve-scoreboard-entries.patch b/patches/server/0732-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0733-Improve-scoreboard-entries.patch
rename to patches/server/0732-Improve-scoreboard-entries.patch
diff --git a/patches/server/0734-Entity-powdered-snow-API.patch b/patches/server/0733-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0734-Entity-powdered-snow-API.patch
rename to patches/server/0733-Entity-powdered-snow-API.patch
diff --git a/patches/server/0735-Add-API-for-item-entity-health.patch b/patches/server/0734-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0735-Add-API-for-item-entity-health.patch
rename to patches/server/0734-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0735-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0736-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0737-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0738-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0739-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0741-Fix-bees-aging-inside-hives.patch b/patches/server/0740-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0741-Fix-bees-aging-inside-hives.patch
rename to patches/server/0740-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0742-Bucketable-API.patch b/patches/server/0741-Bucketable-API.patch
similarity index 100%
rename from patches/server/0742-Bucketable-API.patch
rename to patches/server/0741-Bucketable-API.patch
diff --git a/patches/server/0743-Validate-usernames.patch b/patches/server/0742-Validate-usernames.patch
similarity index 100%
rename from patches/server/0743-Validate-usernames.patch
rename to patches/server/0742-Validate-usernames.patch
diff --git a/patches/server/0744-Make-water-animal-spawn-height-configurable.patch b/patches/server/0743-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0744-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0743-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0744-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0745-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0746-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0748-Multiple-Entries-with-Scoreboards.patch b/patches/server/0747-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0748-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0747-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0749-Reset-placed-block-on-exception.patch b/patches/server/0748-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0749-Reset-placed-block-on-exception.patch
rename to patches/server/0748-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0750-Add-configurable-height-for-slime-spawn.patch b/patches/server/0749-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0750-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0749-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0750-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0751-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0752-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0751-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0753-Kick-on-main-for-illegal-chat.patch b/patches/server/0752-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0753-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0752-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0754-Multi-Block-Change-API-Implementation.patch b/patches/server/0753-Multi-Block-Change-API-Implementation.patch
similarity index 95%
rename from patches/server/0754-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0753-Multi-Block-Change-API-Implementation.patch
index 61a5c2f1ce..d3cd5e8039 100644
--- a/patches/server/0754-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0753-Multi-Block-Change-API-Implementation.patch
@@ -24,10 +24,10 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a
      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 529792ac8f17ffd4960e67638e87974474cd776c..ed7d6c2303873b39ecabfe78d0950cf698f6f61c 100644
+index 4b167b30275a4dd180c4b88f453e5d2ff935a857..4dcc4ad66e7c6cd9cbf568d8763d707b5e2b3b8b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -891,6 +891,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -879,6 +879,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0755-Fix-NotePlayEvent.patch b/patches/server/0754-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0755-Fix-NotePlayEvent.patch
rename to patches/server/0754-Fix-NotePlayEvent.patch
diff --git a/patches/server/0756-Freeze-Tick-Lock-API.patch b/patches/server/0755-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0756-Freeze-Tick-Lock-API.patch
rename to patches/server/0755-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0757-Dolphin-API.patch b/patches/server/0756-Dolphin-API.patch
similarity index 100%
rename from patches/server/0757-Dolphin-API.patch
rename to patches/server/0756-Dolphin-API.patch
diff --git a/patches/server/0758-More-PotionEffectType-API.patch b/patches/server/0757-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0758-More-PotionEffectType-API.patch
rename to patches/server/0757-More-PotionEffectType-API.patch
diff --git a/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0758-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0759-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0761-Add-missing-structure-set-seed-configs.patch b/patches/server/0760-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0761-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0760-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0762-Implement-regenerateChunk.patch b/patches/server/0761-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0762-Implement-regenerateChunk.patch
rename to patches/server/0761-Implement-regenerateChunk.patch
diff --git a/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0762-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0763-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0765-Add-GameEvent-tags.patch b/patches/server/0764-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0765-Add-GameEvent-tags.patch
rename to patches/server/0764-Add-GameEvent-tags.patch
diff --git a/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0765-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0767-Furnace-RecipesUsed-API.patch b/patches/server/0766-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0767-Furnace-RecipesUsed-API.patch
rename to patches/server/0766-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0768-Configurable-sculk-sensor-listener-range.patch b/patches/server/0767-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0768-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0767-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0768-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0769-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0768-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0769-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0770-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0772-Fix-Entity-Position-Desync.patch b/patches/server/0771-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0772-Fix-Entity-Position-Desync.patch
rename to patches/server/0771-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0773-Custom-Potion-Mixes.patch b/patches/server/0772-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0773-Custom-Potion-Mixes.patch
rename to patches/server/0772-Custom-Potion-Mixes.patch
diff --git a/patches/server/0774-Force-close-world-loading-screen.patch b/patches/server/0773-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0774-Force-close-world-loading-screen.patch
rename to patches/server/0773-Force-close-world-loading-screen.patch
diff --git a/patches/server/0775-Fix-falling-block-spawn-methods.patch b/patches/server/0774-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0775-Fix-falling-block-spawn-methods.patch
rename to patches/server/0774-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0776-Expose-furnace-minecart-push-values.patch b/patches/server/0775-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0776-Expose-furnace-minecart-push-values.patch
rename to patches/server/0775-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0776-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0778-More-Projectile-API.patch b/patches/server/0777-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0778-More-Projectile-API.patch
rename to patches/server/0777-More-Projectile-API.patch
diff --git a/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0778-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0779-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0781-Implement-getComputedBiome-API.patch b/patches/server/0780-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0781-Implement-getComputedBiome-API.patch
rename to patches/server/0780-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0782-Make-some-itemstacks-nonnull.patch b/patches/server/0781-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0782-Make-some-itemstacks-nonnull.patch
rename to patches/server/0781-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0783-Implement-enchantWithLevels-API.patch b/patches/server/0782-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0783-Implement-enchantWithLevels-API.patch
rename to patches/server/0782-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0784-Fix-saving-in-unloadWorld.patch b/patches/server/0783-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0784-Fix-saving-in-unloadWorld.patch
rename to patches/server/0783-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0785-Buffer-OOB-setBlock-calls.patch b/patches/server/0784-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0785-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0784-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0786-Add-TameableDeathMessageEvent.patch b/patches/server/0785-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0786-Add-TameableDeathMessageEvent.patch
rename to patches/server/0785-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0786-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0787-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0788-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0790-Guard-against-invalid-entity-positions.patch b/patches/server/0789-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0790-Guard-against-invalid-entity-positions.patch
rename to patches/server/0789-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0791-cache-resource-keys.patch b/patches/server/0790-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0791-cache-resource-keys.patch
rename to patches/server/0790-cache-resource-keys.patch
diff --git a/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0791-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0792-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0793-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0794-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0795-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0796-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 100%
rename from patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0797-Pass-ServerLevel-for-gamerule-callbacks.patch
diff --git a/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0798-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0800-WorldCreator-keepSpawnLoaded.patch b/patches/server/0799-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0800-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0799-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0800-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0801-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0802-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0803-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0804-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0806-Add-PlayerStopUsingItemEvent.patch b/patches/server/0805-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0806-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0805-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0807-Don-t-tick-markers.patch b/patches/server/0806-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0807-Don-t-tick-markers.patch
rename to patches/server/0806-Don-t-tick-markers.patch
diff --git a/patches/server/0808-Expand-FallingBlock-API.patch b/patches/server/0807-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0808-Expand-FallingBlock-API.patch
rename to patches/server/0807-Expand-FallingBlock-API.patch
diff --git a/patches/server/0809-Do-not-accept-invalid-client-settings.patch b/patches/server/0808-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0809-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0808-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0810-Add-support-for-Proxy-Protocol.patch b/patches/server/0809-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0810-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0809-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0810-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0811-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0812-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0813-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0814-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0815-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0816-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0817-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0816-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0818-Dont-resent-entity-on-art-update.patch b/patches/server/0817-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0818-Dont-resent-entity-on-art-update.patch
rename to patches/server/0817-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0819-Add-WardenAngerChangeEvent.patch b/patches/server/0818-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0819-Add-WardenAngerChangeEvent.patch
rename to patches/server/0818-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0819-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0820-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0822-Nameable-Banner-API.patch b/patches/server/0821-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0822-Nameable-Banner-API.patch
rename to patches/server/0821-Nameable-Banner-API.patch
diff --git a/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0822-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0823-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0824-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0826-Add-Player-getFishHook.patch b/patches/server/0825-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0826-Add-Player-getFishHook.patch
rename to patches/server/0825-Add-Player-getFishHook.patch
diff --git a/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0826-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0827-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0828-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0830-Fix-Bee-flower-NPE.patch b/patches/server/0829-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0830-Fix-Bee-flower-NPE.patch
rename to patches/server/0829-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0830-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0832-More-Teleport-API.patch b/patches/server/0831-More-Teleport-API.patch
similarity index 97%
rename from patches/server/0832-More-Teleport-API.patch
rename to patches/server/0831-More-Teleport-API.patch
index 519cdbe10e..b6588baba2 100644
--- a/patches/server/0832-More-Teleport-API.patch
+++ b/patches/server/0831-More-Teleport-API.patch
@@ -72,10 +72,10 @@ index b9c69703bb41f7d04f95bef27eb0614c5931c326..706eeebe3ebbecd431c42140e7f351d5
          // 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 ed7d6c2303873b39ecabfe78d0950cf698f6f61c..8bdfbe71e2718e0e24b1de048c8e48927fae1e3a 100644
+index 4dcc4ad66e7c6cd9cbf568d8763d707b5e2b3b8b..3f31fca8d1bbbcd62d72c3d8ce47237aff2a326d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1212,13 +1212,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1200,13 +1200,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setRotation(float yaw, float pitch) {
@@ -178,7 +178,7 @@ index ed7d6c2303873b39ecabfe78d0950cf698f6f61c..8bdfbe71e2718e0e24b1de048c8e4892
          location.checkFinite();
  
          ServerPlayer entity = this.getHandle();
-@@ -1231,7 +1319,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1219,7 +1307,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             return false;
          }
  
@@ -187,7 +187,7 @@ index ed7d6c2303873b39ecabfe78d0950cf698f6f61c..8bdfbe71e2718e0e24b1de048c8e4892
              return false;
          }
  
-@@ -1249,7 +1337,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1237,7 +1325,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          // If this player is riding another entity, we must dismount before teleporting.
@@ -196,7 +196,7 @@ index ed7d6c2303873b39ecabfe78d0950cf698f6f61c..8bdfbe71e2718e0e24b1de048c8e4892
  
          // SPIGOT-5509: Wakeup, similar to riding
          if (this.isSleeping()) {
-@@ -1265,13 +1353,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1253,13 +1341,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ServerLevel toWorld = ((CraftWorld) to.getWorld()).getHandle();
  
          // Close any foreign inventory
diff --git a/patches/server/0833-Add-EntityPortalReadyEvent.patch b/patches/server/0832-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0833-Add-EntityPortalReadyEvent.patch
rename to patches/server/0832-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0833-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch b/patches/server/0834-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0835-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0834-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0835-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch
similarity index 76%
rename from patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch
index 70a7bab286..94ccf0b6a5 100644
--- a/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0836-Custom-Chat-Completion-Suggestions-API.patch
@@ -5,14 +5,14 @@ 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 8bdfbe71e2718e0e24b1de048c8e48927fae1e3a..7cea988c9ada598f00e79c834c644d6bf01b4c93 100644
+index 3f31fca8d1bbbcd62d72c3d8ce47237aff2a326d..0d8bdc59e8b900fc39234aaeb9b0faa97c71ec33 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -652,6 +652,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
- 
-         this.getHandle().getServer().getPlayerList().sendPlayerPermissionLevel(this.getHandle(), level, false);
+@@ -642,6 +642,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
-+
+     // Paper end - sendOpLevel API
+ 
++    // Paper start - custom chat completions API
 +    @Override
 +    public void addAdditionalChatCompletions(@NotNull Collection<String> completions) {
 +        this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket(
@@ -28,6 +28,8 @@ index 8bdfbe71e2718e0e24b1de048c8e48927fae1e3a..7cea988c9ada598f00e79c834c644d6b
 +            new ArrayList<>(completions)
 +        ));
 +    }
-     // Paper end
- 
++    // Paper end - custom chat completions API
++
      @Override
+     public void setCompassTarget(Location loc) {
+         Preconditions.checkArgument(loc != null, "Location cannot be null");
diff --git a/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0837-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0839-Collision-API.patch b/patches/server/0838-Collision-API.patch
similarity index 100%
rename from patches/server/0839-Collision-API.patch
rename to patches/server/0838-Collision-API.patch
diff --git a/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0839-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0841-Block-Ticking-API.patch b/patches/server/0840-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0841-Block-Ticking-API.patch
rename to patches/server/0840-Block-Ticking-API.patch
diff --git a/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0841-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0842-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0844-Add-NamespacedKey-biome-methods.patch b/patches/server/0843-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0844-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0843-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0844-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0845-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0846-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0848-Missing-eating-regain-reason.patch b/patches/server/0847-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0848-Missing-eating-regain-reason.patch
rename to patches/server/0847-Missing-eating-regain-reason.patch
diff --git a/patches/server/0849-Missing-effect-cause.patch b/patches/server/0848-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0849-Missing-effect-cause.patch
rename to patches/server/0848-Missing-effect-cause.patch
diff --git a/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0849-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0850-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0851-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0852-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0851-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0853-Configurable-chat-thread-limit.patch b/patches/server/0852-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0853-Configurable-chat-thread-limit.patch
rename to patches/server/0852-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0853-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0855-fix-Jigsaw-block-kicking-user.patch b/patches/server/0854-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0855-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0854-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0855-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0857-Add-getDrops-to-BlockState.patch b/patches/server/0856-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0857-Add-getDrops-to-BlockState.patch
rename to patches/server/0856-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0857-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0858-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0860-Fix-custom-piglin-loved-items.patch b/patches/server/0859-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0860-Fix-custom-piglin-loved-items.patch
rename to patches/server/0859-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0861-EntityPickupItemEvent-fixes.patch b/patches/server/0860-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0861-EntityPickupItemEvent-fixes.patch
rename to patches/server/0860-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0861-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0862-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0864-Elder-Guardian-appearance-API.patch b/patches/server/0863-Elder-Guardian-appearance-API.patch
similarity index 84%
rename from patches/server/0864-Elder-Guardian-appearance-API.patch
rename to patches/server/0863-Elder-Guardian-appearance-API.patch
index 467d5949ce..309d1be1cc 100644
--- a/patches/server/0864-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0863-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 7cea988c9ada598f00e79c834c644d6bf01b4c93..d24f7d1a3e9d7f0752a8c3c028465cdaf13f8cf8 100644
+index 0d8bdc59e8b900fc39234aaeb9b0faa97c71ec33..11a8f6105a3de444dbe3a13ce98f9c91697bdc71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3172,6 +3172,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3162,6 +3162,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0865-Allow-changing-bed-s-occupied-property.patch b/patches/server/0864-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0865-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0864-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0866-Add-entity-knockback-API.patch b/patches/server/0865-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0866-Add-entity-knockback-API.patch
rename to patches/server/0865-Add-entity-knockback-API.patch
diff --git a/patches/server/0867-Detect-headless-JREs.patch b/patches/server/0866-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0867-Detect-headless-JREs.patch
rename to patches/server/0866-Detect-headless-JREs.patch
diff --git a/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0867-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0869-optimized-dirt-and-snow-spreading.patch b/patches/server/0868-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0869-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0868-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0870-Added-EntityToggleSitEvent.patch b/patches/server/0869-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0870-Added-EntityToggleSitEvent.patch
rename to patches/server/0869-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0871-Add-fire-tick-delay-option.patch b/patches/server/0870-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0871-Add-fire-tick-delay-option.patch
rename to patches/server/0870-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0872-Add-Moving-Piston-API.patch b/patches/server/0871-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0872-Add-Moving-Piston-API.patch
rename to patches/server/0871-Add-Moving-Piston-API.patch
diff --git a/patches/server/0873-Ignore-impossible-spawn-tick.patch b/patches/server/0872-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0873-Ignore-impossible-spawn-tick.patch
rename to patches/server/0872-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0873-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0874-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0875-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0877-Prevent-compass-from-loading-chunks.patch b/patches/server/0876-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0877-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0876-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0877-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0878-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0877-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0878-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0879-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0881-Add-Player-Warden-Warning-API.patch b/patches/server/0880-Add-Player-Warden-Warning-API.patch
similarity index 93%
rename from patches/server/0881-Add-Player-Warden-Warning-API.patch
rename to patches/server/0880-Add-Player-Warden-Warning-API.patch
index 249094a304..30ed1857b9 100644
--- a/patches/server/0881-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0880-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 d24f7d1a3e9d7f0752a8c3c028465cdaf13f8cf8..7569b59b75adf4c7870cc95aad92ccc949a8a070 100644
+index 11a8f6105a3de444dbe3a13ce98f9c91697bdc71..6b64a88d7653f2df288764a988d957d94b625ebe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3177,6 +3177,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3167,6 +3167,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/0882-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0881-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0883-Add-paper-dumplisteners-command.patch b/patches/server/0882-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0883-Add-paper-dumplisteners-command.patch
rename to patches/server/0882-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0884-check-global-player-list-where-appropriate.patch b/patches/server/0883-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0884-check-global-player-list-where-appropriate.patch
rename to patches/server/0883-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0884-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0886-ItemStack-damage-API.patch b/patches/server/0885-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0886-ItemStack-damage-API.patch
rename to patches/server/0885-ItemStack-damage-API.patch
diff --git a/patches/server/0887-Friction-API.patch b/patches/server/0886-Friction-API.patch
similarity index 100%
rename from patches/server/0887-Friction-API.patch
rename to patches/server/0886-Friction-API.patch
diff --git a/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0887-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0889-Fix-player-kick-on-shutdown.patch b/patches/server/0888-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0889-Fix-player-kick-on-shutdown.patch
rename to patches/server/0888-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0890-Sync-offhand-slot-in-menus.patch b/patches/server/0889-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0890-Sync-offhand-slot-in-menus.patch
rename to patches/server/0889-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0891-Player-Entity-Tracking-Events.patch b/patches/server/0890-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0891-Player-Entity-Tracking-Events.patch
rename to patches/server/0890-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0892-Limit-pet-look-distance.patch b/patches/server/0891-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0892-Limit-pet-look-distance.patch
rename to patches/server/0891-Limit-pet-look-distance.patch
diff --git a/patches/server/0893-Properly-resend-entities.patch b/patches/server/0892-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0893-Properly-resend-entities.patch
rename to patches/server/0892-Properly-resend-entities.patch
diff --git a/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0893-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0895-fix-Instruments.patch b/patches/server/0894-fix-Instruments.patch
similarity index 94%
rename from patches/server/0895-fix-Instruments.patch
rename to patches/server/0894-fix-Instruments.patch
index 8132408618..b0d3525e46 100644
--- a/patches/server/0895-fix-Instruments.patch
+++ b/patches/server/0894-fix-Instruments.patch
@@ -6,10 +6,10 @@ 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 7569b59b75adf4c7870cc95aad92ccc949a8a070..f496824194613851ea3eb500b12fe7b9351fea88 100644
+index 6b64a88d7653f2df288764a988d957d94b625ebe..28963293732ff801ab0926a4b6affaec52cada54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -726,29 +726,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -716,29 +716,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          if (this.getHandle().connection == null) return;
  
diff --git a/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0895-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0896-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0898-Add-BlockLockCheckEvent.patch b/patches/server/0897-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0898-Add-BlockLockCheckEvent.patch
rename to patches/server/0897-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0899-Add-Sneaking-API-for-Entities.patch b/patches/server/0898-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0899-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0898-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0900-Improve-logging-and-errors.patch b/patches/server/0899-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0900-Improve-logging-and-errors.patch
rename to patches/server/0899-Improve-logging-and-errors.patch
diff --git a/patches/server/0901-Improve-PortalEvents.patch b/patches/server/0900-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0901-Improve-PortalEvents.patch
rename to patches/server/0900-Improve-PortalEvents.patch
diff --git a/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0901-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0902-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0903-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0905-Flying-Fall-Damage.patch b/patches/server/0904-Flying-Fall-Damage.patch
similarity index 93%
rename from patches/server/0905-Flying-Fall-Damage.patch
rename to patches/server/0904-Flying-Fall-Damage.patch
index 3231fd2429..5dad37d9dc 100644
--- a/patches/server/0905-Flying-Fall-Damage.patch
+++ b/patches/server/0904-Flying-Fall-Damage.patch
@@ -26,10 +26,10 @@ index f9a308490e1cd7745dc12369c6041f0ae9e0b1e1..481c3e321cfc0f20bb1c4c6942b8bdbd
          } 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 f496824194613851ea3eb500b12fe7b9351fea88..20b1de95c3afbf9cfd4f8943e06fdf07caa21219 100644
+index 28963293732ff801ab0926a4b6affaec52cada54..a26f4115b3fc1964e259d73bfbca315396394ced 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2392,6 +2392,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2382,6 +2382,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().onUpdateAbilities();
      }
  
diff --git a/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0905-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0906-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0908-config-for-disabling-entity-tag-tags.patch b/patches/server/0907-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0908-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0907-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0909-Use-single-player-info-update-packet-on-join.patch b/patches/server/0908-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0909-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0908-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0909-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0911-Win-Screen-API.patch b/patches/server/0910-Win-Screen-API.patch
similarity index 88%
rename from patches/server/0911-Win-Screen-API.patch
rename to patches/server/0910-Win-Screen-API.patch
index bd69622d7c..70e44adc2b 100644
--- a/patches/server/0911-Win-Screen-API.patch
+++ b/patches/server/0910-Win-Screen-API.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 20b1de95c3afbf9cfd4f8943e06fdf07caa21219..42c6288d26dc866dae19031aa3310d88274a6fbf 100644
+index a26f4115b3fc1964e259d73bfbca315396394ced..e55898d5237d4413dfa2ea81f7e5f4941901bc08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1215,6 +1215,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1205,6 +1205,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(packet);
      }
  
diff --git a/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0911-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0913-Fix-force-opening-enchantment-tables.patch b/patches/server/0912-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0913-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0912-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0914-Add-Entity-Body-Yaw-API.patch b/patches/server/0913-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0914-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0913-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0914-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0915-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0917-Add-EntityFertilizeEggEvent.patch b/patches/server/0916-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0917-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0916-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0917-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0918-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0919-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0920-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0922-Fix-text-display-error-on-spawn.patch b/patches/server/0921-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0922-Fix-text-display-error-on-spawn.patch
rename to patches/server/0921-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0922-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0924-Add-Shearable-API.patch b/patches/server/0923-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0924-Add-Shearable-API.patch
rename to patches/server/0923-Add-Shearable-API.patch
diff --git a/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0924-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0926-Optimize-Hoppers.patch b/patches/server/0925-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/0926-Optimize-Hoppers.patch
rename to patches/server/0925-Optimize-Hoppers.patch
diff --git a/patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0926-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0927-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0926-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0927-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0928-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0927-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0929-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0928-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0929-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0928-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0930-remove-duplicate-animate-packet-for-records.patch b/patches/server/0929-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0930-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0929-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0930-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0931-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0930-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0931-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0932-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0931-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0933-Use-array-for-gamerule-storage.patch b/patches/server/0932-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0933-Use-array-for-gamerule-storage.patch
rename to patches/server/0932-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0933-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0934-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0933-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0934-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0935-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0934-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0936-Add-Mob-Experience-reward-API.patch b/patches/server/0935-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0936-Add-Mob-Experience-reward-API.patch
rename to patches/server/0935-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0936-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0937-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0936-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0937-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0938-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0937-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0938-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0939-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0938-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0940-More-accurate-isInOpenWater-impl.patch b/patches/server/0939-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0940-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0939-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0940-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0941-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0940-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0941-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0942-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0941-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0943-Expand-PlayerItemMendEvent.patch b/patches/server/0942-Expand-PlayerItemMendEvent.patch
similarity index 96%
rename from patches/server/0943-Expand-PlayerItemMendEvent.patch
rename to patches/server/0942-Expand-PlayerItemMendEvent.patch
index 0b4ee58ae8..f3745282c6 100644
--- a/patches/server/0943-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0942-Expand-PlayerItemMendEvent.patch
@@ -33,10 +33,10 @@ index 37cd883f4920d5e1e58900ebdcfd4495a0abd2ae..6dac7cd4c9abfbde299f5d279acc2739
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 42c6288d26dc866dae19031aa3310d88274a6fbf..2981475368094b7749cfec2e5a99ec0947248eee 100644
+index e55898d5237d4413dfa2ea81f7e5f4941901bc08..200f2a0a98e32fa722e50bf204d3ee886da58815 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1737,11 +1737,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1727,11 +1727,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              orb.setPosRaw(handle.getX(), handle.getY(), handle.getZ());
  
              int i = Math.min(orb.xpToDurability(amount), itemstack.getDamageValue());
diff --git a/patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0943-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0944-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0943-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0945-Add-transient-modifier-API.patch b/patches/server/0944-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0945-Add-transient-modifier-API.patch
rename to patches/server/0944-Add-transient-modifier-API.patch
diff --git a/patches/server/0946-Fix-block-place-logic.patch b/patches/server/0945-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0946-Fix-block-place-logic.patch
rename to patches/server/0945-Fix-block-place-logic.patch
diff --git a/patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0946-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0947-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0946-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0947-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0948-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0947-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0948-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0949-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0948-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0949-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0950-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0949-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0950-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0951-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0950-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0952-Fix-sniffer-removeExploredLocation.patch b/patches/server/0951-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0952-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0951-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0952-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0953-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0952-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0953-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0954-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0953-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0954-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0955-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0954-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0956-Properly-Cancel-Usable-Items.patch b/patches/server/0955-Properly-Cancel-Usable-Items.patch
similarity index 100%
rename from patches/server/0956-Properly-Cancel-Usable-Items.patch
rename to patches/server/0955-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0957-Add-event-for-player-editing-sign.patch b/patches/server/0956-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0957-Add-event-for-player-editing-sign.patch
rename to patches/server/0956-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0957-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0958-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0957-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0959-Improve-command-function-perm-level-checks.patch b/patches/server/0958-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0959-Improve-command-function-perm-level-checks.patch
rename to patches/server/0958-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0960-Add-option-to-disable-block-updates.patch b/patches/server/0959-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0960-Add-option-to-disable-block-updates.patch
rename to patches/server/0959-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0961-Call-missing-BlockDispenseEvent.patch b/patches/server/0960-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0961-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0960-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0961-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0962-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0961-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0963-Optimize-player-lookups-for-beacons.patch b/patches/server/0962-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0963-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0962-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0964-Add-Sign-getInteractableSideFor.patch b/patches/server/0963-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0964-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0963-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0965-Array-backed-synched-entity-data.patch b/patches/server/0964-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0965-Array-backed-synched-entity-data.patch
rename to patches/server/0964-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0966-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0965-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0966-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0965-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0966-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0967-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0966-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0968-Fix-BanList-API.patch b/patches/server/0967-Fix-BanList-API.patch
similarity index 98%
rename from patches/server/0968-Fix-BanList-API.patch
rename to patches/server/0967-Fix-BanList-API.patch
index 4dbd085a1a..aeed5fc467 100644
--- a/patches/server/0968-Fix-BanList-API.patch
+++ b/patches/server/0967-Fix-BanList-API.patch
@@ -208,10 +208,10 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57
              return null;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2981475368094b7749cfec2e5a99ec0947248eee..1be276757f241d17f2d24f35df15c5d9cdaaa10c 100644
+index 200f2a0a98e32fa722e50bf204d3ee886da58815..48e6b61c0b61507e9aac7557ce3b9c7f115b8539 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1635,23 +1635,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1625,23 +1625,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
@@ -240,7 +240,7 @@ index 2981475368094b7749cfec2e5a99ec0947248eee..1be276757f241d17f2d24f35df15c5d9
          if (kickPlayer) {
              this.kickPlayer(reason);
          }
-@@ -1659,12 +1659,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1649,12 +1649,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      @Override
diff --git a/patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0968-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0969-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0968-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0970-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0969-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0970-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0969-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0970-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0971-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0970-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0971-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0972-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0971-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0973-Don-t-tick-signs.patch b/patches/server/0972-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0973-Don-t-tick-signs.patch
rename to patches/server/0972-Don-t-tick-signs.patch
diff --git a/patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0973-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0974-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0973-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0975-Add-whitelist-events.patch b/patches/server/0974-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0975-Add-whitelist-events.patch
rename to patches/server/0974-Add-whitelist-events.patch
diff --git a/patches/server/0976-Implement-PlayerFailMoveEvent.patch b/patches/server/0975-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0976-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0975-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0977-Folia-scheduler-and-owned-region-API.patch b/patches/server/0976-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0977-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0976-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0977-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0978-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0977-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0979-API-for-updating-recipes-on-clients.patch b/patches/server/0978-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0979-API-for-updating-recipes-on-clients.patch
rename to patches/server/0978-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0980-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0979-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0980-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0979-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0981-Only-capture-actual-tree-growth.patch b/patches/server/0980-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0981-Only-capture-actual-tree-growth.patch
rename to patches/server/0980-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0981-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0982-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0981-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0982-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0983-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0982-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0984-Use-correct-seed-on-api-world-load.patch b/patches/server/0983-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0984-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0983-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0984-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0985-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0984-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0986-Cache-map-ids-on-item-frames.patch b/patches/server/0985-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0986-Cache-map-ids-on-item-frames.patch
rename to patches/server/0985-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0987-Fix-custom-statistic-criteria-creation.patch b/patches/server/0986-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0987-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0986-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0988-Bandaid-fix-for-Effect.patch b/patches/server/0987-Bandaid-fix-for-Effect.patch
similarity index 97%
rename from patches/server/0988-Bandaid-fix-for-Effect.patch
rename to patches/server/0987-Bandaid-fix-for-Effect.patch
index 5c981e5fca..14e9b12cb4 100644
--- a/patches/server/0988-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0987-Bandaid-fix-for-Effect.patch
@@ -58,10 +58,10 @@ index c9ab48d99992a39cc6977424c589489a35f36992..5e350fa39f47d54f6048ea89c1317759
              // Special case: the axis is optional for ELECTRIC_SPARK
              Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1be276757f241d17f2d24f35df15c5d9cdaaa10c..3bdce11d4debf950ec5f1ce5d03e203f80b57214 100644
+index 48e6b61c0b61507e9aac7557ce3b9c7f115b8539..2e0863cf1756c0b76e5637777f15f27e2c94fe6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -862,7 +862,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -852,7 +852,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          Preconditions.checkArgument(effect != null, "Effect cannot be null");
          if (data != null) {
              Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect);
diff --git a/patches/server/0989-SculkCatalyst-bloom-API.patch b/patches/server/0988-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0989-SculkCatalyst-bloom-API.patch
rename to patches/server/0988-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0990-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0989-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0990-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0989-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0990-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/0991-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0990-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0991-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0992-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0991-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0992-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0993-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0992-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0993-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0994-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0993-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0994-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0995-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0994-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0995-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0996-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0995-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0997-Add-Listing-API-for-Player.patch b/patches/server/0996-Add-Listing-API-for-Player.patch
similarity index 98%
rename from patches/server/0997-Add-Listing-API-for-Player.patch
rename to patches/server/0996-Add-Listing-API-for-Player.patch
index 0a5a371aec..ab9b37502d 100644
--- a/patches/server/0997-Add-Listing-API-for-Player.patch
+++ b/patches/server/0996-Add-Listing-API-for-Player.patch
@@ -113,7 +113,7 @@ index 4e7141968d88ca3fbb9cceaadbef60fed0ce64eb..03d2dc7f68d6918065f852057321fbaa
          // Paper end
          player.sentListPacket = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3bdce11d4debf950ec5f1ce5d03e203f80b57214..dfa1f48b6d61c6644a02adbd5a5183f917a2982c 100644
+index 2e0863cf1756c0b76e5637777f15f27e2c94fe6b..97ef38f744908a09e4d24c445a5cc39db0e6ee7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -184,6 +184,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -124,7 +124,7 @@ index 3bdce11d4debf950ec5f1ce5d03e203f80b57214..dfa1f48b6d61c6644a02adbd5a5183f9
      private static final WeakHashMap<Plugin, WeakReference<Plugin>> pluginWeakReferences = new WeakHashMap<>();
      private int hash = 0;
      private double health = 20;
-@@ -1975,7 +1976,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1965,7 +1966,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  otherPlayer.setUUID(uuidOverride);
              }
              // Paper end
@@ -133,7 +133,7 @@ index 3bdce11d4debf950ec5f1ce5d03e203f80b57214..dfa1f48b6d61c6644a02adbd5a5183f9
              if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
          }
  
-@@ -2084,6 +2085,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2074,6 +2075,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return (entity != null) ? this.canSee(entity) : false; // If we can't find it, we can't see it
      }
  
diff --git a/patches/server/0998-Configurable-Region-Compression-Format.patch b/patches/server/0997-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0998-Configurable-Region-Compression-Format.patch
rename to patches/server/0997-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0998-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0999-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/0998-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/1000-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0999-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/1000-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0999-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/1001-Expand-Pose-API.patch b/patches/server/1000-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/1001-Expand-Pose-API.patch
rename to patches/server/1000-Expand-Pose-API.patch
diff --git a/patches/server/1002-More-DragonBattle-API.patch b/patches/server/1001-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/1002-More-DragonBattle-API.patch
rename to patches/server/1001-More-DragonBattle-API.patch
diff --git a/patches/server/1003-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1002-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/1003-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/1002-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1004-Add-PlayerPickItemEvent.patch b/patches/server/1003-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/1004-Add-PlayerPickItemEvent.patch
rename to patches/server/1003-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/1005-Improve-performance-of-mass-crafts.patch b/patches/server/1004-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1005-Improve-performance-of-mass-crafts.patch
rename to patches/server/1004-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1006-Allow-trident-custom-damage.patch b/patches/server/1005-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/1006-Allow-trident-custom-damage.patch
rename to patches/server/1005-Allow-trident-custom-damage.patch
diff --git a/patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1006-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/1007-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/1006-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1008-Optimize-nearest-structure-border-iteration.patch b/patches/server/1007-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/1008-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/1007-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch b/patches/server/1008-Implement-OfflinePlayer-isConnected.patch
similarity index 94%
rename from patches/server/1009-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/1008-Implement-OfflinePlayer-isConnected.patch
index 2cf0e8deb5..b96be3603a 100644
--- a/patches/server/1009-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/1008-Implement-OfflinePlayer-isConnected.patch
@@ -23,7 +23,7 @@ index f9b2d773449fa5d332e0c37454ba6ea731982e85..bb794638a990488afc8d9d245dd20326
      public String getName() {
          Player player = this.getPlayer();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dfa1f48b6d61c6644a02adbd5a5183f917a2982c..57229748ae446d70dbc3d71219d9f81f5c8f72b1 100644
+index 9710cb0d414d33c98cccf6d3811530414a4a221f..2e6fb5111f1b1abcbff674855077dd377290d80d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -274,6 +274,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1010-Fix-inventory-desync.patch b/patches/server/1009-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/1010-Fix-inventory-desync.patch
rename to patches/server/1009-Fix-inventory-desync.patch
diff --git a/patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1010-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/1011-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/1010-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1012-Configure-sniffer-egg-hatch-time.patch b/patches/server/1011-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/1012-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/1011-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1012-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/1013-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/1012-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1013-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/1014-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/1013-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1014-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/1015-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/1014-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1015-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/1016-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/1015-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1016-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/1017-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/1016-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/1018-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1017-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/1018-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/1017-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/1019-Fix-spigot-s-Forced-Stats.patch b/patches/server/1018-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/1019-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/1018-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1019-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/1020-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/1019-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1020-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/1021-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/1020-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/1022-Actually-optimise-explosions.patch b/patches/server/1021-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1022-Actually-optimise-explosions.patch
rename to patches/server/1021-Actually-optimise-explosions.patch
diff --git a/patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1022-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/1023-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/1022-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1023-Remove-Spigot-Bug-Fix-for-MC-109346.patch
similarity index 100%
rename from patches/server/1024-Remove-Spigot-Bug-Fix-for-MC-109346.patch
rename to patches/server/1023-Remove-Spigot-Bug-Fix-for-MC-109346.patch
diff --git a/patches/server/1025-Fix-SuspiciousStewMeta.patch b/patches/server/1024-Fix-SuspiciousStewMeta.patch
similarity index 100%
rename from patches/server/1025-Fix-SuspiciousStewMeta.patch
rename to patches/server/1024-Fix-SuspiciousStewMeta.patch
diff --git a/patches/server/1026-Optimise-chunk-tick-iteration.patch b/patches/server/1025-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/1026-Optimise-chunk-tick-iteration.patch
rename to patches/server/1025-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1027-Lag-compensation-ticks.patch b/patches/server/1026-Lag-compensation-ticks.patch
similarity index 100%
rename from patches/server/1027-Lag-compensation-ticks.patch
rename to patches/server/1026-Lag-compensation-ticks.patch
diff --git a/patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1027-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/1028-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/1027-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/1029-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/1028-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/1030-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/1029-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/1031-Optimise-nearby-player-retrieval.patch b/patches/server/1030-Optimise-nearby-player-retrieval.patch
similarity index 100%
rename from patches/server/1031-Optimise-nearby-player-retrieval.patch
rename to patches/server/1030-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1032-Remove-streams-for-villager-AI.patch b/patches/server/1031-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/1032-Remove-streams-for-villager-AI.patch
rename to patches/server/1031-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/1033-Fix-missing-map-initialize-event-call.patch b/patches/server/1032-Fix-missing-map-initialize-event-call.patch
similarity index 100%
rename from patches/server/1033-Fix-missing-map-initialize-event-call.patch
rename to patches/server/1032-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1033-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/1034-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/1033-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1034-Use-correct-variable-for-initializing-CraftLootTable.patch
similarity index 100%
rename from patches/server/1035-Use-correct-variable-for-initializing-CraftLootTable.patch
rename to patches/server/1034-Use-correct-variable-for-initializing-CraftLootTable.patch
diff --git a/patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1035-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
similarity index 100%
rename from patches/server/1036-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
rename to patches/server/1035-Make-setVelocity-method-of-Fireballs-change-the-trav.patch
diff --git a/patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1036-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/1037-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/1036-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/1038-Add-player-idle-duration-API.patch b/patches/server/1037-Add-player-idle-duration-API.patch
similarity index 85%
rename from patches/server/1038-Add-player-idle-duration-API.patch
rename to patches/server/1037-Add-player-idle-duration-API.patch
index bf7b454c60..64e41c50dd 100644
--- a/patches/server/1038-Add-player-idle-duration-API.patch
+++ b/patches/server/1037-Add-player-idle-duration-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API
 Implements API for getting and resetting a player's idle duration.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 57229748ae446d70dbc3d71219d9f81f5c8f72b1..743b3c952e01de44905cacac3ffd501e2059238f 100644
+index f6bc3a4af1bffe6abf5a93e975848de44965cbe3..57b67e42c1e5784ecd752cf1a5165a4d7eccdb15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3280,6 +3280,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3270,6 +3270,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/1039-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/1039-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/1038-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 84%
rename from patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index e70d4274ff..f5b7d3fea1 100644
--- a/patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 743b3c952e01de44905cacac3ffd501e2059238f..4f237880cf53ec2eb4e7c93dccc168bbb682f473 100644
+index 57b67e42c1e5784ecd752cf1a5165a4d7eccdb15..00bae5df87bcc1c75d4e2f430241579d3be82c11 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1072,7 +1072,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1062,7 +1062,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void sendEquipmentChange(LivingEntity entity, EquipmentSlot slot, ItemStack item) {
diff --git a/patches/server/1042-Optimize-VarInts.patch b/patches/server/1041-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/1042-Optimize-VarInts.patch
rename to patches/server/1041-Optimize-VarInts.patch
diff --git a/patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch b/patches/server/1042-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
similarity index 100%
rename from patches/server/1043-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch
rename to patches/server/1042-Fix-NPE-when-no-valid-world-is-found-on-legacy-Playe.patch