From 9147456fc9fa15cd0dc0a8f11a4de22bb2885de5 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 27 Jan 2023 12:52:04 -0800
Subject: [PATCH] Updated Upstream (CraftBukkit/Spigot) (#8815)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
ab8ace685 SPIGOT-7236: Bone meal doesn't increase use statistic
7dcb59b8e Avoid switch on material in previous commit

Spigot Changes:
19641c75 SPIGOT-7235: World.Spigot#strikeLightningEffect doesn't do anything
---
 patches/server/0008-MC-Utils.patch            | 16 ++++++++--------
 patches/server/0009-Adventure.patch           |  4 ++--
 ...068-Handle-Item-Meta-Inconsistencies.patch |  6 +++---
 ...ow-chests-to-be-placed-with-NBT-data.patch |  4 ++--
 patches/server/0332-Optimize-Hoppers.patch    |  6 +++---
 ...-Plugin-Tickets-to-API-Chunk-Methods.patch |  4 ++--
 ...keLighting-call-to-World-spigot-stri.patch | 19 -------------------
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0458-Brand-support.patch} |  0
 ...patch => 0459-Add-setMaxPlayers-API.patch} |  2 +-
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0461-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  2 +-
 ...PI.patch => 0463-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  2 +-
 ...ent.patch => 0465-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0467-Buffer-joins-to-world.patch} |  0
 ...-Eigencraft-redstone-implementation.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  2 +-
 ...reateEvent-needs-to-know-its-entity.patch} |  4 ++--
 ...ch => 0471-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0472-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0475-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  2 +-
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0482-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...-Concurrency-issue-in-ShufflingList.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0487-Optimise-getType-calls.patch} |  0
 ....patch => 0488-Villager-resetOffers.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0492-Player-elytra-boost-API.patch} |  0
 ...93-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0496-Add-ignore-discounts-API.patch} |  0
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  2 +-
 ...> 0499-Item-no-age-no-player-pickup.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...501-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0502-Add-API-for-quit-reason.patch} |  2 +-
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...ch => 0504-Expose-world-spawn-angle.patch} |  2 +-
 ...patch => 0505-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...07-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0508-Add-PlayerItemCooldownEvent.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...PI.patch => 0510-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  2 +-
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0513-Add-PlayerShearBlockEvent.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  0
 ....patch => 0515-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ...517-Player-Chunk-Load-Unload-Events.patch} |  0
 ...8-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  2 +-
 ...-invalid-ingredient-lists-in-Villag.patch} |  0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |  0
 ...ch => 0523-Implement-TargetHitEvent.patch} |  0
 ... 0524-MC-4-Fix-item-position-desync.patch} |  0
 ...525-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0526-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ....patch => 0528-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  0
 ...h => 0533-Zombie-API-breaking-doors.patch} |  0
 ...534-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0535-Add-EntityLoadCrossbowEvent.patch} |  0
 ...0536-Added-WorldGameRuleChangeEvent.patch} |  2 +-
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...mplemented-BlockFailedDispenseEvent.patch} |  2 +-
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  0
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...I-to-expose-exact-interaction-point.patch} |  2 +-
 ...OIs.patch => 0545-Remove-stale-POIs.patch} |  0
 ...h => 0546-Fix-villager-boat-exploit.patch} |  2 +-
 ...I.patch => 0547-Add-sendOpLevel-API.patch} |  2 +-
 ...try.patch => 0548-Add-PaperRegistry.patch} |  0
 ...h => 0549-Add-StructuresLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  2 +-
 ...leHitEvent-call-when-fireballs-dead.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...553-Make-schedule-command-per-world.patch} |  0
 ...554-Configurable-max-leash-distance.patch} |  0
 ...555-Implement-BlockPreDispenseEvent.patch} |  2 +-
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  2 +-
 ...shield-blocking-on-dimension-change.patch} |  0
 ...atch => 0561-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0562-EntityMoveEvent.patch} |  2 +-
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0564-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  2 +-
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...ix-dead-slime-setSize-invincibility.patch} |  0
 ...pes-should-return-an-immutable-list.patch} |  0
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...atch => 0571-Expose-Tracked-Players.patch} |  0
 ...2-Remove-streams-from-SensorNearest.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  0
 ...GUI.patch => 0574-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...576-fix-converting-txt-to-json-file.patch} |  2 +-
 ...atch => 0577-Add-worldborder-events.patch} |  0
 ...=> 0578-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0580-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0581-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ....patch => 0583-Expand-world-key-API.patch} |  0
 ...ternative-constructor-for-Rotations.patch} |  0
 ...y-API.patch => 0585-Item-Rarity-API.patch} |  0
 ...py-TESign-isEditable-from-snapshots.patch} |  0
 ...d-item-when-player-has-disconnected.patch} |  2 +-
 ...elist-use-configurable-kick-message.patch} |  0
 ...gnore-result-of-PlayerEditBookEvent.patch} |  0
 ...90-Entity-load-save-limit-per-chunk.patch} |  2 +-
 ...tch => 0591-Expose-protocol-version.patch} |  0
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  2 +-
 ...patch => 0594-Add-bypass-host-check.patch} |  0
 ...0595-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
 ...-checkReach-check-for-Shulker-boxes.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ... => 0602-Added-PlayerDeepSleepEvent.patch} |  2 +-
 ...ld-API.patch => 0603-More-World-API.patch} |  2 +-
 ... 0604-Added-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |  2 +-
 ...acon-activation-deactivation-events.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  2 +-
 ...dd-Channel-initialization-listeners.patch} |  2 +-
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0611-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  2 +-
 ...close.patch => 0615-Inventory-close.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0617-Fix-CraftPotionBrewer-cache.patch} |  0
 ...atch => 0618-Add-basic-Datapack-API.patch} |  0
 ...ment-variable-to-disable-server-gui.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  0
 ... => 0621-ItemStack-repair-check-API.patch} |  0
 ....patch => 0622-More-Enchantment-API.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-and-optimise-world-force-upgrading.patch} |  0
 ...PI.patch => 0625-Add-Mob-lookAt-API.patch} |  0
 ...0626-Add-Unix-domain-socket-support.patch} |  2 +-
 ... => 0627-Add-EntityInsideBlockEvent.patch} |  0
 ...28-Attributes-API-for-item-defaults.patch} |  0
 ...ause-to-Weather-ThunderChangeEvents.patch} |  2 +-
 ...patch => 0630-More-Lidded-Block-API.patch} |  0
 ...31-Limit-item-frame-cursors-on-maps.patch} |  0
 ... => 0632-Add-PlayerKickEvent-causes.patch} |  2 +-
 ...0633-Add-PufferFishStateChangeEvent.patch} |  0
 ...erBucketEmptyEvent-result-itemstack.patch} |  0
 ...tedContainer-instead-of-ThreadingDe.patch} |  0
 ...-to-fix-items-merging-through-walls.patch} |  0
 ...h => 0637-Add-BellRevealRaiderEvent.patch} |  0
 ... 0638-Fix-invulnerable-end-crystals.patch} |  0
 ...39-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0640-Fix-dangerous-end-portal-logic.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...-Make-item-validations-configurable.patch} |  0
 ...patch => 0643-Line-Of-Sight-Changes.patch} |  2 +-
 ... => 0644-add-per-world-spawn-limits.patch} |  2 +-
 ...h => 0645-Fix-potions-splash-events.patch} |  0
 ... => 0646-Add-more-LimitedRegion-API.patch} |  0
 ...layerDropItemEvent-using-wrong-item.patch} |  2 +-
 ...=> 0648-Missing-Entity-Behavior-API.patch} |  0
 ...ect-for-book-edit-is-called-on-main.patch} |  0
 ...of-Block-applyBoneMeal-always-being.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  0
 ...rom-signs-not-firing-command-events.patch} |  0
 ...ch => 0653-Adds-PlayerArmSwingEvent.patch} |  0
 ...-event-leave-message-not-being-sent.patch} |  2 +-
 ...-for-mobs-immune-to-default-effects.patch} |  2 +-
 ...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 => 0660-Stinger-API.patch} |  0
 ...cy-issue-with-empty-map-items-in-CB.patch} |  0
 ... => 0662-Add-System.out-err-catcher.patch} |  0
 ... => 0663-Fix-test-not-bootstrapping.patch} |  0
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...-Improve-boat-collision-performance.patch} |  2 +-
 ...AFK-kick-while-watching-end-credits.patch} |  0
 ...iting-of-comments-to-server.propert.patch} |  0
 ...tch => 0668-Add-PlayerSetSpawnEvent.patch} |  2 +-
 ...rs-respect-inventory-max-stack-size.patch} |  0
 ...ize-entity-tracker-passenger-checks.patch} |  0
 ...-option-for-Piglins-guarding-chests.patch} |  0
 ...=> 0672-Added-EntityDamageItemEvent.patch} | 12 ++++++------
 ...timize-indirect-passenger-iteration.patch} |  0
 ...osition-losing-precision-millions-o.patch} |  0
 ...em-frame-map-cursor-update-interval.patch} |  0
 ...Make-EntityUnleashEvent-cancellable.patch} |  0
 ...677-Clear-bucket-NBT-after-dispense.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0679-Add-BlockBreakBlockEvent.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0681-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  2 +-
 ...0683-Add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  2 +-
 ... 0685-Get-entity-default-attributes.patch} |  0
 ...d-API.patch => 0686-Left-handed-API.patch} |  0
 ...ch => 0687-Add-more-advancement-API.patch} |  2 +-
 ...688-Add-ItemFactory-getSpawnEgg-API.patch} |  0
 ...tch => 0689-Add-critical-damage-API.patch} |  6 +++---
 ...0690-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  0
 ...-ram-API.patch => 0692-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...4-Add-Raw-Byte-Entity-Serialization.patch} |  0
 ...95-Vanilla-command-permission-fixes.patch} |  0
 ...logic-for-inventories-on-chunk-unlo.patch} |  2 +-
 ...97-Fix-GameProfileCache-concurrency.patch} |  0
 ...g-when-the-async-catcher-is-tripped.patch} |  0
 ...per-mobcaps-and-paper-playermobcaps.patch} |  2 +-
 ...tize-ResourceLocation-error-logging.patch} |  0
 ...rolled-flushing-for-network-manager.patch} |  2 +-
 ...=> 0702-Optimise-general-POI-access.patch} |  0
 ... 0703-Optimise-chunk-tick-iteration.patch} |  0
 ...> 0704-Execute-chunk-tasks-mid-tick.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  0
 ...lly-inline-methods-in-BlockPosition.patch} |  0
 ... 0709-Distance-manager-tick-timings.patch} |  0
 ...ler-threads-according-to-the-plugin.patch} |  0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |  0
 ...h => 0712-Add-packet-limiter-config.patch} |  2 +-
 ...our-chunk-data-off-disk-when-conver.patch} |  0
 ...sh-calls-for-entity-tracker-packets.patch} |  0
 ...-lookup-fluid-state-when-raytracing.patch} |  0
 ...atch => 0716-Time-scoreboard-search.patch} |  0
 ...packets-for-hard-colliding-entities.patch} |  0
 ...8-Do-not-run-raytrace-logic-for-AIR.patch} |  0
 ...rimise-map-impl-for-tracked-players.patch} |  0
 ...imise-BlockSoil-nearby-water-lookup.patch} |  0
 ... 0721-Optimise-random-block-ticking.patch} |  0
 ...2-Optimise-non-flush-packet-sending.patch} |  2 +-
 ...0723-Optimise-nearby-player-lookups.patch} |  0
 ...0724-Remove-streams-for-villager-AI.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  6 +++---
 ...hread-worker-count-for-low-core-cou.patch} |  0
 ...ifications-to-critical-entity-state.patch} |  0
 ...ix-Bukkit-NamespacedKey-shenanigans.patch} |  0
 ...ntory-not-closing-on-entity-removal.patch} |  0
 ...rement-before-suggesting-root-nodes.patch} |  0
 ...ServerboundCommandSuggestionPacket-.patch} |  0
 ...nColor-on-tropical-fish-bucket-meta.patch} |  0
 ...=> 0733-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 => 0738-Preserve-overstacked-loot.patch} |  0
 ...ate-head-rotation-in-missing-places.patch} |  2 +-
 ...unintended-light-block-manipulation.patch} |  0
 ...0741-Fix-CraftCriteria-defaults-map.patch} |  0
 ...Fix-upstreams-block-state-factories.patch} |  0
 ...ion-for-logging-player-ip-addresses.patch} |  4 ++--
 ... => 0744-Configurable-feature-seeds.patch} |  0
 ...pper-didnt-account-for-entity-sende.patch} |  0
 ... 0746-Add-root-admin-user-detection.patch} |  0
 ...ays-allow-item-changing-in-Fireball.patch} |  0
 ...t-attempt-to-teleport-dead-entities.patch} |  2 +-
 ...ive-velocity-through-repeated-crits.patch} |  2 +-
 ...e-code-using-deprecated-for-removal.patch} |  0
 ...ochunk-light-sources-unless-it-is-m.patch} |  0
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  2 +-
 ...e-unnecessary-itemmeta-from-clients.patch} |  2 +-
 ...=> 0755-Fix-Spigot-growth-modifiers.patch} |  0
 ...OpenersCounter-openCount-from-going.patch} |  0
 ...0757-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0758-Add-player-health-update-API.patch} |  0
 ...tch => 0759-Optimize-HashMapPalette.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...ingle-and-multi-AABB-VoxelShapes-an.patch} |  2 +-
 ...n-checking-in-player-move-packet-ha.patch} |  0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |  0
 ...patch => 0764-Add-more-Campfire-API.patch} |  0
 ...data-to-disk-if-it-serializes-witho.patch} |  0
 ...66-Fix-tripwire-state-inconsistency.patch} |  0
 ...ard-CraftEntity-in-teleport-command.patch} |  0
 ... => 0768-Improve-scoreboard-entries.patch} |  0
 ...ch => 0769-Entity-powdered-snow-API.patch} |  0
 ...0770-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
 ...=> 0776-Fix-bees-aging-inside-hives.patch} |  0
 ...le-API.patch => 0777-Bucketable-API.patch} |  0
 ...es.patch => 0778-Validate-usernames.patch} |  4 ++--
 ...er-animal-spawn-height-configurable.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  2 +-
 ...ion-for-worlds-affected-by-time-cmd.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...3-Multiple-Entries-with-Scoreboards.patch} |  0
 ...784-Reset-placed-block-on-exception.patch} |  0
 ...configurable-height-for-slime-spawn.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  2 +-
 ...0787-Fix-xp-reward-for-baby-zombies.patch} |  0
 ... 0788-Kick-on-main-for-illegal-chat.patch} |  0
 ...lti-Block-Change-API-Implementation.patch} |  0
 ...ent.patch => 0790-Fix-NotePlayEvent.patch} |  0
 ....patch => 0791-Freeze-Tick-Lock-API.patch} |  2 +-
 ...lphin-API.patch => 0792-Dolphin-API.patch} |  0
 ...h => 0793-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 => 0797-Implement-regenerateChunk.patch} |  2 +-
 ...lled-powdered-snow-bucket-placement.patch} |  4 ++--
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |  0
 ...gs.patch => 0800-Add-GameEvent-tags.patch} |  0
 ...ks-fairly-for-worlds-while-waiting-.patch} |  0
 ...tch => 0802-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
 ... => 0807-Fix-Entity-Position-Desync.patch} |  0
 ...s.patch => 0808-Custom-Potion-Mixes.patch} |  0
 ...0809-Fix-Fluid-tags-isTagged-method.patch} |  2 +-
 ...10-Force-close-world-loading-screen.patch} |  2 +-
 ...811-Fix-falling-block-spawn-methods.patch} |  2 +-
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...ojectileHitEvent-for-piercing-arrow.patch} |  2 +-
 ...I.patch => 0814-More-Projectile-API.patch} |  2 +-
 ...x-swamp-hut-cat-generation-deadlock.patch} |  0
 ...le-movement-from-players-while-tele.patch} |  0
 ...0817-Implement-getComputedBiome-API.patch} |  0
 ...> 0818-Make-some-itemstacks-nonnull.patch} |  0
 ...819-Implement-enchantWithLevels-API.patch} |  0
 ...h => 0820-Fix-saving-in-unloadWorld.patch} |  0
 ...h => 0821-Buffer-OOB-setBlock-calls.patch} |  0
 ... 0822-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 => 0827-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} |  2 +-
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  4 ++--
 ...> 0836-WorldCreator-keepSpawnLoaded.patch} |  0
 ...-NPE-for-BlockDataMeta-getBlockData.patch} |  0
 ...destroyed-trigger-in-the-correct-pl.patch} |  0
 ...Event-and-CollarColorable-interface.patch} |  0
 ...CauldronLevelChange-on-initial-fill.patch} |  0
 ...snow-cauldrons-not-turning-to-water.patch} |  0
 ...> 0842-Add-PlayerStopUsingItemEvent.patch} |  2 +-
 ...43-FallingBlock-auto-expire-setting.patch} |  0
 ...rs.patch => 0844-Don-t-tick-markers.patch} |  2 +-
 ...-not-accept-invalid-client-settings.patch} |  0
 ...0846-Add-support-for-Proxy-Protocol.patch} |  0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |  2 +-
 ...tory-for-smokers-and-blast-furnaces.patch} |  0
 ... 0849-Sanitize-Sent-BlockEntity-NBT.patch} |  0
 ...ntity-loading-causing-async-lookups.patch} |  2 +-
 ...-selector-resolving-in-books-by-def.patch} |  0
 ...-on-world-create-while-being-ticked.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...54-Dont-resent-entity-on-art-update.patch} |  0
 ... => 0855-Add-WardenAngerChangeEvent.patch} |  0
 ...strict-advancement-dimension-checks.patch} |  0
 ...tant-BlockStateListPopulator-method.patch} |  0
 ...I.patch => 0858-Nameable-Banner-API.patch} |  0
 ...roadcast-messages-to-command-blocks.patch} |  0
 ...pty-items-from-being-added-to-world.patch} |  0
 ...hPotion-and-LingeringPotion-spawnin.patch} |  0
 ...nent-in-resource-pack-rejection-mes.patch} |  0
 ...atch => 0863-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 => 0867-Fix-Bee-flower-NPE.patch} |  0
 ...-not-using-commands.spam-exclusions.patch} |  0
 ...API.patch => 0869-More-Teleport-API.patch} |  0
 ... => 0870-Add-EntityPortalReadyEvent.patch} |  0
 ...level-random-in-entity-constructors.patch} |  0
 ...k-entities-after-destroy-prediction.patch} |  0
 ...on-plugins-accessing-faraway-chunks.patch} |  2 +-
 ...tom-Chat-Completion-Suggestions-API.patch} |  0
 ...=> 0875-Add-missing-BlockFadeEvents.patch} |  0
 ...ion-API.patch => 0876-Collision-API.patch} |  0
 ...nd-message-for-brigadier-syntax-exc.patch} |  0
 ...-invalid-signature-login-stacktrace.patch} |  0
 ...-to-PlayerConnection-internalTelepo.patch} |  0
 ...API.patch => 0880-Block-Ticking-API.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  2 +-
 ...andom-in-ServerLoginPacketListenerI.patch} |  2 +-
 ...883-Add-NamespacedKey-biome-methods.patch} |  0
 ...x-plugin-loggers-on-server-shutdown.patch} |  2 +-
 ...und-for-client-lag-spikes-MC-162253.patch} |  0
 ...ok-changes-from-crashing-the-server.patch} |  2 +-
 ...estroyerIdentity-to-sendBlockDamage.patch} |  0
 ...t-killed-statuses-should-be-false-f.patch} |  0
 ...tityChangeBlockEvent-in-more-places.patch} |  0
 ...> 0890-Missing-eating-regain-reason.patch} |  0
 ....patch => 0891-Missing-effect-cause.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...4-Call-BlockPhysicsEvent-more-often.patch} |  0
 ...0895-Configurable-chat-thread-limit.patch} |  0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |  2 +-
 ...re-player-sending-on-dimension-chan.patch} |  0
 ... 0898-fix-Jigsaw-block-kicking-user.patch} |  0
 ...mEvent-for-mud-converting-into-clay.patch} |  0
 ...lockState-and-isPreferredTool-to-Bl.patch} |  0
 ...=> 0901-Fix-a-bunch-of-vanilla-bugs.patch} |  0
 ...y-onTrackingStart-during-navigation.patch} |  0
 ... 0903-Fix-custom-piglin-loved-items.patch} |  0
 ...=> 0904-EntityPickupItemEvent-fixes.patch} |  0
 ...interactions-with-items-on-cooldown.patch} |  2 +-
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  0
 ... 0907-Elder-Guardian-appearance-API.patch} |  0
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...ch => 0909-Add-entity-knockback-API.patch} |  0
 ....patch => 0910-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...2-optimized-dirt-and-snow-spreading.patch} |  0
 ... => 0913-Added-EntityToggleSitEvent.patch} |  0
 ... => 0914-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0915-Add-Moving-Piston-API.patch} |  0
 ...> 0916-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
 ...0921-Add-PrePlayerAttackEntityEvent.patch} |  2 +-
 ...e-reset-EnderDragon-boss-event-name.patch} |  0
 ...-green-map-markers-do-not-disappear.patch} |  0
 ... 0924-Add-Player-Warden-Warning-API.patch} |  0
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...926-Add-paper-dumplisteners-command.patch} |  0
 ...lobal-player-list-where-appropriate.patch} |  0
 ...sync-entity-add-due-to-fungus-trees.patch} |  0
 ....patch => 0929-ItemStack-damage-API.patch} |  0
 ...tion-API.patch => 0930-Friction-API.patch} |  0
 ...trol-player-s-insomnia-and-phantoms.patch} |  0
 ...=> 0932-Fix-player-kick-on-shutdown.patch} |  0
 ... => 0933-Sync-offhand-slot-in-menus.patch} |  0
 ... 0934-Player-Entity-Tracking-Events.patch} |  0
 ...tch => 0935-Limit-pet-look-distance.patch} |  0
 ...ch => 0936-Properly-resend-entities.patch} |  2 +-
 ...nd-additions-to-the-SpawnReason-API.patch} |  2 +-
 ...ments.patch => 0938-fix-Instruments.patch} |  0
 ...939-Fix-chunk-snapshot-biome-getter.patch} |  0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |  0
 ...-MapLike-Codec-missing-key-selector.patch} |  0
 ...es-in-dispense-events-regarding-sta.patch} |  0
 ... => 0943-Improve-logging-and-errors.patch} |  0
 ...-explosion-yield-with-new-gamerules.patch} |  0
 ...tch => 0945-Add-BlockLockCheckEvent.patch} |  0
 ... 0946-Add-Sneaking-API-for-Entities.patch} |  0
 ....patch => 0947-Improve-PortalEvents.patch} |  0
 ...ed-block-state-to-BlockExplodeEvent.patch} |  0
 ...ion-for-spider-worldborder-climbing.patch} |  0
 ...sing-SpigotConfig-logCommands-check.patch} |  0
 ...Allay-stopDancing-while-not-dancing.patch} |  0
 ...ge.patch => 0952-Flying-Fall-Damage.patch} |  0
 ...ion-moving-velocity-to-VehicleBlock.patch} |  0
 ...onfig-for-disabling-entity-tag-tags.patch} |  2 +-
 ...e-player-info-update-packet-on-join.patch} |  2 +-
 ...k-items-during-EntityResurrectEvent.patch} |  0
 ...-Player-sendEquipmentChange-Map-API.patch} |  0
 ...en-API.patch => 0958-Win-Screen-API.patch} |  0
 ...ItemStack-setAmount-null-assignment.patch} |  0
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 514 files changed, 124 insertions(+), 143 deletions(-)
 delete mode 100644 patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
 rename patches/server/{0456-Fix-some-rails-connecting-improperly.patch => 0455-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0457-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0458-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0457-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0459-Brand-support.patch => 0458-Brand-support.patch} (100%)
 rename patches/server/{0460-Add-setMaxPlayers-API.patch => 0459-Add-setMaxPlayers-API.patch} (94%)
 rename patches/server/{0461-Add-playPickupItemAnimation-to-LivingEntity.patch => 0460-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0462-Don-t-require-FACING-data.patch => 0461-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (96%)
 rename patches/server/{0464-Add-moon-phase-API.patch => 0463-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0465-Prevent-headless-pistons-from-being-created.patch => 0464-Prevent-headless-pistons-from-being-created.patch} (95%)
 rename patches/server/{0466-Add-BellRingEvent.patch => 0465-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0467-Add-zombie-targets-turtle-egg-config.patch => 0466-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename patches/server/{0468-Buffer-joins-to-world.patch => 0467-Buffer-joins-to-world.patch} (100%)
 rename patches/server/{0469-Eigencraft-redstone-implementation.patch => 0468-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0470-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0469-Fix-hex-colors-not-working-in-some-kick-messages.patch} (97%)
 rename patches/server/{0471-PortalCreateEvent-needs-to-know-its-entity.patch => 0470-PortalCreateEvent-needs-to-know-its-entity.patch} (98%)
 rename patches/server/{0472-Fix-CraftTeam-null-check.patch => 0471-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0473-Add-more-Evoker-API.patch => 0472-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0474-Add-methods-to-get-translation-keys.patch => 0473-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/server/{0475-Create-HoverEvent-from-ItemStack-Entity.patch => 0474-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0476-Cache-block-data-strings.patch => 0475-Cache-block-data-strings.patch} (100%)
 rename patches/server/{0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (98%)
 rename patches/server/{0478-Add-additional-open-container-api-to-HumanEntity.patch => 0477-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0479-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0480-Extend-block-drop-capture-to-capture-all-items-added.patch => 0479-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename patches/server/{0481-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0482-Lazily-track-plugin-scoreboards-by-default.patch => 0481-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename patches/server/{0483-Entity-isTicking.patch => 0482-Entity-isTicking.patch} (100%)
 rename patches/server/{0484-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename patches/server/{0485-Fix-Concurrency-issue-in-ShufflingList.patch => 0484-Fix-Concurrency-issue-in-ShufflingList.patch} (100%)
 rename patches/server/{0486-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0487-Fix-for-large-move-vectors-crashing-server.patch => 0486-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0488-Optimise-getType-calls.patch => 0487-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0489-Villager-resetOffers.patch => 0488-Villager-resetOffers.patch} (100%)
 rename patches/server/{0490-Retain-block-place-order-when-capturing-blockstates.patch => 0489-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0491-Reduce-blockpos-allocation-from-pathfinding.patch => 0490-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0492-Fix-item-locations-dropped-from-campfires.patch => 0491-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0493-Player-elytra-boost-API.patch => 0492-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0494-Fixed-TileEntityBell-memory-leak.patch => 0493-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0495-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0496-Add-getOfflinePlayerIfCached-String.patch => 0495-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0497-Add-ignore-discounts-API.patch => 0496-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0498-Toggle-for-removing-existing-dragon.patch => 0497-Toggle-for-removing-existing-dragon.patch} (100%)
 rename patches/server/{0499-Fix-client-lag-on-advancement-loading.patch => 0498-Fix-client-lag-on-advancement-loading.patch} (95%)
 rename patches/server/{0500-Item-no-age-no-player-pickup.patch => 0499-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0501-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0502-Beacon-API-custom-effect-ranges.patch => 0501-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0503-Add-API-for-quit-reason.patch => 0502-Add-API-for-quit-reason.patch} (98%)
 rename patches/server/{0504-Add-Wandering-Trader-spawn-rate-config-options.patch => 0503-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename patches/server/{0505-Expose-world-spawn-angle.patch => 0504-Expose-world-spawn-angle.patch} (93%)
 rename patches/server/{0506-Add-Destroy-Speed-API.patch => 0505-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0508-Add-LivingEntity-clearActiveItem.patch => 0507-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0509-Add-PlayerItemCooldownEvent.patch => 0508-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0510-Significantly-improve-performance-of-the-end-generat.patch => 0509-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0511-More-lightning-API.patch => 0510-More-lightning-API.patch} (100%)
 rename patches/server/{0512-Climbing-should-not-bypass-cramming-gamerule.patch => 0511-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename patches/server/{0513-Added-missing-default-perms-for-commands.patch => 0512-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0514-Add-PlayerShearBlockEvent.patch => 0513-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0515-Fix-curing-zombie-villager-discount-exploit.patch => 0514-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename patches/server/{0516-Limit-recipe-packets.patch => 0515-Limit-recipe-packets.patch} (100%)
 rename patches/server/{0517-Fix-CraftSound-backwards-compatibility.patch => 0516-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0518-Player-Chunk-Load-Unload-Events.patch => 0517-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/server/{0519-Optimize-Dynamic-get-Missing-Keys.patch => 0518-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0520-Expose-LivingEntity-hurt-direction.patch => 0519-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (91%)
 rename patches/server/{0522-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0523-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0524-Implement-TargetHitEvent.patch => 0523-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0525-MC-4-Fix-item-position-desync.patch => 0524-MC-4-Fix-item-position-desync.patch} (100%)
 rename patches/server/{0526-Additional-Block-Material-API-s.patch => 0525-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0527-Fix-harming-potion-dupe.patch => 0526-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0528-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0529-Cache-burn-durations.patch => 0528-Cache-burn-durations.patch} (100%)
 rename patches/server/{0530-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename patches/server/{0531-Fix-Not-a-string-Map-Conversion-spam.patch => 0530-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0532-Implement-PlayerFlowerPotManipulateEvent.patch => 0531-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0533-Fix-interact-event-not-being-called-in-adventure.patch => 0532-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0534-Zombie-API-breaking-doors.patch => 0533-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0535-Fix-nerfed-slime-when-splitting.patch => 0534-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0536-Add-EntityLoadCrossbowEvent.patch => 0535-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0537-Added-WorldGameRuleChangeEvent.patch => 0536-Added-WorldGameRuleChangeEvent.patch} (98%)
 rename patches/server/{0538-Added-ServerResourcesReloadedEvent.patch => 0537-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/server/{0539-Added-world-settings-for-mobs-picking-up-loot.patch => 0538-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename patches/server/{0540-Implemented-BlockFailedDispenseEvent.patch => 0539-Implemented-BlockFailedDispenseEvent.patch} (96%)
 rename patches/server/{0541-Added-PlayerLecternPageChangeEvent.patch => 0540-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0542-Added-PlayerLoomPatternSelectEvent.patch => 0541-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0543-Configurable-door-breaking-difficulty.patch => 0542-Configurable-door-breaking-difficulty.patch} (100%)
 rename patches/server/{0544-Empty-commands-shall-not-be-dispatched.patch => 0543-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0545-Implement-API-to-expose-exact-interaction-point.patch => 0544-Implement-API-to-expose-exact-interaction-point.patch} (97%)
 rename patches/server/{0546-Remove-stale-POIs.patch => 0545-Remove-stale-POIs.patch} (100%)
 rename patches/server/{0547-Fix-villager-boat-exploit.patch => 0546-Fix-villager-boat-exploit.patch} (93%)
 rename patches/server/{0548-Add-sendOpLevel-API.patch => 0547-Add-sendOpLevel-API.patch} (95%)
 rename patches/server/{0549-Add-PaperRegistry.patch => 0548-Add-PaperRegistry.patch} (100%)
 rename patches/server/{0550-Add-StructuresLocateEvent.patch => 0549-Add-StructuresLocateEvent.patch} (100%)
 rename patches/server/{0551-Collision-option-for-requiring-a-player-participant.patch => 0550-Collision-option-for-requiring-a-player-participant.patch} (96%)
 rename patches/server/{0552-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0553-Return-chat-component-with-empty-text-instead-of-thr.patch => 0552-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0554-Make-schedule-command-per-world.patch => 0553-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0555-Configurable-max-leash-distance.patch => 0554-Configurable-max-leash-distance.patch} (100%)
 rename patches/server/{0556-Implement-BlockPreDispenseEvent.patch => 0555-Implement-BlockPreDispenseEvent.patch} (95%)
 rename patches/server/{0557-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0558-Add-toggle-for-always-placing-the-dragon-egg.patch => 0557-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename patches/server/{0559-Added-PlayerStonecutterRecipeSelectEvent.patch => 0558-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0560-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (98%)
 rename patches/server/{0561-Reset-shield-blocking-on-dimension-change.patch => 0560-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename patches/server/{0562-add-DragonEggFormEvent.patch => 0561-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0563-EntityMoveEvent.patch => 0562-EntityMoveEvent.patch} (97%)
 rename patches/server/{0564-added-option-to-disable-pathfinding-updates-on-block.patch => 0563-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename patches/server/{0565-Inline-shift-direction-fields.patch => 0564-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0566-Allow-adding-items-to-BlockDropItemEvent.patch => 0565-Allow-adding-items-to-BlockDropItemEvent.patch} (95%)
 rename patches/server/{0567-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0568-living-entity-allow-attribute-registration.patch => 0567-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0569-fix-dead-slime-setSize-invincibility.patch => 0568-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0570-Merchant-getRecipes-should-return-an-immutable-list.patch => 0569-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0571-Add-support-for-hex-color-codes-in-console.patch => 0570-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0572-Expose-Tracked-Players.patch => 0571-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0573-Remove-streams-from-SensorNearest.patch => 0572-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0574-Throw-proper-exception-on-empty-JsonList-file.patch => 0573-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0575-Improve-ServerGUI.patch => 0574-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0576-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0577-fix-converting-txt-to-json-file.patch => 0576-fix-converting-txt-to-json-file.patch} (97%)
 rename patches/server/{0578-Add-worldborder-events.patch => 0577-Add-worldborder-events.patch} (100%)
 rename patches/server/{0579-added-PlayerNameEntityEvent.patch => 0578-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0580-Prevent-grindstones-from-overstacking-items.patch => 0579-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0581-Add-recipe-to-cook-events.patch => 0580-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0582-Add-Block-isValidTool.patch => 0581-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0583-Allow-using-signs-inside-spawn-protection.patch => 0582-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename patches/server/{0584-Expand-world-key-API.patch => 0583-Expand-world-key-API.patch} (100%)
 rename patches/server/{0585-Add-fast-alternative-constructor-for-Rotations.patch => 0584-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0586-Item-Rarity-API.patch => 0585-Item-Rarity-API.patch} (100%)
 rename patches/server/{0587-copy-TESign-isEditable-from-snapshots.patch => 0586-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0588-Drop-carried-item-when-player-has-disconnected.patch => 0587-Drop-carried-item-when-player-has-disconnected.patch} (92%)
 rename patches/server/{0589-forced-whitelist-use-configurable-kick-message.patch => 0588-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0590-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0591-Entity-load-save-limit-per-chunk.patch => 0590-Entity-load-save-limit-per-chunk.patch} (97%)
 rename patches/server/{0592-Expose-protocol-version.patch => 0591-Expose-protocol-version.patch} (100%)
 rename patches/server/{0593-Enhance-console-tab-completions-for-brigadier-comman.patch => 0592-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0594-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (92%)
 rename patches/server/{0595-Add-bypass-host-check.patch => 0594-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0596-Set-area-affect-cloud-rotation.patch => 0595-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0597-add-isDeeplySleeping-to-HumanEntity.patch => 0596-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0598-add-consumeFuel-to-FurnaceBurnEvent.patch => 0597-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0599-add-get-set-drop-chance-to-EntityEquipment.patch => 0598-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0600-fix-PigZombieAngerEvent-cancellation.patch => 0599-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0601-Fix-checkReach-check-for-Shulker-boxes.patch => 0600-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0602-fix-PlayerItemHeldEvent-firing-twice.patch => 0601-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0603-Added-PlayerDeepSleepEvent.patch => 0602-Added-PlayerDeepSleepEvent.patch} (91%)
 rename patches/server/{0604-More-World-API.patch => 0603-More-World-API.patch} (97%)
 rename patches/server/{0605-Added-PlayerBedFailEnterEvent.patch => 0604-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0606-Implement-methods-to-convert-between-Component-and-B.patch => 0605-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0607-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0606-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (95%)
 rename patches/server/{0608-Introduce-beacon-activation-deactivation-events.patch => 0607-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0609-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0608-add-RespawnFlags-to-PlayerRespawnEvent.patch} (97%)
 rename patches/server/{0610-Add-Channel-initialization-listeners.patch => 0609-Add-Channel-initialization-listeners.patch} (98%)
 rename patches/server/{0611-Send-empty-commands-if-tab-completion-is-disabled.patch => 0610-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0612-Add-more-WanderingTrader-API.patch => 0611-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0613-Add-EntityBlockStorage-clearEntities.patch => 0612-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0614-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0613-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0615-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0614-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (95%)
 rename patches/server/{0616-Inventory-close.patch => 0615-Inventory-close.patch} (100%)
 rename patches/server/{0617-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0616-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0618-Fix-CraftPotionBrewer-cache.patch => 0617-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0619-Add-basic-Datapack-API.patch => 0618-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0620-Add-environment-variable-to-disable-server-gui.patch => 0619-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0621-additions-to-PlayerGameModeChangeEvent.patch => 0620-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0622-ItemStack-repair-check-API.patch => 0621-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0623-More-Enchantment-API.patch => 0622-More-Enchantment-API.patch} (100%)
 rename patches/server/{0624-Move-range-check-for-block-placing-up.patch => 0623-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0625-Fix-and-optimise-world-force-upgrading.patch => 0624-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{0626-Add-Mob-lookAt-API.patch => 0625-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0627-Add-Unix-domain-socket-support.patch => 0626-Add-Unix-domain-socket-support.patch} (98%)
 rename patches/server/{0628-Add-EntityInsideBlockEvent.patch => 0627-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0629-Attributes-API-for-item-defaults.patch => 0628-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0630-Add-cause-to-Weather-ThunderChangeEvents.patch => 0629-Add-cause-to-Weather-ThunderChangeEvents.patch} (98%)
 rename patches/server/{0631-More-Lidded-Block-API.patch => 0630-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0632-Limit-item-frame-cursors-on-maps.patch => 0631-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0633-Add-PlayerKickEvent-causes.patch => 0632-Add-PlayerKickEvent-causes.patch} (99%)
 rename patches/server/{0634-Add-PufferFishStateChangeEvent.patch => 0633-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0635-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0634-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0636-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0635-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0637-Add-option-to-fix-items-merging-through-walls.patch => 0636-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0638-Add-BellRevealRaiderEvent.patch => 0637-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0639-Fix-invulnerable-end-crystals.patch => 0638-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0640-Add-ElderGuardianAppearanceEvent.patch => 0639-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0641-Fix-dangerous-end-portal-logic.patch => 0640-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0642-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0641-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0643-Make-item-validations-configurable.patch => 0642-Make-item-validations-configurable.patch} (100%)
 rename patches/server/{0644-Line-Of-Sight-Changes.patch => 0643-Line-Of-Sight-Changes.patch} (98%)
 rename patches/server/{0645-add-per-world-spawn-limits.patch => 0644-add-per-world-spawn-limits.patch} (91%)
 rename patches/server/{0646-Fix-potions-splash-events.patch => 0645-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0647-Add-more-LimitedRegion-API.patch => 0646-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0648-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0647-Fix-PlayerDropItemEvent-using-wrong-item.patch} (94%)
 rename patches/server/{0649-Missing-Entity-Behavior-API.patch => 0648-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/server/{0650-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0649-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0651-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0650-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0652-Use-getChunkIfLoadedImmediately-in-places.patch => 0651-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0653-Fix-commands-from-signs-not-firing-command-events.patch => 0652-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0654-Adds-PlayerArmSwingEvent.patch => 0653-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0655-Fixes-kick-event-leave-message-not-being-sent.patch => 0654-Fixes-kick-event-leave-message-not-being-sent.patch} (98%)
 rename patches/server/{0656-Add-config-for-mobs-immune-to-default-effects.patch => 0655-Add-config-for-mobs-immune-to-default-effects.patch} (97%)
 rename patches/server/{0657-Fix-incorrect-message-for-outdated-client.patch => 0656-Fix-incorrect-message-for-outdated-client.patch} (100%)
 rename patches/server/{0658-Don-t-apply-cramming-damage-to-players.patch => 0657-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0659-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0658-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0660-Add-a-bunch-of-missing-forceDrop-toggles.patch => 0659-Add-a-bunch-of-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0661-Stinger-API.patch => 0660-Stinger-API.patch} (100%)
 rename patches/server/{0662-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0661-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%)
 rename patches/server/{0663-Add-System.out-err-catcher.patch => 0662-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0664-Fix-test-not-bootstrapping.patch => 0663-Fix-test-not-bootstrapping.patch} (100%)
 rename patches/server/{0665-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0664-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/server/{0666-Improve-boat-collision-performance.patch => 0665-Improve-boat-collision-performance.patch} (97%)
 rename patches/server/{0667-Prevent-AFK-kick-while-watching-end-credits.patch => 0666-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0668-Allow-skipping-writing-of-comments-to-server.propert.patch => 0667-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0669-Add-PlayerSetSpawnEvent.patch => 0668-Add-PlayerSetSpawnEvent.patch} (99%)
 rename patches/server/{0670-Make-hoppers-respect-inventory-max-stack-size.patch => 0669-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0671-Optimize-entity-tracker-passenger-checks.patch => 0670-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0672-Config-option-for-Piglins-guarding-chests.patch => 0671-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0673-Added-EntityDamageItemEvent.patch => 0672-Added-EntityDamageItemEvent.patch} (90%)
 rename patches/server/{0674-Optimize-indirect-passenger-iteration.patch => 0673-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0675-Fix-block-drops-position-losing-precision-millions-o.patch => 0674-Fix-block-drops-position-losing-precision-millions-o.patch} (100%)
 rename patches/server/{0676-Configurable-item-frame-map-cursor-update-interval.patch => 0675-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0677-Make-EntityUnleashEvent-cancellable.patch => 0676-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/server/{0678-Clear-bucket-NBT-after-dispense.patch => 0677-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0679-Change-EnderEye-target-without-changing-other-things.patch => 0678-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0680-Add-BlockBreakBlockEvent.patch => 0679-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0681-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0680-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/server/{0682-More-CommandBlock-API.patch => 0681-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0683-Add-missing-team-sidebar-display-slots.patch => 0682-Add-missing-team-sidebar-display-slots.patch} (98%)
 rename patches/server/{0684-Add-back-EntityPortalExitEvent.patch => 0683-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0685-Add-methods-to-find-targets-for-lightning-strikes.patch => 0684-Add-methods-to-find-targets-for-lightning-strikes.patch} (96%)
 rename patches/server/{0686-Get-entity-default-attributes.patch => 0685-Get-entity-default-attributes.patch} (100%)
 rename patches/server/{0687-Left-handed-API.patch => 0686-Left-handed-API.patch} (100%)
 rename patches/server/{0688-Add-more-advancement-API.patch => 0687-Add-more-advancement-API.patch} (99%)
 rename patches/server/{0689-Add-ItemFactory-getSpawnEgg-API.patch => 0688-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0690-Add-critical-damage-API.patch => 0689-Add-critical-damage-API.patch} (96%)
 rename patches/server/{0691-Fix-issues-with-mob-conversion.patch => 0690-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0692-Add-isCollidable-methods-to-various-places.patch => 0691-Add-isCollidable-methods-to-various-places.patch} (100%)
 rename patches/server/{0693-Goat-ram-API.patch => 0692-Goat-ram-API.patch} (100%)
 rename patches/server/{0694-Add-API-for-resetting-a-single-score.patch => 0693-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0695-Add-Raw-Byte-Entity-Serialization.patch => 0694-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/server/{0696-Vanilla-command-permission-fixes.patch => 0695-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0697-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0696-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (97%)
 rename patches/server/{0698-Fix-GameProfileCache-concurrency.patch => 0697-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0699-Log-when-the-async-catcher-is-tripped.patch => 0698-Log-when-the-async-catcher-is-tripped.patch} (100%)
 rename patches/server/{0700-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0699-Add-paper-mobcaps-and-paper-playermobcaps.patch} (99%)
 rename patches/server/{0701-Sanitize-ResourceLocation-error-logging.patch => 0700-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0702-Allow-controlled-flushing-for-network-manager.patch => 0701-Allow-controlled-flushing-for-network-manager.patch} (98%)
 rename patches/server/{0703-Optimise-general-POI-access.patch => 0702-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{0704-Optimise-chunk-tick-iteration.patch => 0703-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{0705-Execute-chunk-tasks-mid-tick.patch => 0704-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{0706-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 0705-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{0707-Custom-table-implementation-for-blockstate-state-loo.patch => 0706-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{0708-Detail-more-information-in-watchdog-dumps.patch => 0707-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{0709-Manually-inline-methods-in-BlockPosition.patch => 0708-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0710-Distance-manager-tick-timings.patch => 0709-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{0711-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0710-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0712-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0711-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0713-Add-packet-limiter-config.patch => 0712-Add-packet-limiter-config.patch} (98%)
 rename patches/server/{0714-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0713-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0715-Consolidate-flush-calls-for-entity-tracker-packets.patch => 0714-Consolidate-flush-calls-for-entity-tracker-packets.patch} (100%)
 rename patches/server/{0716-Don-t-lookup-fluid-state-when-raytracing.patch => 0715-Don-t-lookup-fluid-state-when-raytracing.patch} (100%)
 rename patches/server/{0717-Time-scoreboard-search.patch => 0716-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0718-Send-full-pos-packets-for-hard-colliding-entities.patch => 0717-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{0719-Do-not-run-raytrace-logic-for-AIR.patch => 0718-Do-not-run-raytrace-logic-for-AIR.patch} (100%)
 rename patches/server/{0720-Oprimise-map-impl-for-tracked-players.patch => 0719-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0721-Optimise-BlockSoil-nearby-water-lookup.patch => 0720-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0722-Optimise-random-block-ticking.patch => 0721-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{0723-Optimise-non-flush-packet-sending.patch => 0722-Optimise-non-flush-packet-sending.patch} (96%)
 rename patches/server/{0724-Optimise-nearby-player-lookups.patch => 0723-Optimise-nearby-player-lookups.patch} (100%)
 rename patches/server/{0725-Remove-streams-for-villager-AI.patch => 0724-Remove-streams-for-villager-AI.patch} (100%)
 rename patches/server/{0726-Use-Velocity-compression-and-cipher-natives.patch => 0725-Use-Velocity-compression-and-cipher-natives.patch} (98%)
 rename patches/server/{0727-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch => 0726-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch} (100%)
 rename patches/server/{0728-Async-catch-modifications-to-critical-entity-state.patch => 0727-Async-catch-modifications-to-critical-entity-state.patch} (100%)
 rename patches/server/{0729-Fix-Bukkit-NamespacedKey-shenanigans.patch => 0728-Fix-Bukkit-NamespacedKey-shenanigans.patch} (100%)
 rename patches/server/{0730-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0729-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0731-Check-requirement-before-suggesting-root-nodes.patch => 0730-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0732-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0731-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0733-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0732-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0734-Ensure-valid-vehicle-status.patch => 0733-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0735-Prevent-softlocked-end-exit-portal-generation.patch => 0734-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0736-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0735-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0737-Don-t-log-debug-logging-being-disabled.patch => 0736-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0738-fix-various-menus-with-empty-level-accesses.patch => 0737-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0739-Preserve-overstacked-loot.patch => 0738-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0740-Update-head-rotation-in-missing-places.patch => 0739-Update-head-rotation-in-missing-places.patch} (93%)
 rename patches/server/{0741-prevent-unintended-light-block-manipulation.patch => 0740-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0742-Fix-CraftCriteria-defaults-map.patch => 0741-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0743-Fix-upstreams-block-state-factories.patch => 0742-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0744-Add-config-option-for-logging-player-ip-addresses.patch => 0743-Add-config-option-for-logging-player-ip-addresses.patch} (97%)
 rename patches/server/{0745-Configurable-feature-seeds.patch => 0744-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0746-VanillaCommandWrapper-didnt-account-for-entity-sende.patch => 0745-VanillaCommandWrapper-didnt-account-for-entity-sende.patch} (100%)
 rename patches/server/{0747-Add-root-admin-user-detection.patch => 0746-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0748-Always-allow-item-changing-in-Fireball.patch => 0747-Always-allow-item-changing-in-Fireball.patch} (100%)
 rename patches/server/{0749-don-t-attempt-to-teleport-dead-entities.patch => 0748-don-t-attempt-to-teleport-dead-entities.patch} (91%)
 rename patches/server/{0750-Prevent-excessive-velocity-through-repeated-crits.patch => 0749-Prevent-excessive-velocity-through-repeated-crits.patch} (94%)
 rename patches/server/{0751-Remove-client-side-code-using-deprecated-for-removal.patch => 0750-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0752-Always-parse-protochunk-light-sources-unless-it-is-m.patch => 0751-Always-parse-protochunk-light-sources-unless-it-is-m.patch} (100%)
 rename patches/server/{0753-Fix-removing-recipes-from-RecipeIterator.patch => 0752-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0754-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0753-Prevent-sending-oversized-item-data-in-equipment-and.patch} (97%)
 rename patches/server/{0755-Hide-unnecessary-itemmeta-from-clients.patch => 0754-Hide-unnecessary-itemmeta-from-clients.patch} (98%)
 rename patches/server/{0756-Fix-Spigot-growth-modifiers.patch => 0755-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0757-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0756-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0758-Add-PlayerItemFrameChangeEvent.patch => 0757-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0759-Add-player-health-update-API.patch => 0758-Add-player-health-update-API.patch} (100%)
 rename patches/server/{0760-Optimize-HashMapPalette.patch => 0759-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0761-Allow-delegation-to-vanilla-chunk-gen.patch => 0760-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0762-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch => 0761-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch} (99%)
 rename patches/server/{0763-Optimise-collision-checking-in-player-move-packet-ha.patch => 0762-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{0764-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0763-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0765-Add-more-Campfire-API.patch => 0764-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0766-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0765-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0767-Fix-tripwire-state-inconsistency.patch => 0766-Fix-tripwire-state-inconsistency.patch} (100%)
 rename patches/server/{0768-Forward-CraftEntity-in-teleport-command.patch => 0767-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0769-Improve-scoreboard-entries.patch => 0768-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0770-Entity-powdered-snow-API.patch => 0769-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0771-Add-API-for-item-entity-health.patch => 0770-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0772-Fix-entity-type-tags-suggestions-in-selectors.patch => 0771-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{0773-Configurable-max-block-light-for-monster-spawning.patch => 0772-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0774-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0773-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0775-Load-effect-amplifiers-greater-than-127-correctly.patch => 0774-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%)
 rename patches/server/{0776-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0775-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0777-Fix-bees-aging-inside-hives.patch => 0776-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0778-Bucketable-API.patch => 0777-Bucketable-API.patch} (100%)
 rename patches/server/{0779-Validate-usernames.patch => 0778-Validate-usernames.patch} (94%)
 rename patches/server/{0780-Make-water-animal-spawn-height-configurable.patch => 0779-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0781-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0780-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (98%)
 rename patches/server/{0782-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0781-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0783-Add-new-overload-to-PersistentDataContainer-has.patch => 0782-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/server/{0784-Multiple-Entries-with-Scoreboards.patch => 0783-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0785-Reset-placed-block-on-exception.patch => 0784-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0786-Add-configurable-height-for-slime-spawn.patch => 0785-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0787-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0786-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (94%)
 rename patches/server/{0788-Fix-xp-reward-for-baby-zombies.patch => 0787-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0789-Kick-on-main-for-illegal-chat.patch => 0788-Kick-on-main-for-illegal-chat.patch} (100%)
 rename patches/server/{0790-Multi-Block-Change-API-Implementation.patch => 0789-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0791-Fix-NotePlayEvent.patch => 0790-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0792-Freeze-Tick-Lock-API.patch => 0791-Freeze-Tick-Lock-API.patch} (97%)
 rename patches/server/{0793-Dolphin-API.patch => 0792-Dolphin-API.patch} (100%)
 rename patches/server/{0794-More-PotionEffectType-API.patch => 0793-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0795-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0794-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0796-API-for-creating-command-sender-which-forwards-feedb.patch => 0795-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0797-Add-missing-structure-set-seed-configs.patch => 0796-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0798-Implement-regenerateChunk.patch => 0797-Implement-regenerateChunk.patch} (98%)
 rename patches/server/{0799-Fix-cancelled-powdered-snow-bucket-placement.patch => 0798-Fix-cancelled-powdered-snow-bucket-placement.patch} (95%)
 rename patches/server/{0800-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0799-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0801-Add-GameEvent-tags.patch => 0800-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0802-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0801-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0803-Furnace-RecipesUsed-API.patch => 0802-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0804-Configurable-sculk-sensor-listener-range.patch => 0803-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0805-Add-missing-block-data-mins-and-maxes.patch => 0804-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0806-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0805-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0807-Put-world-into-worldlist-before-initing-the-world.patch => 0806-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0808-Fix-Entity-Position-Desync.patch => 0807-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0809-Custom-Potion-Mixes.patch => 0808-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0810-Fix-Fluid-tags-isTagged-method.patch => 0809-Fix-Fluid-tags-isTagged-method.patch} (94%)
 rename patches/server/{0811-Force-close-world-loading-screen.patch => 0810-Force-close-world-loading-screen.patch} (95%)
 rename patches/server/{0812-Fix-falling-block-spawn-methods.patch => 0811-Fix-falling-block-spawn-methods.patch} (97%)
 rename patches/server/{0813-Expose-furnace-minecart-push-values.patch => 0812-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0814-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0813-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (95%)
 rename patches/server/{0815-More-Projectile-API.patch => 0814-More-Projectile-API.patch} (99%)
 rename patches/server/{0816-Fix-swamp-hut-cat-generation-deadlock.patch => 0815-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0817-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0816-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0818-Implement-getComputedBiome-API.patch => 0817-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0819-Make-some-itemstacks-nonnull.patch => 0818-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0820-Implement-enchantWithLevels-API.patch => 0819-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0821-Fix-saving-in-unloadWorld.patch => 0820-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0822-Buffer-OOB-setBlock-calls.patch => 0821-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0823-Add-TameableDeathMessageEvent.patch => 0822-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0824-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0823-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0825-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0824-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0826-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0825-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0827-Guard-against-invalid-entity-positions.patch => 0826-Guard-against-invalid-entity-positions.patch} (100%)
 rename patches/server/{0828-cache-resource-keys.patch => 0827-cache-resource-keys.patch} (100%)
 rename patches/server/{0829-Allow-to-change-the-podium-for-the-EnderDragon.patch => 0828-Allow-to-change-the-podium-for-the-EnderDragon.patch} (100%)
 rename patches/server/{0830-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0829-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0831-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch => 0830-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch} (100%)
 rename patches/server/{0832-Prevent-tile-entity-copies-loading-chunks.patch => 0831-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0833-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0832-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0834-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch => 0833-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch} (100%)
 rename patches/server/{0835-Pass-ServerLevel-for-gamerule-callbacks.patch => 0834-Pass-ServerLevel-for-gamerule-callbacks.patch} (99%)
 rename patches/server/{0836-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0835-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (89%)
 rename patches/server/{0837-WorldCreator-keepSpawnLoaded.patch => 0836-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0838-Fix-NPE-for-BlockDataMeta-getBlockData.patch => 0837-Fix-NPE-for-BlockDataMeta-getBlockData.patch} (100%)
 rename patches/server/{0839-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0838-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0840-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0839-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0841-Fire-CauldronLevelChange-on-initial-fill.patch => 0840-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0842-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0841-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0843-Add-PlayerStopUsingItemEvent.patch => 0842-Add-PlayerStopUsingItemEvent.patch} (91%)
 rename patches/server/{0844-FallingBlock-auto-expire-setting.patch => 0843-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/server/{0845-Don-t-tick-markers.patch => 0844-Don-t-tick-markers.patch} (96%)
 rename patches/server/{0846-Do-not-accept-invalid-client-settings.patch => 0845-Do-not-accept-invalid-client-settings.patch} (100%)
 rename patches/server/{0847-Add-support-for-Proxy-Protocol.patch => 0846-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0848-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0847-Fix-OfflinePlayer-getBedSpawnLocation.patch} (96%)
 rename patches/server/{0849-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0848-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0850-Sanitize-Sent-BlockEntity-NBT.patch => 0849-Sanitize-Sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0851-Prevent-entity-loading-causing-async-lookups.patch => 0850-Prevent-entity-loading-causing-async-lookups.patch} (97%)
 rename patches/server/{0852-Disable-component-selector-resolving-in-books-by-def.patch => 0851-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0853-Throw-exception-on-world-create-while-being-ticked.patch => 0852-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0854-Add-Alternate-Current-redstone-implementation.patch => 0853-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{0855-Dont-resent-entity-on-art-update.patch => 0854-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0856-Add-WardenAngerChangeEvent.patch => 0855-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0857-Add-option-for-strict-advancement-dimension-checks.patch => 0856-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0858-Add-missing-important-BlockStateListPopulator-method.patch => 0857-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0859-Nameable-Banner-API.patch => 0858-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0860-Don-t-broadcast-messages-to-command-blocks.patch => 0859-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0861-Prevent-empty-items-from-being-added-to-world.patch => 0860-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0862-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0861-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0863-Don-t-print-component-in-resource-pack-rejection-mes.patch => 0862-Don-t-print-component-in-resource-pack-rejection-mes.patch} (100%)
 rename patches/server/{0864-Add-Player-getFishHook.patch => 0863-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0865-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0864-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0866-Add-various-missing-EntityDropItemEvent-calls.patch => 0865-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0867-Add-some-minimal-debug-information-to-chat-packet-er.patch => 0866-Add-some-minimal-debug-information-to-chat-packet-er.patch} (100%)
 rename patches/server/{0868-Fix-Bee-flower-NPE.patch => 0867-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0869-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0868-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0870-More-Teleport-API.patch => 0869-More-Teleport-API.patch} (100%)
 rename patches/server/{0871-Add-EntityPortalReadyEvent.patch => 0870-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0872-Don-t-use-level-random-in-entity-constructors.patch => 0871-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0873-Send-block-entities-after-destroy-prediction.patch => 0872-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0874-Warn-on-plugins-accessing-faraway-chunks.patch => 0873-Warn-on-plugins-accessing-faraway-chunks.patch} (98%)
 rename patches/server/{0875-Custom-Chat-Completion-Suggestions-API.patch => 0874-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0876-Add-missing-BlockFadeEvents.patch => 0875-Add-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0877-Collision-API.patch => 0876-Collision-API.patch} (100%)
 rename patches/server/{0878-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0877-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0879-Remove-invalid-signature-login-stacktrace.patch => 0878-Remove-invalid-signature-login-stacktrace.patch} (100%)
 rename patches/server/{0880-Add-async-catcher-to-PlayerConnection-internalTelepo.patch => 0879-Add-async-catcher-to-PlayerConnection-internalTelepo.patch} (100%)
 rename patches/server/{0881-Block-Ticking-API.patch => 0880-Block-Ticking-API.patch} (100%)
 rename patches/server/{0882-Add-Velocity-IP-Forwarding-Support.patch => 0881-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename patches/server/{0883-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch => 0882-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch} (92%)
 rename patches/server/{0884-Add-NamespacedKey-biome-methods.patch => 0883-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/server/{0885-Fix-plugin-loggers-on-server-shutdown.patch => 0884-Fix-plugin-loggers-on-server-shutdown.patch} (96%)
 rename patches/server/{0886-Workaround-for-client-lag-spikes-MC-162253.patch => 0885-Workaround-for-client-lag-spikes-MC-162253.patch} (100%)
 rename patches/server/{0887-Stop-large-look-changes-from-crashing-the-server.patch => 0886-Stop-large-look-changes-from-crashing-the-server.patch} (96%)
 rename patches/server/{0888-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0887-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (100%)
 rename patches/server/{0889-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch => 0888-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch} (100%)
 rename patches/server/{0890-Fire-EntityChangeBlockEvent-in-more-places.patch => 0889-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0891-Missing-eating-regain-reason.patch => 0890-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0892-Missing-effect-cause.patch => 0891-Missing-effect-cause.patch} (100%)
 rename patches/server/{0893-Added-byte-array-serialization-deserialization-for-P.patch => 0892-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0894-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0893-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0895-Call-BlockPhysicsEvent-more-often.patch => 0894-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0896-Configurable-chat-thread-limit.patch => 0895-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0897-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0896-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (93%)
 rename patches/server/{0898-Set-position-before-player-sending-on-dimension-chan.patch => 0897-Set-position-before-player-sending-on-dimension-chan.patch} (100%)
 rename patches/server/{0899-fix-Jigsaw-block-kicking-user.patch => 0898-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0900-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0899-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0901-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch => 0900-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch} (100%)
 rename patches/server/{0902-Fix-a-bunch-of-vanilla-bugs.patch => 0901-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0903-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0902-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0904-Fix-custom-piglin-loved-items.patch => 0903-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0905-EntityPickupItemEvent-fixes.patch => 0904-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0906-Correctly-handle-interactions-with-items-on-cooldown.patch => 0905-Correctly-handle-interactions-with-items-on-cooldown.patch} (97%)
 rename patches/server/{0907-Add-PlayerInventorySlotChangeEvent.patch => 0906-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0908-Elder-Guardian-appearance-API.patch => 0907-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0909-Allow-changing-bed-s-occupied-property.patch => 0908-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0910-Add-entity-knockback-API.patch => 0909-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0911-Detect-headless-JREs.patch => 0910-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0912-fixed-entity-vehicle-collision-event-not-called.patch => 0911-fixed-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0913-optimized-dirt-and-snow-spreading.patch => 0912-optimized-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{0914-Added-EntityToggleSitEvent.patch => 0913-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0915-Add-fire-tick-delay-option.patch => 0914-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0916-Add-Moving-Piston-API.patch => 0915-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0917-Ignore-impossible-spawn-tick.patch => 0916-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0918-Track-projectile-source-for-fireworks-from-dispenser.patch => 0917-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%)
 rename patches/server/{0919-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0918-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0920-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0919-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0921-Prevent-compass-from-loading-chunks.patch => 0920-Prevent-compass-from-loading-chunks.patch} (100%)
 rename patches/server/{0922-Add-PrePlayerAttackEntityEvent.patch => 0921-Add-PrePlayerAttackEntityEvent.patch} (93%)
 rename patches/server/{0923-ensure-reset-EnderDragon-boss-event-name.patch => 0922-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0924-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0923-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0925-Add-Player-Warden-Warning-API.patch => 0924-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0926-More-vanilla-friendly-methods-to-update-trades.patch => 0925-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0927-Add-paper-dumplisteners-command.patch => 0926-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0928-check-global-player-list-where-appropriate.patch => 0927-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0929-Fix-async-entity-add-due-to-fungus-trees.patch => 0928-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0930-ItemStack-damage-API.patch => 0929-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0931-Friction-API.patch => 0930-Friction-API.patch} (100%)
 rename patches/server/{0932-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0931-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0933-Fix-player-kick-on-shutdown.patch => 0932-Fix-player-kick-on-shutdown.patch} (100%)
 rename patches/server/{0934-Sync-offhand-slot-in-menus.patch => 0933-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0935-Player-Entity-Tracking-Events.patch => 0934-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0936-Limit-pet-look-distance.patch => 0935-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0937-Properly-resend-entities.patch => 0936-Properly-resend-entities.patch} (98%)
 rename patches/server/{0938-Fixes-and-additions-to-the-SpawnReason-API.patch => 0937-Fixes-and-additions-to-the-SpawnReason-API.patch} (98%)
 rename patches/server/{0939-fix-Instruments.patch => 0938-fix-Instruments.patch} (100%)
 rename patches/server/{0940-Fix-chunk-snapshot-biome-getter.patch => 0939-Fix-chunk-snapshot-biome-getter.patch} (100%)
 rename patches/server/{0941-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0940-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0942-Fix-MapLike-Codec-missing-key-selector.patch => 0941-Fix-MapLike-Codec-missing-key-selector.patch} (100%)
 rename patches/server/{0943-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0942-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0944-Improve-logging-and-errors.patch => 0943-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0945-Fix-explosion-yield-with-new-gamerules.patch => 0944-Fix-explosion-yield-with-new-gamerules.patch} (100%)
 rename patches/server/{0946-Add-BlockLockCheckEvent.patch => 0945-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0947-Add-Sneaking-API-for-Entities.patch => 0946-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0948-Improve-PortalEvents.patch => 0947-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0949-Add-exploded-block-state-to-BlockExplodeEvent.patch => 0948-Add-exploded-block-state-to-BlockExplodeEvent.patch} (100%)
 rename patches/server/{0950-Add-config-option-for-spider-worldborder-climbing.patch => 0949-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0951-Add-missing-SpigotConfig-logCommands-check.patch => 0950-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0952-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0951-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0953-Flying-Fall-Damage.patch => 0952-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0954-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0953-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0955-config-for-disabling-entity-tag-tags.patch => 0954-config-for-disabling-entity-tag-tags.patch} (93%)
 rename patches/server/{0956-Use-single-player-info-update-packet-on-join.patch => 0955-Use-single-player-info-update-packet-on-join.patch} (97%)
 rename patches/server/{0957-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0956-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0958-Add-Player-sendEquipmentChange-Map-API.patch => 0957-Add-Player-sendEquipmentChange-Map-API.patch} (100%)
 rename patches/server/{0959-Win-Screen-API.patch => 0958-Win-Screen-API.patch} (100%)
 rename patches/server/{0960-Remove-CraftItemStack-setAmount-null-assignment.patch => 0959-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)

diff --git a/patches/server/0008-MC-Utils.patch b/patches/server/0008-MC-Utils.patch
index 2ee8ad33f2..79db606372 100644
--- a/patches/server/0008-MC-Utils.patch
+++ b/patches/server/0008-MC-Utils.patch
@@ -5793,7 +5793,7 @@ index f902b1f7062fc2c81e0ce43e8b8599192469e57c..74d1ae0104e8d0795df50f00317fd860
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 773638011f8ece0663d2ba891071124ab1122b0d..bd9d6f7721994780b70dff22319614bc67bbf276 100644
+index 01438ee9ad7a64ac4fd124d97029f87b49c25d5d..ae69c14943bd93ca948789ad4d4da899a7505a60 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -65,6 +65,7 @@ import net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket;
@@ -6412,7 +6412,7 @@ index b323b8329f534b7020dd595b8b15197c29939590..794ad2dbaea2555d4557124e9d942d3e
          ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos);
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9908ab936780a88992c2690502c85e4d9074371d..017e0ae318c15cfce72ed389b250345418e7b876 100644
+index 8309eb14140ebcf62ae7be1dfa0177ac7fcf83d7..8784b0702f10eb7582c309c15f18fe13eebd9c8e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -171,6 +171,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
@@ -6588,7 +6588,7 @@ index a63d5ba706a5b8e430aedc045bdeb3a410bd0eef..e96a0ca47e4701ba187555bd92c96834
      public BlockState getBlockState(BlockPos pos) {
          return this.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ())).getBlockState(pos);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8550bd48f51209279e892b212d40b72feb59562a..c9497bead11bf2b3b859f1c91c9692ce6007e5ed 100644
+index 029d0197863a6975a7b42132bd0b734025299a8f..25227822aa0e1dd7fbbe98a0925ccd023af8d0dc 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -181,6 +181,7 @@ public abstract class PlayerList {
@@ -6683,10 +6683,10 @@ index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292
          super(type, world);
          this.xpReward = 5;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 3cdb60ba3ba7bf996046d43ddf48523040063dfa..f53d8bb8078109f6ff89121261be46f1cccb2860 100644
+index 1f7fe7995d3ecc1a47717927f5f2f74b8d99b33d..489cb50f70589c87dd8fb57087e5fa14fd5e1c43 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -758,6 +758,25 @@ public final class ItemStack {
+@@ -759,6 +759,25 @@ public final class ItemStack {
          return this.tag != null ? this.tag.getList("Enchantments", 10) : new ListTag();
      }
  
@@ -6712,7 +6712,7 @@ index 3cdb60ba3ba7bf996046d43ddf48523040063dfa..f53d8bb8078109f6ff89121261be46f1
      public void setTag(@Nullable CompoundTag nbt) {
          this.tag = nbt;
          if (this.getItem().canBeDepleted()) {
-@@ -1144,6 +1163,7 @@ public final class ItemStack {
+@@ -1145,6 +1164,7 @@ public final class ItemStack {
      // CraftBukkit start
      @Deprecated
      public void setItem(Item item) {
@@ -7297,7 +7297,7 @@ index f66369ddaeab5c5ac643c0979dac3ed21337ff71..038abf2ac104ceecaab11b10d466ea69
              return false;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3e7207ccb6496b0e04e7cdef2b762601745933dd..f4455d8a45fbd687a21a46a4c2850f9a3e6432c5 100644
+index 6ca724889789f9ed3244991517b2d6ecb3bf8af8..1220c2f67ead85fdc0ca26a2fbee6a483a876975 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -233,8 +233,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -7320,7 +7320,7 @@ index 3e7207ccb6496b0e04e7cdef2b762601745933dd..f4455d8a45fbd687a21a46a4c2850f9a
          if (playerChunk == null) return false;
  
          playerChunk.getTickingChunkFuture().thenAccept(either -> {
-@@ -1942,4 +1942,32 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1943,4 +1943,32 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0009-Adventure.patch b/patches/server/0009-Adventure.patch
index 814b0e3aaf..0904ed2ccc 100644
--- a/patches/server/0009-Adventure.patch
+++ b/patches/server/0009-Adventure.patch
@@ -2772,7 +2772,7 @@ index f29395b6bf9eebd4830bbcda7d96085fb8e3d8b0..877a104e3899debd387544b740896ffb
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f4455d8a45fbd687a21a46a4c2850f9a3e6432c5..e91305263fcf6929fe62e5e8da46721707b51517 100644
+index 1220c2f67ead85fdc0ca26a2fbee6a483a876975..d0476e736610c8afb21c7b1fcfc17cf44309fd68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -149,6 +149,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2783,7 +2783,7 @@ index f4455d8a45fbd687a21a46a4c2850f9a3e6432c5..e91305263fcf6929fe62e5e8da467217
  
      private static final Random rand = new Random();
  
-@@ -1969,5 +1970,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1970,5 +1971,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
          return ret;
      }
diff --git a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
index e91280918a..b71515e3ff 100644
--- a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
+++ b/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index f53d8bb8078109f6ff89121261be46f1cccb2860..6ca9a5cf426befde4882d78df5fd8202b73ddbeb 100644
+index 489cb50f70589c87dd8fb57087e5fa14fd5e1c43..d979c94861f0d38d55fc1ac0214b1313fe5f08f5 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -155,6 +155,23 @@ public final class ItemStack {
@@ -53,7 +53,7 @@ index f53d8bb8078109f6ff89121261be46f1cccb2860..6ca9a5cf426befde4882d78df5fd8202
              this.getItem().verifyTagAfterLoad(this.tag);
          }
  
-@@ -779,6 +797,7 @@ public final class ItemStack {
+@@ -780,6 +798,7 @@ public final class ItemStack {
  
      public void setTag(@Nullable CompoundTag nbt) {
          this.tag = nbt;
@@ -61,7 +61,7 @@ index f53d8bb8078109f6ff89121261be46f1cccb2860..6ca9a5cf426befde4882d78df5fd8202
          if (this.getItem().canBeDepleted()) {
              this.setDamageValue(this.getDamageValue());
          }
-@@ -1072,6 +1091,7 @@ public final class ItemStack {
+@@ -1073,6 +1092,7 @@ public final class ItemStack {
          ListTag nbttaglist = this.tag.getList("Enchantments", 10);
  
          nbttaglist.add(EnchantmentHelper.storeEnchantment(EnchantmentHelper.getEnchantmentId(enchantment), (byte) level));
diff --git a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
index b0af2dcb09..9e6fd9e505 100644
--- a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 504a56fb2f2901c67ed22b9f0a57eb8db10ca4df..7d1e41272d05a8cb8d1adbcd2e9bc00f1a6f95fe 100644
+index f7b7a6a2327dd863390432679519caebac6dd567..9a3cc9af85b1f1d4d9ecb093f874f03d9bfde342 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -368,6 +368,7 @@ public final class ItemStack {
+@@ -369,6 +369,7 @@ public final class ItemStack {
                      enuminteractionresult = InteractionResult.FAIL; // cancel placement
                      // PAIL: Remove this when MC-99075 fixed
                      placeEvent.getPlayer().updateInventory();
diff --git a/patches/server/0332-Optimize-Hoppers.patch b/patches/server/0332-Optimize-Hoppers.patch
index ddb64fa503..e1deb2df41 100644
--- a/patches/server/0332-Optimize-Hoppers.patch
+++ b/patches/server/0332-Optimize-Hoppers.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41376a0aaa2da34ec3194d38c59a4ea2f353bd64..ea1ad3dad6bc9c7603d5dd0bdaec0d4563e90f16 100644
+index 80519ddf6302bf0aa8a186bd03aaa6e518e19adc..c277ccc012bd5011e31d746b08ace1ae5238c937 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1412,6 +1412,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index 41376a0aaa2da34ec3194d38c59a4ea2f353bd64..ea1ad3dad6bc9c7603d5dd0bdaec0d45
              this.profiler.push(() -> {
                  return worldserver + " " + worldserver.dimension().location();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 7d1e41272d05a8cb8d1adbcd2e9bc00f1a6f95fe..29c605ff88956435752412847734992fe6bcd55d 100644
+index 9a3cc9af85b1f1d4d9ecb093f874f03d9bfde342..da74c2f131f74b830c616baed5b932466a009e91 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -633,11 +633,12 @@ public final class ItemStack {
+@@ -634,11 +634,12 @@ public final class ItemStack {
          return this.getItem().interactLivingEntity(this, user, entity, hand);
      }
  
diff --git a/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 53ea7da82f..cb982c6bd0 100644
--- a/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0432-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -44,7 +44,7 @@ index a67e158bad42086aec237a822ec252fd26f80e3c..829105771a06deca2a85e2f27b68d96c
          this.printSaveWarning = false;
          console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bc083d58f670f2a0c6e621da5e2258f7be5680b8..f22457cf9dd5ceb6630c1f96a2050c350c4fbbc9 100644
+index b6c66b8ee015847c962eb504bf4a88a5331e0944..21051093bc65d30f32c6a5ea3ee07086e10d57c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -281,8 +281,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -111,7 +111,7 @@ index bc083d58f670f2a0c6e621da5e2258f7be5680b8..f22457cf9dd5ceb6630c1f96a2050c35
          world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
          return true;
          // Paper end
-@@ -2147,6 +2163,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2148,6 +2164,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> {
              net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
                  net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)c;
diff --git a/patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
deleted file mode 100644
index 9eb04a5221..0000000000
--- a/patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 26 Jul 2020 12:11:39 +0100
-Subject: [PATCH] Add missing strikeLighting call to
- World#spigot()#strikeLightningEffect
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f22457cf9dd5ceb6630c1f96a2050c350c4fbbc9..cec02e3b47ccc99ba8343dafa7a760ebca64ffc1 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2133,6 +2133,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-             lightning.moveTo( loc.getX(), loc.getY(), loc.getZ() );
-             lightning.visualOnly = true;
-             lightning.isSilent = isSilent;
-+            world.strikeLightning( lightning );
-             return (LightningStrike) lightning.getBukkitEntity();
-         }
-     };
diff --git a/patches/server/0456-Fix-some-rails-connecting-improperly.patch b/patches/server/0455-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0456-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0455-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0457-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0457-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0456-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0458-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0458-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0457-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0459-Brand-support.patch b/patches/server/0458-Brand-support.patch
similarity index 100%
rename from patches/server/0459-Brand-support.patch
rename to patches/server/0458-Brand-support.patch
diff --git a/patches/server/0460-Add-setMaxPlayers-API.patch b/patches/server/0459-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0460-Add-setMaxPlayers-API.patch
rename to patches/server/0459-Add-setMaxPlayers-API.patch
index 9c8b74fe17..7c98ab0ad9 100644
--- a/patches/server/0460-Add-setMaxPlayers-API.patch
+++ b/patches/server/0459-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c618388599c5b56320c526e71613f8434a0e2c47..f36019234a85c177d3d863979bbc653f89384cd4 100644
+index 5d6128932e1af0445cf928fac6d6b91226a18de6..fdd7f80fe912d4f75e7c42a2dd97160031f857b7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -151,7 +151,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0461-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0461-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0460-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0462-Don-t-require-FACING-data.patch b/patches/server/0461-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0462-Don-t-require-FACING-data.patch
rename to patches/server/0461-Don-t-require-FACING-data.patch
diff --git a/patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 96%
rename from patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 8df2fdf21b..223fe0dca6 100644
--- a/patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0462-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -17,7 +17,7 @@ index 95c53189e32aec6aca254fa3b157df7bc68d4d1a..0637fd424e98175f864f15c8bfa8bf69
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cec02e3b47ccc99ba8343dafa7a760ebca64ffc1..51f20f0f28c3372be871873dcf58c551800797b2 100644
+index 21051093bc65d30f32c6a5ea3ee07086e10d57c1..05599db0ed0da4d5055188722b9d15adfe4e4dec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -262,11 +262,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0464-Add-moon-phase-API.patch b/patches/server/0463-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0464-Add-moon-phase-API.patch
rename to patches/server/0463-Add-moon-phase-API.patch
diff --git a/patches/server/0465-Prevent-headless-pistons-from-being-created.patch b/patches/server/0464-Prevent-headless-pistons-from-being-created.patch
similarity index 95%
rename from patches/server/0465-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0464-Prevent-headless-pistons-from-being-created.patch
index 26079d6aeb..60b7241583 100644
--- a/patches/server/0465-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0464-Prevent-headless-pistons-from-being-created.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created
 Prevent headless pistons from being created by explosions or tree/mushroom growth.
 
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 7f769f72c847d4894c1cd7a3b09c58f51c392388..446b0e74c406d3d57268d8332ea4c29a4dd5f9eb 100644
+index 0a2f5e929d34c933755e9bc4b205e1b2ad0ce3bc..f607c40cde7ac2a79ee2cfd618c0c11abbab6e46 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
 @@ -183,6 +183,15 @@ public class Explosion {
diff --git a/patches/server/0466-Add-BellRingEvent.patch b/patches/server/0465-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0466-Add-BellRingEvent.patch
rename to patches/server/0465-Add-BellRingEvent.patch
diff --git a/patches/server/0467-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0466-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from patches/server/0467-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0466-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0468-Buffer-joins-to-world.patch b/patches/server/0467-Buffer-joins-to-world.patch
similarity index 100%
rename from patches/server/0468-Buffer-joins-to-world.patch
rename to patches/server/0467-Buffer-joins-to-world.patch
diff --git a/patches/server/0469-Eigencraft-redstone-implementation.patch b/patches/server/0468-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0469-Eigencraft-redstone-implementation.patch
rename to patches/server/0468-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0470-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 97%
rename from patches/server/0470-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch
index fdffdb9433..0ab77dfebe 100644
--- a/patches/server/0470-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0469-Fix-hex-colors-not-working-in-some-kick-messages.patch
@@ -25,7 +25,7 @@ index 34e4d00ede62be50808a2782e54da987cc62c9af..e12c67bdfa326b3f52f6a4973063cef4
  
                      this.connection.send(new ClientboundLoginDisconnectPacket(ichatmutablecomponent));
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 75a32d33518023cb24ba639751631bfad3563bd5..0869a7d6807815879aa9ded0d8b9baee82d535a9 100644
+index b09069196fbcba32bdd6ea67718ea4c3086fb318..966f5bd5b922c9f64616e93c292c87997402c521 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -102,7 +102,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0471-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 98%
rename from patches/server/0471-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch
index 0dd30afad9..acfc64af77 100644
--- a/patches/server/0471-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/patches/server/0470-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 36107f22914ec47212e41c17852fb486c67e5c52..40e2fc6746b3a243c82d6100578ad510b193faa0 100644
+index 9816d5767d808f6259b516602bc96078fd94793f..40395738e41575a5b2b1b4020c1c60707ceac9ad 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -439,7 +439,7 @@ public final class ItemStack {
+@@ -440,7 +440,7 @@ public final class ItemStack {
                          net.minecraft.world.level.block.state.BlockState block = world.getBlockState(newblockposition);
  
                          if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
diff --git a/patches/server/0472-Fix-CraftTeam-null-check.patch b/patches/server/0471-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0472-Fix-CraftTeam-null-check.patch
rename to patches/server/0471-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0473-Add-more-Evoker-API.patch b/patches/server/0472-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0473-Add-more-Evoker-API.patch
rename to patches/server/0472-Add-more-Evoker-API.patch
diff --git a/patches/server/0474-Add-methods-to-get-translation-keys.patch b/patches/server/0473-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/server/0474-Add-methods-to-get-translation-keys.patch
rename to patches/server/0473-Add-methods-to-get-translation-keys.patch
diff --git a/patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0474-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0476-Cache-block-data-strings.patch b/patches/server/0475-Cache-block-data-strings.patch
similarity index 100%
rename from patches/server/0476-Cache-block-data-strings.patch
rename to patches/server/0475-Cache-block-data-strings.patch
diff --git a/patches/server/0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 98%
rename from patches/server/0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index ea7c704f76..9f51c53888 100644
--- a/patches/server/0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0476-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -31,7 +31,7 @@ index d06d1e00b42dd9474ec834e0bafa94329b90cb75..15b16d37928eca9f8da026df0c76a1f7
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 09b2b6633b108739e8fe6d4c400d42d88b27435e..ff65d3125da3d2716cccac24317e40d0e54f405c 100644
+index 1a33ce4ff0e00ac2f6bba288cb43880ca5dae19a..873206bb65b2412d3066a0f7e35fe0684e29661a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -158,6 +158,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0478-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0478-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0477-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0479-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0479-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0478-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0479-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0481-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0481-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0480-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0482-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0481-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from patches/server/0482-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0481-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0483-Entity-isTicking.patch b/patches/server/0482-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0483-Entity-isTicking.patch
rename to patches/server/0482-Entity-isTicking.patch
diff --git a/patches/server/0484-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from patches/server/0484-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0483-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/patches/server/0485-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch
similarity index 100%
rename from patches/server/0485-Fix-Concurrency-issue-in-ShufflingList.patch
rename to patches/server/0484-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0486-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0486-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0485-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0487-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0487-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0486-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0488-Optimise-getType-calls.patch b/patches/server/0487-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0488-Optimise-getType-calls.patch
rename to patches/server/0487-Optimise-getType-calls.patch
diff --git a/patches/server/0489-Villager-resetOffers.patch b/patches/server/0488-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0489-Villager-resetOffers.patch
rename to patches/server/0488-Villager-resetOffers.patch
diff --git a/patches/server/0490-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0489-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0490-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0489-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0491-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0491-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0490-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0492-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0491-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0492-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0491-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0493-Player-elytra-boost-API.patch b/patches/server/0492-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0493-Player-elytra-boost-API.patch
rename to patches/server/0492-Player-elytra-boost-API.patch
diff --git a/patches/server/0494-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0493-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0494-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0493-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0495-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0495-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0494-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0496-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0495-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0496-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0495-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0497-Add-ignore-discounts-API.patch b/patches/server/0496-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0497-Add-ignore-discounts-API.patch
rename to patches/server/0496-Add-ignore-discounts-API.patch
diff --git a/patches/server/0498-Toggle-for-removing-existing-dragon.patch b/patches/server/0497-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from patches/server/0498-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0497-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0499-Fix-client-lag-on-advancement-loading.patch b/patches/server/0498-Fix-client-lag-on-advancement-loading.patch
similarity index 95%
rename from patches/server/0499-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0498-Fix-client-lag-on-advancement-loading.patch
index f0dde86efd..6702720a1d 100644
--- a/patches/server/0499-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0498-Fix-client-lag-on-advancement-loading.patch
@@ -15,7 +15,7 @@ manually reload the advancement data for all players, which
 normally takes place as a part of the datapack reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 31960587fff298e1b50c8216e47db9a0aa053b29..7502624de2710e28ae427a7e6f38ba932f21ac1d 100644
+index 0fc844b717a466e7ac0438bbf04371bba6a19ee2..00cffc8666cc5e0694da2a3d2a2efab457781374 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -344,7 +344,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0500-Item-no-age-no-player-pickup.patch b/patches/server/0499-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0500-Item-no-age-no-player-pickup.patch
rename to patches/server/0499-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0501-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0501-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0500-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0502-Beacon-API-custom-effect-ranges.patch b/patches/server/0501-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0502-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0501-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0503-Add-API-for-quit-reason.patch b/patches/server/0502-Add-API-for-quit-reason.patch
similarity index 98%
rename from patches/server/0503-Add-API-for-quit-reason.patch
rename to patches/server/0502-Add-API-for-quit-reason.patch
index d73cba72bd..107b7f2ebb 100644
--- a/patches/server/0503-Add-API-for-quit-reason.patch
+++ b/patches/server/0502-Add-API-for-quit-reason.patch
@@ -49,7 +49,7 @@ index ebce5372a4961b8518b3c5ee1f727705c8b68152..4e9ae442a838e685e96d436e0f14ff2d
              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 e9846135153cfd1e4eb34cd70c23ba811ca1ee9f..cf84c48aad4765633333a56b369568fca51ebffc 100644
+index fdd7f80fe912d4f75e7c42a2dd97160031f857b7..233539a8dd7d44efad748036ae93a31d2d3e7d46 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -552,7 +552,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0504-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from patches/server/0504-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0503-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0505-Expose-world-spawn-angle.patch b/patches/server/0504-Expose-world-spawn-angle.patch
similarity index 93%
rename from patches/server/0505-Expose-world-spawn-angle.patch
rename to patches/server/0504-Expose-world-spawn-angle.patch
index 39967eda38..519c0d330f 100644
--- a/patches/server/0505-Expose-world-spawn-angle.patch
+++ b/patches/server/0504-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 a9f61042c961dc4ffc12b9e8ff66001205e41511..4e28eca701b91d1533b5eeffc96b66c4e71da1db 100644
+index 233539a8dd7d44efad748036ae93a31d2d3e7d46..a0d682165f736bbdd32e88c2a4e73a1724dae053 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -816,7 +816,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0506-Add-Destroy-Speed-API.patch b/patches/server/0505-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0506-Add-Destroy-Speed-API.patch
rename to patches/server/0505-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0506-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0508-Add-LivingEntity-clearActiveItem.patch b/patches/server/0507-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0508-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0507-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0509-Add-PlayerItemCooldownEvent.patch b/patches/server/0508-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0509-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0508-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0510-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0509-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0510-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0509-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0511-More-lightning-API.patch b/patches/server/0510-More-lightning-API.patch
similarity index 100%
rename from patches/server/0511-More-lightning-API.patch
rename to patches/server/0510-More-lightning-API.patch
diff --git a/patches/server/0512-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0512-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch
index 5df09f1b27..b9f348ec80 100644
--- a/patches/server/0512-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0511-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -45,7 +45,7 @@ index 302676ef78ed5b3b7fc1b04851447ca72eed10c0..a00c3d96f2fc7131d1f4afa7af4e41ac
              } 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 745797f1110db582cdac83c423b4cae78928ffe2..425d831bb2b0f4fc5722f18dc9d265e24965c86d 100644
+index 2ce769b00798f35095f50380083c7cbf4de462ef..beaf3b3bf4a4373d563b5b75238f79299a304db5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3392,7 +3392,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0513-Added-missing-default-perms-for-commands.patch b/patches/server/0512-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0513-Added-missing-default-perms-for-commands.patch
rename to patches/server/0512-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0514-Add-PlayerShearBlockEvent.patch b/patches/server/0513-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0514-Add-PlayerShearBlockEvent.patch
rename to patches/server/0513-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0515-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0514-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from patches/server/0515-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0514-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/patches/server/0516-Limit-recipe-packets.patch b/patches/server/0515-Limit-recipe-packets.patch
similarity index 100%
rename from patches/server/0516-Limit-recipe-packets.patch
rename to patches/server/0515-Limit-recipe-packets.patch
diff --git a/patches/server/0517-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0516-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0517-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0516-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0518-Player-Chunk-Load-Unload-Events.patch b/patches/server/0517-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/server/0518-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0517-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0519-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0518-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0519-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0518-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0520-Expose-LivingEntity-hurt-direction.patch b/patches/server/0519-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0520-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0519-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 91%
rename from patches/server/0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index da86add647..0f536de5a2 100644
--- a/patches/server/0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0520-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 1c3419d6b7cdc13485e2667c9bc55bd28d607094..9dfbf59fd781e649579dd7082e8ea0ffaa7885d3 100644
+index be1b4a27ccb4c7519ba9213267ab461304090b87..060f0b54d6fbd53a98bfa3a0e752040cf4b1ef29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -265,6 +265,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0522-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0522-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0521-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0523-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0523-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0522-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0524-Implement-TargetHitEvent.patch b/patches/server/0523-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0524-Implement-TargetHitEvent.patch
rename to patches/server/0523-Implement-TargetHitEvent.patch
diff --git a/patches/server/0525-MC-4-Fix-item-position-desync.patch b/patches/server/0524-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from patches/server/0525-MC-4-Fix-item-position-desync.patch
rename to patches/server/0524-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0526-Additional-Block-Material-API-s.patch b/patches/server/0525-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0526-Additional-Block-Material-API-s.patch
rename to patches/server/0525-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0527-Fix-harming-potion-dupe.patch b/patches/server/0526-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0527-Fix-harming-potion-dupe.patch
rename to patches/server/0526-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0528-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0528-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0527-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0529-Cache-burn-durations.patch b/patches/server/0528-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0529-Cache-burn-durations.patch
rename to patches/server/0528-Cache-burn-durations.patch
diff --git a/patches/server/0530-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from patches/server/0530-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0529-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0531-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0531-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0530-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0532-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0532-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0531-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0533-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0533-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0532-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0534-Zombie-API-breaking-doors.patch b/patches/server/0533-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0534-Zombie-API-breaking-doors.patch
rename to patches/server/0533-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0535-Fix-nerfed-slime-when-splitting.patch b/patches/server/0534-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0535-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0534-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0536-Add-EntityLoadCrossbowEvent.patch b/patches/server/0535-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0536-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0535-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0537-Added-WorldGameRuleChangeEvent.patch b/patches/server/0536-Added-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from patches/server/0537-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0536-Added-WorldGameRuleChangeEvent.patch
index e4b74bdb4c..9b22f164a0 100644
--- a/patches/server/0537-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0536-Added-WorldGameRuleChangeEvent.patch
@@ -64,7 +64,7 @@ index 694a2f685cb46a5391da012f4d7e3bd3e6e88f4c..fa8cd4438c19a262272da47985a57f7e
  
          public int get() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 51f20f0f28c3372be871873dcf58c551800797b2..9055b7821ba2a52e20bf6422cae2edfefc1872b1 100644
+index 05599db0ed0da4d5055188722b9d15adfe4e4dec..f3d78ba340d92a482fd3d54cbe16983ec9766eed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1792,8 +1792,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0538-Added-ServerResourcesReloadedEvent.patch b/patches/server/0537-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/server/0538-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0537-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/server/0539-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from patches/server/0539-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0538-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0540-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0539-Implemented-BlockFailedDispenseEvent.patch
similarity index 96%
rename from patches/server/0540-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0539-Implemented-BlockFailedDispenseEvent.patch
index 84ff4448b5..3be519a9c8 100644
--- a/patches/server/0540-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0539-Implemented-BlockFailedDispenseEvent.patch
@@ -32,7 +32,7 @@ index 1415ad60163f6584619cc7caa61f1848d6ebaa93..801c4c120e98584bcf218a4ef9bd66d7
          } else {
              ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0656f9ec67a51c1ad41de7bfe80a9f67da36dea2..b2c29d6c8affd823e8d9882b72cb5661da57c746 100644
+index 060f0b54d6fbd53a98bfa3a0e752040cf4b1ef29..73aa49396a1db7e3ee5264214c69a640eacab0e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1876,4 +1876,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0541-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0540-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0541-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0540-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0542-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0541-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0542-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0541-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0543-Configurable-door-breaking-difficulty.patch b/patches/server/0542-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from patches/server/0543-Configurable-door-breaking-difficulty.patch
rename to patches/server/0542-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0544-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0543-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0544-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0543-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0545-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch
similarity index 97%
rename from patches/server/0545-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch
index 30140949bb..6a4573cf4d 100644
--- a/patches/server/0545-Implement-API-to-expose-exact-interaction-point.patch
+++ b/patches/server/0544-Implement-API-to-expose-exact-interaction-point.patch
@@ -18,7 +18,7 @@ index b0096fe5399397d4c5e170daa892aef017108c2f..645a226c2e3f6dcf1c25187d006d4250
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index b98ba88d5bf423cee6d88133f021e748171a37c6..3b7c3e15db25c04d818eef4ab6562649597d39f4 100644
+index 73aa49396a1db7e3ee5264214c69a640eacab0e3..636f8ccfbcdead68948147213c03bfdf5e312416 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -56,7 +56,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
diff --git a/patches/server/0546-Remove-stale-POIs.patch b/patches/server/0545-Remove-stale-POIs.patch
similarity index 100%
rename from patches/server/0546-Remove-stale-POIs.patch
rename to patches/server/0545-Remove-stale-POIs.patch
diff --git a/patches/server/0547-Fix-villager-boat-exploit.patch b/patches/server/0546-Fix-villager-boat-exploit.patch
similarity index 93%
rename from patches/server/0547-Fix-villager-boat-exploit.patch
rename to patches/server/0546-Fix-villager-boat-exploit.patch
index f4b9edc9da..973e08f312 100644
--- a/patches/server/0547-Fix-villager-boat-exploit.patch
+++ b/patches/server/0546-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 4e28eca701b91d1533b5eeffc96b66c4e71da1db..310f14b440697c8a32660592acf05b50be43c445 100644
+index a0d682165f736bbdd32e88c2a4e73a1724dae053..3d05b2f37b192bf707414f4a574f79423b0f0be1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -577,6 +577,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0548-Add-sendOpLevel-API.patch b/patches/server/0547-Add-sendOpLevel-API.patch
similarity index 95%
rename from patches/server/0548-Add-sendOpLevel-API.patch
rename to patches/server/0547-Add-sendOpLevel-API.patch
index 47ac10053a..9b83aa61b7 100644
--- a/patches/server/0548-Add-sendOpLevel-API.patch
+++ b/patches/server/0547-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 310f14b440697c8a32660592acf05b50be43c445..a5936f9c836520b26eb1abf05e90fc5d0bc1a32b 100644
+index 3d05b2f37b192bf707414f4a574f79423b0f0be1..ad6a9e238d21a821e7d5c3634fbc8fc9bdfc38a3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1063,6 +1063,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0549-Add-PaperRegistry.patch b/patches/server/0548-Add-PaperRegistry.patch
similarity index 100%
rename from patches/server/0549-Add-PaperRegistry.patch
rename to patches/server/0548-Add-PaperRegistry.patch
diff --git a/patches/server/0550-Add-StructuresLocateEvent.patch b/patches/server/0549-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/server/0550-Add-StructuresLocateEvent.patch
rename to patches/server/0549-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0551-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0550-Collision-option-for-requiring-a-player-participant.patch
similarity index 96%
rename from patches/server/0551-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0550-Collision-option-for-requiring-a-player-participant.patch
index e64717cad1..081d4f6a4d 100644
--- a/patches/server/0551-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0550-Collision-option-for-requiring-a-player-participant.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7451ee1537c67a96dc33af13cf6ad43338434d43..b2c85ef84d5455cbdcb211af94a5046593d663c3 100644
+index 9833207c4d29a082cd68d52e72490e7a314f420c..ae89716b1dc6f54cb1a6356f52697a00bd8a4218 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1794,6 +1794,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0552-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0552-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0551-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0553-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0553-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0552-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0554-Make-schedule-command-per-world.patch b/patches/server/0553-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0554-Make-schedule-command-per-world.patch
rename to patches/server/0553-Make-schedule-command-per-world.patch
diff --git a/patches/server/0555-Configurable-max-leash-distance.patch b/patches/server/0554-Configurable-max-leash-distance.patch
similarity index 100%
rename from patches/server/0555-Configurable-max-leash-distance.patch
rename to patches/server/0554-Configurable-max-leash-distance.patch
diff --git a/patches/server/0556-Implement-BlockPreDispenseEvent.patch b/patches/server/0555-Implement-BlockPreDispenseEvent.patch
similarity index 95%
rename from patches/server/0556-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0555-Implement-BlockPreDispenseEvent.patch
index afe35a0492..834107f008 100644
--- a/patches/server/0556-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0555-Implement-BlockPreDispenseEvent.patch
@@ -17,7 +17,7 @@ index 85c5319837295bd2f85baebfe8d6660b267f1d5f..8f55d0753fa26924235c943595f0d1a0
                  tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 36fa211c9ae970624dfc461d9a1b6bcd9e33d22e..9851859fc3c1ff87edc1d52aa8e6806d0d1494a0 100644
+index 636f8ccfbcdead68948147213c03bfdf5e312416..5f50f96939dbe709bc82f63c91615ba2e3a35e15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1894,5 +1894,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0557-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0557-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0556-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0558-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from patches/server/0558-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0557-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0559-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0559-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0558-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0560-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 98%
rename from patches/server/0560-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index 2230e421b8..5545bb77d9 100644
--- a/patches/server/0560-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0559-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -122,7 +122,7 @@ index 88c7e494051bc3d2c134167318f3eb84abaa2125..6672ca0e82048c23405845a8f5df49ac
                          }
                      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9851859fc3c1ff87edc1d52aa8e6806d0d1494a0..fcdc34d42076758543b5c5e75ea634e6b0ab767b 100644
+index 5f50f96939dbe709bc82f63c91615ba2e3a35e15..3d1817d686c53e893cfabe439b927ce8db770d32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1526,8 +1526,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0561-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0560-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from patches/server/0561-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0560-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0562-add-DragonEggFormEvent.patch b/patches/server/0561-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0562-add-DragonEggFormEvent.patch
rename to patches/server/0561-add-DragonEggFormEvent.patch
diff --git a/patches/server/0563-EntityMoveEvent.patch b/patches/server/0562-EntityMoveEvent.patch
similarity index 97%
rename from patches/server/0563-EntityMoveEvent.patch
rename to patches/server/0562-EntityMoveEvent.patch
index a38db63193..e17f65e411 100644
--- a/patches/server/0563-EntityMoveEvent.patch
+++ b/patches/server/0562-EntityMoveEvent.patch
@@ -29,7 +29,7 @@ index f8832ebb35ceb7f70e12d6c11f435308de4ae33d..abc909031b676c91b621a2c9a8beb0b1
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 425d831bb2b0f4fc5722f18dc9d265e24965c86d..464da8e64626358238a6d872f0474e12310a0fdf 100644
+index beaf3b3bf4a4373d563b5b75238f79299a304db5..d388ea52c711eb26c99f82ffe72c0b5b245d30d1 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3327,6 +3327,20 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0564-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from patches/server/0564-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0563-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0565-Inline-shift-direction-fields.patch b/patches/server/0564-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0565-Inline-shift-direction-fields.patch
rename to patches/server/0564-Inline-shift-direction-fields.patch
diff --git a/patches/server/0566-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 95%
rename from patches/server/0566-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch
index 741b663ed1..b291acf3d9 100644
--- a/patches/server/0566-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0565-Allow-adding-items-to-BlockDropItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a0cc7dc09bfb74e0101e53c5c53dcf9438541ee0..5927968003b6ff55bd524244338c236892d4ca88 100644
+index 3d1817d686c53e893cfabe439b927ce8db770d32..49693aa4d136701c822ab4b386ab7ed8b061a156 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -400,13 +400,30 @@ public class CraftEventFactory {
diff --git a/patches/server/0567-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0567-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0566-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0568-living-entity-allow-attribute-registration.patch b/patches/server/0567-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0568-living-entity-allow-attribute-registration.patch
rename to patches/server/0567-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0569-fix-dead-slime-setSize-invincibility.patch b/patches/server/0568-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0569-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0568-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0570-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0570-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0569-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0571-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0570-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0571-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0570-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0572-Expose-Tracked-Players.patch b/patches/server/0571-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0572-Expose-Tracked-Players.patch
rename to patches/server/0571-Expose-Tracked-Players.patch
diff --git a/patches/server/0573-Remove-streams-from-SensorNearest.patch b/patches/server/0572-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0573-Remove-streams-from-SensorNearest.patch
rename to patches/server/0572-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0574-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0574-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0573-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0575-Improve-ServerGUI.patch b/patches/server/0574-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0575-Improve-ServerGUI.patch
rename to patches/server/0574-Improve-ServerGUI.patch
diff --git a/patches/server/0576-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0576-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0575-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0577-fix-converting-txt-to-json-file.patch b/patches/server/0576-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from patches/server/0577-fix-converting-txt-to-json-file.patch
rename to patches/server/0576-fix-converting-txt-to-json-file.patch
index c2f364d23f..f035cb1709 100644
--- a/patches/server/0577-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0576-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index 520cd1a6b347687b2ec6d13f034be391d1a1af85..cc885fd0eb19516d3864a43c2e4ae785
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a5936f9c836520b26eb1abf05e90fc5d0bc1a32b..1254ab553e0d2c8e1a0fd93b602dd339da05dabb 100644
+index ad6a9e238d21a821e7d5c3634fbc8fc9bdfc38a3..437e78adcc4838a9887887858afe883c8f928fef 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -182,6 +182,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0578-Add-worldborder-events.patch b/patches/server/0577-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0578-Add-worldborder-events.patch
rename to patches/server/0577-Add-worldborder-events.patch
diff --git a/patches/server/0579-added-PlayerNameEntityEvent.patch b/patches/server/0578-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0579-added-PlayerNameEntityEvent.patch
rename to patches/server/0578-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0580-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0579-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0580-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0579-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0581-Add-recipe-to-cook-events.patch b/patches/server/0580-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0581-Add-recipe-to-cook-events.patch
rename to patches/server/0580-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0582-Add-Block-isValidTool.patch b/patches/server/0581-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0582-Add-Block-isValidTool.patch
rename to patches/server/0581-Add-Block-isValidTool.patch
diff --git a/patches/server/0583-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0582-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from patches/server/0583-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0582-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0584-Expand-world-key-API.patch b/patches/server/0583-Expand-world-key-API.patch
similarity index 100%
rename from patches/server/0584-Expand-world-key-API.patch
rename to patches/server/0583-Expand-world-key-API.patch
diff --git a/patches/server/0585-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0584-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0585-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0584-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0586-Item-Rarity-API.patch b/patches/server/0585-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0586-Item-Rarity-API.patch
rename to patches/server/0585-Item-Rarity-API.patch
diff --git a/patches/server/0587-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0586-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0587-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0586-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0588-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch
similarity index 92%
rename from patches/server/0588-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch
index a29b66b0e6..135372a1ba 100644
--- a/patches/server/0588-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0587-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1254ab553e0d2c8e1a0fd93b602dd339da05dabb..42f4c3dee830f0aa65392319a3c505d044e4c17c 100644
+index 437e78adcc4838a9887887858afe883c8f928fef..17dc86f7cb383bda18f28576113d1af0d5fb288a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -570,6 +570,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0589-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0588-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0589-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0588-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0590-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0590-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0589-Don-t-ignore-result-of-PlayerEditBookEvent.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 97%
rename from patches/server/0591-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0590-Entity-load-save-limit-per-chunk.patch
index 8e80b61dcc..8432163170 100644
--- a/patches/server/0591-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/0590-Entity-load-save-limit-per-chunk.patch
@@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting
 limits for any entity type.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 57bcdc06823efdb50b656e05fae6a50e92eb2217..a697c3a68e9f00f7d66dead1ec516961d9ae6e1c 100644
+index c33550137ea83f23885341545c4a7f4985e07cfc..9d6979f4a00e2f6bcba21b3e2b48e9b62e057931 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -618,9 +618,20 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
diff --git a/patches/server/0592-Expose-protocol-version.patch b/patches/server/0591-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0592-Expose-protocol-version.patch
rename to patches/server/0591-Expose-protocol-version.patch
diff --git a/patches/server/0593-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0593-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0592-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0594-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 92%
rename from patches/server/0594-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index 31a395f4c9..5ad3879177 100644
--- a/patches/server/0594-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0593-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
@@ -9,7 +9,7 @@ till their item is switched.
 This patch clears the active item when the event is cancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 464da8e64626358238a6d872f0474e12310a0fdf..485888bc3e85054c4452c7abd70c65f997b26479 100644
+index d388ea52c711eb26c99f82ffe72c0b5b245d30d1..b58dba64638a7cabd05487a1f6fa7553321e3196 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3814,6 +3814,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0595-Add-bypass-host-check.patch b/patches/server/0594-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0595-Add-bypass-host-check.patch
rename to patches/server/0594-Add-bypass-host-check.patch
diff --git a/patches/server/0596-Set-area-affect-cloud-rotation.patch b/patches/server/0595-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0596-Set-area-affect-cloud-rotation.patch
rename to patches/server/0595-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0597-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0597-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0596-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0598-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0598-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0597-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0599-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0599-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0598-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0600-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0599-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0600-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0599-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0601-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0600-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0601-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0600-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0602-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0601-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0602-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0601-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0603-Added-PlayerDeepSleepEvent.patch b/patches/server/0602-Added-PlayerDeepSleepEvent.patch
similarity index 91%
rename from patches/server/0603-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0602-Added-PlayerDeepSleepEvent.patch
index 455937d536..f9da9ab71d 100644
--- a/patches/server/0603-Added-PlayerDeepSleepEvent.patch
+++ b/patches/server/0602-Added-PlayerDeepSleepEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added PlayerDeepSleepEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index caa0995fc4282c795783e6fa98843ce0cb594b17..bb3a4088db91f59982a9a2532ccd3001d0cba80a 100644
+index 3de169fea4121804de381ee7fa96b36c174c599d..f018533ecfd662532cf2658701be6d452ba774f4 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -248,6 +248,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0604-More-World-API.patch b/patches/server/0603-More-World-API.patch
similarity index 97%
rename from patches/server/0604-More-World-API.patch
rename to patches/server/0603-More-World-API.patch
index c98f05f25c..8f7bc53890 100644
--- a/patches/server/0604-More-World-API.patch
+++ b/patches/server/0603-More-World-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More World API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9055b7821ba2a52e20bf6422cae2edfefc1872b1..efc2fa39175d6981ebbc5b204baeef4298eb0e5c 100644
+index f3d78ba340d92a482fd3d54cbe16983ec9766eed..6ef1abea28f67704a308282b4addf645245e2595 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2034,6 +2034,69 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0605-Added-PlayerBedFailEnterEvent.patch b/patches/server/0604-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0605-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0604-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0606-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0605-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0606-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0605-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0607-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0606-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 95%
rename from patches/server/0607-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0606-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 2d165ae8dc..7a38ea5437 100644
--- a/patches/server/0607-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0606-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 42f4c3dee830f0aa65392319a3c505d044e4c17c..a87ea8b0922ccf724e6e7d410601ba88a6e84338 100644
+index 17dc86f7cb383bda18f28576113d1af0d5fb288a..12d65c3dfe2aa95d2aa80ba6bc4383f51e8cfc4a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -789,6 +789,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0608-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0607-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0608-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0607-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0609-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0608-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from patches/server/0609-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0608-add-RespawnFlags-to-PlayerRespawnEvent.patch
index 6bd78b3d75..225cb1efaa 100644
--- a/patches/server/0609-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0608-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -18,7 +18,7 @@ index b25509b00569ae8b612841b94ab243be194cb08a..7dd27fc7a539ab0cbf06936ba4daa37e
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a87ea8b0922ccf724e6e7d410601ba88a6e84338..4eaabbf73d1449a28b36b99162cfc898bd42ccfa 100644
+index 12d65c3dfe2aa95d2aa80ba6bc4383f51e8cfc4a..565a75e5e775edf604cdb4b991b17fb3ca3423ab 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -748,6 +748,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0610-Add-Channel-initialization-listeners.patch b/patches/server/0609-Add-Channel-initialization-listeners.patch
similarity index 98%
rename from patches/server/0610-Add-Channel-initialization-listeners.patch
rename to patches/server/0609-Add-Channel-initialization-listeners.patch
index bdea52c944..e22e8ce80b 100644
--- a/patches/server/0610-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0609-Add-Channel-initialization-listeners.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..0d7e7db9e37ef0183c32b217bd944fb4
 +    COMPRESSION_DISABLED
 +}
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 43fd36b2ed8e58a2e6213d749a8612a98be421b2..d8b0fb4854280ae1e7b95d414a725996d4fb4c77 100644
+index 5fa1b0d609ffc43b03f66d710a2702c2597786fc..779a3639d3caafd49d87b99449add5b46897a8ba 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -604,6 +604,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0611-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0610-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0611-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0610-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0612-Add-more-WanderingTrader-API.patch b/patches/server/0611-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0612-Add-more-WanderingTrader-API.patch
rename to patches/server/0611-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0613-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0612-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0613-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0612-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0614-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0613-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0614-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0613-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0615-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0614-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 95%
rename from patches/server/0615-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0614-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
index a5283c32e5..fb98312dc2 100644
--- a/patches/server/0615-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0614-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 0869a7d6807815879aa9ded0d8b9baee82d535a9..703a6daf4af2459ea3acf7569cbc92c4e017aad1 100644
+index 966f5bd5b922c9f64616e93c292c87997402c521..fb2502a6ccf421d658a805eacc8b4b3b86ff61df 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -331,12 +331,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0616-Inventory-close.patch b/patches/server/0615-Inventory-close.patch
similarity index 100%
rename from patches/server/0616-Inventory-close.patch
rename to patches/server/0615-Inventory-close.patch
diff --git a/patches/server/0617-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0616-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0617-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0616-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0618-Fix-CraftPotionBrewer-cache.patch b/patches/server/0617-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0618-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0617-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0619-Add-basic-Datapack-API.patch b/patches/server/0618-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0619-Add-basic-Datapack-API.patch
rename to patches/server/0618-Add-basic-Datapack-API.patch
diff --git a/patches/server/0620-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0619-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0620-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0619-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0621-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0620-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0621-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0620-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0622-ItemStack-repair-check-API.patch b/patches/server/0621-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0622-ItemStack-repair-check-API.patch
rename to patches/server/0621-ItemStack-repair-check-API.patch
diff --git a/patches/server/0623-More-Enchantment-API.patch b/patches/server/0622-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0623-More-Enchantment-API.patch
rename to patches/server/0622-More-Enchantment-API.patch
diff --git a/patches/server/0624-Move-range-check-for-block-placing-up.patch b/patches/server/0623-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0624-Move-range-check-for-block-placing-up.patch
rename to patches/server/0623-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0625-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0624-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/0625-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0624-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/0626-Add-Mob-lookAt-API.patch b/patches/server/0625-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0626-Add-Mob-lookAt-API.patch
rename to patches/server/0625-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0627-Add-Unix-domain-socket-support.patch b/patches/server/0626-Add-Unix-domain-socket-support.patch
similarity index 98%
rename from patches/server/0627-Add-Unix-domain-socket-support.patch
rename to patches/server/0626-Add-Unix-domain-socket-support.patch
index ac667b7519..5e98d10f18 100644
--- a/patches/server/0627-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0626-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
 Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index d8b0fb4854280ae1e7b95d414a725996d4fb4c77..9515626305d8496eac2a7af65ba39fcda60c782a 100644
+index 779a3639d3caafd49d87b99449add5b46897a8ba..9042f2953b1cf21969faf33883d3c845553e937e 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -690,6 +690,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0628-Add-EntityInsideBlockEvent.patch b/patches/server/0627-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0628-Add-EntityInsideBlockEvent.patch
rename to patches/server/0627-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0629-Attributes-API-for-item-defaults.patch b/patches/server/0628-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0629-Attributes-API-for-item-defaults.patch
rename to patches/server/0628-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0630-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0629-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0630-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0629-Add-cause-to-Weather-ThunderChangeEvents.patch
index e452b5db02..13cadbfcb4 100644
--- a/patches/server/0630-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0629-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -95,7 +95,7 @@ index 274c8eb1f76fb7cb8a16b438e7e1b14804f3dc51..b6218626bad7f8ddfba91b216ac1e106
              if (weather.isCancelled()) {
                  return;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index efc2fa39175d6981ebbc5b204baeef4298eb0e5c..88e04599e4f4718f4e7dc8b0e49c52e6714fad1d 100644
+index 6ef1abea28f67704a308282b4addf645245e2595..8a81b0011d80d320a75308d18dc09a5f365e097a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1183,7 +1183,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0631-More-Lidded-Block-API.patch b/patches/server/0630-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0631-More-Lidded-Block-API.patch
rename to patches/server/0630-More-Lidded-Block-API.patch
diff --git a/patches/server/0632-Limit-item-frame-cursors-on-maps.patch b/patches/server/0631-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0632-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0631-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0633-Add-PlayerKickEvent-causes.patch b/patches/server/0632-Add-PlayerKickEvent-causes.patch
similarity index 99%
rename from patches/server/0633-Add-PlayerKickEvent-causes.patch
rename to patches/server/0632-Add-PlayerKickEvent-causes.patch
index dbe96a0151..4b8fd7912f 100644
--- a/patches/server/0633-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0632-Add-PlayerKickEvent-causes.patch
@@ -434,7 +434,7 @@ index 68b9c257f98617fe9e9e0492129bdbb3d22e6e0d..7c0ef92a9bad6f66a5f7f466c47f7695
  
              }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3126ed6f8415bfef63ed6f6717bf9ce1d53fdfe2..2e4cbe508e96ae0268b4b41e7835ed7208399690 100644
+index 565a75e5e775edf604cdb4b991b17fb3ca3423ab..adb546d97810b0a4f25568c8a5e50d01bdcfb274 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -657,7 +657,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0634-Add-PufferFishStateChangeEvent.patch b/patches/server/0633-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0634-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0633-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0635-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0634-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0635-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0634-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0636-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0635-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0636-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0635-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0637-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0636-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0637-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0636-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0638-Add-BellRevealRaiderEvent.patch b/patches/server/0637-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0638-Add-BellRevealRaiderEvent.patch
rename to patches/server/0637-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0639-Fix-invulnerable-end-crystals.patch b/patches/server/0638-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0639-Fix-invulnerable-end-crystals.patch
rename to patches/server/0638-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0640-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0639-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0640-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0639-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0641-Fix-dangerous-end-portal-logic.patch b/patches/server/0640-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0641-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0640-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0642-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0641-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0642-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0641-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0643-Make-item-validations-configurable.patch b/patches/server/0642-Make-item-validations-configurable.patch
similarity index 100%
rename from patches/server/0643-Make-item-validations-configurable.patch
rename to patches/server/0642-Make-item-validations-configurable.patch
diff --git a/patches/server/0644-Line-Of-Sight-Changes.patch b/patches/server/0643-Line-Of-Sight-Changes.patch
similarity index 98%
rename from patches/server/0644-Line-Of-Sight-Changes.patch
rename to patches/server/0643-Line-Of-Sight-Changes.patch
index 734eb99ea8..97f0f96e60 100644
--- a/patches/server/0644-Line-Of-Sight-Changes.patch
+++ b/patches/server/0643-Line-Of-Sight-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 485888bc3e85054c4452c7abd70c65f997b26479..8e8906679c3d814e62740f0a31bc756eb8b634fc 100644
+index b58dba64638a7cabd05487a1f6fa7553321e3196..fa80feabfc54857781062a0debeb866f3d50bfc0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3542,7 +3542,8 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0645-add-per-world-spawn-limits.patch b/patches/server/0644-add-per-world-spawn-limits.patch
similarity index 91%
rename from patches/server/0645-add-per-world-spawn-limits.patch
rename to patches/server/0644-add-per-world-spawn-limits.patch
index 049fb4c4b1..1246c6fe62 100644
--- a/patches/server/0645-add-per-world-spawn-limits.patch
+++ b/patches/server/0644-add-per-world-spawn-limits.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 88e04599e4f4718f4e7dc8b0e49c52e6714fad1d..f48c2be5fcc134c2e440507e31f61c4430ec06b3 100644
+index 8a81b0011d80d320a75308d18dc09a5f365e097a..7d57bf8ca060d6c3dcf8ef4201c7e4ff78ecabb3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -209,6 +209,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0646-Fix-potions-splash-events.patch b/patches/server/0645-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0646-Fix-potions-splash-events.patch
rename to patches/server/0645-Fix-potions-splash-events.patch
diff --git a/patches/server/0647-Add-more-LimitedRegion-API.patch b/patches/server/0646-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0647-Add-more-LimitedRegion-API.patch
rename to patches/server/0646-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0648-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0647-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 94%
rename from patches/server/0648-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0647-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 9d86741f11..30c41221b3 100644
--- a/patches/server/0648-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0647-Fix-PlayerDropItemEvent-using-wrong-item.patch
@@ -18,7 +18,7 @@ index 5428a5ee4097e29922d48564714998604ba07dbb..77a3fa81d94005de4c5b7c130e893487
  
                  this.awardStat(Stats.DROP);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index bb3a4088db91f59982a9a2532ccd3001d0cba80a..3d5e5d41a2d8c1de0d318eeac0652b115aa0ded8 100644
+index f018533ecfd662532cf2658701be6d452ba774f4..321feaea3bd8c082151302fe7d93294a6bf5dec6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -718,6 +718,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0649-Missing-Entity-Behavior-API.patch b/patches/server/0648-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/server/0649-Missing-Entity-Behavior-API.patch
rename to patches/server/0648-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0650-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0649-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0650-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0649-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0651-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0650-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0651-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0650-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0652-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0651-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0652-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0651-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0653-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0652-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0653-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0652-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0654-Adds-PlayerArmSwingEvent.patch b/patches/server/0653-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0654-Adds-PlayerArmSwingEvent.patch
rename to patches/server/0653-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/server/0655-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0654-Fixes-kick-event-leave-message-not-being-sent.patch
similarity index 98%
rename from patches/server/0655-Fixes-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0654-Fixes-kick-event-leave-message-not-being-sent.patch
index eff76affb6..2d64b13037 100644
--- a/patches/server/0655-Fixes-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0654-Fixes-kick-event-leave-message-not-being-sent.patch
@@ -59,7 +59,7 @@ index 1d84ee2afa76ecc1c7c07bf0a21c3d1ee7213515..3ccb8f290a842487da80ed24d04d5519
              this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false);
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5cd624e6dae63b31bdae849fa3190e967960b621..b486bb218438b7705cd27fb386622a5e0e59b347 100644
+index adb546d97810b0a4f25568c8a5e50d01bdcfb274..a1ea893c4af69bdbbca9bee2760016e8c8a17bb3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -543,6 +543,11 @@ public abstract class PlayerList {
diff --git a/patches/server/0656-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0655-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 97%
rename from patches/server/0656-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0655-Add-config-for-mobs-immune-to-default-effects.patch
index d10db04bef..6719d108a0 100644
--- a/patches/server/0656-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0655-Add-config-for-mobs-immune-to-default-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 8e8906679c3d814e62740f0a31bc756eb8b634fc..bb148172250cfa1db0feb4073c0cc7954bc11876 100644
+index fa80feabfc54857781062a0debeb866f3d50bfc0..e775468f225aa4123e3f679c11d4e7896f061730 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1152,7 +1152,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0657-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0656-Fix-incorrect-message-for-outdated-client.patch
similarity index 100%
rename from patches/server/0657-Fix-incorrect-message-for-outdated-client.patch
rename to patches/server/0656-Fix-incorrect-message-for-outdated-client.patch
diff --git a/patches/server/0658-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0657-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0658-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0657-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0659-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0658-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0659-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0658-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0660-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0659-Add-a-bunch-of-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0660-Add-a-bunch-of-missing-forceDrop-toggles.patch
rename to patches/server/0659-Add-a-bunch-of-missing-forceDrop-toggles.patch
diff --git a/patches/server/0661-Stinger-API.patch b/patches/server/0660-Stinger-API.patch
similarity index 100%
rename from patches/server/0661-Stinger-API.patch
rename to patches/server/0660-Stinger-API.patch
diff --git a/patches/server/0662-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0661-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
similarity index 100%
rename from patches/server/0662-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
rename to patches/server/0661-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff --git a/patches/server/0663-Add-System.out-err-catcher.patch b/patches/server/0662-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0663-Add-System.out-err-catcher.patch
rename to patches/server/0662-Add-System.out-err-catcher.patch
diff --git a/patches/server/0664-Fix-test-not-bootstrapping.patch b/patches/server/0663-Fix-test-not-bootstrapping.patch
similarity index 100%
rename from patches/server/0664-Fix-test-not-bootstrapping.patch
rename to patches/server/0663-Fix-test-not-bootstrapping.patch
diff --git a/patches/server/0665-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0664-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0665-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0664-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0666-Improve-boat-collision-performance.patch b/patches/server/0665-Improve-boat-collision-performance.patch
similarity index 97%
rename from patches/server/0666-Improve-boat-collision-performance.patch
rename to patches/server/0665-Improve-boat-collision-performance.patch
index 06c36a9d49..ac89107a80 100644
--- a/patches/server/0666-Improve-boat-collision-performance.patch
+++ b/patches/server/0665-Improve-boat-collision-performance.patch
@@ -17,7 +17,7 @@ index 8120739e2a7c4c86ecb7058f08bd8179d3a943b8..439ae035d8b2787916e017e2636115b5
      };
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bb148172250cfa1db0feb4073c0cc7954bc11876..5c7cd39135ddf89a7f9ed60d4e59bfa4957461a9 100644
+index e775468f225aa4123e3f679c11d4e7896f061730..865d774135f8417142287cc9efd8ca5ec909a04a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1340,7 +1340,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0667-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0666-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0667-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0666-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0668-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0667-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0668-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0667-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0669-Add-PlayerSetSpawnEvent.patch b/patches/server/0668-Add-PlayerSetSpawnEvent.patch
similarity index 99%
rename from patches/server/0669-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0668-Add-PlayerSetSpawnEvent.patch
index e0d2c52a34..791cd532aa 100644
--- a/patches/server/0669-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0668-Add-PlayerSetSpawnEvent.patch
@@ -89,7 +89,7 @@ index ad110326b3086137a6762ef73d04ea796b3dbf39..36330e5a2b59cf4d5eb45b3d0840440a
  
      public void trackChunk(ChunkPos chunkPos, Packet<?> chunkDataPacket) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8273055be92fbe96187721c95e5ff74c9e5daafe..8f32292900f7c446e874bad4b1768be841bfa963 100644
+index a1ea893c4af69bdbbca9bee2760016e8c8a17bb3..892db3baaf2936d5db9b073faf7537b6a97ededf 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -833,13 +833,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0670-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0669-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0670-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0669-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0671-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0670-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0671-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0670-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0672-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0671-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0672-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0671-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0673-Added-EntityDamageItemEvent.patch b/patches/server/0672-Added-EntityDamageItemEvent.patch
similarity index 90%
rename from patches/server/0673-Added-EntityDamageItemEvent.patch
rename to patches/server/0672-Added-EntityDamageItemEvent.patch
index 844198f927..fd4e1081d9 100644
--- a/patches/server/0673-Added-EntityDamageItemEvent.patch
+++ b/patches/server/0672-Added-EntityDamageItemEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added EntityDamageItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 40e2fc6746b3a243c82d6100578ad510b193faa0..a2d92e0ed4348e632b8a55a4fae71ecc3777edcb 100644
+index 40395738e41575a5b2b1b4020c1c60707ceac9ad..a6858017ff9468dbf4651fe62faea487a54b3878 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -555,7 +555,7 @@ public final class ItemStack {
+@@ -556,7 +556,7 @@ public final class ItemStack {
          return this.getItem().getMaxDamage();
      }
  
@@ -17,7 +17,7 @@ index 40e2fc6746b3a243c82d6100578ad510b193faa0..a2d92e0ed4348e632b8a55a4fae71ecc
          if (!this.isDamageableItem()) {
              return false;
          } else {
-@@ -573,8 +573,8 @@ public final class ItemStack {
+@@ -574,8 +574,8 @@ public final class ItemStack {
  
                  amount -= k;
                  // CraftBukkit start
@@ -28,7 +28,7 @@ index 40e2fc6746b3a243c82d6100578ad510b193faa0..a2d92e0ed4348e632b8a55a4fae71ecc
                      event.getPlayer().getServer().getPluginManager().callEvent(event);
  
                      if (amount != event.getDamage() || event.isCancelled()) {
-@@ -585,6 +585,14 @@ public final class ItemStack {
+@@ -586,6 +586,14 @@ public final class ItemStack {
                      }
  
                      amount = event.getDamage();
@@ -43,7 +43,7 @@ index 40e2fc6746b3a243c82d6100578ad510b193faa0..a2d92e0ed4348e632b8a55a4fae71ecc
                  }
                  // CraftBukkit end
                  if (amount <= 0) {
-@@ -592,8 +600,8 @@ public final class ItemStack {
+@@ -593,8 +601,8 @@ public final class ItemStack {
                  }
              }
  
@@ -54,7 +54,7 @@ index 40e2fc6746b3a243c82d6100578ad510b193faa0..a2d92e0ed4348e632b8a55a4fae71ecc
              }
  
              j = this.getDamageValue() + amount;
-@@ -605,7 +613,7 @@ public final class ItemStack {
+@@ -606,7 +614,7 @@ public final class ItemStack {
      public <T extends LivingEntity> void hurtAndBreak(int amount, T entity, Consumer<T> breakCallback) {
          if (!entity.level.isClientSide && (!(entity instanceof net.minecraft.world.entity.player.Player) || !((net.minecraft.world.entity.player.Player) entity).getAbilities().instabuild)) {
              if (this.isDamageableItem()) {
diff --git a/patches/server/0674-Optimize-indirect-passenger-iteration.patch b/patches/server/0673-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0674-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0673-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0675-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0674-Fix-block-drops-position-losing-precision-millions-o.patch
similarity index 100%
rename from patches/server/0675-Fix-block-drops-position-losing-precision-millions-o.patch
rename to patches/server/0674-Fix-block-drops-position-losing-precision-millions-o.patch
diff --git a/patches/server/0676-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0675-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0676-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0675-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0677-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0676-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0677-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0676-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0678-Clear-bucket-NBT-after-dispense.patch b/patches/server/0677-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0678-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0677-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0679-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0678-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0679-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0678-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0680-Add-BlockBreakBlockEvent.patch b/patches/server/0679-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0680-Add-BlockBreakBlockEvent.patch
rename to patches/server/0679-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0681-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0680-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0681-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0680-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0682-More-CommandBlock-API.patch b/patches/server/0681-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0682-More-CommandBlock-API.patch
rename to patches/server/0681-More-CommandBlock-API.patch
diff --git a/patches/server/0683-Add-missing-team-sidebar-display-slots.patch b/patches/server/0682-Add-missing-team-sidebar-display-slots.patch
similarity index 98%
rename from patches/server/0683-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0682-Add-missing-team-sidebar-display-slots.patch
index 2a7dbde0e6..73e373b0ba 100644
--- a/patches/server/0683-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0682-Add-missing-team-sidebar-display-slots.patch
@@ -54,7 +54,7 @@ index e2d3fe9af7d3bd82bee519b20e141cd58f68bbd6..944a4fee237730c0d89567aaa6ddf268
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 2c537a80951ddf98d3135ca19a34a238484c2d88..cf73d333ae625ea1bdc32d5f79daf408937bb13b 100644
+index 2eb62af25076b7160b0159ec382baebe5162b024..0ef20dc6a43dc973183854a638d5f9f770583ec1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -251,6 +251,14 @@ public class Commodore
diff --git a/patches/server/0684-Add-back-EntityPortalExitEvent.patch b/patches/server/0683-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0684-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0683-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0685-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0684-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 96%
rename from patches/server/0685-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0684-Add-methods-to-find-targets-for-lightning-strikes.patch
index 1647f1b5a5..bf202bd38a 100644
--- a/patches/server/0685-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0684-Add-methods-to-find-targets-for-lightning-strikes.patch
@@ -31,7 +31,7 @@ index 17e77f727b0cd3da788bf5593762f2930e98a609..2de60a2f3da7f8d30295def7045cd753
                      blockposition1 = blockposition1.above(2);
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f48c2be5fcc134c2e440507e31f61c4430ec06b3..1a2b706d26aa355de95fb9d0599e7c59435e50b8 100644
+index 7d57bf8ca060d6c3dcf8ef4201c7e4ff78ecabb3..9942c1de6d8e087520c9e795a9f775f59bfa8942 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -685,6 +685,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0686-Get-entity-default-attributes.patch b/patches/server/0685-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0686-Get-entity-default-attributes.patch
rename to patches/server/0685-Get-entity-default-attributes.patch
diff --git a/patches/server/0687-Left-handed-API.patch b/patches/server/0686-Left-handed-API.patch
similarity index 100%
rename from patches/server/0687-Left-handed-API.patch
rename to patches/server/0686-Left-handed-API.patch
diff --git a/patches/server/0688-Add-more-advancement-API.patch b/patches/server/0687-Add-more-advancement-API.patch
similarity index 99%
rename from patches/server/0688-Add-more-advancement-API.patch
rename to patches/server/0687-Add-more-advancement-API.patch
index 1e90291df5..732d3c494c 100644
--- a/patches/server/0688-Add-more-advancement-API.patch
+++ b/patches/server/0687-Add-more-advancement-API.patch
@@ -189,7 +189,7 @@ index 4aa8cda2bf72627b153e636a408fb3971caf2309..e29d7c6e1cef10a76c8630855fada11c
  
      private final DisplayInfo handle;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 1c430959289b99eb8ebf1627dcbed8893dc88886..0d150f5ea05b8ecb83cef738ae8ad036d6a2de87 100644
+index 0ef20dc6a43dc973183854a638d5f9f770583ec1..d7c1077f2eb2846a17a5872f01ebb8aabf0cb181 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -54,6 +54,7 @@ public class Commodore
diff --git a/patches/server/0689-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0688-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0689-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0688-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0690-Add-critical-damage-API.patch b/patches/server/0689-Add-critical-damage-API.patch
similarity index 96%
rename from patches/server/0690-Add-critical-damage-API.patch
rename to patches/server/0689-Add-critical-damage-API.patch
index f5d56ac68c..4f802fd238 100644
--- a/patches/server/0690-Add-critical-damage-API.patch
+++ b/patches/server/0689-Add-critical-damage-API.patch
@@ -29,7 +29,7 @@ index ed8bad446a1845befa6d5d75c40cf281fa47a9d9..8795c94e6b6474addddbb0b337a962e8
      public static DamageSource fallingBlock(Entity attacker) {
          return (new EntityDamageSource("fallingBlock", attacker)).damageHelmet();
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 3d5e5d41a2d8c1de0d318eeac0652b115aa0ded8..95019b6ba1bc3bff42e15e5bed4ca7c5d109f1be 100644
+index 321feaea3bd8c082151302fe7d93294a6bf5dec6..72b11ea489becaee3aaeb644347142b62adfbf28 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1256,7 +1256,7 @@ public abstract class Player extends LivingEntity {
@@ -60,7 +60,7 @@ index 3d5e5d41a2d8c1de0d318eeac0652b115aa0ded8..95019b6ba1bc3bff42e15e5bed4ca7c5
                                      }
                                      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 724bf984fdc65e8468a1b0826332aef87e67a35f..740f08e5fadf9b8d277af05cc9734ceb54f54abb 100644
+index 9b487737fc83166a66f9a6cc57aa505b5243c530..8c08e07ba78e2ed042d79b692221008f59e92593 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -372,6 +372,7 @@ public abstract class AbstractArrow extends Projectile {
@@ -72,7 +72,7 @@ index 724bf984fdc65e8468a1b0826332aef87e67a35f..740f08e5fadf9b8d277af05cc9734ceb
          int k = entity.getRemainingFireTicks();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 97f97a00063e1e4012ec825c165d1dddd7c898f8..31d0227cfb5ceede53830fad43167ee561841618 100644
+index 49693aa4d136701c822ab4b386ab7ed8b061a156..4143f72b8df92bee25399f90a759c8a8fb567cba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -970,7 +970,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0691-Fix-issues-with-mob-conversion.patch b/patches/server/0690-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0691-Fix-issues-with-mob-conversion.patch
rename to patches/server/0690-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0692-Add-isCollidable-methods-to-various-places.patch b/patches/server/0691-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0692-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0691-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0693-Goat-ram-API.patch b/patches/server/0692-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0693-Goat-ram-API.patch
rename to patches/server/0692-Goat-ram-API.patch
diff --git a/patches/server/0694-Add-API-for-resetting-a-single-score.patch b/patches/server/0693-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0694-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0693-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0695-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0694-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0695-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0694-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0696-Vanilla-command-permission-fixes.patch b/patches/server/0695-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0696-Vanilla-command-permission-fixes.patch
rename to patches/server/0695-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0697-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0696-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 97%
rename from patches/server/0697-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0696-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index b87a0a5c5a..53f3c7e439 100644
--- a/patches/server/0697-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0696-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
@@ -51,7 +51,7 @@ index 36330e5a2b59cf4d5eb45b3d0840440a2991fc5e..5015076ff1ac2b13203588db4566b9cf
      @Override
      public void doCloseContainer() {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 95019b6ba1bc3bff42e15e5bed4ca7c5d109f1be..d7ef9c267a0cf496ac08ce568cb7649e09d5fcd6 100644
+index 72b11ea489becaee3aaeb644347142b62adfbf28..23ef09683ff506996c45aa8a3b84c72055960f03 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -499,6 +499,11 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0698-Fix-GameProfileCache-concurrency.patch b/patches/server/0697-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0698-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0697-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0699-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0698-Log-when-the-async-catcher-is-tripped.patch
similarity index 100%
rename from patches/server/0699-Log-when-the-async-catcher-is-tripped.patch
rename to patches/server/0698-Log-when-the-async-catcher-is-tripped.patch
diff --git a/patches/server/0700-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0699-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 99%
rename from patches/server/0700-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0699-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 5fe111ce94..229c8c9124 100644
--- a/patches/server/0700-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0699-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -302,7 +302,7 @@ index caa9885dd942fc5b82ba6b820d89f1b1a7ffda20..9ab3f3a490e55211670e2847f03bd4f8
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1a2b706d26aa355de95fb9d0599e7c59435e50b8..cb7c070c190e63644160ddd9855628547fd37ee1 100644
+index 9942c1de6d8e087520c9e795a9f775f59bfa8942..c093401834d7111857a0d49e60faa36ee22aae40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1700,9 +1700,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0701-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0700-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0701-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0700-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0702-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0701-Allow-controlled-flushing-for-network-manager.patch
similarity index 98%
rename from patches/server/0702-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0701-Allow-controlled-flushing-for-network-manager.patch
index 224a032a4e..2819caed1e 100644
--- a/patches/server/0702-Allow-controlled-flushing-for-network-manager.patch
+++ b/patches/server/0701-Allow-controlled-flushing-for-network-manager.patch
@@ -9,7 +9,7 @@ This patch will be used to optimise out flush calls in later
 patches.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 9515626305d8496eac2a7af65ba39fcda60c782a..b996b5c6a8dccd122fbb5d04f446927ae788bad5 100644
+index 9042f2953b1cf21969faf33883d3c845553e937e..3355d0d75675e2f9a62c4681871ba0f403073286 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -122,6 +122,39 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0703-Optimise-general-POI-access.patch b/patches/server/0702-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0703-Optimise-general-POI-access.patch
rename to patches/server/0702-Optimise-general-POI-access.patch
diff --git a/patches/server/0704-Optimise-chunk-tick-iteration.patch b/patches/server/0703-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0704-Optimise-chunk-tick-iteration.patch
rename to patches/server/0703-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0705-Execute-chunk-tasks-mid-tick.patch b/patches/server/0704-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/0705-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0704-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/0706-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0705-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0706-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0705-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0707-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0706-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0707-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0706-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0708-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0707-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0708-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0707-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0709-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0708-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0709-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0708-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0710-Distance-manager-tick-timings.patch b/patches/server/0709-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0710-Distance-manager-tick-timings.patch
rename to patches/server/0709-Distance-manager-tick-timings.patch
diff --git a/patches/server/0711-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0710-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0711-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0710-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0712-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0711-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0712-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0711-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0713-Add-packet-limiter-config.patch b/patches/server/0712-Add-packet-limiter-config.patch
similarity index 98%
rename from patches/server/0713-Add-packet-limiter-config.patch
rename to patches/server/0712-Add-packet-limiter-config.patch
index 5556f35187..ef80bb4170 100644
--- a/patches/server/0713-Add-packet-limiter-config.patch
+++ b/patches/server/0712-Add-packet-limiter-config.patch
@@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK
 If interval or rate are less-than 0, the limit is ignored
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index 8ba85f8b36b06ce5047b2587018a49dc50207866..af38c38c03c93392906f752958090b3ab2dd0964 100644
+index 46153b8e5823959e17621bbebd414d8998b77fb5..fa0845ea094714c320617d3a39efac759ddbbd36 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -154,6 +154,22 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/patches/server/0714-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0713-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0714-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0713-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0715-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0714-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0715-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0714-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0716-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0715-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0716-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0715-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0717-Time-scoreboard-search.patch b/patches/server/0716-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0717-Time-scoreboard-search.patch
rename to patches/server/0716-Time-scoreboard-search.patch
diff --git a/patches/server/0718-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0717-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0718-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0717-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0719-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0718-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0719-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0718-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0720-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0719-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0720-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0719-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0721-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0720-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0721-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0720-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0722-Optimise-random-block-ticking.patch b/patches/server/0721-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0722-Optimise-random-block-ticking.patch
rename to patches/server/0721-Optimise-random-block-ticking.patch
diff --git a/patches/server/0723-Optimise-non-flush-packet-sending.patch b/patches/server/0722-Optimise-non-flush-packet-sending.patch
similarity index 96%
rename from patches/server/0723-Optimise-non-flush-packet-sending.patch
rename to patches/server/0722-Optimise-non-flush-packet-sending.patch
index c46ce41ca1..19a8f2b8e9 100644
--- a/patches/server/0723-Optimise-non-flush-packet-sending.patch
+++ b/patches/server/0722-Optimise-non-flush-packet-sending.patch
@@ -20,7 +20,7 @@ up on this optimisation before he came along.
 Locally this patch drops the entity tracker tick by a full 1.5x.
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index af38c38c03c93392906f752958090b3ab2dd0964..fdfd8be686b9a7f99597ba918b20a0b688ec66cd 100644
+index fa0845ea094714c320617d3a39efac759ddbbd36..1a077353811a0a233f1a7ee7b6afe6c535e49168 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -46,6 +46,8 @@ import org.slf4j.Logger;
diff --git a/patches/server/0724-Optimise-nearby-player-lookups.patch b/patches/server/0723-Optimise-nearby-player-lookups.patch
similarity index 100%
rename from patches/server/0724-Optimise-nearby-player-lookups.patch
rename to patches/server/0723-Optimise-nearby-player-lookups.patch
diff --git a/patches/server/0725-Remove-streams-for-villager-AI.patch b/patches/server/0724-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0725-Remove-streams-for-villager-AI.patch
rename to patches/server/0724-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0726-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0725-Use-Velocity-compression-and-cipher-natives.patch
similarity index 98%
rename from patches/server/0726-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0725-Use-Velocity-compression-and-cipher-natives.patch
index 8172c62e70..2ee4a41d37 100644
--- a/patches/server/0726-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0725-Use-Velocity-compression-and-cipher-natives.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use Velocity compression and cipher natives
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 8f32e0c3078366f4b07a499b1838929564a05b76..f9839f17bcda4619c257162e9bf14d5e00053c80 100644
+index dea5594330830b4a7a2a717188cc33367c38a5ad..9411103b2d68e46ef9889f7a512362a4701486dc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -27,6 +27,11 @@ dependencies {
@@ -268,7 +268,7 @@ index 792883afe53d2b7989c25a81c2f9a639d5e21d20..c04379ca8a4db0f4de46ad2b3b338431
          return this.threshold;
      }
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
-index fdfd8be686b9a7f99597ba918b20a0b688ec66cd..507e98438f6d13de1bcf063db673a8e483dbea47 100644
+index 1a077353811a0a233f1a7ee7b6afe6c535e49168..38c09c65dfa4a7a0c80d36f726c1fd028cbe05f8 100644
 --- a/src/main/java/net/minecraft/network/Connection.java
 +++ b/src/main/java/net/minecraft/network/Connection.java
 @@ -689,11 +689,28 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -341,7 +341,7 @@ index b80aedd2002959b4026c27ce76b3ed17f0acfb5b..2985271132c9ae822dcb0d7a7e6f0c26
                  protected void initChannel(Channel channel) {
                      try {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 703a6daf4af2459ea3acf7569cbc92c4e017aad1..35c857f037e94baca3bb2c1cb44cd7f32017dd20 100644
+index fb2502a6ccf421d658a805eacc8b4b3b86ff61df..acde45dcf605d9e2ce85002cd4d0d457c4afce38 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -265,12 +265,14 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0727-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0726-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0727-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0726-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0728-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0727-Async-catch-modifications-to-critical-entity-state.patch
similarity index 100%
rename from patches/server/0728-Async-catch-modifications-to-critical-entity-state.patch
rename to patches/server/0727-Async-catch-modifications-to-critical-entity-state.patch
diff --git a/patches/server/0729-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0728-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0729-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0728-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0730-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0729-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0730-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0729-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0731-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0730-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0731-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0730-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0732-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0731-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0732-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0731-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0733-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0732-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0733-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0732-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0734-Ensure-valid-vehicle-status.patch b/patches/server/0733-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0734-Ensure-valid-vehicle-status.patch
rename to patches/server/0733-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0735-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0734-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0735-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0734-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0736-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0735-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0736-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0735-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0737-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0736-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0737-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0736-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0738-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0737-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0738-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0737-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0739-Preserve-overstacked-loot.patch b/patches/server/0738-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0739-Preserve-overstacked-loot.patch
rename to patches/server/0738-Preserve-overstacked-loot.patch
diff --git a/patches/server/0740-Update-head-rotation-in-missing-places.patch b/patches/server/0739-Update-head-rotation-in-missing-places.patch
similarity index 93%
rename from patches/server/0740-Update-head-rotation-in-missing-places.patch
rename to patches/server/0739-Update-head-rotation-in-missing-places.patch
index 9184900b7b..850b4b7aec 100644
--- a/patches/server/0740-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0739-Update-head-rotation-in-missing-places.patch
@@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw.
 This issue only applies to players.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a4d4e5cb3bd7a4816671b058c640ccc90dec8f54..9a6a3718788e7085f6defc3c82ba4bb66dd6c5b3 100644
+index ef515ec320454fd6a54457ca419ddd42d0c3b5c8..7e19fff139c4a0151a2dafd63086362e41d0b098 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1778,6 +1778,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0741-prevent-unintended-light-block-manipulation.patch b/patches/server/0740-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0741-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0740-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0742-Fix-CraftCriteria-defaults-map.patch b/patches/server/0741-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0742-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0741-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0743-Fix-upstreams-block-state-factories.patch b/patches/server/0742-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0743-Fix-upstreams-block-state-factories.patch
rename to patches/server/0742-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0744-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0743-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 97%
rename from patches/server/0744-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0743-Add-config-option-for-logging-player-ip-addresses.patch
index a438fb9d91..a229fda50b 100644
--- a/patches/server/0744-Add-config-option-for-logging-player-ip-addresses.patch
+++ b/patches/server/0743-Add-config-option-for-logging-player-ip-addresses.patch
@@ -49,7 +49,7 @@ index 2985271132c9ae822dcb0d7a7e6f0c268d1736cc..cfdbcd024de6ad0f9d4e83b2f912b36e
  
                              networkmanager.send(new ClientboundDisconnectPacket(ichatmutablecomponent), PacketSendListener.thenRun(() -> {
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 35c857f037e94baca3bb2c1cb44cd7f32017dd20..00e2692dd5e2b6a17c0f5c9e149b90977afc1237 100644
+index acde45dcf605d9e2ce85002cd4d0d457c4afce38..b6dc42aef6458b0c09007bb0e13048b99531f8c0 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -206,7 +206,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -65,7 +65,7 @@ index 35c857f037e94baca3bb2c1cb44cd7f32017dd20..00e2692dd5e2b6a17c0f5c9e149b9097
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8f32292900f7c446e874bad4b1768be841bfa963..6c7d68f910d3be55ed0b3124bfc861d5446c1388 100644
+index 892db3baaf2936d5db9b073faf7537b6a97ededf..50455e4efa287c0c49b60ddcabff5a336b86365f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -240,7 +240,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0745-Configurable-feature-seeds.patch b/patches/server/0744-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0745-Configurable-feature-seeds.patch
rename to patches/server/0744-Configurable-feature-seeds.patch
diff --git a/patches/server/0746-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0745-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
similarity index 100%
rename from patches/server/0746-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
rename to patches/server/0745-VanillaCommandWrapper-didnt-account-for-entity-sende.patch
diff --git a/patches/server/0747-Add-root-admin-user-detection.patch b/patches/server/0746-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0747-Add-root-admin-user-detection.patch
rename to patches/server/0746-Add-root-admin-user-detection.patch
diff --git a/patches/server/0748-Always-allow-item-changing-in-Fireball.patch b/patches/server/0747-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0748-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0747-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0749-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0748-don-t-attempt-to-teleport-dead-entities.patch
similarity index 91%
rename from patches/server/0749-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0748-don-t-attempt-to-teleport-dead-entities.patch
index f45b63cc58..25111cc771 100644
--- a/patches/server/0749-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0748-don-t-attempt-to-teleport-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9a6a3718788e7085f6defc3c82ba4bb66dd6c5b3..9d7304e97ecc56b78e1a890762346d192c792f4c 100644
+index 7e19fff139c4a0151a2dafd63086362e41d0b098..b284a9fd506f30256b8194603c12865086eebdaa 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -779,7 +779,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0750-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0749-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 94%
rename from patches/server/0750-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0749-Prevent-excessive-velocity-through-repeated-crits.patch
index 85acc1d328..fc4d8ad38a 100644
--- a/patches/server/0750-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0749-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5c7cd39135ddf89a7f9ed60d4e59bfa4957461a9..e912fc1b9201058f2d6a7dfe949c3bbe0397d5ee 100644
+index 865d774135f8417142287cc9efd8ca5ec909a04a..39c2cd8b100ab93d27a61d46b8f2d3fc354a824a 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2672,14 +2672,27 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0751-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0750-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0751-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0750-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0752-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0751-Always-parse-protochunk-light-sources-unless-it-is-m.patch
similarity index 100%
rename from patches/server/0752-Always-parse-protochunk-light-sources-unless-it-is-m.patch
rename to patches/server/0751-Always-parse-protochunk-light-sources-unless-it-is-m.patch
diff --git a/patches/server/0753-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0752-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0753-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0752-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0754-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0753-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 97%
rename from patches/server/0754-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0753-Prevent-sending-oversized-item-data-in-equipment-and.patch
index fca9e2a9bb..4dff623c27 100644
--- a/patches/server/0754-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0753-Prevent-sending-oversized-item-data-in-equipment-and.patch
@@ -34,7 +34,7 @@ index 64683e218c9c43cfd30514800cfa8da42e37563e..d2fed123ed56eaf550ac2c7a3fcc1678
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e912fc1b9201058f2d6a7dfe949c3bbe0397d5ee..b9552b24c41913be638aea08e06f43d0122c895a 100644
+index 39c2cd8b100ab93d27a61d46b8f2d3fc354a824a..7dbdcd6ba2c17a0320ae1ca872274207c125bf75 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3158,7 +3158,10 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0755-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0754-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 98%
rename from patches/server/0755-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0754-Hide-unnecessary-itemmeta-from-clients.patch
index 0cef3acc09..10544cf651 100644
--- a/patches/server/0755-Hide-unnecessary-itemmeta-from-clients.patch
+++ b/patches/server/0754-Hide-unnecessary-itemmeta-from-clients.patch
@@ -33,7 +33,7 @@ index 2b7abf42c08672194cc460e6e74e6f8e5f3c7443..ef8ce274f4085a76b4a7dc4ab37a1100
                                  }
                              }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b9552b24c41913be638aea08e06f43d0122c895a..b50204dda517611e0774727139ea69ca085dfcb5 100644
+index 7dbdcd6ba2c17a0320ae1ca872274207c125bf75..5e9f0a30778091c54f064073811f95d9ef2990e0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3160,7 +3160,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0756-Fix-Spigot-growth-modifiers.patch b/patches/server/0755-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0756-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0755-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0757-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0756-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0757-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0756-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0758-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0757-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0758-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0757-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0759-Add-player-health-update-API.patch b/patches/server/0758-Add-player-health-update-API.patch
similarity index 100%
rename from patches/server/0759-Add-player-health-update-API.patch
rename to patches/server/0758-Add-player-health-update-API.patch
diff --git a/patches/server/0760-Optimize-HashMapPalette.patch b/patches/server/0759-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0760-Optimize-HashMapPalette.patch
rename to patches/server/0759-Optimize-HashMapPalette.patch
diff --git a/patches/server/0761-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0760-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0761-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0760-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0762-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0761-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 99%
rename from patches/server/0762-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0761-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
index 60d259223f..ba54a7286b 100644
--- a/patches/server/0762-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
+++ b/patches/server/0761-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
@@ -1202,7 +1202,7 @@ index e1b59a1e6fd957b45f0a73eb51487e44108af34c..2e3d5b38ace99ce99a8107e750c5eeaf
              }
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6c7d68f910d3be55ed0b3124bfc861d5446c1388..88e9c5faca16eeb5cafcedb811a3d9d4dba6e9ce 100644
+index 50455e4efa287c0c49b60ddcabff5a336b86365f..3bc06377d022f6a3f6e0c2129640b6b9e04054f9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -874,7 +874,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0763-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0762-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0763-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0762-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0764-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0763-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0764-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0763-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0765-Add-more-Campfire-API.patch b/patches/server/0764-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0765-Add-more-Campfire-API.patch
rename to patches/server/0764-Add-more-Campfire-API.patch
diff --git a/patches/server/0766-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0765-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0766-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0765-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0767-Fix-tripwire-state-inconsistency.patch b/patches/server/0766-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0767-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0766-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0768-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0767-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0768-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0767-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0769-Improve-scoreboard-entries.patch b/patches/server/0768-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0769-Improve-scoreboard-entries.patch
rename to patches/server/0768-Improve-scoreboard-entries.patch
diff --git a/patches/server/0770-Entity-powdered-snow-API.patch b/patches/server/0769-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0770-Entity-powdered-snow-API.patch
rename to patches/server/0769-Entity-powdered-snow-API.patch
diff --git a/patches/server/0771-Add-API-for-item-entity-health.patch b/patches/server/0770-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0771-Add-API-for-item-entity-health.patch
rename to patches/server/0770-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0772-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0771-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0772-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0771-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0773-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0772-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0773-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0772-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0774-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0773-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0774-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0773-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0775-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0774-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0775-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0774-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0776-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0775-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0776-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0775-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0777-Fix-bees-aging-inside-hives.patch b/patches/server/0776-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0777-Fix-bees-aging-inside-hives.patch
rename to patches/server/0776-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0778-Bucketable-API.patch b/patches/server/0777-Bucketable-API.patch
similarity index 100%
rename from patches/server/0778-Bucketable-API.patch
rename to patches/server/0777-Bucketable-API.patch
diff --git a/patches/server/0779-Validate-usernames.patch b/patches/server/0778-Validate-usernames.patch
similarity index 94%
rename from patches/server/0779-Validate-usernames.patch
rename to patches/server/0778-Validate-usernames.patch
index a1c6756470..50fe171058 100644
--- a/patches/server/0779-Validate-usernames.patch
+++ b/patches/server/0778-Validate-usernames.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate usernames
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 00e2692dd5e2b6a17c0f5c9e149b90977afc1237..3911daf2a51da1c39adbe8486ecc8fa16093f898 100644
+index b6dc42aef6458b0c09007bb0e13048b99531f8c0..7e8401a05905775f7209abb1269e24aad409af50 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -60,6 +60,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -56,7 +56,7 @@ index 00e2692dd5e2b6a17c0f5c9e149b90977afc1237..3911daf2a51da1c39adbe8486ecc8fa1
  
          if (gameprofile != null && packet.name().equalsIgnoreCase(gameprofile.getName())) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 88e9c5faca16eeb5cafcedb811a3d9d4dba6e9ce..01404600dcf4eefe1e62e7c62edb5b0980298583 100644
+index 3bc06377d022f6a3f6e0c2129640b6b9e04054f9..d7a5d6e548e6239f3f5a26303e03b657fc2ec8f5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -652,7 +652,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0780-Make-water-animal-spawn-height-configurable.patch b/patches/server/0779-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0780-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0779-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0781-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0780-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0781-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0780-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index ffa965a726..868eef4b9d 100644
--- a/patches/server/0781-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0780-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -31,7 +31,7 @@ index 74c2bb3de8b5bfc3b285a19a322cfe308a9b88f2..9d8b856132f20d94b928d4e343ede2e0
              biomeProvider = generator.getDefaultBiomeProvider(worldInfo);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cb7c070c190e63644160ddd9855628547fd37ee1..2cee0f5a746d37fa5b3fbe0ca3af2632af6f5735 100644
+index c093401834d7111857a0d49e60faa36ee22aae40..bbef20b0be264b429bcb037ae6740120d4113bb0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -199,6 +199,30 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0782-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0781-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0782-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0781-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0783-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0782-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0783-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0782-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0784-Multiple-Entries-with-Scoreboards.patch b/patches/server/0783-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0784-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0783-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0785-Reset-placed-block-on-exception.patch b/patches/server/0784-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0785-Reset-placed-block-on-exception.patch
rename to patches/server/0784-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0786-Add-configurable-height-for-slime-spawn.patch b/patches/server/0785-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0786-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0785-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0787-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0786-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 94%
rename from patches/server/0787-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0786-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
index 5b253ada97..8f2c897029 100644
--- a/patches/server/0787-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
+++ b/patches/server/0786-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Added getHostname to AsyncPlayerPreLoginEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 3911daf2a51da1c39adbe8486ecc8fa16093f898..a571d1e4b5407090f60c97326f8703d270a3314d 100644
+index 7e8401a05905775f7209abb1269e24aad409af50..0bedd9eadbfe1ce290f22d6c648571e25e3ae0e9 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -371,7 +371,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0788-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0787-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0788-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0787-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0789-Kick-on-main-for-illegal-chat.patch b/patches/server/0788-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0789-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0788-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0790-Multi-Block-Change-API-Implementation.patch b/patches/server/0789-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0790-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0789-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0791-Fix-NotePlayEvent.patch b/patches/server/0790-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0791-Fix-NotePlayEvent.patch
rename to patches/server/0790-Fix-NotePlayEvent.patch
diff --git a/patches/server/0792-Freeze-Tick-Lock-API.patch b/patches/server/0791-Freeze-Tick-Lock-API.patch
similarity index 97%
rename from patches/server/0792-Freeze-Tick-Lock-API.patch
rename to patches/server/0791-Freeze-Tick-Lock-API.patch
index e2f05654d5..80e7185949 100644
--- a/patches/server/0792-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0791-Freeze-Tick-Lock-API.patch
@@ -46,7 +46,7 @@ index 9bbc8e1f15b5dfc62bcb065d6ebb87fa58afb91e..ac9a612488bf8a3efdfbfbfe9fb1de81
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index b50204dda517611e0774727139ea69ca085dfcb5..19a9aaaf842d021bcd0f1bc5decf559a683448b1 100644
+index 5e9f0a30778091c54f064073811f95d9ef2990e0..04df7f6d7a406b939b20cb16504ba4f603e5c5f2 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3411,7 +3411,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0793-Dolphin-API.patch b/patches/server/0792-Dolphin-API.patch
similarity index 100%
rename from patches/server/0793-Dolphin-API.patch
rename to patches/server/0792-Dolphin-API.patch
diff --git a/patches/server/0794-More-PotionEffectType-API.patch b/patches/server/0793-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0794-More-PotionEffectType-API.patch
rename to patches/server/0793-More-PotionEffectType-API.patch
diff --git a/patches/server/0795-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0794-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0795-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0794-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0796-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0795-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0796-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0795-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0797-Add-missing-structure-set-seed-configs.patch b/patches/server/0796-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0797-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0796-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0798-Implement-regenerateChunk.patch b/patches/server/0797-Implement-regenerateChunk.patch
similarity index 98%
rename from patches/server/0798-Implement-regenerateChunk.patch
rename to patches/server/0797-Implement-regenerateChunk.patch
index a9643269e1..65c36cccb0 100644
--- a/patches/server/0798-Implement-regenerateChunk.patch
+++ b/patches/server/0797-Implement-regenerateChunk.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk
 Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2cee0f5a746d37fa5b3fbe0ca3af2632af6f5735..498d8e2782d28db0fd35b737d548c1ffba238177 100644
+index bbef20b0be264b429bcb037ae6740120d4113bb0..36bdc4aa5356ddcf9353c28a6ef15cd8c6aa4a47 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -138,6 +138,7 @@ import org.bukkit.util.Vector;
diff --git a/patches/server/0799-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0798-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 95%
rename from patches/server/0799-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0798-Fix-cancelled-powdered-snow-bucket-placement.patch
index 03f89be4c3..c37348f1c6 100644
--- a/patches/server/0799-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0798-Fix-cancelled-powdered-snow-bucket-placement.patch
@@ -20,7 +20,7 @@ index e581dc10f3c805f7f8b6e4c842092609e7e1a0f8..b0204af850ee182773ad458208cccd94
                                  }
                                  return InteractionResult.FAIL;
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index a2d92e0ed4348e632b8a55a4fae71ecc3777edcb..64738fffa5ab0cb9ea22fa7198856ea69d8e9cfd 100644
+index a6858017ff9468dbf4651fe62faea487a54b3878..def4d9c5a9b311d002eb88729bdba73b30f99bb7 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -345,7 +345,7 @@ public final class ItemStack {
@@ -32,7 +32,7 @@ index a2d92e0ed4348e632b8a55a4fae71ecc3777edcb..64738fffa5ab0cb9ea22fa7198856ea6
                  world.captureBlockStates = true;
                  // special case bonemeal
                  if (this.getItem() == Items.BONE_MEAL) {
-@@ -399,7 +399,7 @@ public final class ItemStack {
+@@ -400,7 +400,7 @@ public final class ItemStack {
                  world.capturedBlockStates.clear();
                  if (blocks.size() > 1) {
                      placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockMultiPlaceEvent(world, entityhuman, enumhand, blocks, blockposition.getX(), blockposition.getY(), blockposition.getZ());
diff --git a/patches/server/0800-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0799-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0800-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0799-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0801-Add-GameEvent-tags.patch b/patches/server/0800-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0801-Add-GameEvent-tags.patch
rename to patches/server/0800-Add-GameEvent-tags.patch
diff --git a/patches/server/0802-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0801-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0802-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0801-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0803-Furnace-RecipesUsed-API.patch b/patches/server/0802-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0803-Furnace-RecipesUsed-API.patch
rename to patches/server/0802-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0804-Configurable-sculk-sensor-listener-range.patch b/patches/server/0803-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0804-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0803-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0805-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0804-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0805-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0804-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0806-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0805-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0806-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0805-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0807-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0806-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0807-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0806-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0808-Fix-Entity-Position-Desync.patch b/patches/server/0807-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0808-Fix-Entity-Position-Desync.patch
rename to patches/server/0807-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0809-Custom-Potion-Mixes.patch b/patches/server/0808-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0809-Custom-Potion-Mixes.patch
rename to patches/server/0808-Custom-Potion-Mixes.patch
diff --git a/patches/server/0810-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0809-Fix-Fluid-tags-isTagged-method.patch
similarity index 94%
rename from patches/server/0810-Fix-Fluid-tags-isTagged-method.patch
rename to patches/server/0809-Fix-Fluid-tags-isTagged-method.patch
index 45c0d27536..adf5cdf802 100644
--- a/patches/server/0810-Fix-Fluid-tags-isTagged-method.patch
+++ b/patches/server/0809-Fix-Fluid-tags-isTagged-method.patch
@@ -18,7 +18,7 @@ index 89cb1ec575c0f58e9934d98b056621348dbbe27a..cdd474e9b0363641839a66d3e61fec46
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index ba9ce30003eb787fe974ae53f375ae9c0591d619..45e13c9dc4a65207728cdb401511b187597fe199 100644
+index 90dbc63a7472b923ed4faca5ac52f9438126fa63..73e82653e0a68560c25ae41ade4c58111cbcd276 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -205,7 +205,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0811-Force-close-world-loading-screen.patch b/patches/server/0810-Force-close-world-loading-screen.patch
similarity index 95%
rename from patches/server/0811-Force-close-world-loading-screen.patch
rename to patches/server/0810-Force-close-world-loading-screen.patch
index f0a197cad4..b70ca1828f 100644
--- a/patches/server/0811-Force-close-world-loading-screen.patch
+++ b/patches/server/0810-Force-close-world-loading-screen.patch
@@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to
 be loaded to close the loading screen, so we just send an empty one.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 01404600dcf4eefe1e62e7c62edb5b0980298583..e706e94b2f85830dd82dd30b4451243f540bd3f8 100644
+index d7a5d6e548e6239f3f5a26303e03b657fc2ec8f5..0093be36b2d107549da99d51894f7a332af5e3fa 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -375,6 +375,16 @@ public abstract class PlayerList {
diff --git a/patches/server/0812-Fix-falling-block-spawn-methods.patch b/patches/server/0811-Fix-falling-block-spawn-methods.patch
similarity index 97%
rename from patches/server/0812-Fix-falling-block-spawn-methods.patch
rename to patches/server/0811-Fix-falling-block-spawn-methods.patch
index 1a6d6b70ec..68ca552a02 100644
--- a/patches/server/0812-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0811-Fix-falling-block-spawn-methods.patch
@@ -24,7 +24,7 @@ index bb486249d409743b0fc9891ac5ae76a38034800b..e365081bf532488f2b41b22deb2fb234
              if (Snowball.class.isAssignableFrom(clazz)) {
                  entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 498d8e2782d28db0fd35b737d548c1ffba238177..63dff3a4426470cede26fcb03424f8cf63757214 100644
+index 36bdc4aa5356ddcf9353c28a6ef15cd8c6aa4a47..bfc9badadd90303cd9042d85697c95bd5b4f6f9c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1394,7 +1394,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0813-Expose-furnace-minecart-push-values.patch b/patches/server/0812-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0813-Expose-furnace-minecart-push-values.patch
rename to patches/server/0812-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0814-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0813-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 95%
rename from patches/server/0814-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0813-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 7d56bce19b..ef0ba395b1 100644
--- a/patches/server/0814-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0813-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
@@ -15,7 +15,7 @@ piercing arrows to avoid duplicate damage being applied.
 protected net.minecraft.world.entity.projectile.Projectile hitCancelled
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 740f08e5fadf9b8d277af05cc9734ceb54f54abb..09a4c0d30898bbdc05e32b6f1d4b0436a5e4af53 100644
+index 8c08e07ba78e2ed042d79b692221008f59e92593..9788e477ff1446ad2ea3669922cc7dfc09900ce8 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -290,6 +290,19 @@ public abstract class AbstractArrow extends Projectile {
diff --git a/patches/server/0815-More-Projectile-API.patch b/patches/server/0814-More-Projectile-API.patch
similarity index 99%
rename from patches/server/0815-More-Projectile-API.patch
rename to patches/server/0814-More-Projectile-API.patch
index 5cd7d6bb11..0d4b17fc77 100644
--- a/patches/server/0815-More-Projectile-API.patch
+++ b/patches/server/0814-More-Projectile-API.patch
@@ -340,7 +340,7 @@ index 832981b07ef5c633ef00a382f56798ee87eec0df..faf071201b7c1414225a33fe9641eac9
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 7f6d331cf832f57857519b6e9801c3b45b53fc32..998370e84410d54cae5d5ba15212701fefb40782 100644
+index f3fcaf02a7718e20c1779934687a718e28a1d55a..3e5abea2f814a0a364cf87ff4ce1b1718ba2ddac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -278,12 +278,20 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0816-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0815-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0816-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0815-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0817-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0816-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0817-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0816-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0818-Implement-getComputedBiome-API.patch b/patches/server/0817-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0818-Implement-getComputedBiome-API.patch
rename to patches/server/0817-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0819-Make-some-itemstacks-nonnull.patch b/patches/server/0818-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0819-Make-some-itemstacks-nonnull.patch
rename to patches/server/0818-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0820-Implement-enchantWithLevels-API.patch b/patches/server/0819-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0820-Implement-enchantWithLevels-API.patch
rename to patches/server/0819-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0821-Fix-saving-in-unloadWorld.patch b/patches/server/0820-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0821-Fix-saving-in-unloadWorld.patch
rename to patches/server/0820-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0822-Buffer-OOB-setBlock-calls.patch b/patches/server/0821-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0822-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0821-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0823-Add-TameableDeathMessageEvent.patch b/patches/server/0822-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0823-Add-TameableDeathMessageEvent.patch
rename to patches/server/0822-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0824-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0823-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0824-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0823-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0825-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0824-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0825-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0824-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0826-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0825-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0826-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0825-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0827-Guard-against-invalid-entity-positions.patch b/patches/server/0826-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0827-Guard-against-invalid-entity-positions.patch
rename to patches/server/0826-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0828-cache-resource-keys.patch b/patches/server/0827-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0828-cache-resource-keys.patch
rename to patches/server/0827-cache-resource-keys.patch
diff --git a/patches/server/0829-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0828-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0829-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0828-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0830-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0829-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0830-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0829-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0831-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0830-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0831-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0830-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0832-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0831-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0832-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0831-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0833-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0832-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0833-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0832-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0834-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0833-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0834-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0833-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0835-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0834-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 99%
rename from patches/server/0835-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0834-Pass-ServerLevel-for-gamerule-callbacks.patch
index 54ab0ce0a5..e222a0da56 100644
--- a/patches/server/0835-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0834-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -158,7 +158,7 @@ index fa8cd4438c19a262272da47985a57f7e84654f1b..663c1d8c1611af915a1bae733920dd75
              this.onChanged(server);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 63dff3a4426470cede26fcb03424f8cf63757214..01ccb54fb94fc5c03865b12bde63a2cb5a46e0f5 100644
+index bfc9badadd90303cd9042d85697c95bd5b4f6f9c..346348eb37f6026931a864d2dc9926db8d4321bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1898,7 +1898,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0836-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0835-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 89%
rename from patches/server/0836-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0835-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 683861bcf1..710c21cbb7 100644
--- a/patches/server/0836-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/server/0835-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add pre-unbreaking amount to PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 64738fffa5ab0cb9ea22fa7198856ea69d8e9cfd..8450a22b0fc6e8dc5cad0f61ac52a82b3cd3791e 100644
+index def4d9c5a9b311d002eb88729bdba73b30f99bb7..6860096cb8c0deecc9c1d87543d1128fb95fd2d4 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -571,10 +571,11 @@ public final class ItemStack {
+@@ -572,10 +572,11 @@ public final class ItemStack {
                      }
                  }
  
diff --git a/patches/server/0837-WorldCreator-keepSpawnLoaded.patch b/patches/server/0836-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0837-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0836-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0838-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0837-Fix-NPE-for-BlockDataMeta-getBlockData.patch
similarity index 100%
rename from patches/server/0838-Fix-NPE-for-BlockDataMeta-getBlockData.patch
rename to patches/server/0837-Fix-NPE-for-BlockDataMeta-getBlockData.patch
diff --git a/patches/server/0839-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0838-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0839-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0838-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0840-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0839-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0840-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0839-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0841-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0840-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0841-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0840-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0842-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0841-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0842-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0841-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0843-Add-PlayerStopUsingItemEvent.patch b/patches/server/0842-Add-PlayerStopUsingItemEvent.patch
similarity index 91%
rename from patches/server/0843-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0842-Add-PlayerStopUsingItemEvent.patch
index 7b71cb5818..641257376b 100644
--- a/patches/server/0843-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0842-Add-PlayerStopUsingItemEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 19a9aaaf842d021bcd0f1bc5decf559a683448b1..5c1fc7ae7e92426491bf95a249763c789a4c54cd 100644
+index 04df7f6d7a406b939b20cb16504ba4f603e5c5f2..8433a1359a742f8947a328cc621c0ff4f64977f0 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3974,6 +3974,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0844-FallingBlock-auto-expire-setting.patch b/patches/server/0843-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0844-FallingBlock-auto-expire-setting.patch
rename to patches/server/0843-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0845-Don-t-tick-markers.patch b/patches/server/0844-Don-t-tick-markers.patch
similarity index 96%
rename from patches/server/0845-Don-t-tick-markers.patch
rename to patches/server/0844-Don-t-tick-markers.patch
index 09a066dd65..32054a3421 100644
--- a/patches/server/0845-Don-t-tick-markers.patch
+++ b/patches/server/0844-Don-t-tick-markers.patch
@@ -34,7 +34,7 @@ index b91a199f2e426b49ddc72c8e9d0224c05d8a7acd..d0a19d8e04e92a39d5db19e9eb23aa44
          }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 417296e8d2efb2b70809ff91b61451bd8e788df3..1b42c98956342832c37f0aa266f85271daa4ba5b 100644
+index f158fc8a151272428a33dc5f6e1742876edc80d5..e881584d38dc354204479863f004e974a0ac6c07 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -212,7 +212,7 @@ public class ActivationRange
diff --git a/patches/server/0846-Do-not-accept-invalid-client-settings.patch b/patches/server/0845-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0846-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0845-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0847-Add-support-for-Proxy-Protocol.patch b/patches/server/0846-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0847-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0846-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0848-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0847-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 96%
rename from patches/server/0848-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0847-Fix-OfflinePlayer-getBedSpawnLocation.patch
index b11ce011a5..f74dc698da 100644
--- a/patches/server/0848-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0847-Fix-OfflinePlayer-getBedSpawnLocation.patch
@@ -8,7 +8,7 @@ instance of CraftOfflinePlayer the world was incorrect
 due to the logic for reading the NBT not being up-to-date.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index d7823d7dc88cfba6f6ac9dae220e03dea4a0bcdd..6d2ba650f53de8a460857f1846401a20b50cc43c 100644
+index 17b3d5de58a9ef3acc67624c46cd6bbd96394f87..714afc98b5150907b45a00060be4e41582333204 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -31,6 +31,7 @@ import org.bukkit.profile.PlayerProfile;
diff --git a/patches/server/0849-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0848-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0849-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0848-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0850-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0849-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0850-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0849-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0851-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0850-Prevent-entity-loading-causing-async-lookups.patch
similarity index 97%
rename from patches/server/0851-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0850-Prevent-entity-loading-causing-async-lookups.patch
index 8e1e2b27cb..e784b14706 100644
--- a/patches/server/0851-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0850-Prevent-entity-loading-causing-async-lookups.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8770c02b6ba1d1dcb7b5fa3ac7f006a7097234f5..0bc808ac268dce5a170e7e55666885b8c2c09164 100644
+index 5597c0ff49179e4978b82d36d92ba96f147c590c..0e27a7b943a5e4d580fdbce4cd14d0528c808735 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -788,6 +788,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0852-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0851-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0852-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0851-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0853-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0852-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0853-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0852-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0854-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0853-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0854-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0853-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0855-Dont-resent-entity-on-art-update.patch b/patches/server/0854-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0855-Dont-resent-entity-on-art-update.patch
rename to patches/server/0854-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0856-Add-WardenAngerChangeEvent.patch b/patches/server/0855-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0856-Add-WardenAngerChangeEvent.patch
rename to patches/server/0855-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0857-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0856-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0857-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0856-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0858-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0857-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0858-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0857-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0859-Nameable-Banner-API.patch b/patches/server/0858-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0859-Nameable-Banner-API.patch
rename to patches/server/0858-Nameable-Banner-API.patch
diff --git a/patches/server/0860-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0859-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0860-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0859-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0861-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0860-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0861-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0860-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0862-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0861-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0862-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0861-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0863-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0862-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0863-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0862-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0864-Add-Player-getFishHook.patch b/patches/server/0863-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0864-Add-Player-getFishHook.patch
rename to patches/server/0863-Add-Player-getFishHook.patch
diff --git a/patches/server/0865-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0864-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0865-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0864-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0866-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0865-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0866-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0865-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0867-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0866-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0867-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0866-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0868-Fix-Bee-flower-NPE.patch b/patches/server/0867-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0868-Fix-Bee-flower-NPE.patch
rename to patches/server/0867-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0869-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0868-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0869-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0868-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0870-More-Teleport-API.patch b/patches/server/0869-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0870-More-Teleport-API.patch
rename to patches/server/0869-More-Teleport-API.patch
diff --git a/patches/server/0871-Add-EntityPortalReadyEvent.patch b/patches/server/0870-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0871-Add-EntityPortalReadyEvent.patch
rename to patches/server/0870-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0872-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0871-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0872-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0871-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0873-Send-block-entities-after-destroy-prediction.patch b/patches/server/0872-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0873-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0872-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0874-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0873-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 98%
rename from patches/server/0874-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0873-Warn-on-plugins-accessing-faraway-chunks.patch
index c5bbe48e84..361a384ff4 100644
--- a/patches/server/0874-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0873-Warn-on-plugins-accessing-faraway-chunks.patch
@@ -18,7 +18,7 @@ index bb411f4efc550ed7872f0252373be81bd8e99b76..3cbf801b2e5420c0e870f73788deb550
  
      private static boolean isOutsideSpawnableHeight(int y) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 01ccb54fb94fc5c03865b12bde63a2cb5a46e0f5..f8d321e925bf2708e51590542325c1bdc67d5964 100644
+index 346348eb37f6026931a864d2dc9926db8d4321bc..4cb0307935aa63d44aac55c80ee50be074d7913c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -312,9 +312,24 @@ public class CraftWorld extends CraftRegionAccessor implements World {
diff --git a/patches/server/0875-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0874-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0875-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0874-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0876-Add-missing-BlockFadeEvents.patch b/patches/server/0875-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0876-Add-missing-BlockFadeEvents.patch
rename to patches/server/0875-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0877-Collision-API.patch b/patches/server/0876-Collision-API.patch
similarity index 100%
rename from patches/server/0877-Collision-API.patch
rename to patches/server/0876-Collision-API.patch
diff --git a/patches/server/0878-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0877-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0878-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0877-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0879-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0878-Remove-invalid-signature-login-stacktrace.patch
similarity index 100%
rename from patches/server/0879-Remove-invalid-signature-login-stacktrace.patch
rename to patches/server/0878-Remove-invalid-signature-login-stacktrace.patch
diff --git a/patches/server/0880-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0879-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
similarity index 100%
rename from patches/server/0880-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
rename to patches/server/0879-Add-async-catcher-to-PlayerConnection-internalTelepo.patch
diff --git a/patches/server/0881-Block-Ticking-API.patch b/patches/server/0880-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0881-Block-Ticking-API.patch
rename to patches/server/0880-Block-Ticking-API.patch
diff --git a/patches/server/0882-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0881-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0882-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0881-Add-Velocity-IP-Forwarding-Support.patch
index a04943245c..ac101f06a4 100644
--- a/patches/server/0882-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0881-Add-Velocity-IP-Forwarding-Support.patch
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..c4934979b1ed85bfc4f8d9e6f8848b2b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index a571d1e4b5407090f60c97326f8703d270a3314d..2bae7c5494ed4f144d094a26471fa5f9e45e9918 100644
+index 0bedd9eadbfe1ce290f22d6c648571e25e3ae0e9..093822a5256e8e919350a000239a3e92a2379aaf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -61,6 +61,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0883-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0882-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 92%
rename from patches/server/0883-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0882-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 484b3ab4b3..c54bb3b083 100644
--- a/patches/server/0883-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0882-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 2bae7c5494ed4f144d094a26471fa5f9e45e9918..3f7fab2f80ded9a7a720bd623f1ef028a4d0dca6 100644
+index 093822a5256e8e919350a000239a3e92a2379aaf..a25306fe8a35bb70a490e6a0c01d0340bbc0d781 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -49,7 +49,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
diff --git a/patches/server/0884-Add-NamespacedKey-biome-methods.patch b/patches/server/0883-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0884-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0883-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0885-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0884-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 96%
rename from patches/server/0885-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0884-Fix-plugin-loggers-on-server-shutdown.patch
index 950e47ed3e..f974636c1c 100644
--- a/patches/server/0885-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0884-Fix-plugin-loggers-on-server-shutdown.patch
@@ -49,7 +49,7 @@ index 0e04083ff0598451c66731b1518b2eb6367ae36c..710ca7d3a5659953f64bc6dccdd93b43
          // Paper end
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 1176f77c79c2cbd727f1f6867e956fb698936349..119d9bb5e41038704654e248bf168d22af246b7f 100644
+index 4714e0199987d864b37aaec94ffa885a5b76b437..190e17eb28d166aedee06e9578561ba402d1b6d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -20,6 +20,12 @@ public class Main {
diff --git a/patches/server/0886-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0885-Workaround-for-client-lag-spikes-MC-162253.patch
similarity index 100%
rename from patches/server/0886-Workaround-for-client-lag-spikes-MC-162253.patch
rename to patches/server/0885-Workaround-for-client-lag-spikes-MC-162253.patch
diff --git a/patches/server/0887-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0886-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 96%
rename from patches/server/0887-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0886-Stop-large-look-changes-from-crashing-the-server.patch
index 07871e307d..81badd0182 100644
--- a/patches/server/0887-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0886-Stop-large-look-changes-from-crashing-the-server.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server
 Co-authored-by: Jaren Knodel <Jaren@Knodel.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 5c1fc7ae7e92426491bf95a249763c789a4c54cd..a3cd6e3d0d1fc01d47d08fead7990af1dce66c85 100644
+index 8433a1359a742f8947a328cc621c0ff4f64977f0..c9c16dfffa782b82c1697f3819591077995760d3 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3028,37 +3028,15 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0888-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0887-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/server/0888-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/server/0887-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/server/0889-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0888-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
similarity index 100%
rename from patches/server/0889-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
rename to patches/server/0888-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch
diff --git a/patches/server/0890-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0889-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0890-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0889-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0891-Missing-eating-regain-reason.patch b/patches/server/0890-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0891-Missing-eating-regain-reason.patch
rename to patches/server/0890-Missing-eating-regain-reason.patch
diff --git a/patches/server/0892-Missing-effect-cause.patch b/patches/server/0891-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0892-Missing-effect-cause.patch
rename to patches/server/0891-Missing-effect-cause.patch
diff --git a/patches/server/0893-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0892-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0893-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0892-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0894-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0893-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0894-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0893-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0895-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0894-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0895-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0894-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0896-Configurable-chat-thread-limit.patch b/patches/server/0895-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0896-Configurable-chat-thread-limit.patch
rename to patches/server/0895-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0897-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0896-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 93%
rename from patches/server/0897-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0896-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 2061ee704b..5894565e16 100644
--- a/patches/server/0897-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0896-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Mitigate effects of WorldCreator#keepSpawnLoaded ret type
 TODO: Remove in 1.21?
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 0d150f5ea05b8ecb83cef738ae8ad036d6a2de87..27883f91870422384af4a0348804b5dd53aa3483 100644
+index d7c1077f2eb2846a17a5872f01ebb8aabf0cb181..ebbbfc318439fec33331d71563e528cd3429e541 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -443,6 +443,12 @@ public class Commodore
diff --git a/patches/server/0898-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0897-Set-position-before-player-sending-on-dimension-chan.patch
similarity index 100%
rename from patches/server/0898-Set-position-before-player-sending-on-dimension-chan.patch
rename to patches/server/0897-Set-position-before-player-sending-on-dimension-chan.patch
diff --git a/patches/server/0899-fix-Jigsaw-block-kicking-user.patch b/patches/server/0898-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0899-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0898-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0900-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0899-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0900-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0899-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0901-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0900-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
similarity index 100%
rename from patches/server/0901-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
rename to patches/server/0900-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch
diff --git a/patches/server/0902-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0901-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0902-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0901-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0903-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0902-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0903-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0902-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0904-Fix-custom-piglin-loved-items.patch b/patches/server/0903-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0904-Fix-custom-piglin-loved-items.patch
rename to patches/server/0903-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0905-EntityPickupItemEvent-fixes.patch b/patches/server/0904-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0905-EntityPickupItemEvent-fixes.patch
rename to patches/server/0904-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0906-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0905-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 97%
rename from patches/server/0906-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0905-Correctly-handle-interactions-with-items-on-cooldown.patch
index 0f681af26a..f081c5b1af 100644
--- a/patches/server/0906-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0905-Correctly-handle-interactions-with-items-on-cooldown.patch
@@ -30,7 +30,7 @@ index 13031576c20bda3bb12c926f6cd938fa5fb105f2..58b093bb1de78ee3b3b2ea364aa50474
          this.interactResult = event.useItemInHand() == Event.Result.DENY;
          this.interactPosition = blockposition.immutable();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e3b44666564cf40f015daff6ad1109bd5983fcfa..dd063e8b0df7505a96cd25dc5c797c0c04dfdfd0 100644
+index 4143f72b8df92bee25399f90a759c8a8fb567cba..6a52ae70b5f7fd9953b6b2605cae722f606e7fec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -499,6 +499,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0907-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0906-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0907-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0906-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0908-Elder-Guardian-appearance-API.patch b/patches/server/0907-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0908-Elder-Guardian-appearance-API.patch
rename to patches/server/0907-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0909-Allow-changing-bed-s-occupied-property.patch b/patches/server/0908-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0909-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0908-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0910-Add-entity-knockback-API.patch b/patches/server/0909-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0910-Add-entity-knockback-API.patch
rename to patches/server/0909-Add-entity-knockback-API.patch
diff --git a/patches/server/0911-Detect-headless-JREs.patch b/patches/server/0910-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0911-Detect-headless-JREs.patch
rename to patches/server/0910-Detect-headless-JREs.patch
diff --git a/patches/server/0912-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0911-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0912-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0911-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0913-optimized-dirt-and-snow-spreading.patch b/patches/server/0912-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0913-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0912-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0914-Added-EntityToggleSitEvent.patch b/patches/server/0913-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0914-Added-EntityToggleSitEvent.patch
rename to patches/server/0913-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0915-Add-fire-tick-delay-option.patch b/patches/server/0914-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0915-Add-fire-tick-delay-option.patch
rename to patches/server/0914-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0916-Add-Moving-Piston-API.patch b/patches/server/0915-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0916-Add-Moving-Piston-API.patch
rename to patches/server/0915-Add-Moving-Piston-API.patch
diff --git a/patches/server/0917-Ignore-impossible-spawn-tick.patch b/patches/server/0916-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0917-Ignore-impossible-spawn-tick.patch
rename to patches/server/0916-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0918-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0917-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0918-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0917-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0919-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0918-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0919-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0918-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0920-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0919-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0920-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0919-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0921-Prevent-compass-from-loading-chunks.patch b/patches/server/0920-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0921-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0920-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0922-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0921-Add-PrePlayerAttackEntityEvent.patch
similarity index 93%
rename from patches/server/0922-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0921-Add-PrePlayerAttackEntityEvent.patch
index df2f4dad15..8b93056f79 100644
--- a/patches/server/0922-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0921-Add-PrePlayerAttackEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PrePlayerAttackEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index d7ef9c267a0cf496ac08ce568cb7649e09d5fcd6..2e6557a19523d18aecff709de30cb4466b46a9fa 100644
+index 23ef09683ff506996c45aa8a3b84c72055960f03..0dcae10fd05a8fe963fdedda8199aa09dc717c9a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1233,8 +1233,17 @@ public abstract class Player extends LivingEntity {
diff --git a/patches/server/0923-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0922-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0923-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0922-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0924-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0923-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0924-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0923-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0925-Add-Player-Warden-Warning-API.patch b/patches/server/0924-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0925-Add-Player-Warden-Warning-API.patch
rename to patches/server/0924-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0926-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0925-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0926-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0925-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0927-Add-paper-dumplisteners-command.patch b/patches/server/0926-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0927-Add-paper-dumplisteners-command.patch
rename to patches/server/0926-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0928-check-global-player-list-where-appropriate.patch b/patches/server/0927-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0928-check-global-player-list-where-appropriate.patch
rename to patches/server/0927-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0929-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0928-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0929-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0928-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0930-ItemStack-damage-API.patch b/patches/server/0929-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0930-ItemStack-damage-API.patch
rename to patches/server/0929-ItemStack-damage-API.patch
diff --git a/patches/server/0931-Friction-API.patch b/patches/server/0930-Friction-API.patch
similarity index 100%
rename from patches/server/0931-Friction-API.patch
rename to patches/server/0930-Friction-API.patch
diff --git a/patches/server/0932-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0931-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0932-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0931-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0933-Fix-player-kick-on-shutdown.patch b/patches/server/0932-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0933-Fix-player-kick-on-shutdown.patch
rename to patches/server/0932-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0934-Sync-offhand-slot-in-menus.patch b/patches/server/0933-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0934-Sync-offhand-slot-in-menus.patch
rename to patches/server/0933-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0935-Player-Entity-Tracking-Events.patch b/patches/server/0934-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0935-Player-Entity-Tracking-Events.patch
rename to patches/server/0934-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0936-Limit-pet-look-distance.patch b/patches/server/0935-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0936-Limit-pet-look-distance.patch
rename to patches/server/0935-Limit-pet-look-distance.patch
diff --git a/patches/server/0937-Properly-resend-entities.patch b/patches/server/0936-Properly-resend-entities.patch
similarity index 98%
rename from patches/server/0937-Properly-resend-entities.patch
rename to patches/server/0936-Properly-resend-entities.patch
index 626bb4e0a7..1afcbceb95 100644
--- a/patches/server/0937-Properly-resend-entities.patch
+++ b/patches/server/0936-Properly-resend-entities.patch
@@ -79,7 +79,7 @@ index 50c1d6dedcb7579ce5e83599b47016e4fc8d9d9a..08cb3db28f13c352a162009deeb28ee6
                              }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index af78bee12160435fc2ea01bfa7a1cd919e353833..8961310c0789c4dd95a729ecc0b8dbf8d701ffc4 100644
+index c092bfa679c60fd11eb95aaa4828b4f3403869f8..15f1a1dd63633005787876c37f9a67fa4f3fcbb9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -351,7 +351,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0938-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0937-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 98%
rename from patches/server/0938-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0937-Fixes-and-additions-to-the-SpawnReason-API.patch
index d3cee9849f..ebe4057d56 100644
--- a/patches/server/0938-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0937-Fixes-and-additions-to-the-SpawnReason-API.patch
@@ -8,7 +8,7 @@ Fixes some wrong reasons, and adds missing spawn reasons for entities.
 Co-authored-by: Doc <nachito94@msn.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index a697c3a68e9f00f7d66dead1ec516961d9ae6e1c..e5cd4b7609243669c9d84ff8a4988c209e6101aa 100644
+index 9d6979f4a00e2f6bcba21b3e2b48e9b62e057931..65b829ad019eb167bf7a9c4931e3006146dd742e 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -341,7 +341,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
diff --git a/patches/server/0939-fix-Instruments.patch b/patches/server/0938-fix-Instruments.patch
similarity index 100%
rename from patches/server/0939-fix-Instruments.patch
rename to patches/server/0938-fix-Instruments.patch
diff --git a/patches/server/0940-Fix-chunk-snapshot-biome-getter.patch b/patches/server/0939-Fix-chunk-snapshot-biome-getter.patch
similarity index 100%
rename from patches/server/0940-Fix-chunk-snapshot-biome-getter.patch
rename to patches/server/0939-Fix-chunk-snapshot-biome-getter.patch
diff --git a/patches/server/0941-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0940-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0941-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0940-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0942-Fix-MapLike-Codec-missing-key-selector.patch b/patches/server/0941-Fix-MapLike-Codec-missing-key-selector.patch
similarity index 100%
rename from patches/server/0942-Fix-MapLike-Codec-missing-key-selector.patch
rename to patches/server/0941-Fix-MapLike-Codec-missing-key-selector.patch
diff --git a/patches/server/0943-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0942-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0943-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0942-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0944-Improve-logging-and-errors.patch b/patches/server/0943-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0944-Improve-logging-and-errors.patch
rename to patches/server/0943-Improve-logging-and-errors.patch
diff --git a/patches/server/0945-Fix-explosion-yield-with-new-gamerules.patch b/patches/server/0944-Fix-explosion-yield-with-new-gamerules.patch
similarity index 100%
rename from patches/server/0945-Fix-explosion-yield-with-new-gamerules.patch
rename to patches/server/0944-Fix-explosion-yield-with-new-gamerules.patch
diff --git a/patches/server/0946-Add-BlockLockCheckEvent.patch b/patches/server/0945-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0946-Add-BlockLockCheckEvent.patch
rename to patches/server/0945-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0947-Add-Sneaking-API-for-Entities.patch b/patches/server/0946-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0947-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0946-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0948-Improve-PortalEvents.patch b/patches/server/0947-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0948-Improve-PortalEvents.patch
rename to patches/server/0947-Improve-PortalEvents.patch
diff --git a/patches/server/0949-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0948-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/server/0949-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/server/0948-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0950-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0949-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0950-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0949-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0951-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0950-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0951-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0950-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0952-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0951-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0952-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0951-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0953-Flying-Fall-Damage.patch b/patches/server/0952-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0953-Flying-Fall-Damage.patch
rename to patches/server/0952-Flying-Fall-Damage.patch
diff --git a/patches/server/0954-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0953-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0954-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0953-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0955-config-for-disabling-entity-tag-tags.patch b/patches/server/0954-config-for-disabling-entity-tag-tags.patch
similarity index 93%
rename from patches/server/0955-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0954-config-for-disabling-entity-tag-tags.patch
index 2ae3536198..961760b9ad 100644
--- a/patches/server/0955-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0954-config-for-disabling-entity-tag-tags.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] config for disabling entity tag tags
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index e5cd4b7609243669c9d84ff8a4988c209e6101aa..4589f7db68f7a72065c85c0a50216c6d02658f1e 100644
+index 65b829ad019eb167bf7a9c4931e3006146dd742e..41ff954010c11d524ffb90abd22c29a1d8d8f5a0 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -484,6 +484,13 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
diff --git a/patches/server/0956-Use-single-player-info-update-packet-on-join.patch b/patches/server/0955-Use-single-player-info-update-packet-on-join.patch
similarity index 97%
rename from patches/server/0956-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0955-Use-single-player-info-update-packet-on-join.patch
index 0f8a1e290b..b68960dd6b 100644
--- a/patches/server/0956-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0955-Use-single-player-info-update-packet-on-join.patch
@@ -18,7 +18,7 @@ index 50d8d16b1856c0c875ccabbcfc240379a7669559..3472f7f9b98d6d9c9f6465872803ef17
          });
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 8961310c0789c4dd95a729ecc0b8dbf8d701ffc4..a01654bb553c00459e64f16e5ccc91b70cc84444 100644
+index 15f1a1dd63633005787876c37f9a67fa4f3fcbb9..4b754f6eae683248d7fe11d6d6cb168d5dd696a2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -297,7 +297,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0957-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0956-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0957-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0956-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0958-Add-Player-sendEquipmentChange-Map-API.patch b/patches/server/0957-Add-Player-sendEquipmentChange-Map-API.patch
similarity index 100%
rename from patches/server/0958-Add-Player-sendEquipmentChange-Map-API.patch
rename to patches/server/0957-Add-Player-sendEquipmentChange-Map-API.patch
diff --git a/patches/server/0959-Win-Screen-API.patch b/patches/server/0958-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0959-Win-Screen-API.patch
rename to patches/server/0958-Win-Screen-API.patch
diff --git a/patches/server/0960-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0959-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0960-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0959-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 4768df7366..ab8ace6857 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 4768df7366ef10e808b31e8b167b21913822f076
+Subproject commit ab8ace68577ab6c0eb2f84b19bbf1adf3ad4a01d
diff --git a/work/Spigot b/work/Spigot
index d90018e043..19641c7577 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit d90018e043c1bdf8dd894701e61927c4f1a8b064
+Subproject commit 19641c7577eefd3f47df12167c5e01f449bce47c