From d8c3fb7e479c5289ad91fc48ce6e3e9612caecaf Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 16 Jun 2021 00:19:23 -0700
Subject: [PATCH] Temporarily revert incremental chunk saving patch

Needs updating to hook into new entity storage system
---
 .../1.17}/0455-incremental-chunk-saving.patch        |  1 +
 .../1.17}/0499-Incremental-player-saving.patch       |  1 +
 ...55-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...Fix-missing-chunks-due-to-integer-overflow.patch} |  0
 ...cheduler-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...Fix-piston-physics-inconsistency-MC-188840.patch} |  0
 ...-sand-duping.patch => 0459-Fix-sand-duping.patch} |  0
 ...sition-desync-in-playerconnection-causing-.patch} |  0
 ...ry-getHolder-method-without-block-snapshot.patch} |  0
 ...ck.patch => 0462-Expose-Arrow-getItemStack.patch} |  0
 ...d-and-implement-PlayerRecipeBookClickEvent.patch} |  0
 ...=> 0464-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ... => 0465-Add-permission-for-command-blocks.patch} |  0
 ...466-Ensure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...imize-WorldBorder-collision-checks-and-air.patch} |  0
 ...er-World-Difficulty-Remembering-Difficulty.patch} |  4 ++--
 ...mmand.patch => 0469-Paper-dumpitem-command.patch} |  0
 ...h => 0470-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...mprove-Legacy-Component-serialization-size.patch} |  0
 ...on-write-operations-for-updating-light-dat.patch} |  0
 ...ch => 0473-Support-old-UUID-format-for-NBT.patch} |  0
 ...Clean-up-duplicated-GameProfile-Properties.patch} |  0
 ...475-Convert-legacy-attributes-in-Item-Meta.patch} |  0
 ...> 0476-Remove-some-streams-from-structures.patch} |  0
 ...reams-from-classes-related-villager-gossip.patch} |  0
 ...Optimize-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...tch => 0479-Support-components-in-ItemMeta.patch} |  0
 ...ntityTargetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...id-API.patch => 0481-Add-entity-liquid-API.patch} |  0
 ...0482-Update-itemstack-legacy-name-and-lore.patch} |  0
 ...483-Spawn-player-in-correct-world-on-login.patch} |  0
 ...Event.patch => 0484-Add-PrepareResultEvent.patch} |  0
 ...0485-Allow-delegation-to-vanilla-chunk-gen.patch} |  0
 ...k-chunk-for-portal-on-world-gen-entity-add.patch} |  0
 ...Optimize-NetworkManager-Exception-Handling.patch} |  0
 ...he-advancement-data-player-iteration-to-be.patch} |  0
 ...0489-Fix-arrows-never-despawning-MC-125757.patch} |  0
 ...d-Safe-Vanilla-Command-permission-checking.patch} |  0
 ...0491-Move-range-check-for-block-placing-up.patch} |  0
 ...-SPIGOT-5989.patch => 0492-Fix-SPIGOT-5989.patch} |  0
 ...OT-5824-Bukkit-world-container-is-not-used.patch} |  0
 ...SPIGOT-5885-Unable-to-disable-advancements.patch} |  0
 ...ementDataPlayer-leak-due-from-quitting-ear.patch} |  0
 ...g-strikeLighting-call-to-World-spigot-stri.patch} |  0
 ... 0497-Fix-some-rails-connecting-improperly.patch} |  0
 ...> 0498-Fix-MC-187716-Use-configured-height.patch} |  0
 ...egex-mistake-in-CB-NBT-int-deserialization.patch} |  0
 ...-the-server-load-chunks-from-newer-version.patch} |  0
 ...-Brand-support.patch => 0501-Brand-support.patch} |  0
 ...rs-API.patch => 0502-Add-setMaxPlayers-API.patch} |  2 +-
 ...dd-playPickupItemAnimation-to-LivingEntity.patch} |  0
 ...ta.patch => 0504-Don-t-require-FACING-data.patch} |  0
 ...wnChangeEvent-not-firing-for-all-use-cases.patch} |  4 ++--
 ...phase-API.patch => 0506-Add-moon-phase-API.patch} |  0
 ...revent-headless-pistons-from-being-created.patch} | 12 +++++-------
 ...lRingEvent.patch => 0508-Add-BellRingEvent.patch} |  0
 ... 0509-Add-zombie-targets-turtle-egg-config.patch} |  2 +-
 ...-world.patch => 0510-Buffer-joins-to-world.patch} |  8 ++++----
 ....patch => 0511-Optimize-redstone-algorithm.patch} |  2 +-
 ...x-colors-not-working-in-some-kick-messages.patch} |  0
 ...PortalCreateEvent-needs-to-know-its-entity.patch} |  0
 ...eck.patch => 0514-Fix-CraftTeam-null-check.patch} |  0
 ...oker-API.patch => 0515-Add-more-Evoker-API.patch} |  0
 ...to-get-translation-keys-for-blocks-entitie.patch} |  0
 ...17-Create-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ngs.patch => 0518-Cache-block-data-strings.patch} |  4 ++--
 ...-Teleportation-and-cancel-velocity-if-tele.patch} |  0
 ...ditional-open-container-api-to-HumanEntity.patch} |  0
 ...che-DataFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...ck-drop-capture-to-capture-all-items-added.patch} |  4 ++--
 ...ark-dirty-in-invalid-locations-SPIGOT-6086.patch} |  4 ++--
 ...-Entity-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...Lazily-track-plugin-scoreboards-by-default.patch} |  4 ++--
 ...y-isTicking.patch => 0526-Entity-isTicking.patch} |  0
 ...icking-non-whitelisted-player-when-white-l.patch} |  4 ++--
 ...n-adding-a-passenger-in-CreatureSpawnEvent.patch} |  0
 ...0529-Fix-Concurrency-issue-in-WeightedList.patch} |  0
 ... 0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...Fix-for-large-move-vectors-crashing-server.patch} |  0
 ...calls.patch => 0532-Optimise-getType-calls.patch} |  0
 ...tOffers.patch => 0533-Villager-resetOffers.patch} |  0
 ...ve-inlinig-for-some-hot-IBlockData-methods.patch} |  0
 ...ock-place-order-when-capturing-blockstates.patch} |  0
 ...educe-blockpos-allocation-from-pathfinding.patch} |  0
 ...-Fix-item-locations-dropped-from-campfires.patch} |  0
 ...-API.patch => 0538-Player-elytra-boost-API.patch} |  0
 ...h => 0539-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...r-bubbling-up-when-item-stack-is-empty-in-.patch} |  0
 ...> 0541-Add-getOfflinePlayerIfCached-String.patch} |  0
 ...API.patch => 0542-Add-ignore-discounts-API.patch} |  0
 ...> 0543-Toggle-for-removing-existing-dragon.patch} |  2 +-
 ...0544-Fix-client-lag-on-advancement-loading.patch} |  0
 ...patch => 0545-Item-no-age-no-player-pickup.patch} |  0
 ...athfinder-Remove-Streams-Optimized-collect.patch} |  0
 ...ch => 0547-Beacon-API-custom-effect-ranges.patch} |  0
 ...ason.patch => 0548-Add-API-for-quit-reason.patch} |  8 ++++----
 ...ch.patch => 0549-Seed-based-feature-search.patch} |  4 ++--
 ...Wandering-Trader-spawn-rate-config-options.patch} |  2 +-
 ...tly-improve-performance-of-the-end-generat.patch} |  0
 ...gle.patch => 0552-Expose-world-spawn-angle.patch} |  4 ++--
 ...ed-API.patch => 0553-Add-Destroy-Speed-API.patch} |  0
 ...-Player-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...h => 0555-Add-LivingEntity-clearActiveItem.patch} |  0
 ....patch => 0556-Add-PlayerItemCooldownEvent.patch} |  0
 ...tning-API.patch => 0557-More-lightning-API.patch} |  0
 ...imbing-should-not-bypass-cramming-gamerule.patch} |  2 +-
 ...9-Added-missing-default-perms-for-commands.patch} |  0
 ...nt.patch => 0560-Add-PlayerShearBlockEvent.patch} |  0
 ...gots-verbose-world-setting-to-false-by-def.patch} |  0
 ...ix-curing-zombie-villager-discount-exploit.patch} |  2 +-
 ...packets.patch => 0563-Limit-recipe-packets.patch} |  2 +-
 ...564-Fix-CraftSound-backwards-compatibility.patch} |  0
 ...atch => 0565-MC-4-Fix-item-position-desync.patch} |  4 ++--
 ...ch => 0566-Player-Chunk-Load-Unload-Events.patch} |  4 ++--
 ... => 0567-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...=> 0568-Expose-LivingEntity-hurt-direction.patch} |  0
 ...69-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...sh-from-invalid-ingredient-lists-in-Villag.patch} |  0
 ...Event.patch => 0571-added-PlayerTradeEvent.patch} |  0
 ...ent.patch => 0572-Implement-TargetHitEvent.patch} |  0
 ...ch => 0573-Additional-Block-Material-API-s.patch} |  0
 ...dupe.patch => 0574-Fix-harming-potion-dupe.patch} |  0
 ...API-to-get-Material-from-Boats-and-Minecar.patch} |  0
 ...rations.patch => 0576-Cache-burn-durations.patch} |  0
 ...bling-mob-spawner-spawn-egg-transformation.patch} |  2 +-
 ... 0578-Fix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...9-Implement-PlayerFlowerPotManipulateEvent.patch} |  0
 ...teract-event-not-being-called-in-adventure.patch} |  0
 ...rs.patch => 0581-Zombie-API-breaking-doors.patch} |  0
 ...ch => 0582-Fix-nerfed-slime-when-splitting.patch} |  0
 ....patch => 0583-Add-EntityLoadCrossbowEvent.patch} |  0
 ...und.patch => 0584-Guardian-beam-workaround.patch} |  0
 ...tch => 0585-Added-WorldGameRuleChangeEvent.patch} |  0
 ...=> 0586-Added-ServerResourcesReloadedEvent.patch} |  6 +++---
 ...ed-world-settings-for-mobs-picking-up-loot.patch} |  4 ++--
 ... 0588-Implemented-BlockFailedDispenseEvent.patch} |  0
 ...=> 0589-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...=> 0590-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...0591-Configurable-door-breaking-difficulty.patch} |  4 ++--
 ...592-Empty-commands-shall-not-be-dispatched.patch} |  0
 ...ment-API-to-expose-exact-interaction-point.patch} |  0
 ...stale-POIs.patch => 0594-Remove-stale-POIs.patch} |  4 ++--
 ...it.patch => 0595-Fix-villager-boat-exploit.patch} |  4 ++--
 ...evel-API.patch => 0596-Add-sendOpLevel-API.patch} |  4 ++--
 ...ent.patch => 0597-Add-StructureLocateEvent.patch} |  0
 ...-option-for-requiring-a-player-participant.patch} |  2 +-
 ...rojectileHitEvent-call-when-fireballs-dead.patch} |  0
 ...t-component-with-empty-text-instead-of-thr.patch} |  0
 ...ch => 0601-Make-schedule-command-per-world.patch} |  0
 ...ch => 0602-Configurable-max-leash-distance.patch} |  4 ++--
 ...ch => 0603-Implement-BlockPreDispenseEvent.patch} |  0
 ...gs.patch => 0604-Added-Vanilla-Entity-Tags.patch} |  0
 ...-Wither-API.patch => 0605-added-Wither-API.patch} |  0
 ...ed-firing-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...console-spam-when-removing-chests-in-water.patch} |  0
 ...d-toggle-for-always-placing-the-dragon-egg.patch} |  4 ++--
 ...9-Added-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...d-dropLeash-variable-to-EntityUnleashEvent.patch} |  0
 ...distance-map-update-when-spawning-disabled.patch} |  4 ++--
 ...-Reset-shield-blocking-on-dimension-change.patch} |  4 ++--
 ...Event.patch => 0613-add-DragonEggFormEvent.patch} |  0
 ...ityMoveEvent.patch => 0614-EntityMoveEvent.patch} |  6 +++---
 ...on-to-disable-pathfinding-updates-on-block.patch} | 10 +++++-----
 ...atch => 0616-Inline-shift-direction-fields.patch} |  0
 ...7-Allow-adding-items-to-BlockDropItemEvent.patch} |  0
 ...d-getMainThreadExecutor-to-BukkitScheduler.patch} |  0
 ...living-entity-allow-attribute-registration.patch} |  0
 ... 0620-fix-dead-slime-setSize-invincibility.patch} |  0
 ...getRecipes-should-return-an-immutable-list.patch} |  0
 ...g-dumps.patch => 0622-misc-debugging-dumps.patch} |  6 +++---
 ...Add-support-for-hex-color-codes-in-console.patch} |  0
 ...ayers.patch => 0624-Expose-Tracked-Players.patch} |  0
 ... => 0625-Remove-streams-from-SensorNearest.patch} |  0
 ...29274-Fix-Wither-hostility-towards-players.patch} |  4 ++--
 ...ow-proper-exception-on-empty-JsonList-file.patch} |  0
 ...-ServerGUI.patch => 0628-Improve-ServerGUI.patch} |  0
 ...g-pressure-plate-EntityInteractEvent-for-i.patch} |  0
 ...ch => 0630-fix-converting-txt-to-json-file.patch} |  2 +-
 ...vents.patch => 0631-Add-worldborder-events.patch} |  0
 ....patch => 0632-added-PlayerNameEntityEvent.patch} |  0
 ...revent-grindstones-from-overstacking-items.patch} |  0
 ...ts.patch => 0634-Add-recipe-to-cook-events.patch} |  0
 ...idTool.patch => 0635-Add-Block-isValidTool.patch} |  0
 ...-Allow-using-signs-inside-spawn-protection.patch} |  4 ++--
 ...rld.patch => 0637-Implement-Keyed-on-World.patch} |  0
 ...fast-alternative-constructor-for-Rotations.patch} |  0
 ...m-Rarity-API.patch => 0639-Item-Rarity-API.patch} |  0
 ...espawnTimer-for-Wandering-Traders-spawned-.patch} |  0
 ...0641-copy-TESign-isEditable-from-snapshots.patch} |  0
 ...-carried-item-when-player-has-disconnected.patch} |  4 ++--
 ...ed-whitelist-use-configurable-kick-message.patch} |  4 ++--
 ...Don-t-ignore-result-of-PlayerEditBookEvent.patch} |  0
 ...elling-block-falling-causing-client-desync.patch} |  0
 ...sion.patch => 0646-Expose-protocol-version.patch} |  0
 ...Component-suggestion-tooltips-in-AsyncTabC.patch} |  0
 ...nsole-tab-completions-for-brigadier-comman.patch} |  4 ++--
 ...PlayerItemConsumeEvent-cancelling-properly.patch} |  0
 ...-check.patch => 0650-Add-bypass-host-check.patch} |  0
 ...tch => 0651-Set-area-affect-cloud-rotation.patch} |  0
 ...> 0652-add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...duplicating-give-items-on-item-drop-cancel.patch} |  0
 ...> 0654-add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...add-get-set-drop-chance-to-EntityEquipment.patch} |  0
 ... 0656-fix-PigZombieAngerEvent-cancellation.patch} |  0
 ...657-Fix-checkReach-check-for-Shulker-boxes.patch} |  0
 ... 0658-fix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ...t.patch => 0659-Added-PlayerDeepSleepEvent.patch} |  0
 ...ore-World-API.patch => 0660-More-World-API.patch} |  0
 ...atch => 0661-Added-PlayerBedFailEnterEvent.patch} |  0
 ...methods-to-convert-between-Component-and-B.patch} |  0
 ...-respawn-acting-as-a-bed-respawn-from-the-.patch} |  8 ++++----
 ...duce-beacon-activation-deactivation-events.patch} |  0
 ...665-add-RespawnFlags-to-PlayerRespawnEvent.patch} |  6 +++---
 ... 0666-Add-Channel-initialization-listeners.patch} |  0
 ...pty-commands-if-tab-completion-is-disabled.patch} |  0
 ...patch => 0668-Add-more-WanderingTrader-API.patch} |  0
 ... 0669-Add-EntityBlockStorage-clearEntities.patch} |  0
 ...ture-message-to-PlayerAdvancementDoneEvent.patch} |  0
 ...dd-raw-address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...entory-close.patch => 0672-Inventory-close.patch} |  0
 ...PortalCreateEvent-players-and-end-platform.patch} |  4 ++--
 ...ld-burn-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ....patch => 0675-Fix-CraftPotionBrewer-cache.patch} |  0
 ...k-API.patch => 0676-Add-basic-Datapack-API.patch} |  0
 ...environment-variable-to-disable-server-gui.patch} |  0
 ...678-additions-to-PlayerGameModeChangeEvent.patch} |  8 ++++----
 ...cLoadInfo.patch => 0679-Clear-SyncLoadInfo.patch} |  0
 ...I.patch => 0680-ItemStack-repair-check-API.patch} |  0
 ...ent-API.patch => 0681-More-Enchantment-API.patch} |  0
 ...d-line-option-to-load-extra-plugin-jars-no.patch} |  0
 ...683-Fix-and-optimise-world-force-upgrading.patch} |  6 +++---
 ...ookAt-API.patch => 0684-Add-Mob-lookAt-API.patch} |  0
 ...tch => 0685-Add-Unix-domain-socket-support.patch} |  0
 ...t.patch => 0686-Add-EntityInsideBlockEvent.patch} |  0
 ...h => 0687-Attributes-API-for-item-defaults.patch} |  0
 ...aftMerchantCustom-emit-PlayerPurchaseEvent.patch} |  0
 ...9-Add-cause-to-Weather-ThunderChangeEvents.patch} |  2 +-
 ...ck-API.patch => 0690-More-Lidded-Block-API.patch} |  0
 ...h => 0691-Limit-item-frame-cursors-on-maps.patch} |  4 ++--
 ...tch => 0692-Add-PufferFishStateChangeEvent.patch} |  0
 ...s.patch => 0693-Add-PlayerKickEvent-causes.patch} | 10 +++++-----
 ...ix-PlayerBucketEmptyEvent-result-itemstack.patch} |  0
 ...e-PalettedContainer-instead-of-ReentrantLo.patch} |  0
 ...-option-to-fix-items-merging-through-walls.patch} |  4 ++--
 ...nt.patch => 0697-Add-BellRevealRaiderEvent.patch} |  0
 ...atch => 0698-Fix-invulnerable-end-crystals.patch} |  4 ++--
 ...h => 0699-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...llager-inventory-on-cancelled-pickup-event.patch} |  0
 ...tch => 0701-Fix-dangerous-end-portal-logic.patch} |  0
 ...ptimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...=> 0703-Make-item-validations-configurable.patch} |  4 ++--
 ...tch => 0704-Add-more-line-of-sight-methods.patch} |  0
 ...s.patch => 0705-add-per-world-spawn-limits.patch} |  4 ++--
 ...PotionSplashEvent-for-water-splash-potions.patch} |  0
 ...ect-status-dataconverter-for-pre-1.13-chun.patch} |  0
 255 files changed, 122 insertions(+), 122 deletions(-)
 rename patches/{server => removed/1.17}/0455-incremental-chunk-saving.patch (99%)
 rename patches/{server => removed/1.17}/0499-Incremental-player-saving.patch (98%)
 rename patches/server/{0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename patches/server/{0457-Fix-missing-chunks-due-to-integer-overflow.patch => 0456-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename patches/server/{0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename patches/server/{0459-Fix-piston-physics-inconsistency-MC-188840.patch => 0458-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename patches/server/{0460-Fix-sand-duping.patch => 0459-Fix-sand-duping.patch} (100%)
 rename patches/server/{0461-Prevent-position-desync-in-playerconnection-causing-.patch => 0460-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename patches/server/{0462-Inventory-getHolder-method-without-block-snapshot.patch => 0461-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/server/{0463-Expose-Arrow-getItemStack.patch => 0462-Expose-Arrow-getItemStack.patch} (100%)
 rename patches/server/{0464-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0463-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/server/{0465-Hide-sync-chunk-writes-behind-flag.patch => 0464-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename patches/server/{0466-Add-permission-for-command-blocks.patch => 0465-Add-permission-for-command-blocks.patch} (100%)
 rename patches/server/{0467-Ensure-Entity-AABB-s-are-never-invalid.patch => 0466-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename patches/server/{0468-Optimize-WorldBorder-collision-checks-and-air.patch => 0467-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename patches/server/{0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (96%)
 rename patches/server/{0470-Paper-dumpitem-command.patch => 0469-Paper-dumpitem-command.patch} (100%)
 rename patches/server/{0471-Don-t-allow-null-UUID-s-for-chat.patch => 0470-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename patches/server/{0472-Improve-Legacy-Component-serialization-size.patch => 0471-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename patches/server/{0473-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0472-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename patches/server/{0474-Support-old-UUID-format-for-NBT.patch => 0473-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0475-Clean-up-duplicated-GameProfile-Properties.patch => 0474-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename patches/server/{0476-Convert-legacy-attributes-in-Item-Meta.patch => 0475-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename patches/server/{0477-Remove-some-streams-from-structures.patch => 0476-Remove-some-streams-from-structures.patch} (100%)
 rename patches/server/{0478-Remove-streams-from-classes-related-villager-gossip.patch => 0477-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename patches/server/{0479-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0478-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename patches/server/{0480-Support-components-in-ItemMeta.patch => 0479-Support-components-in-ItemMeta.patch} (100%)
 rename patches/server/{0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename patches/server/{0482-Add-entity-liquid-API.patch => 0481-Add-entity-liquid-API.patch} (100%)
 rename patches/server/{0483-Update-itemstack-legacy-name-and-lore.patch => 0482-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename patches/server/{0484-Spawn-player-in-correct-world-on-login.patch => 0483-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename patches/server/{0485-Add-PrepareResultEvent.patch => 0484-Add-PrepareResultEvent.patch} (100%)
 rename patches/server/{0486-Allow-delegation-to-vanilla-chunk-gen.patch => 0485-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename patches/server/{0488-Optimize-NetworkManager-Exception-Handling.patch => 0487-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename patches/server/{0489-Optimize-the-advancement-data-player-iteration-to-be.patch => 0488-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename patches/server/{0490-Fix-arrows-never-despawning-MC-125757.patch => 0489-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename patches/server/{0491-Thread-Safe-Vanilla-Command-permission-checking.patch => 0490-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename patches/server/{0492-Move-range-check-for-block-placing-up.patch => 0491-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0493-Fix-SPIGOT-5989.patch => 0492-Fix-SPIGOT-5989.patch} (100%)
 rename patches/server/{0494-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0493-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename patches/server/{0495-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0494-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename patches/server/{0496-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0495-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename patches/server/{0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0496-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename patches/server/{0498-Fix-some-rails-connecting-improperly.patch => 0497-Fix-some-rails-connecting-improperly.patch} (100%)
 rename patches/server/{0500-Fix-MC-187716-Use-configured-height.patch => 0498-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename patches/server/{0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0499-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename patches/server/{0502-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0500-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename patches/server/{0503-Brand-support.patch => 0501-Brand-support.patch} (100%)
 rename patches/server/{0504-Add-setMaxPlayers-API.patch => 0502-Add-setMaxPlayers-API.patch} (94%)
 rename patches/server/{0505-Add-playPickupItemAnimation-to-LivingEntity.patch => 0503-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/server/{0506-Don-t-require-FACING-data.patch => 0504-Don-t-require-FACING-data.patch} (100%)
 rename patches/server/{0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0505-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (94%)
 rename patches/server/{0508-Add-moon-phase-API.patch => 0506-Add-moon-phase-API.patch} (100%)
 rename patches/server/{0509-Prevent-headless-pistons-from-being-created.patch => 0507-Prevent-headless-pistons-from-being-created.patch} (92%)
 rename patches/server/{0510-Add-BellRingEvent.patch => 0508-Add-BellRingEvent.patch} (100%)
 rename patches/server/{0511-Add-zombie-targets-turtle-egg-config.patch => 0509-Add-zombie-targets-turtle-egg-config.patch} (95%)
 rename patches/server/{0512-Buffer-joins-to-world.patch => 0510-Buffer-joins-to-world.patch} (86%)
 rename patches/server/{0513-Optimize-redstone-algorithm.patch => 0511-Optimize-redstone-algorithm.patch} (99%)
 rename patches/server/{0514-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0512-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename patches/server/{0515-PortalCreateEvent-needs-to-know-its-entity.patch => 0513-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename patches/server/{0516-Fix-CraftTeam-null-check.patch => 0514-Fix-CraftTeam-null-check.patch} (100%)
 rename patches/server/{0517-Add-more-Evoker-API.patch => 0515-Add-more-Evoker-API.patch} (100%)
 rename patches/server/{0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0516-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename patches/server/{0519-Create-HoverEvent-from-ItemStack-Entity.patch => 0517-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/server/{0520-Cache-block-data-strings.patch => 0518-Cache-block-data-strings.patch} (95%)
 rename patches/server/{0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0519-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename patches/server/{0522-Add-additional-open-container-api-to-HumanEntity.patch => 0520-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/server/{0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0521-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename patches/server/{0524-Extend-block-drop-capture-to-capture-all-items-added.patch => 0522-Extend-block-drop-capture-to-capture-all-items-added.patch} (94%)
 rename patches/server/{0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0523-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (84%)
 rename patches/server/{0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0524-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/server/{0527-Lazily-track-plugin-scoreboards-by-default.patch => 0525-Lazily-track-plugin-scoreboards-by-default.patch} (97%)
 rename patches/server/{0528-Entity-isTicking.patch => 0526-Entity-isTicking.patch} (100%)
 rename patches/server/{0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0527-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (86%)
 rename patches/server/{0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0528-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (100%)
 rename patches/server/{0531-Fix-Concurrency-issue-in-WeightedList.patch => 0529-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename patches/server/{0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename patches/server/{0533-Fix-for-large-move-vectors-crashing-server.patch => 0531-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename patches/server/{0534-Optimise-getType-calls.patch => 0532-Optimise-getType-calls.patch} (100%)
 rename patches/server/{0535-Villager-resetOffers.patch => 0533-Villager-resetOffers.patch} (100%)
 rename patches/server/{0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename patches/server/{0537-Retain-block-place-order-when-capturing-blockstates.patch => 0535-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename patches/server/{0538-Reduce-blockpos-allocation-from-pathfinding.patch => 0536-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename patches/server/{0539-Fix-item-locations-dropped-from-campfires.patch => 0537-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename patches/server/{0540-Player-elytra-boost-API.patch => 0538-Player-elytra-boost-API.patch} (100%)
 rename patches/server/{0541-Fixed-TileEntityBell-memory-leak.patch => 0539-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename patches/server/{0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename patches/server/{0543-Add-getOfflinePlayerIfCached-String.patch => 0541-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/server/{0544-Add-ignore-discounts-API.patch => 0542-Add-ignore-discounts-API.patch} (100%)
 rename patches/server/{0545-Toggle-for-removing-existing-dragon.patch => 0543-Toggle-for-removing-existing-dragon.patch} (95%)
 rename patches/server/{0546-Fix-client-lag-on-advancement-loading.patch => 0544-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename patches/server/{0547-Item-no-age-no-player-pickup.patch => 0545-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/server/{0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{0549-Beacon-API-custom-effect-ranges.patch => 0547-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/server/{0550-Add-API-for-quit-reason.patch => 0548-Add-API-for-quit-reason.patch} (94%)
 rename patches/server/{0551-Seed-based-feature-search.patch => 0549-Seed-based-feature-search.patch} (96%)
 rename patches/server/{0552-Add-Wandering-Trader-spawn-rate-config-options.patch => 0550-Add-Wandering-Trader-spawn-rate-config-options.patch} (98%)
 rename patches/server/{0553-Significantly-improve-performance-of-the-end-generat.patch => 0551-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename patches/server/{0554-Expose-world-spawn-angle.patch => 0552-Expose-world-spawn-angle.patch} (93%)
 rename patches/server/{0555-Add-Destroy-Speed-API.patch => 0553-Add-Destroy-Speed-API.patch} (100%)
 rename patches/server/{0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename patches/server/{0557-Add-LivingEntity-clearActiveItem.patch => 0555-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/server/{0558-Add-PlayerItemCooldownEvent.patch => 0556-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/server/{0559-More-lightning-API.patch => 0557-More-lightning-API.patch} (100%)
 rename patches/server/{0560-Climbing-should-not-bypass-cramming-gamerule.patch => 0558-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename patches/server/{0561-Added-missing-default-perms-for-commands.patch => 0559-Added-missing-default-perms-for-commands.patch} (100%)
 rename patches/server/{0562-Add-PlayerShearBlockEvent.patch => 0560-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/server/{0563-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0561-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename patches/server/{0564-Fix-curing-zombie-villager-discount-exploit.patch => 0562-Fix-curing-zombie-villager-discount-exploit.patch} (96%)
 rename patches/server/{0565-Limit-recipe-packets.patch => 0563-Limit-recipe-packets.patch} (97%)
 rename patches/server/{0566-Fix-CraftSound-backwards-compatibility.patch => 0564-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename patches/server/{0567-MC-4-Fix-item-position-desync.patch => 0565-MC-4-Fix-item-position-desync.patch} (95%)
 rename patches/server/{0568-Player-Chunk-Load-Unload-Events.patch => 0566-Player-Chunk-Load-Unload-Events.patch} (90%)
 rename patches/server/{0569-Optimize-Dynamic-get-Missing-Keys.patch => 0567-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename patches/server/{0570-Expose-LivingEntity-hurt-direction.patch => 0568-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/server/{0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/server/{0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename patches/server/{0573-added-PlayerTradeEvent.patch => 0571-added-PlayerTradeEvent.patch} (100%)
 rename patches/server/{0574-Implement-TargetHitEvent.patch => 0572-Implement-TargetHitEvent.patch} (100%)
 rename patches/server/{0575-Additional-Block-Material-API-s.patch => 0573-Additional-Block-Material-API-s.patch} (100%)
 rename patches/server/{0576-Fix-harming-potion-dupe.patch => 0574-Fix-harming-potion-dupe.patch} (100%)
 rename patches/server/{0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename patches/server/{0578-Cache-burn-durations.patch => 0576-Cache-burn-durations.patch} (100%)
 rename patches/server/{0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (95%)
 rename patches/server/{0580-Fix-Not-a-string-Map-Conversion-spam.patch => 0578-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename patches/server/{0581-Implement-PlayerFlowerPotManipulateEvent.patch => 0579-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/server/{0582-Fix-interact-event-not-being-called-in-adventure.patch => 0580-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename patches/server/{0583-Zombie-API-breaking-doors.patch => 0581-Zombie-API-breaking-doors.patch} (100%)
 rename patches/server/{0584-Fix-nerfed-slime-when-splitting.patch => 0582-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename patches/server/{0585-Add-EntityLoadCrossbowEvent.patch => 0583-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/server/{0586-Guardian-beam-workaround.patch => 0584-Guardian-beam-workaround.patch} (100%)
 rename patches/server/{0587-Added-WorldGameRuleChangeEvent.patch => 0585-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/server/{0588-Added-ServerResourcesReloadedEvent.patch => 0586-Added-ServerResourcesReloadedEvent.patch} (93%)
 rename patches/server/{0589-Added-world-settings-for-mobs-picking-up-loot.patch => 0587-Added-world-settings-for-mobs-picking-up-loot.patch} (95%)
 rename patches/server/{0590-Implemented-BlockFailedDispenseEvent.patch => 0588-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename patches/server/{0591-Added-PlayerLecternPageChangeEvent.patch => 0589-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/server/{0592-Added-PlayerLoomPatternSelectEvent.patch => 0590-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/server/{0593-Configurable-door-breaking-difficulty.patch => 0591-Configurable-door-breaking-difficulty.patch} (96%)
 rename patches/server/{0594-Empty-commands-shall-not-be-dispatched.patch => 0592-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename patches/server/{0595-Implement-API-to-expose-exact-interaction-point.patch => 0593-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename patches/server/{0596-Remove-stale-POIs.patch => 0594-Remove-stale-POIs.patch} (87%)
 rename patches/server/{0597-Fix-villager-boat-exploit.patch => 0595-Fix-villager-boat-exploit.patch} (89%)
 rename patches/server/{0598-Add-sendOpLevel-API.patch => 0596-Add-sendOpLevel-API.patch} (94%)
 rename patches/server/{0599-Add-StructureLocateEvent.patch => 0597-Add-StructureLocateEvent.patch} (100%)
 rename patches/server/{0600-Collision-option-for-requiring-a-player-participant.patch => 0598-Collision-option-for-requiring-a-player-participant.patch} (98%)
 rename patches/server/{0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%)
 rename patches/server/{0602-Return-chat-component-with-empty-text-instead-of-thr.patch => 0600-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/server/{0603-Make-schedule-command-per-world.patch => 0601-Make-schedule-command-per-world.patch} (100%)
 rename patches/server/{0604-Configurable-max-leash-distance.patch => 0602-Configurable-max-leash-distance.patch} (94%)
 rename patches/server/{0605-Implement-BlockPreDispenseEvent.patch => 0603-Implement-BlockPreDispenseEvent.patch} (100%)
 rename patches/server/{0606-Added-Vanilla-Entity-Tags.patch => 0604-Added-Vanilla-Entity-Tags.patch} (100%)
 rename patches/server/{0607-added-Wither-API.patch => 0605-added-Wither-API.patch} (100%)
 rename patches/server/{0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/server/{0609-Fix-console-spam-when-removing-chests-in-water.patch => 0607-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename patches/server/{0610-Add-toggle-for-always-placing-the-dragon-egg.patch => 0608-Add-toggle-for-always-placing-the-dragon-egg.patch} (92%)
 rename patches/server/{0611-Added-PlayerStonecutterRecipeSelectEvent.patch => 0609-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/server/{0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/server/{0613-Skip-distance-map-update-when-spawning-disabled.patch => 0611-Skip-distance-map-update-when-spawning-disabled.patch} (87%)
 rename patches/server/{0614-Reset-shield-blocking-on-dimension-change.patch => 0612-Reset-shield-blocking-on-dimension-change.patch} (83%)
 rename patches/server/{0615-add-DragonEggFormEvent.patch => 0613-add-DragonEggFormEvent.patch} (100%)
 rename patches/server/{0616-EntityMoveEvent.patch => 0614-EntityMoveEvent.patch} (93%)
 rename patches/server/{0617-added-option-to-disable-pathfinding-updates-on-block.patch => 0615-added-option-to-disable-pathfinding-updates-on-block.patch} (82%)
 rename patches/server/{0618-Inline-shift-direction-fields.patch => 0616-Inline-shift-direction-fields.patch} (100%)
 rename patches/server/{0619-Allow-adding-items-to-BlockDropItemEvent.patch => 0617-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/server/{0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/server/{0621-living-entity-allow-attribute-registration.patch => 0619-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/server/{0622-fix-dead-slime-setSize-invincibility.patch => 0620-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename patches/server/{0623-Merchant-getRecipes-should-return-an-immutable-list.patch => 0621-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename patches/server/{0624-misc-debugging-dumps.patch => 0622-misc-debugging-dumps.patch} (93%)
 rename patches/server/{0625-Add-support-for-hex-color-codes-in-console.patch => 0623-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename patches/server/{0626-Expose-Tracked-Players.patch => 0624-Expose-Tracked-Players.patch} (100%)
 rename patches/server/{0627-Remove-streams-from-SensorNearest.patch => 0625-Remove-streams-from-SensorNearest.patch} (100%)
 rename patches/server/{0628-MC-29274-Fix-Wither-hostility-towards-players.patch => 0626-MC-29274-Fix-Wither-hostility-towards-players.patch} (93%)
 rename patches/server/{0629-Throw-proper-exception-on-empty-JsonList-file.patch => 0627-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename patches/server/{0630-Improve-ServerGUI.patch => 0628-Improve-ServerGUI.patch} (100%)
 rename patches/server/{0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename patches/server/{0632-fix-converting-txt-to-json-file.patch => 0630-fix-converting-txt-to-json-file.patch} (97%)
 rename patches/server/{0633-Add-worldborder-events.patch => 0631-Add-worldborder-events.patch} (100%)
 rename patches/server/{0634-added-PlayerNameEntityEvent.patch => 0632-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/server/{0635-Prevent-grindstones-from-overstacking-items.patch => 0633-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename patches/server/{0636-Add-recipe-to-cook-events.patch => 0634-Add-recipe-to-cook-events.patch} (100%)
 rename patches/server/{0637-Add-Block-isValidTool.patch => 0635-Add-Block-isValidTool.patch} (100%)
 rename patches/server/{0638-Allow-using-signs-inside-spawn-protection.patch => 0636-Allow-using-signs-inside-spawn-protection.patch} (94%)
 rename patches/server/{0639-Implement-Keyed-on-World.patch => 0637-Implement-Keyed-on-World.patch} (100%)
 rename patches/server/{0640-Add-fast-alternative-constructor-for-Rotations.patch => 0638-Add-fast-alternative-constructor-for-Rotations.patch} (100%)
 rename patches/server/{0641-Item-Rarity-API.patch => 0639-Item-Rarity-API.patch} (100%)
 rename patches/server/{0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0643-copy-TESign-isEditable-from-snapshots.patch => 0641-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename patches/server/{0644-Drop-carried-item-when-player-has-disconnected.patch => 0642-Drop-carried-item-when-player-has-disconnected.patch} (88%)
 rename patches/server/{0645-forced-whitelist-use-configurable-kick-message.patch => 0643-forced-whitelist-use-configurable-kick-message.patch} (89%)
 rename patches/server/{0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0647-fix-cancelling-block-falling-causing-client-desync.patch => 0645-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename patches/server/{0648-Expose-protocol-version.patch => 0646-Expose-protocol-version.patch} (100%)
 rename patches/server/{0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (100%)
 rename patches/server/{0650-Enhance-console-tab-completions-for-brigadier-comman.patch => 0648-Enhance-console-tab-completions-for-brigadier-comman.patch} (98%)
 rename patches/server/{0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0652-Add-bypass-host-check.patch => 0650-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0653-Set-area-affect-cloud-rotation.patch => 0651-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0654-add-isDeeplySleeping-to-HumanEntity.patch => 0652-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0655-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0653-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename patches/server/{0656-add-consumeFuel-to-FurnaceBurnEvent.patch => 0654-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0657-add-get-set-drop-chance-to-EntityEquipment.patch => 0655-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0658-fix-PigZombieAngerEvent-cancellation.patch => 0656-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0659-Fix-checkReach-check-for-Shulker-boxes.patch => 0657-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename patches/server/{0660-fix-PlayerItemHeldEvent-firing-twice.patch => 0658-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0661-Added-PlayerDeepSleepEvent.patch => 0659-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0662-More-World-API.patch => 0660-More-World-API.patch} (100%)
 rename patches/server/{0663-Added-PlayerBedFailEnterEvent.patch => 0661-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0664-Implement-methods-to-convert-between-Component-and-B.patch => 0662-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (87%)
 rename patches/server/{0666-Introduce-beacon-activation-deactivation-events.patch => 0664-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0667-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0665-add-RespawnFlags-to-PlayerRespawnEvent.patch} (94%)
 rename patches/server/{0668-Add-Channel-initialization-listeners.patch => 0666-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0669-Send-empty-commands-if-tab-completion-is-disabled.patch => 0667-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0670-Add-more-WanderingTrader-API.patch => 0668-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0671-Add-EntityBlockStorage-clearEntities.patch => 0669-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/server/{0674-Inventory-close.patch => 0672-Inventory-close.patch} (100%)
 rename patches/server/{0675-call-PortalCreateEvent-players-and-end-platform.patch => 0673-call-PortalCreateEvent-players-and-end-platform.patch} (94%)
 rename patches/server/{0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0677-Fix-CraftPotionBrewer-cache.patch => 0675-Fix-CraftPotionBrewer-cache.patch} (100%)
 rename patches/server/{0678-Add-basic-Datapack-API.patch => 0676-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0679-Add-environment-variable-to-disable-server-gui.patch => 0677-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0680-additions-to-PlayerGameModeChangeEvent.patch => 0678-additions-to-PlayerGameModeChangeEvent.patch} (96%)
 rename patches/server/{0681-Clear-SyncLoadInfo.patch => 0679-Clear-SyncLoadInfo.patch} (100%)
 rename patches/server/{0682-ItemStack-repair-check-API.patch => 0680-ItemStack-repair-check-API.patch} (100%)
 rename patches/server/{0683-More-Enchantment-API.patch => 0681-More-Enchantment-API.patch} (100%)
 rename patches/server/{0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch => 0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch} (100%)
 rename patches/server/{0685-Fix-and-optimise-world-force-upgrading.patch => 0683-Fix-and-optimise-world-force-upgrading.patch} (98%)
 rename patches/server/{0686-Add-Mob-lookAt-API.patch => 0684-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0687-Add-Unix-domain-socket-support.patch => 0685-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0688-Add-EntityInsideBlockEvent.patch => 0686-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0689-Attributes-API-for-item-defaults.patch => 0687-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/server/{0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch => 0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0691-Add-cause-to-Weather-ThunderChangeEvents.patch => 0689-Add-cause-to-Weather-ThunderChangeEvents.patch} (98%)
 rename patches/server/{0692-More-Lidded-Block-API.patch => 0690-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0693-Limit-item-frame-cursors-on-maps.patch => 0691-Limit-item-frame-cursors-on-maps.patch} (93%)
 rename patches/server/{0694-Add-PufferFishStateChangeEvent.patch => 0692-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0695-Add-PlayerKickEvent-causes.patch => 0693-Add-PlayerKickEvent-causes.patch} (98%)
 rename patches/server/{0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch => 0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch} (100%)
 rename patches/server/{0698-Add-option-to-fix-items-merging-through-walls.patch => 0696-Add-option-to-fix-items-merging-through-walls.patch} (93%)
 rename patches/server/{0699-Add-BellRevealRaiderEvent.patch => 0697-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0700-Fix-invulnerable-end-crystals.patch => 0698-Fix-invulnerable-end-crystals.patch} (96%)
 rename patches/server/{0701-Add-ElderGuardianAppearanceEvent.patch => 0699-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0702-Reset-villager-inventory-on-cancelled-pickup-event.patch => 0700-Reset-villager-inventory-on-cancelled-pickup-event.patch} (100%)
 rename patches/server/{0703-Fix-dangerous-end-portal-logic.patch => 0701-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0702-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0705-Make-item-validations-configurable.patch => 0703-Make-item-validations-configurable.patch} (97%)
 rename patches/server/{0706-Add-more-line-of-sight-methods.patch => 0704-Add-more-line-of-sight-methods.patch} (100%)
 rename patches/server/{0707-add-per-world-spawn-limits.patch => 0705-add-per-world-spawn-limits.patch} (94%)
 rename patches/server/{0708-Fix-PotionSplashEvent-for-water-splash-potions.patch => 0706-Fix-PotionSplashEvent-for-water-splash-potions.patch} (100%)
 rename patches/server/{0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch => 0707-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch} (100%)

diff --git a/patches/server/0455-incremental-chunk-saving.patch b/patches/removed/1.17/0455-incremental-chunk-saving.patch
similarity index 99%
rename from patches/server/0455-incremental-chunk-saving.patch
rename to patches/removed/1.17/0455-incremental-chunk-saving.patch
index e114a9ace5..26796dc778 100644
--- a/patches/server/0455-incremental-chunk-saving.patch
+++ b/patches/removed/1.17/0455-incremental-chunk-saving.patch
@@ -3,6 +3,7 @@ From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
 
+1.17 Update note: Patch has been applied already, needs updating to properly save entities
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 index 2216fc05ef5f1c2f7e4dcab7bb20b9944838c5f4..66c8e729b1e01c0ecf7c7c58bda8e06f202a31fe 100644
diff --git a/patches/server/0499-Incremental-player-saving.patch b/patches/removed/1.17/0499-Incremental-player-saving.patch
similarity index 98%
rename from patches/server/0499-Incremental-player-saving.patch
rename to patches/removed/1.17/0499-Incremental-player-saving.patch
index d288885d6f..eecba40662 100644
--- a/patches/server/0499-Incremental-player-saving.patch
+++ b/patches/removed/1.17/0499-Incremental-player-saving.patch
@@ -3,6 +3,7 @@ From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Aug 2020 08:59:25 +0300
 Subject: [PATCH] Incremental player saving
 
+1.17 Update note: Patch has been updated already, re-removed temporarily as it depends on 'incremental chunk saving' patch
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 index b67ba8f75e4a3358d7c2462918b85b0bf9b5a922..fdbd8b89bb8bf3b61f60b812b90483c98a3d5ccb 100644
diff --git a/patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch
rename to patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch
rename to patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0460-Fix-sand-duping.patch b/patches/server/0459-Fix-sand-duping.patch
similarity index 100%
rename from patches/server/0460-Fix-sand-duping.patch
rename to patches/server/0459-Fix-sand-duping.patch
diff --git a/patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch
rename to patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0463-Expose-Arrow-getItemStack.patch b/patches/server/0462-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from patches/server/0463-Expose-Arrow-getItemStack.patch
rename to patches/server/0462-Expose-Arrow-getItemStack.patch
diff --git a/patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch
rename to patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0466-Add-permission-for-command-blocks.patch b/patches/server/0465-Add-permission-for-command-blocks.patch
similarity index 100%
rename from patches/server/0466-Add-permission-for-command-blocks.patch
rename to patches/server/0465-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch
rename to patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 96%
rename from patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 74c27d6ed9..5c6d630dda 100644
--- a/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,10 +8,10 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 363dcebb3b2d5a2512776a191f6716ed3d0e8aff..1feda8b44364c748497174944b26abc4f058f354 100644
+index 11dbe48c8a8c29cd28d725c43505e326a6e626ff..f87409af9218e8003da370444ea97695023de439 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1721,11 +1721,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1711,11 +1711,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
diff --git a/patches/server/0470-Paper-dumpitem-command.patch b/patches/server/0469-Paper-dumpitem-command.patch
similarity index 100%
rename from patches/server/0470-Paper-dumpitem-command.patch
rename to patches/server/0469-Paper-dumpitem-command.patch
diff --git a/patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch
rename to patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/patches/server/0472-Improve-Legacy-Component-serialization-size.patch b/patches/server/0471-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from patches/server/0472-Improve-Legacy-Component-serialization-size.patch
rename to patches/server/0471-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/patches/server/0474-Support-old-UUID-format-for-NBT.patch b/patches/server/0473-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0474-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0473-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch
rename to patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch
rename to patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0477-Remove-some-streams-from-structures.patch b/patches/server/0476-Remove-some-streams-from-structures.patch
similarity index 100%
rename from patches/server/0477-Remove-some-streams-from-structures.patch
rename to patches/server/0476-Remove-some-streams-from-structures.patch
diff --git a/patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch
rename to patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/patches/server/0480-Support-components-in-ItemMeta.patch b/patches/server/0479-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/server/0480-Support-components-in-ItemMeta.patch
rename to patches/server/0479-Support-components-in-ItemMeta.patch
diff --git a/patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/patches/server/0482-Add-entity-liquid-API.patch b/patches/server/0481-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/server/0482-Add-entity-liquid-API.patch
rename to patches/server/0481-Add-entity-liquid-API.patch
diff --git a/patches/server/0483-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from patches/server/0483-Update-itemstack-legacy-name-and-lore.patch
rename to patches/server/0482-Update-itemstack-legacy-name-and-lore.patch
diff --git a/patches/server/0484-Spawn-player-in-correct-world-on-login.patch b/patches/server/0483-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from patches/server/0484-Spawn-player-in-correct-world-on-login.patch
rename to patches/server/0483-Spawn-player-in-correct-world-on-login.patch
diff --git a/patches/server/0485-Add-PrepareResultEvent.patch b/patches/server/0484-Add-PrepareResultEvent.patch
similarity index 100%
rename from patches/server/0485-Add-PrepareResultEvent.patch
rename to patches/server/0484-Add-PrepareResultEvent.patch
diff --git a/patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/patches/server/0488-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0487-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from patches/server/0488-Optimize-NetworkManager-Exception-Handling.patch
rename to patches/server/0487-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0489-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0488-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from patches/server/0489-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to patches/server/0488-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/patches/server/0490-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0489-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from patches/server/0490-Fix-arrows-never-despawning-MC-125757.patch
rename to patches/server/0489-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0491-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0490-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from patches/server/0491-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to patches/server/0490-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0492-Move-range-check-for-block-placing-up.patch b/patches/server/0491-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0492-Move-range-check-for-block-placing-up.patch
rename to patches/server/0491-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0493-Fix-SPIGOT-5989.patch b/patches/server/0492-Fix-SPIGOT-5989.patch
similarity index 100%
rename from patches/server/0493-Fix-SPIGOT-5989.patch
rename to patches/server/0492-Fix-SPIGOT-5989.patch
diff --git a/patches/server/0494-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0493-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from patches/server/0494-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to patches/server/0493-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0495-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0494-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from patches/server/0495-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to patches/server/0494-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0496-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0495-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from patches/server/0496-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to patches/server/0495-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0496-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from patches/server/0497-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to patches/server/0496-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/patches/server/0498-Fix-some-rails-connecting-improperly.patch b/patches/server/0497-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from patches/server/0498-Fix-some-rails-connecting-improperly.patch
rename to patches/server/0497-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0500-Fix-MC-187716-Use-configured-height.patch b/patches/server/0498-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from patches/server/0500-Fix-MC-187716-Use-configured-height.patch
rename to patches/server/0498-Fix-MC-187716-Use-configured-height.patch
diff --git a/patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0499-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to patches/server/0499-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0500-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to patches/server/0500-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0503-Brand-support.patch b/patches/server/0501-Brand-support.patch
similarity index 100%
rename from patches/server/0503-Brand-support.patch
rename to patches/server/0501-Brand-support.patch
diff --git a/patches/server/0504-Add-setMaxPlayers-API.patch b/patches/server/0502-Add-setMaxPlayers-API.patch
similarity index 94%
rename from patches/server/0504-Add-setMaxPlayers-API.patch
rename to patches/server/0502-Add-setMaxPlayers-API.patch
index 32f175e263..d7c4ed33cb 100644
--- a/patches/server/0504-Add-setMaxPlayers-API.patch
+++ b/patches/server/0502-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 8c62367888af566dd9be4bb5cd301c26e0248e46..2f73f1f770e5e1fa422bec9c27e5bd10e86b7538 100644
+index 9c594c0f142ca10b7c1df50faf45ccb3f7468ba9..31dd2c4a41e172c7eeb835ae61a45c954d0e647a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -142,7 +142,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0503-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0503-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0506-Don-t-require-FACING-data.patch b/patches/server/0504-Don-t-require-FACING-data.patch
similarity index 100%
rename from patches/server/0506-Don-t-require-FACING-data.patch
rename to patches/server/0504-Don-t-require-FACING-data.patch
diff --git a/patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0505-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 94%
rename from patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0505-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index bfbcc9b276..7c8f97ccda 100644
--- a/patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0505-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 225823ef8bb4171f770f90f083689850aa6a171e..8221b271aa18252b9883fbaf3982b467406ec56b 100644
+index 2188666675192cb02e0bccf845cf7863486a305b..4821c64761fd136b4d27ad4bb190e0aa8950db26 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1681,12 +1681,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1649,12 +1649,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
      }
      // Paper end
  
diff --git a/patches/server/0508-Add-moon-phase-API.patch b/patches/server/0506-Add-moon-phase-API.patch
similarity index 100%
rename from patches/server/0508-Add-moon-phase-API.patch
rename to patches/server/0506-Add-moon-phase-API.patch
diff --git a/patches/server/0509-Prevent-headless-pistons-from-being-created.patch b/patches/server/0507-Prevent-headless-pistons-from-being-created.patch
similarity index 92%
rename from patches/server/0509-Prevent-headless-pistons-from-being-created.patch
rename to patches/server/0507-Prevent-headless-pistons-from-being-created.patch
index a8508e9361..485cd2eae5 100644
--- a/patches/server/0509-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0507-Prevent-headless-pistons-from-being-created.patch
@@ -6,22 +6,20 @@ 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/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index fdbd8b89bb8bf3b61f60b812b90483c98a3d5ccb..faa1b775e45563b93ac1d5b904938b1f5ad8d80c 100644
+index b67ba8f75e4a3358d7c2462918b85b0bf9b5a922..1ff9dbde24d6e15076c4e90a73ce5801c47ef3f2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -441,6 +441,12 @@ public class PaperConfig {
+@@ -440,4 +440,10 @@ public class PaperConfig {
+         allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
- 
++
 +    public static boolean allowHeadlessPistons;
 +    private static void allowHeadlessPistons() {
 +        config.set("settings.unsupported-settings.allow-headless-pistons-readme", "This setting controls if players should be able to create headless pistons.");
 +        allowHeadlessPistons = getBoolean("settings.unsupported-settings.allow-headless-pistons", false);
 +    }
-+
-     public static int playerAutoSaveRate = -1;
-     public static int maxPlayerAutoSavePerTick = 10;
-     private static void playerAutoSaveRate() {
+ }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
 index a12af10e28f2d023ba6f916b5e7a53539416713f..822a8dbfaea0a312c4eb2849f2386ecd401b13e9 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
diff --git a/patches/server/0510-Add-BellRingEvent.patch b/patches/server/0508-Add-BellRingEvent.patch
similarity index 100%
rename from patches/server/0510-Add-BellRingEvent.patch
rename to patches/server/0508-Add-BellRingEvent.patch
diff --git a/patches/server/0511-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0509-Add-zombie-targets-turtle-egg-config.patch
similarity index 95%
rename from patches/server/0511-Add-zombie-targets-turtle-egg-config.patch
rename to patches/server/0509-Add-zombie-targets-turtle-egg-config.patch
index 85fb15538a..d9e6db9efc 100644
--- a/patches/server/0511-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0509-Add-zombie-targets-turtle-egg-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 66c8e729b1e01c0ecf7c7c58bda8e06f202a31fe..2355dd0c75e4981edbb180b65cd12f1d17aa0d26 100644
+index 2216fc05ef5f1c2f7e4dcab7bb20b9944838c5f4..f3d98b40b5adb5b6aa76371e9d3eb974b551d4f3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -38,6 +38,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0512-Buffer-joins-to-world.patch b/patches/server/0510-Buffer-joins-to-world.patch
similarity index 86%
rename from patches/server/0512-Buffer-joins-to-world.patch
rename to patches/server/0510-Buffer-joins-to-world.patch
index 139ee8a613..6502965afe 100644
--- a/patches/server/0512-Buffer-joins-to-world.patch
+++ b/patches/server/0510-Buffer-joins-to-world.patch
@@ -8,12 +8,12 @@ the world per tick, this attempts to reduce the impact that join floods
 has on the server
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index faa1b775e45563b93ac1d5b904938b1f5ad8d80c..545948f20efd6c8dd42140b565af94cd6b52b661 100644
+index 1ff9dbde24d6e15076c4e90a73ce5801c47ef3f2..2675012b619705d7d55406aba10bdbd7c1ccf6cd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -457,4 +457,9 @@ public class PaperConfig {
-             maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
-         }
+@@ -446,4 +446,9 @@ public class PaperConfig {
+         config.set("settings.unsupported-settings.allow-headless-pistons-readme", "This setting controls if players should be able to create headless pistons.");
+         allowHeadlessPistons = getBoolean("settings.unsupported-settings.allow-headless-pistons", false);
      }
 +
 +    public static int maxJoinsPerTick;
diff --git a/patches/server/0513-Optimize-redstone-algorithm.patch b/patches/server/0511-Optimize-redstone-algorithm.patch
similarity index 99%
rename from patches/server/0513-Optimize-redstone-algorithm.patch
rename to patches/server/0511-Optimize-redstone-algorithm.patch
index 0ceaeaa472..88314fe880 100644
--- a/patches/server/0513-Optimize-redstone-algorithm.patch
+++ b/patches/server/0511-Optimize-redstone-algorithm.patch
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2355dd0c75e4981edbb180b65cd12f1d17aa0d26..d25a8965524046ea24dbf5ed2096a5a4c73c0a94 100644
+index f3d98b40b5adb5b6aa76371e9d3eb974b551d4f3..b1ae749b2178dc8c49a7adf4a3e93339d8b99dfb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -43,6 +43,16 @@ public class PaperWorldConfig {
diff --git a/patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0512-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to patches/server/0512-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0513-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch
rename to patches/server/0513-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/patches/server/0516-Fix-CraftTeam-null-check.patch b/patches/server/0514-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from patches/server/0516-Fix-CraftTeam-null-check.patch
rename to patches/server/0514-Fix-CraftTeam-null-check.patch
diff --git a/patches/server/0517-Add-more-Evoker-API.patch b/patches/server/0515-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/server/0517-Add-more-Evoker-API.patch
rename to patches/server/0515-Add-more-Evoker-API.patch
diff --git a/patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0516-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to patches/server/0516-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0517-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/server/0517-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0520-Cache-block-data-strings.patch b/patches/server/0518-Cache-block-data-strings.patch
similarity index 95%
rename from patches/server/0520-Cache-block-data-strings.patch
rename to patches/server/0518-Cache-block-data-strings.patch
index 90aa71661d..49d39787e1 100644
--- a/patches/server/0520-Cache-block-data-strings.patch
+++ b/patches/server/0518-Cache-block-data-strings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1889de77a5e3d9371005b6bd451e2c0e57e96a93..dd51341115450a38ea5b0ea34dbadc2a8e191f60 100644
+index f87409af9218e8003da370444ea97695023de439..c3fc81457b534bf7a41ce2b021790cb3396ea56e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2038,6 +2038,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2023,6 +2023,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getPlayerList().reloadResources();
              this.functionManager.replaceLibrary(this.resources.getFunctionLibrary());
              this.structureManager.onResourceManagerReload(this.resources.getResourceManager());
diff --git a/patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0519-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to patches/server/0519-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0520-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/server/0520-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0521-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to patches/server/0521-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0522-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 94%
rename from patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to patches/server/0522-Extend-block-drop-capture-to-capture-all-items-added.patch
index f233017276..4f78b3eb9b 100644
--- a/patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0522-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8221b271aa18252b9883fbaf3982b467406ec56b..fda07a19e9e54adb88ccac2dd0b65d5a0aeeb18a 100644
+index 4821c64761fd136b4d27ad4bb190e0aa8950db26..30824d000fce6c74288d9c5e656e668fad746e26 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1226,6 +1226,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1194,6 +1194,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
              return false;
          } else {
diff --git a/patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0523-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 84%
rename from patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to patches/server/0523-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
index 9104dab8c6..697ac16096 100644
--- a/patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
+++ b/patches/server/0523-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086)
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index c1db5cc45dbc7dd24a1ef4dbf88a8efb6c7f2d57..f811aa3710b33b55c984088bbd1f8fe688c84bc1 100644
+index c2401b2ff0547335ddbbeb05c07b74552c246fc9..3f4506eb99e7b11416a48386c4185380e4680611 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -246,6 +246,7 @@ public class ChunkHolder {
+@@ -244,6 +244,7 @@ public class ChunkHolder {
      }
  
      public void blockChanged(BlockPos pos) {
diff --git a/patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0524-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/server/0524-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0525-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 97%
rename from patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch
rename to patches/server/0525-Lazily-track-plugin-scoreboards-by-default.patch
index 76bcce754e..51aeadc52d 100644
--- a/patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0525-Lazily-track-plugin-scoreboards-by-default.patch
@@ -14,10 +14,10 @@ this breaks your workflow you can always force all scoreboards to be tracked wit
 settings.track-plugin-scoreboards in paper.yml.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 545948f20efd6c8dd42140b565af94cd6b52b661..7d50aded88f5b7dfebaea1aebc86231f7b5c4e25 100644
+index 2675012b619705d7d55406aba10bdbd7c1ccf6cd..649e46115260259820a9d2255ad669b926319a3f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -462,4 +462,9 @@ public class PaperConfig {
+@@ -451,4 +451,9 @@ public class PaperConfig {
      private static void maxJoinsPerTick() {
          maxJoinsPerTick = getInt("settings.max-joins-per-tick", 3);
      }
diff --git a/patches/server/0528-Entity-isTicking.patch b/patches/server/0526-Entity-isTicking.patch
similarity index 100%
rename from patches/server/0528-Entity-isTicking.patch
rename to patches/server/0526-Entity-isTicking.patch
diff --git a/patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0527-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 86%
rename from patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to patches/server/0527-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 79c9a69984..237b42c06d 100644
--- a/patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0527-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd51341115450a38ea5b0ea34dbadc2a8e191f60..9bd2255d31bcfd4574f8d1caf598f9141aa9e3c1 100644
+index c3fc81457b534bf7a41ce2b021790cb3396ea56e..75e4d69e69509a94f0e112fe121369a6f8952ee7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2104,6 +2104,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2089,6 +2089,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.isEnforceWhitelist()) {
              PlayerList playerlist = source.getServer().getPlayerList();
              UserWhiteList whitelist = playerlist.getWhiteList();
diff --git a/patches/server/0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0528-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from patches/server/0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to patches/server/0528-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0529-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch
rename to patches/server/0529-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to patches/server/0530-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0531-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch
rename to patches/server/0531-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0534-Optimise-getType-calls.patch b/patches/server/0532-Optimise-getType-calls.patch
similarity index 100%
rename from patches/server/0534-Optimise-getType-calls.patch
rename to patches/server/0532-Optimise-getType-calls.patch
diff --git a/patches/server/0535-Villager-resetOffers.patch b/patches/server/0533-Villager-resetOffers.patch
similarity index 100%
rename from patches/server/0535-Villager-resetOffers.patch
rename to patches/server/0533-Villager-resetOffers.patch
diff --git a/patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to patches/server/0534-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch
rename to patches/server/0535-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0536-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch
rename to patches/server/0536-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/patches/server/0539-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0537-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from patches/server/0539-Fix-item-locations-dropped-from-campfires.patch
rename to patches/server/0537-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0540-Player-elytra-boost-API.patch b/patches/server/0538-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/server/0540-Player-elytra-boost-API.patch
rename to patches/server/0538-Player-elytra-boost-API.patch
diff --git a/patches/server/0541-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0539-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from patches/server/0541-Fixed-TileEntityBell-memory-leak.patch
rename to patches/server/0539-Fixed-TileEntityBell-memory-leak.patch
diff --git a/patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to patches/server/0540-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0543-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0541-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/server/0543-Add-getOfflinePlayerIfCached-String.patch
rename to patches/server/0541-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/server/0544-Add-ignore-discounts-API.patch b/patches/server/0542-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/server/0544-Add-ignore-discounts-API.patch
rename to patches/server/0542-Add-ignore-discounts-API.patch
diff --git a/patches/server/0545-Toggle-for-removing-existing-dragon.patch b/patches/server/0543-Toggle-for-removing-existing-dragon.patch
similarity index 95%
rename from patches/server/0545-Toggle-for-removing-existing-dragon.patch
rename to patches/server/0543-Toggle-for-removing-existing-dragon.patch
index c26fc7e7e2..38144034b8 100644
--- a/patches/server/0545-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0543-Toggle-for-removing-existing-dragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index d25a8965524046ea24dbf5ed2096a5a4c73c0a94..81afddeadbece05f3d9ef604a3d2b3cc0a731cde 100644
+index b1ae749b2178dc8c49a7adf4a3e93339d8b99dfb..c484da4558e918c1456588e540a3b34e78581f81 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -53,6 +53,14 @@ public class PaperWorldConfig {
diff --git a/patches/server/0546-Fix-client-lag-on-advancement-loading.patch b/patches/server/0544-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from patches/server/0546-Fix-client-lag-on-advancement-loading.patch
rename to patches/server/0544-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0547-Item-no-age-no-player-pickup.patch b/patches/server/0545-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/server/0547-Item-no-age-no-player-pickup.patch
rename to patches/server/0545-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/0546-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/0549-Beacon-API-custom-effect-ranges.patch b/patches/server/0547-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/server/0549-Beacon-API-custom-effect-ranges.patch
rename to patches/server/0547-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0550-Add-API-for-quit-reason.patch b/patches/server/0548-Add-API-for-quit-reason.patch
similarity index 94%
rename from patches/server/0550-Add-API-for-quit-reason.patch
rename to patches/server/0548-Add-API-for-quit-reason.patch
index 70c449560c..e1ce9d113d 100644
--- a/patches/server/0550-Add-API-for-quit-reason.patch
+++ b/patches/server/0548-Add-API-for-quit-reason.patch
@@ -25,10 +25,10 @@ index d32b96a5f51d745869cfc40c01c54de58e1eb843..759e563d1ed13249fada8a8eab6b6a10
                          Connection.LOGGER.debug("Failed to sent packet", throwable);
                          ConnectionProtocol enumprotocol = this.getCurrentProtocol();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b299b8da09a304cdc52ddb725873a53045835b4a..dcde52c720334ee647569afa91e50278f919956a 100644
+index d59e707f28a5f04545208ad33d122fc433b85933..a361701e3be790ca7477d178a8fd73f932efe797 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -248,6 +248,7 @@ public class ServerPlayer extends Player {
+@@ -247,6 +247,7 @@ public class ServerPlayer extends Player {
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
      boolean needsChunkCenterUpdate; // Paper - no-tick view distance
@@ -49,10 +49,10 @@ index f3b7a9203bca8246789b293f0d043a4f253ce57f..52a23465cbb76a164bf2163045d09bde
              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 2f73f1f770e5e1fa422bec9c27e5bd10e86b7538..fe548b8625a123798f8d966cb3bffd899971cb34 100644
+index 31dd2c4a41e172c7eeb835ae61a45c954d0e647a..b7e3ed5a6298774a315300daef771f278aa20af7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -588,7 +588,7 @@ public abstract class PlayerList {
+@@ -587,7 +587,7 @@ public abstract class PlayerList {
              entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper
          }
  
diff --git a/patches/server/0551-Seed-based-feature-search.patch b/patches/server/0549-Seed-based-feature-search.patch
similarity index 96%
rename from patches/server/0551-Seed-based-feature-search.patch
rename to patches/server/0549-Seed-based-feature-search.patch
index 8ca9e2fdee..0beec6efd0 100644
--- a/patches/server/0551-Seed-based-feature-search.patch
+++ b/patches/server/0549-Seed-based-feature-search.patch
@@ -21,10 +21,10 @@ changes but this should usually not happen. A config option to disable
 this completely is added though in case that should ever be necessary.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 81afddeadbece05f3d9ef604a3d2b3cc0a731cde..e3ca2c9d72e16dabd888234d069fbfa21c1d6fa1 100644
+index c484da4558e918c1456588e540a3b34e78581f81..cac404e1c7ede7b1076532555d35e6c18f158b16 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -376,6 +376,14 @@ public class PaperWorldConfig {
+@@ -361,6 +361,14 @@ public class PaperWorldConfig {
          }
      }
  
diff --git a/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 98%
rename from patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch
index 555110f58c..83f41c4939 100644
--- a/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch
@@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h
 values used in other places.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e3ca2c9d72e16dabd888234d069fbfa21c1d6fa1..e5effa6c735ac268ee9b5d3428ad42a3618a2fda 100644
+index cac404e1c7ede7b1076532555d35e6c18f158b16..f4b533b8e8b6c4bb59d032e91a94353f4b201b69 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -61,6 +61,19 @@ public class PaperWorldConfig {
diff --git a/patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch
rename to patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0554-Expose-world-spawn-angle.patch b/patches/server/0552-Expose-world-spawn-angle.patch
similarity index 93%
rename from patches/server/0554-Expose-world-spawn-angle.patch
rename to patches/server/0552-Expose-world-spawn-angle.patch
index 419b678486..30ed2166d8 100644
--- a/patches/server/0554-Expose-world-spawn-angle.patch
+++ b/patches/server/0552-Expose-world-spawn-angle.patch
@@ -5,10 +5,10 @@ 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 fe548b8625a123798f8d966cb3bffd899971cb34..ce6d9b460f0f55fc6d5544d5c8d2b78e5fcc3937 100644
+index b7e3ed5a6298774a315300daef771f278aa20af7..d8278190323d00c186d81f578f77fa335529baad 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -865,7 +865,7 @@ public abstract class PlayerList {
+@@ -864,7 +864,7 @@ public abstract class PlayerList {
              if (location == null) {
                  worldserver1 = this.server.getLevel(Level.OVERWORLD);
                  blockposition = entityplayer1.getSpawnPoint(worldserver1);
diff --git a/patches/server/0555-Add-Destroy-Speed-API.patch b/patches/server/0553-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/server/0555-Add-Destroy-Speed-API.patch
rename to patches/server/0553-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/patches/server/0557-Add-LivingEntity-clearActiveItem.patch b/patches/server/0555-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/server/0557-Add-LivingEntity-clearActiveItem.patch
rename to patches/server/0555-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0558-Add-PlayerItemCooldownEvent.patch b/patches/server/0556-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/server/0558-Add-PlayerItemCooldownEvent.patch
rename to patches/server/0556-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0559-More-lightning-API.patch b/patches/server/0557-More-lightning-API.patch
similarity index 100%
rename from patches/server/0559-More-lightning-API.patch
rename to patches/server/0557-More-lightning-API.patch
diff --git a/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch
index b63dced87b..4b47e8324e 100644
--- a/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e5effa6c735ac268ee9b5d3428ad42a3618a2fda..e51c66ca0005ecb22ca99d33d2e37900eccf9c73 100644
+index f4b533b8e8b6c4bb59d032e91a94353f4b201b69..5344d25e7bef34954aa058ec019b4ba8ab4de515 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -74,6 +74,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0561-Added-missing-default-perms-for-commands.patch b/patches/server/0559-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from patches/server/0561-Added-missing-default-perms-for-commands.patch
rename to patches/server/0559-Added-missing-default-perms-for-commands.patch
diff --git a/patches/server/0562-Add-PlayerShearBlockEvent.patch b/patches/server/0560-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/server/0562-Add-PlayerShearBlockEvent.patch
rename to patches/server/0560-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 96%
rename from patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
rename to patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch
index 67f06078ca..559a2303d4 100644
--- a/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch
+++ b/patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch
@@ -8,7 +8,7 @@ and curing a villager on repeat by simply resetting the relevant part of
 the reputation when it is cured.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e51c66ca0005ecb22ca99d33d2e37900eccf9c73..ba39026cc7ba904d6f9d8226fae01943544445e9 100644
+index 5344d25e7bef34954aa058ec019b4ba8ab4de515..cf8bc5432de023968ecdae6e48045c93021ad243 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -79,6 +79,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0565-Limit-recipe-packets.patch b/patches/server/0563-Limit-recipe-packets.patch
similarity index 97%
rename from patches/server/0565-Limit-recipe-packets.patch
rename to patches/server/0563-Limit-recipe-packets.patch
index 2843cd99c8..208f8aafb2 100644
--- a/patches/server/0565-Limit-recipe-packets.patch
+++ b/patches/server/0563-Limit-recipe-packets.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7d50aded88f5b7dfebaea1aebc86231f7b5c4e25..652d87fc5d566dba8018c81676329f0e0bca471b 100644
+index 649e46115260259820a9d2255ad669b926319a3f..f9d438325aed9d488d8aa60e0ae68a3789ae8c39 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -334,6 +334,13 @@ public class PaperConfig {
diff --git a/patches/server/0566-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0564-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from patches/server/0566-Fix-CraftSound-backwards-compatibility.patch
rename to patches/server/0564-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0567-MC-4-Fix-item-position-desync.patch b/patches/server/0565-MC-4-Fix-item-position-desync.patch
similarity index 95%
rename from patches/server/0567-MC-4-Fix-item-position-desync.patch
rename to patches/server/0565-MC-4-Fix-item-position-desync.patch
index 8bffcb67c3..33d1969ff1 100644
--- a/patches/server/0567-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0565-MC-4-Fix-item-position-desync.patch
@@ -9,10 +9,10 @@ loss, which forces the server to lose the same precision as the client
 keeping them in sync.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 652d87fc5d566dba8018c81676329f0e0bca471b..c56e7fb18f9a56c8025eb70a524f028b5942da37 100644
+index f9d438325aed9d488d8aa60e0ae68a3789ae8c39..8900ba1b0aad1c1112bde31dc5b66a96ab24d8e7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -474,4 +474,9 @@ public class PaperConfig {
+@@ -463,4 +463,9 @@ public class PaperConfig {
      private static void trackPluginScoreboards() {
          trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false);
      }
diff --git a/patches/server/0568-Player-Chunk-Load-Unload-Events.patch b/patches/server/0566-Player-Chunk-Load-Unload-Events.patch
similarity index 90%
rename from patches/server/0568-Player-Chunk-Load-Unload-Events.patch
rename to patches/server/0566-Player-Chunk-Load-Unload-Events.patch
index 863c2c7671..31fb97f969 100644
--- a/patches/server/0568-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0566-Player-Chunk-Load-Unload-Events.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index dcde52c720334ee647569afa91e50278f919956a..f916b1450fb0c46f6675ff8d1973d95814c980e3 100644
+index a361701e3be790ca7477d178a8fd73f932efe797..28eb1f6e323d50fe8dc0587724ae73c6939f6721 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2065,11 +2065,21 @@ public class ServerPlayer extends Player {
+@@ -2064,11 +2064,21 @@ public class ServerPlayer extends Player {
      public void trackChunk(ChunkPos chunkcoordintpair, Packet<?> packet, Packet<?> packet1) {
          this.connection.send(packet1);
          this.connection.send(packet);
diff --git a/patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch
rename to patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0570-Expose-LivingEntity-hurt-direction.patch b/patches/server/0568-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/server/0570-Expose-LivingEntity-hurt-direction.patch
rename to patches/server/0568-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/patches/server/0573-added-PlayerTradeEvent.patch b/patches/server/0571-added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/server/0573-added-PlayerTradeEvent.patch
rename to patches/server/0571-added-PlayerTradeEvent.patch
diff --git a/patches/server/0574-Implement-TargetHitEvent.patch b/patches/server/0572-Implement-TargetHitEvent.patch
similarity index 100%
rename from patches/server/0574-Implement-TargetHitEvent.patch
rename to patches/server/0572-Implement-TargetHitEvent.patch
diff --git a/patches/server/0575-Additional-Block-Material-API-s.patch b/patches/server/0573-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/server/0575-Additional-Block-Material-API-s.patch
rename to patches/server/0573-Additional-Block-Material-API-s.patch
diff --git a/patches/server/0576-Fix-harming-potion-dupe.patch b/patches/server/0574-Fix-harming-potion-dupe.patch
similarity index 100%
rename from patches/server/0576-Fix-harming-potion-dupe.patch
rename to patches/server/0574-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/patches/server/0578-Cache-burn-durations.patch b/patches/server/0576-Cache-burn-durations.patch
similarity index 100%
rename from patches/server/0578-Cache-burn-durations.patch
rename to patches/server/0576-Cache-burn-durations.patch
diff --git a/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 95%
rename from patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index 3606c0d287..11b781e1d2 100644
--- a/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ba39026cc7ba904d6f9d8226fae01943544445e9..71774634c4adef5102ba931d88b00c23113cc642 100644
+index cf8bc5432de023968ecdae6e48045c93021ad243..f1cc0579654877fde716a3f99e4ea28044941b4b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -84,6 +84,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch
rename to patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch
rename to patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch
rename to patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/patches/server/0583-Zombie-API-breaking-doors.patch b/patches/server/0581-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/server/0583-Zombie-API-breaking-doors.patch
rename to patches/server/0581-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0584-Fix-nerfed-slime-when-splitting.patch b/patches/server/0582-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from patches/server/0584-Fix-nerfed-slime-when-splitting.patch
rename to patches/server/0582-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0585-Add-EntityLoadCrossbowEvent.patch b/patches/server/0583-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/server/0585-Add-EntityLoadCrossbowEvent.patch
rename to patches/server/0583-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0586-Guardian-beam-workaround.patch b/patches/server/0584-Guardian-beam-workaround.patch
similarity index 100%
rename from patches/server/0586-Guardian-beam-workaround.patch
rename to patches/server/0584-Guardian-beam-workaround.patch
diff --git a/patches/server/0587-Added-WorldGameRuleChangeEvent.patch b/patches/server/0585-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/server/0587-Added-WorldGameRuleChangeEvent.patch
rename to patches/server/0585-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0588-Added-ServerResourcesReloadedEvent.patch b/patches/server/0586-Added-ServerResourcesReloadedEvent.patch
similarity index 93%
rename from patches/server/0588-Added-ServerResourcesReloadedEvent.patch
rename to patches/server/0586-Added-ServerResourcesReloadedEvent.patch
index 173ddd64aa..fa0d2a543b 100644
--- a/patches/server/0588-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0586-Added-ServerResourcesReloadedEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9bd2255d31bcfd4574f8d1caf598f9141aa9e3c1..51bbb11ff8d3da95fa6d9890be3135a34b3eafac 100644
+index 75e4d69e69509a94f0e112fe121369a6f8952ee7..e73c211627f7aa5d6aa5525dba7e9601fbbc6794 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2017,7 +2017,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2002,7 +2002,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.functionManager;
      }
  
@@ -22,7 +22,7 @@ index 9bd2255d31bcfd4574f8d1caf598f9141aa9e3c1..51bbb11ff8d3da95fa6d9890be3135a3
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
              Stream<String> stream = datapacks.stream(); // CraftBukkit - decompile error
              PackRepository resourcepackrepository = this.packRepository;
-@@ -2033,6 +2039,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2018,6 +2024,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.packRepository.setSelected(datapacks);
              this.worldData.setDataPackConfig(MinecraftServer.getSelectedPacks(this.packRepository));
              datapackresources.updateGlobals();
diff --git a/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 95%
rename from patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
rename to patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch
index dea623feb7..1ab57d3b32 100644
--- a/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0587-Added-world-settings-for-mobs-picking-up-loot.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added world settings for mobs picking up loot
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 71774634c4adef5102ba931d88b00c23113cc642..807a5bdd2864d56670eb11156a8dc41c7d8e695a 100644
+index f1cc0579654877fde716a3f99e4ea28044941b4b..6fd1e1e36b8af32521adffc908c9a8e165cc3ac2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -430,6 +430,14 @@ public class PaperWorldConfig {
+@@ -415,6 +415,14 @@ public class PaperWorldConfig {
          log("Creeper lingering effect: " + disableCreeperLingeringEffect);
      }
  
diff --git a/patches/server/0590-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0588-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/server/0590-Implemented-BlockFailedDispenseEvent.patch
rename to patches/server/0588-Implemented-BlockFailedDispenseEvent.patch
diff --git a/patches/server/0591-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0589-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/server/0591-Added-PlayerLecternPageChangeEvent.patch
rename to patches/server/0589-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0590-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/server/0590-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0593-Configurable-door-breaking-difficulty.patch b/patches/server/0591-Configurable-door-breaking-difficulty.patch
similarity index 96%
rename from patches/server/0593-Configurable-door-breaking-difficulty.patch
rename to patches/server/0591-Configurable-door-breaking-difficulty.patch
index 8659c40ba1..058ac86947 100644
--- a/patches/server/0593-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0591-Configurable-door-breaking-difficulty.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable door breaking difficulty
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 807a5bdd2864d56670eb11156a8dc41c7d8e695a..5443d5d924f0dc9cb453f43d79372a31a87cee75 100644
+index 6fd1e1e36b8af32521adffc908c9a8e165cc3ac2..aefc43e5fdcecb268a83a31cb6d4e4c4facebe4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,10 @@ package com.destroystokyo.paper;
@@ -46,7 +46,7 @@ index 807a5bdd2864d56670eb11156a8dc41c7d8e695a..5443d5d924f0dc9cb453f43d79372a31
      public short keepLoadedRange;
      private void keepLoadedRange() {
          keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16);
-@@ -140,6 +162,11 @@ public class PaperWorldConfig {
+@@ -125,6 +147,11 @@ public class PaperWorldConfig {
          return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
      }
  
diff --git a/patches/server/0594-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0592-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from patches/server/0594-Empty-commands-shall-not-be-dispatched.patch
rename to patches/server/0592-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch
rename to patches/server/0593-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/patches/server/0596-Remove-stale-POIs.patch b/patches/server/0594-Remove-stale-POIs.patch
similarity index 87%
rename from patches/server/0596-Remove-stale-POIs.patch
rename to patches/server/0594-Remove-stale-POIs.patch
index 22293e01c1..f430ef8185 100644
--- a/patches/server/0596-Remove-stale-POIs.patch
+++ b/patches/server/0594-Remove-stale-POIs.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Remove stale POIs
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index fda07a19e9e54adb88ccac2dd0b65d5a0aeeb18a..bbdabc00ea2ca0db7fd50ddb4ecd3e14661199f3 100644
+index 30824d000fce6c74288d9c5e656e668fad746e26..520db20a1589a2f82c7fa5aa65b3b040af270c0b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1770,6 +1770,11 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1738,6 +1738,11 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              });
              optional1.ifPresent((villageplacetype) -> {
                  this.getServer().execute(() -> {
diff --git a/patches/server/0597-Fix-villager-boat-exploit.patch b/patches/server/0595-Fix-villager-boat-exploit.patch
similarity index 89%
rename from patches/server/0597-Fix-villager-boat-exploit.patch
rename to patches/server/0595-Fix-villager-boat-exploit.patch
index edc990c633..fb232b2f72 100644
--- a/patches/server/0597-Fix-villager-boat-exploit.patch
+++ b/patches/server/0595-Fix-villager-boat-exploit.patch
@@ -5,10 +5,10 @@ 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 ce6d9b460f0f55fc6d5544d5c8d2b78e5fcc3937..9a37a962b141e9faecc9f6f4906a9d727d20c20a 100644
+index d8278190323d00c186d81f578f77fa335529baad..eed8b1055c4c5026ebe3ebf1541ac94beda3112e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -613,6 +613,15 @@ public abstract class PlayerList {
+@@ -612,6 +612,15 @@ public abstract class PlayerList {
                  PlayerList.LOGGER.debug("Removing player mount");
                  entityplayer.stopRiding();
                  entity.getPassengersAndSelf().forEach((entity1) -> {
diff --git a/patches/server/0598-Add-sendOpLevel-API.patch b/patches/server/0596-Add-sendOpLevel-API.patch
similarity index 94%
rename from patches/server/0598-Add-sendOpLevel-API.patch
rename to patches/server/0596-Add-sendOpLevel-API.patch
index 3059f7c30d..e113220db2 100644
--- a/patches/server/0598-Add-sendOpLevel-API.patch
+++ b/patches/server/0596-Add-sendOpLevel-API.patch
@@ -5,10 +5,10 @@ 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 9a37a962b141e9faecc9f6f4906a9d727d20c20a..d01712cad42c078a726d6f757a4d8f0e3f186274 100644
+index eed8b1055c4c5026ebe3ebf1541ac94beda3112e..235c9aef7615948be74b336fd922b80f6b4e6fac 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1113,22 +1113,29 @@ public abstract class PlayerList {
+@@ -1112,22 +1112,29 @@ public abstract class PlayerList {
      }
  
      private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) {
diff --git a/patches/server/0599-Add-StructureLocateEvent.patch b/patches/server/0597-Add-StructureLocateEvent.patch
similarity index 100%
rename from patches/server/0599-Add-StructureLocateEvent.patch
rename to patches/server/0597-Add-StructureLocateEvent.patch
diff --git a/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0598-Collision-option-for-requiring-a-player-participant.patch
similarity index 98%
rename from patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
rename to patches/server/0598-Collision-option-for-requiring-a-player-participant.patch
index e0aaa1a3b4..62ec0515ef 100644
--- a/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0598-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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5443d5d924f0dc9cb453f43d79372a31a87cee75..6f28e7d153ad1ccd99bb3cd53a6632caea139414 100644
+index aefc43e5fdcecb268a83a31cb6d4e4c4facebe4d..cc15735a8a63952724facf3e053c6776dc6ad017 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -64,6 +64,18 @@ public class PaperWorldConfig {
diff --git a/patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
similarity index 100%
rename from patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
rename to patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch
diff --git a/patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0603-Make-schedule-command-per-world.patch b/patches/server/0601-Make-schedule-command-per-world.patch
similarity index 100%
rename from patches/server/0603-Make-schedule-command-per-world.patch
rename to patches/server/0601-Make-schedule-command-per-world.patch
diff --git a/patches/server/0604-Configurable-max-leash-distance.patch b/patches/server/0602-Configurable-max-leash-distance.patch
similarity index 94%
rename from patches/server/0604-Configurable-max-leash-distance.patch
rename to patches/server/0602-Configurable-max-leash-distance.patch
index d13c4c4960..0ea9f2b138 100644
--- a/patches/server/0604-Configurable-max-leash-distance.patch
+++ b/patches/server/0602-Configurable-max-leash-distance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max leash distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6f28e7d153ad1ccd99bb3cd53a6632caea139414..7c663f667e7ab1c0b04d4517e0cbd3446847d938 100644
+index cc15735a8a63952724facf3e053c6776dc6ad017..3c1a84a33743b635e789024a5575fbe59b83bfe0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -263,6 +263,12 @@ public class PaperWorldConfig {
+@@ -248,6 +248,12 @@ public class PaperWorldConfig {
          }
      }
  
diff --git a/patches/server/0605-Implement-BlockPreDispenseEvent.patch b/patches/server/0603-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/server/0605-Implement-BlockPreDispenseEvent.patch
rename to patches/server/0603-Implement-BlockPreDispenseEvent.patch
diff --git a/patches/server/0606-Added-Vanilla-Entity-Tags.patch b/patches/server/0604-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/server/0606-Added-Vanilla-Entity-Tags.patch
rename to patches/server/0604-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/server/0607-added-Wither-API.patch b/patches/server/0605-added-Wither-API.patch
similarity index 100%
rename from patches/server/0607-added-Wither-API.patch
rename to patches/server/0605-added-Wither-API.patch
diff --git a/patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0607-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch
rename to patches/server/0607-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 92%
rename from patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch
index 5bbe45027f..26135b7e1d 100644
--- a/patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for always placing the dragon egg
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7c663f667e7ab1c0b04d4517e0cbd3446847d938..ef8906762b0bb95399fe57a8b8efb282a3c26020 100644
+index 3c1a84a33743b635e789024a5575fbe59b83bfe0..5e24a7eb6108dbec54192874e9d8fb292d73fbb6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -755,5 +755,10 @@ public class PaperWorldConfig {
+@@ -740,5 +740,10 @@ public class PaperWorldConfig {
      private void perPlayerMobSpawns() {
          perPlayerMobSpawns = getBoolean("per-player-mob-spawns", false);
      }
diff --git a/patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0609-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/server/0609-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/server/0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 87%
rename from patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch
rename to patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch
index 55cd4d6540..2df4e684e4 100644
--- a/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch
+++ b/patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Skip distance map update when spawning disabled.
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 094c07c3208b0c05f918b7ee19f1d5b9ceeece47..40f0af6a3c27927c2a2bde00e94e24000a4d54f7 100644
+index e46ccbca0cfa63dd5143080375193a95a9249d60..71b90decb77dbc5a5e0b491db72ca7a239deff2a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -779,7 +779,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -770,7 +770,7 @@ public class ServerChunkCache extends ChunkSource {
              int l = this.distanceManager.getNaturalSpawnChunkCount();
              // Paper start - per player mob spawning
              NaturalSpawner.SpawnState spawnercreature_d; // moved down
diff --git a/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0612-Reset-shield-blocking-on-dimension-change.patch
similarity index 83%
rename from patches/server/0614-Reset-shield-blocking-on-dimension-change.patch
rename to patches/server/0612-Reset-shield-blocking-on-dimension-change.patch
index a294b0525e..43310e7206 100644
--- a/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0612-Reset-shield-blocking-on-dimension-change.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f916b1450fb0c46f6675ff8d1973d95814c980e3..c17637e5796fda8632c2fe399dbcd63fafa4133e 100644
+index 28eb1f6e323d50fe8dc0587724ae73c6939f6721..547f4fe601d5846e339aba23fb20f6684c0e901f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1117,6 +1117,11 @@ public class ServerPlayer extends Player {
+@@ -1116,6 +1116,11 @@ public class ServerPlayer extends Player {
                  this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
              }
diff --git a/patches/server/0615-add-DragonEggFormEvent.patch b/patches/server/0613-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/server/0615-add-DragonEggFormEvent.patch
rename to patches/server/0613-add-DragonEggFormEvent.patch
diff --git a/patches/server/0616-EntityMoveEvent.patch b/patches/server/0614-EntityMoveEvent.patch
similarity index 93%
rename from patches/server/0616-EntityMoveEvent.patch
rename to patches/server/0614-EntityMoveEvent.patch
index 5f445a6e26..53cd1898ac 100644
--- a/patches/server/0616-EntityMoveEvent.patch
+++ b/patches/server/0614-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 51bbb11ff8d3da95fa6d9890be3135a34b3eafac..c8213692e658f6eb82d3bd843b9525ff6565cc81 100644
+index e73c211627f7aa5d6aa5525dba7e9601fbbc6794..d66d93c0eb5a26b61821029f9c470a73e6a0ca93 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1524,6 +1524,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1509,6 +1509,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -17,7 +17,7 @@ index 51bbb11ff8d3da95fa6d9890be3135a34b3eafac..c8213692e658f6eb82d3bd843b9525ff
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index bbdabc00ea2ca0db7fd50ddb4ecd3e14661199f3..e5e2beb8be3976a3f6dfa55e3398d80d84a7fd44 100644
+index 520db20a1589a2f82c7fa5aa65b3b040af270c0b..6e510a168316d615122aa12b1453bed6e185c041 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -200,6 +200,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 82%
rename from patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch
rename to patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch
index 71ede24461..27344cdd5c 100644
--- a/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ef8906762b0bb95399fe57a8b8efb282a3c26020..56fb03d950a7a12f2758421ca2b2204eb3aff563 100644
+index 5e24a7eb6108dbec54192874e9d8fb292d73fbb6..25a284491e5029ecf8d574ca821d18a6c06fa1d8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -760,5 +760,10 @@ public class PaperWorldConfig {
+@@ -745,5 +745,10 @@ public class PaperWorldConfig {
      private void enderDragonsDeathAlwaysPlacesDragonEgg() {
          enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg);
      }
@@ -20,10 +20,10 @@ index ef8906762b0bb95399fe57a8b8efb282a3c26020..56fb03d950a7a12f2758421ca2b2204e
  }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e5e2beb8be3976a3f6dfa55e3398d80d84a7fd44..9a8b3647c161be8d8b87df8fff3b2d204dab6a8b 100644
+index 6e510a168316d615122aa12b1453bed6e185c041..344c6d6dd99819ac1103c065b0410bafb3537581 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1366,6 +1366,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1334,6 +1334,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
      @Override
      public void sendBlockUpdated(BlockPos pos, BlockState oldState, BlockState newState, int flags) {
          this.getChunkSource().blockChanged(pos);
@@ -31,7 +31,7 @@ index e5e2beb8be3976a3f6dfa55e3398d80d84a7fd44..9a8b3647c161be8d8b87df8fff3b2d20
          VoxelShape voxelshape = oldState.getCollisionShape(this, pos);
          VoxelShape voxelshape1 = newState.getCollisionShape(this, pos);
  
-@@ -1393,6 +1394,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
+@@ -1361,6 +1362,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
              }
  
          }
diff --git a/patches/server/0618-Inline-shift-direction-fields.patch b/patches/server/0616-Inline-shift-direction-fields.patch
similarity index 100%
rename from patches/server/0618-Inline-shift-direction-fields.patch
rename to patches/server/0616-Inline-shift-direction-fields.patch
diff --git a/patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0617-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/server/0617-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/server/0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0621-living-entity-allow-attribute-registration.patch b/patches/server/0619-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/server/0621-living-entity-allow-attribute-registration.patch
rename to patches/server/0619-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0622-fix-dead-slime-setSize-invincibility.patch b/patches/server/0620-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from patches/server/0622-fix-dead-slime-setSize-invincibility.patch
rename to patches/server/0620-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0621-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to patches/server/0621-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0624-misc-debugging-dumps.patch b/patches/server/0622-misc-debugging-dumps.patch
similarity index 93%
rename from patches/server/0624-misc-debugging-dumps.patch
rename to patches/server/0622-misc-debugging-dumps.patch
index 5e9c0b75bf..5a04da65b1 100644
--- a/patches/server/0624-misc-debugging-dumps.patch
+++ b/patches/server/0622-misc-debugging-dumps.patch
@@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c8213692e658f6eb82d3bd843b9525ff6565cc81..f1c1d715d509aeb13e465cd57a82896db6c51838 100644
+index d66d93c0eb5a26b61821029f9c470a73e6a0ca93..ed0e697e290ea6504ba337763aabc8c689a44523 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -913,6 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -912,6 +912,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      private boolean hasStopped = false;
      public volatile boolean hasFullyShutdown = false; // Paper
@@ -40,7 +40,7 @@ index c8213692e658f6eb82d3bd843b9525ff6565cc81..f1c1d715d509aeb13e465cd57a82896d
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -927,6 +928,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -926,6 +927,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
diff --git a/patches/server/0625-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from patches/server/0625-Add-support-for-hex-color-codes-in-console.patch
rename to patches/server/0623-Add-support-for-hex-color-codes-in-console.patch
diff --git a/patches/server/0626-Expose-Tracked-Players.patch b/patches/server/0624-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/server/0626-Expose-Tracked-Players.patch
rename to patches/server/0624-Expose-Tracked-Players.patch
diff --git a/patches/server/0627-Remove-streams-from-SensorNearest.patch b/patches/server/0625-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from patches/server/0627-Remove-streams-from-SensorNearest.patch
rename to patches/server/0625-Remove-streams-from-SensorNearest.patch
diff --git a/patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 93%
rename from patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
index adcfc12a3f..b3d99115b8 100644
--- a/patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch
+++ b/patches/server/0626-MC-29274-Fix-Wither-hostility-towards-players.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-29274: Fix Wither hostility towards players
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 56fb03d950a7a12f2758421ca2b2204eb3aff563..9bca4dec4372d1ef0eae545b484cc9e94bd8efb8 100644
+index 25a284491e5029ecf8d574ca821d18a6c06fa1d8..371110b6668794bd49777122a6a11fd89f74bccf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -765,5 +765,11 @@ public class PaperWorldConfig {
+@@ -750,5 +750,11 @@ public class PaperWorldConfig {
      private void setUpdatePathfindingOnBlockUpdate() {
          updatePathfindingOnBlockUpdate = getBoolean("update-pathfinding-on-block-update", this.updatePathfindingOnBlockUpdate);
      }
diff --git a/patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch
rename to patches/server/0627-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/patches/server/0630-Improve-ServerGUI.patch b/patches/server/0628-Improve-ServerGUI.patch
similarity index 100%
rename from patches/server/0630-Improve-ServerGUI.patch
rename to patches/server/0628-Improve-ServerGUI.patch
diff --git a/patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to patches/server/0629-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/patches/server/0632-fix-converting-txt-to-json-file.patch b/patches/server/0630-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from patches/server/0632-fix-converting-txt-to-json-file.patch
rename to patches/server/0630-fix-converting-txt-to-json-file.patch
index 7321e15a00..132893b5ce 100644
--- a/patches/server/0632-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0630-fix-converting-txt-to-json-file.patch
@@ -48,7 +48,7 @@ index a5c1114f9b323e8a49c84d0e68461e473bbcd690..eadacfa8449336c024f6154f46bb514d
          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 d01712cad42c078a726d6f757a4d8f0e3f186274..67b6c205e96d039fc80d11fa5c3b612464a0b53d 100644
+index 235c9aef7615948be74b336fd922b80f6b4e6fac..6250d3d06eba0d982bfd0c755c43be1d14f0ac09 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -171,6 +171,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0633-Add-worldborder-events.patch b/patches/server/0631-Add-worldborder-events.patch
similarity index 100%
rename from patches/server/0633-Add-worldborder-events.patch
rename to patches/server/0631-Add-worldborder-events.patch
diff --git a/patches/server/0634-added-PlayerNameEntityEvent.patch b/patches/server/0632-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/server/0634-added-PlayerNameEntityEvent.patch
rename to patches/server/0632-added-PlayerNameEntityEvent.patch
diff --git a/patches/server/0635-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0633-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from patches/server/0635-Prevent-grindstones-from-overstacking-items.patch
rename to patches/server/0633-Prevent-grindstones-from-overstacking-items.patch
diff --git a/patches/server/0636-Add-recipe-to-cook-events.patch b/patches/server/0634-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/server/0636-Add-recipe-to-cook-events.patch
rename to patches/server/0634-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0637-Add-Block-isValidTool.patch b/patches/server/0635-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/server/0637-Add-Block-isValidTool.patch
rename to patches/server/0635-Add-Block-isValidTool.patch
diff --git a/patches/server/0638-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0636-Allow-using-signs-inside-spawn-protection.patch
similarity index 94%
rename from patches/server/0638-Allow-using-signs-inside-spawn-protection.patch
rename to patches/server/0636-Allow-using-signs-inside-spawn-protection.patch
index d944dd4777..30acf3cb99 100644
--- a/patches/server/0638-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0636-Allow-using-signs-inside-spawn-protection.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow using signs inside spawn protection
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9bca4dec4372d1ef0eae545b484cc9e94bd8efb8..b89ff2b404d0ffd5d0602f82576c0dc684ab2243 100644
+index 371110b6668794bd49777122a6a11fd89f74bccf..3b5e6d95349d51e335835b30f5a748d789adf48c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -771,5 +771,10 @@ public class PaperWorldConfig {
+@@ -756,5 +756,10 @@ public class PaperWorldConfig {
          fixWitherTargetingBug = getBoolean("fix-wither-targeting-bug", false);
          log("Withers properly target players: " + fixWitherTargetingBug);
      }
diff --git a/patches/server/0639-Implement-Keyed-on-World.patch b/patches/server/0637-Implement-Keyed-on-World.patch
similarity index 100%
rename from patches/server/0639-Implement-Keyed-on-World.patch
rename to patches/server/0637-Implement-Keyed-on-World.patch
diff --git a/patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
similarity index 100%
rename from patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch
rename to patches/server/0638-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0641-Item-Rarity-API.patch b/patches/server/0639-Item-Rarity-API.patch
similarity index 100%
rename from patches/server/0641-Item-Rarity-API.patch
rename to patches/server/0639-Item-Rarity-API.patch
diff --git a/patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0640-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0643-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0641-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from patches/server/0643-copy-TESign-isEditable-from-snapshots.patch
rename to patches/server/0641-copy-TESign-isEditable-from-snapshots.patch
diff --git a/patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch
similarity index 88%
rename from patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch
index edf1b58141..1a55403d9d 100644
--- a/patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0642-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,10 +7,10 @@ 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 67b6c205e96d039fc80d11fa5c3b612464a0b53d..dbee3e05cd7d5439ed0605187fa67688a398e629 100644
+index 6250d3d06eba0d982bfd0c755c43be1d14f0ac09..854bb87e876c0f0b5e0d1b9e1c969784ad9d2428 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -606,6 +606,14 @@ public abstract class PlayerList {
+@@ -605,6 +605,14 @@ public abstract class PlayerList {
          }
          // Paper end
  
diff --git a/patches/server/0645-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0643-forced-whitelist-use-configurable-kick-message.patch
similarity index 89%
rename from patches/server/0645-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0643-forced-whitelist-use-configurable-kick-message.patch
index a57d85fa8d..eb81cf9aa4 100644
--- a/patches/server/0645-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0643-forced-whitelist-use-configurable-kick-message.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f1c1d715d509aeb13e465cd57a82896db6c51838..73ac55de9059a1d0f1da5bec0688dcd4bf5c8973 100644
+index ed0e697e290ea6504ba337763aabc8c689a44523..8ab99b04ef3e85b64ea78680aa85df1a0894399f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -77,7 +77,6 @@ import net.minecraft.nbt.NbtOps;
@@ -16,7 +16,7 @@ index f1c1d715d509aeb13e465cd57a82896db6c51838..73ac55de9059a1d0f1da5bec0688dcd4
  import net.minecraft.network.protocol.Packet;
  import net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket;
  import net.minecraft.network.protocol.game.ClientboundSetTimePacket;
-@@ -2124,7 +2123,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2109,7 +2108,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile())) {
diff --git a/patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0644-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0647-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0645-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from patches/server/0647-fix-cancelling-block-falling-causing-client-desync.patch
rename to patches/server/0645-fix-cancelling-block-falling-causing-client-desync.patch
diff --git a/patches/server/0648-Expose-protocol-version.patch b/patches/server/0646-Expose-protocol-version.patch
similarity index 100%
rename from patches/server/0648-Expose-protocol-version.patch
rename to patches/server/0646-Expose-protocol-version.patch
diff --git a/patches/server/0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from patches/server/0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/server/0647-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 98%
rename from patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch
index 0609bfa202..3cc5351713 100644
--- a/patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0648-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c56e7fb18f9a56c8025eb70a524f028b5942da37..efc1e42d606e1c9feb1a4871c0714933ae92a1b2 100644
+index 8900ba1b0aad1c1112bde31dc5b66a96ab24d8e7..046e408fcd185efe9e307abbaf2c1b84f3f864fb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -479,4 +479,11 @@ public class PaperConfig {
+@@ -468,4 +468,11 @@ public class PaperConfig {
      private static void fixEntityPositionDesync() {
          fixEntityPositionDesync = getBoolean("settings.fix-entity-position-desync", fixEntityPositionDesync);
      }
diff --git a/patches/server/0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0649-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0652-Add-bypass-host-check.patch b/patches/server/0650-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0652-Add-bypass-host-check.patch
rename to patches/server/0650-Add-bypass-host-check.patch
diff --git a/patches/server/0653-Set-area-affect-cloud-rotation.patch b/patches/server/0651-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0653-Set-area-affect-cloud-rotation.patch
rename to patches/server/0651-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0654-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0652-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0654-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0652-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0655-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0653-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from patches/server/0655-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to patches/server/0653-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/patches/server/0656-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0654-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0656-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0654-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0657-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0655-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0657-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0655-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0658-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0656-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0658-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0656-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0659-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0657-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from patches/server/0659-Fix-checkReach-check-for-Shulker-boxes.patch
rename to patches/server/0657-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/patches/server/0660-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0658-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0660-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0658-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0661-Added-PlayerDeepSleepEvent.patch b/patches/server/0659-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0661-Added-PlayerDeepSleepEvent.patch
rename to patches/server/0659-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0662-More-World-API.patch b/patches/server/0660-More-World-API.patch
similarity index 100%
rename from patches/server/0662-More-World-API.patch
rename to patches/server/0660-More-World-API.patch
diff --git a/patches/server/0663-Added-PlayerBedFailEnterEvent.patch b/patches/server/0661-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0663-Added-PlayerBedFailEnterEvent.patch
rename to patches/server/0661-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0664-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0664-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0662-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 87%
rename from patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index 0b46f90874..d3a374449b 100644
--- a/patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/patches/server/0663-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,10 +6,10 @@ 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 dbee3e05cd7d5439ed0605187fa67688a398e629..8d52041f8afa065516289cdbf41c373a2529e7f2 100644
+index 854bb87e876c0f0b5e0d1b9e1c969784ad9d2428..2f07e0b17ac1593473e64212889170f50e7845d5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -840,6 +840,7 @@ public abstract class PlayerList {
+@@ -839,6 +839,7 @@ public abstract class PlayerList {
  
          // Paper start
          boolean isBedSpawn = false;
@@ -17,7 +17,7 @@ index dbee3e05cd7d5439ed0605187fa67688a398e629..8d52041f8afa065516289cdbf41c373a
          boolean isRespawn = false;
          boolean isLocAltered = false; // Paper - Fix SPIGOT-5989
          // Paper end
-@@ -860,6 +861,7 @@ public abstract class PlayerList {
+@@ -859,6 +860,7 @@ public abstract class PlayerList {
                  if (optional.isPresent()) {
                      BlockState iblockdata = worldserver1.getBlockState(blockposition);
                      boolean flag3 = iblockdata.is(Blocks.RESPAWN_ANCHOR);
@@ -25,7 +25,7 @@ index dbee3e05cd7d5439ed0605187fa67688a398e629..8d52041f8afa065516289cdbf41c373a
                      Vec3 vec3d = (Vec3) optional.get();
                      float f1;
  
-@@ -887,7 +889,7 @@ public abstract class PlayerList {
+@@ -886,7 +888,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = this.cserver.getPlayer(entityplayer1);
diff --git a/patches/server/0666-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0664-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0666-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0664-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 94%
rename from patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch
index b5f22c9936..80302bb91b 100644
--- a/patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/server/0665-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -18,10 +18,10 @@ index 1fe63bc4e596b22d1f539a1ea541a6e096c0a6af..b8a924d11c146c42ffbc71b584e64388
                  } 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 8d52041f8afa065516289cdbf41c373a2529e7f2..22df6afd5f915665d26488e80f730112c9800a91 100644
+index 2f07e0b17ac1593473e64212889170f50e7845d5..accd579a4122760b84dec48ec165ce113fb9de57 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -799,6 +799,12 @@ public abstract class PlayerList {
+@@ -798,6 +798,12 @@ public abstract class PlayerList {
      }
  
      public ServerPlayer moveToWorld(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation) {
@@ -34,7 +34,7 @@ index 8d52041f8afa065516289cdbf41c373a2529e7f2..22df6afd5f915665d26488e80f730112
          entityplayer.stopRiding(); // CraftBukkit
          this.players.remove(entityplayer);
          this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot
-@@ -889,7 +895,7 @@ public abstract class PlayerList {
+@@ -888,7 +894,7 @@ public abstract class PlayerList {
              }
  
              Player respawnPlayer = this.cserver.getPlayer(entityplayer1);
diff --git a/patches/server/0668-Add-Channel-initialization-listeners.patch b/patches/server/0666-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0668-Add-Channel-initialization-listeners.patch
rename to patches/server/0666-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0670-Add-more-WanderingTrader-API.patch b/patches/server/0668-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0670-Add-more-WanderingTrader-API.patch
rename to patches/server/0668-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0671-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0669-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0671-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0669-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0674-Inventory-close.patch b/patches/server/0672-Inventory-close.patch
similarity index 100%
rename from patches/server/0674-Inventory-close.patch
rename to patches/server/0672-Inventory-close.patch
diff --git a/patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 94%
rename from patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch
rename to patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch
index 38f91a6f8b..4f809295ff 100644
--- a/patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch
+++ b/patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch
@@ -17,10 +17,10 @@ index 8f0cf4297015f3cbe709e2eb82280cac72489925..22ea0da3836b61bb018ae974d2b8c754
              return this.set(this.getX() + dx, this.getY() + dy, this.getZ() + dz);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c17637e5796fda8632c2fe399dbcd63fafa4133e..23be74285d0756b5020130289c43140c1cdaa90a 100644
+index 547f4fe601d5846e339aba23fb20f6684c0e901f..9a776f228891f256876dc0acba403dedddbbd5df 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1144,15 +1144,21 @@ public class ServerPlayer extends Player {
+@@ -1143,15 +1143,21 @@ public class ServerPlayer extends Player {
      private void createEndPlatform(ServerLevel world, BlockPos centerPos) {
          BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable();
  
diff --git a/patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0677-Fix-CraftPotionBrewer-cache.patch b/patches/server/0675-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from patches/server/0677-Fix-CraftPotionBrewer-cache.patch
rename to patches/server/0675-Fix-CraftPotionBrewer-cache.patch
diff --git a/patches/server/0678-Add-basic-Datapack-API.patch b/patches/server/0676-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0678-Add-basic-Datapack-API.patch
rename to patches/server/0676-Add-basic-Datapack-API.patch
diff --git a/patches/server/0679-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0677-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0679-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0677-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch
similarity index 96%
rename from patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch
index d168da32c8..ba82d83519 100644
--- a/patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch
@@ -45,10 +45,10 @@ index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 23be74285d0756b5020130289c43140c1cdaa90a..f170a80e9461945a0f745fe62590d84b34804864 100644
+index 9a776f228891f256876dc0acba403dedddbbd5df..d23a86e6896cefea9eba0e354b25eaaffa09fa8c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1761,8 +1761,15 @@ public class ServerPlayer extends Player {
+@@ -1760,8 +1760,15 @@ public class ServerPlayer extends Player {
      }
  
      public boolean setGameMode(GameType gameMode) {
@@ -66,7 +66,7 @@ index 23be74285d0756b5020130289c43140c1cdaa90a..f170a80e9461945a0f745fe62590d84b
          } else {
              this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
              if (gameMode == GameType.SPECTATOR) {
-@@ -1774,7 +1781,7 @@ public class ServerPlayer extends Player {
+@@ -1773,7 +1780,7 @@ public class ServerPlayer extends Player {
  
              this.onUpdateAbilities();
              this.updateEffectVisibility();
@@ -75,7 +75,7 @@ index 23be74285d0756b5020130289c43140c1cdaa90a..f170a80e9461945a0f745fe62590d84b
          }
      }
  
-@@ -2156,6 +2163,14 @@ public class ServerPlayer extends Player {
+@@ -2155,6 +2162,14 @@ public class ServerPlayer extends Player {
      }
  
      public void loadGameTypes(@Nullable CompoundTag nbt) {
diff --git a/patches/server/0681-Clear-SyncLoadInfo.patch b/patches/server/0679-Clear-SyncLoadInfo.patch
similarity index 100%
rename from patches/server/0681-Clear-SyncLoadInfo.patch
rename to patches/server/0679-Clear-SyncLoadInfo.patch
diff --git a/patches/server/0682-ItemStack-repair-check-API.patch b/patches/server/0680-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/server/0682-ItemStack-repair-check-API.patch
rename to patches/server/0680-ItemStack-repair-check-API.patch
diff --git a/patches/server/0683-More-Enchantment-API.patch b/patches/server/0681-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0683-More-Enchantment-API.patch
rename to patches/server/0681-More-Enchantment-API.patch
diff --git a/patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
similarity index 100%
rename from patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch
rename to patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch
diff --git a/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
similarity index 98%
rename from patches/server/0685-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
index 3b245a1442..410e1b01dc 100644
--- a/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch
@@ -263,10 +263,10 @@ index cf0a74b8a1c31d4bc493eb09a69ee2bd94cb6485..6fa1a7da70896d0ff34d38698769195a
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 73ac55de9059a1d0f1da5bec0688dcd4bf5c8973..db2d6e7b2dc82c60d524dd2a018d28c2068552fa 100644
+index 8ab99b04ef3e85b64ea78680aa85df1a0894399f..43f9143e892111aa9901454b3de7b57945ecb707 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -563,13 +563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -562,13 +562,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  worlddata = new PrimaryLevelData(worldsettings, generatorsettings, Lifecycle.stable());
              }
              worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
@@ -281,7 +281,7 @@ index 73ac55de9059a1d0f1da5bec0688dcd4bf5c8973..db2d6e7b2dc82c60d524dd2a018d28c2
  
              ServerLevelData iworlddataserver = worlddata;
              WorldGenSettings generatorsettings = worlddata.worldGenSettings();
-@@ -589,6 +583,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -588,6 +582,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  chunkgenerator = worlddimension.generator();
              }
  
diff --git a/patches/server/0686-Add-Mob-lookAt-API.patch b/patches/server/0684-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0686-Add-Mob-lookAt-API.patch
rename to patches/server/0684-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0687-Add-Unix-domain-socket-support.patch b/patches/server/0685-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0687-Add-Unix-domain-socket-support.patch
rename to patches/server/0685-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0688-Add-EntityInsideBlockEvent.patch b/patches/server/0686-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0688-Add-EntityInsideBlockEvent.patch
rename to patches/server/0686-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0689-Attributes-API-for-item-defaults.patch b/patches/server/0687-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/server/0689-Attributes-API-for-item-defaults.patch
rename to patches/server/0687-Attributes-API-for-item-defaults.patch
diff --git a/patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
rename to patches/server/0688-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch
diff --git a/patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 98%
rename from patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch
index eb7784d3bf..a199056873 100644
--- a/patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0689-Add-cause-to-Weather-ThunderChangeEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9a8b3647c161be8d8b87df8fff3b2d204dab6a8b..f893d8ab74293feec6ef69c5a4ddec57b11ca751 100644
+index 344c6d6dd99819ac1103c065b0410bafb3537581..445b4647151f56790a9f9c099e4757657dc896c7 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -425,8 +425,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
diff --git a/patches/server/0692-More-Lidded-Block-API.patch b/patches/server/0690-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0692-More-Lidded-Block-API.patch
rename to patches/server/0690-More-Lidded-Block-API.patch
diff --git a/patches/server/0693-Limit-item-frame-cursors-on-maps.patch b/patches/server/0691-Limit-item-frame-cursors-on-maps.patch
similarity index 93%
rename from patches/server/0693-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0691-Limit-item-frame-cursors-on-maps.patch
index 43a000ba2c..b911cb5449 100644
--- a/patches/server/0693-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0691-Limit-item-frame-cursors-on-maps.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Limit item frame cursors on maps
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b89ff2b404d0ffd5d0602f82576c0dc684ab2243..a2151292bc3e573fdb6f2e97124655bce5d5c1a1 100644
+index 3b5e6d95349d51e335835b30f5a748d789adf48c..d199c216a9cd3a53d9e85e559a3a1d1ff5c27539 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -776,5 +776,10 @@ public class PaperWorldConfig {
+@@ -761,5 +761,10 @@ public class PaperWorldConfig {
      private void allowUsingSignsInsideSpawnProtection() {
          allowUsingSignsInsideSpawnProtection = getBoolean("allow-using-signs-inside-spawn-protection", allowUsingSignsInsideSpawnProtection);
      }
diff --git a/patches/server/0694-Add-PufferFishStateChangeEvent.patch b/patches/server/0692-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0694-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0692-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0695-Add-PlayerKickEvent-causes.patch b/patches/server/0693-Add-PlayerKickEvent-causes.patch
similarity index 98%
rename from patches/server/0695-Add-PlayerKickEvent-causes.patch
rename to patches/server/0693-Add-PlayerKickEvent-causes.patch
index 3c655073b2..68b7f1696e 100644
--- a/patches/server/0695-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0693-Add-PlayerKickEvent-causes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerKickEvent causes
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index db2d6e7b2dc82c60d524dd2a018d28c2068552fa..c6747f49ae8ddc9fc1bad82ab480f85d0883da5d 100644
+index 43f9143e892111aa9901454b3de7b57945ecb707..1f29c92776aea8dbba52d4cb197addce5b3e4d5e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2125,7 +2125,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2110,7 +2110,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile())) {
@@ -327,10 +327,10 @@ index ace86fbfe5fff1ae5a6de2582ee1bcf962386dfb..3e5970979d6db8e07fc44a4c0bd2d2fd
          }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 22df6afd5f915665d26488e80f730112c9800a91..2e355f5c7f28dacc5474cce6c5907dad21e788fb 100644
+index accd579a4122760b84dec48ec165ce113fb9de57..b0b4c6a3c6a8ffda142efd13596349f99a8e9daf 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -708,7 +708,7 @@ public abstract class PlayerList {
+@@ -707,7 +707,7 @@ public abstract class PlayerList {
          while (iterator.hasNext()) {
              entityplayer = (ServerPlayer) iterator.next();
              this.save(entityplayer); // CraftBukkit - Force the player's inventory to be saved
@@ -339,7 +339,7 @@ index 22df6afd5f915665d26488e80f730112c9800a91..2e355f5c7f28dacc5474cce6c5907dad
          }
  
          // Instead of kicking then returning, we need to store the kick reason
-@@ -1358,8 +1358,8 @@ public abstract class PlayerList {
+@@ -1346,8 +1346,8 @@ public abstract class PlayerList {
          // Paper end
          // CraftBukkit start - disconnect safely
          for (ServerPlayer player : this.players) {
diff --git a/patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0694-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
similarity index 100%
rename from patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
rename to patches/server/0695-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch
diff --git a/patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch
similarity index 93%
rename from patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch
index c2e8d32502..d75ddf67f9 100644
--- a/patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0696-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a2151292bc3e573fdb6f2e97124655bce5d5c1a1..e2da1bc897482f0cf62a1fbcf523cf2d6074776a 100644
+index d199c216a9cd3a53d9e85e559a3a1d1ff5c27539..02a3033bf5c0f99fbedb900f83ace2bf6bd60ee2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -781,5 +781,10 @@ public class PaperWorldConfig {
+@@ -766,5 +766,10 @@ public class PaperWorldConfig {
      private void mapItemFrameCursorLimit() {
          mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
      }
diff --git a/patches/server/0699-Add-BellRevealRaiderEvent.patch b/patches/server/0697-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0699-Add-BellRevealRaiderEvent.patch
rename to patches/server/0697-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0700-Fix-invulnerable-end-crystals.patch b/patches/server/0698-Fix-invulnerable-end-crystals.patch
similarity index 96%
rename from patches/server/0700-Fix-invulnerable-end-crystals.patch
rename to patches/server/0698-Fix-invulnerable-end-crystals.patch
index 131e4f915c..517530699a 100644
--- a/patches/server/0700-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0698-Fix-invulnerable-end-crystals.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix invulnerable end crystals
 MC-108513
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e2da1bc897482f0cf62a1fbcf523cf2d6074776a..735cc42daf997ab5cb1e194510414d12c4460083 100644
+index 02a3033bf5c0f99fbedb900f83ace2bf6bd60ee2..d55bebc250a6d43a292477811a938575c2a65452 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -786,5 +786,10 @@ public class PaperWorldConfig {
+@@ -771,5 +771,10 @@ public class PaperWorldConfig {
      private void fixItemsMergingThroughWalls() {
          fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
      }
diff --git a/patches/server/0701-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0699-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0701-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0699-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0702-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0700-Reset-villager-inventory-on-cancelled-pickup-event.patch
similarity index 100%
rename from patches/server/0702-Reset-villager-inventory-on-cancelled-pickup-event.patch
rename to patches/server/0700-Reset-villager-inventory-on-cancelled-pickup-event.patch
diff --git a/patches/server/0703-Fix-dangerous-end-portal-logic.patch b/patches/server/0701-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0703-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0701-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0702-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0702-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0705-Make-item-validations-configurable.patch b/patches/server/0703-Make-item-validations-configurable.patch
similarity index 97%
rename from patches/server/0705-Make-item-validations-configurable.patch
rename to patches/server/0703-Make-item-validations-configurable.patch
index 53e2e160d3..223ca90d68 100644
--- a/patches/server/0705-Make-item-validations-configurable.patch
+++ b/patches/server/0703-Make-item-validations-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make item validations configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index efc1e42d606e1c9feb1a4871c0714933ae92a1b2..7acf077bc131af718c7548cc29deef558c04e463 100644
+index 046e408fcd185efe9e307abbaf2c1b84f3f864fb..b0512af1d06f817f29e418d1d83f3ae446814836 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -486,4 +486,19 @@ public class PaperConfig {
+@@ -475,4 +475,19 @@ public class PaperConfig {
          enableBrigadierConsoleHighlighting = getBoolean("settings.console.enable-brigadier-highlighting", enableBrigadierConsoleHighlighting);
          enableBrigadierConsoleCompletions = getBoolean("settings.console.enable-brigadier-completions", enableBrigadierConsoleCompletions);
      }
diff --git a/patches/server/0706-Add-more-line-of-sight-methods.patch b/patches/server/0704-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/server/0706-Add-more-line-of-sight-methods.patch
rename to patches/server/0704-Add-more-line-of-sight-methods.patch
diff --git a/patches/server/0707-add-per-world-spawn-limits.patch b/patches/server/0705-add-per-world-spawn-limits.patch
similarity index 94%
rename from patches/server/0707-add-per-world-spawn-limits.patch
rename to patches/server/0705-add-per-world-spawn-limits.patch
index f4633b9d9c..09319de40b 100644
--- a/patches/server/0707-add-per-world-spawn-limits.patch
+++ b/patches/server/0705-add-per-world-spawn-limits.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] add per world spawn limits
 Taken from #2982. Credit to Chasewhip8
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 735cc42daf997ab5cb1e194510414d12c4460083..ba4724c1ab30c135137510fa1497804462b5ca0f 100644
+index d55bebc250a6d43a292477811a938575c2a65452..e36b13dedcdb60cbd014a4c3b450442f38dffe74 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -641,6 +641,19 @@ public class PaperWorldConfig {
+@@ -626,6 +626,19 @@ public class PaperWorldConfig {
          zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
      }
  
diff --git a/patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0706-Fix-PotionSplashEvent-for-water-splash-potions.patch
similarity index 100%
rename from patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch
rename to patches/server/0706-Fix-PotionSplashEvent-for-water-splash-potions.patch
diff --git a/patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0707-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
similarity index 100%
rename from patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch
rename to patches/server/0707-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch