From 976c6d425b03dbdf3b695bd10b2f871fcc72edac Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 May 2021 15:37:24 -0400
Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches

A recent commit has been made that caused patches to be out of order, rebuilding
---
 ...Generator-Settings.patch => 0377-Generator-Settings.patch} | 0
 .../{0379-Fix-MC-161754.patch => 0378-Fix-MC-161754.patch}    | 0
 ... 0379-Performance-improvement-for-Chunk.getEntities.patch} | 0
 ...ix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} | 2 +-
 ...tick.patch => 0381-Expose-the-internal-current-tick.patch} | 0
 ...82-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} | 4 ++--
 ...atch => 0383-Add-option-to-disable-pillager-patrols.patch} | 0
 ...ix-AssertionError-when-player-hand-set-to-empty-typ.patch} | 0
 ...tileEvent.patch => 0385-PlayerLaunchProjectileEvent.patch} | 0
 ...=> 0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch} | 0
 ...revent-sync-chunk-loads-when-villagers-try-to-find-.patch} | 0
 ...h => 0388-MC-145656-Fix-Follow-Range-Initial-Target.patch} | 0
 ...390-Optimize-Hoppers.patch => 0389-Optimize-Hoppers.patch} | 2 +-
 ...patch => 0390-PlayerDeathEvent-shouldDropExperience.patch} | 2 +-
 ...-Prevent-bees-loading-chunks-checking-hive-position.patch} | 0
 ...392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} | 0
 ...uard-against-serializing-mismatching-chunk-coordina.patch} | 0
 ...atch => 0394-Optimise-IEntityAccess-getPlayerByUUID.patch} | 2 +-
 ...ectly.patch => 0395-Fix-items-not-falling-correctly.patch} | 0
 ...mpensate-eating.patch => 0396-Lag-compensate-eating.patch} | 2 +-
 ...ch => 0397-Optimize-call-to-getFluid-for-explosions.patch} | 0
 ...ix-last-firework-in-stack-not-having-effects-when-d.patch} | 0
 ...y.patch => 0399-Add-effect-to-block-break-naturally.patch} | 2 +-
 ...rovements.patch => 0400-Tracking-Range-Improvements.patch} | 0
 ...Range-2.0.patch => 0401-Entity-Activation-Range-2.0.patch} | 0
 ...atch => 0402-Fix-items-vanishing-through-end-portal.patch} | 2 +-
 ...h => 0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} | 0
 ...=> 0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch} | 2 +-
 ...tch => 0405-Allow-overriding-the-java-version-check.patch} | 0
 ...EggHatchEvent.patch => 0406-Add-ThrownEggHatchEvent.patch} | 0
 ...ticking.patch => 0407-Optimise-random-block-ticking.patch} | 0
 ...{0409-Entity-Jump-API.patch => 0408-Entity-Jump-API.patch} | 2 +-
 ... 0409-Add-option-to-nerf-pigmen-from-nether-portals.patch} | 0
 ...ph-fancier.patch => 0410-Make-the-GUI-graph-fancier.patch} | 2 +-
 ...vent.patch => 0411-add-hand-to-BlockMultiPlaceEvent.patch} | 0
 ...ies.patch => 0412-Prevent-teleporting-dead-entities.patch} | 0
 ...0413-Validate-tripwire-hook-placement-before-update.patch} | 0
 ...414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} | 0
 ...15-Configurable-chance-of-villager-zombie-infection.patch} | 0
 ...hunk-getFluid.patch => 0416-Optimise-Chunk-getFluid.patch} | 0
 ...tch => 0417-Optimise-TickListServer-by-rewriting-it.patch} | 0
 ...illager-patrol-spawn-settings-and-per-player-option.patch} | 2 +-
 ...ch => 0419-Ensure-Entity-is-never-double-registered.patch} | 0
 ...20-Fix-unregistering-entities-from-unloading-chunks.patch} | 0
 ... 0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch} | 0
 ... 0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch} | 0
 ...-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} | 0
 ...patch => 0424-Optimize-Collision-to-not-load-chunks.patch} | 0
 ...-dead-players.patch => 0425-Don-t-tick-dead-players.patch} | 2 +-
 ...tch => 0426-Dead-Player-s-shouldn-t-be-able-to-move.patch} | 0
 ...ptimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} | 2 +-
 ...-Queue-Size.patch => 0428-Increase-Light-Queue-Size.patch} | 2 +-
 ...id-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} | 2 +-
 ... => 0430-Don-t-move-existing-players-to-world-spawn.patch} | 4 ++--
 ...d.patch => 0431-Add-tick-times-API-and-mspt-command.patch} | 2 +-
 ...ning.patch => 0432-Expose-MinecraftServer-isRunning.patch} | 0
 ....patch => 0433-Add-Raw-Byte-ItemStack-Serialization.patch} | 0
 ...tem.patch => 0434-Remove-streams-from-Mob-AI-System.patch} | 0
 ...elay-unsafe-actions-until-after-entity-ticking-is-d.patch} | 0
 ...p-building.patch => 0436-Async-command-map-building.patch} | 0
 ...dog-Support.patch => 0437-Improved-Watchdog-Support.patch} | 2 +-
 ...mize-Pathfinding.patch => 0438-Optimize-Pathfinding.patch} | 0
 ...ion.patch => 0439-Reduce-Either-Optional-allocation.patch} | 0
 ...Queue.patch => 0440-Remove-streams-from-PairedQueue.patch} | 0
 ...h => 0441-Reduce-memory-footprint-of-NBTTagCompound.patch} | 0
 ...tch => 0442-Prevent-opening-inventories-when-frozen.patch} | 0
 ...veIf.patch => 0443-Optimise-ArraySetSorted-removeIf.patch} | 0
 ... 0444-Don-t-run-entity-collision-code-if-not-needed.patch} | 2 +-
 ...ptimize-ChunkProviderServer-s-chunk-level-checking-.patch} | 2 +-
 ...estrict-vanilla-teleport-command-to-valid-locations.patch} | 0
 ...I.patch => 0447-Implement-Player-Client-Options-API.patch} | 0
 ...tch => 0448-Fix-Chunk-Post-Processing-deadlock-risk.patch} | 2 +-
 ...on-t-crash-if-player-is-attempted-to-be-removed-fro.patch} | 0
 ...ole.patch => 0450-Broadcast-join-message-to-console.patch} | 2 +-
 ...Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} | 4 ++--
 ....patch => 0452-Load-Chunks-for-Login-Asynchronously.patch} | 0
 ...ove-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} | 0
 ...ch => 0454-Add-PlayerAttackEntityCooldownResetEvent.patch} | 2 +-
 ...llow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} | 0
 ...ch => 0456-Don-t-fire-BlockFade-on-worldgen-threads.patch} | 0
 ...=> 0457-Add-phantom-creative-and-insomniac-controls.patch} | 0
 ...ix-numerous-item-duplication-issues-and-teleport-is.patch} | 0
 ...ng-API.patch => 0459-Implement-Brigadier-Mojang-API.patch} | 0
 ...er-Restocks-API.patch => 0460-Villager-Restocks-API.patch} | 0
 ... 0461-Validate-PickItem-Packet-and-kick-for-invalid.patch} | 0
 ...pose-game-version.patch => 0462-Expose-game-version.patch} | 0
 ...-Merging.patch => 0463-Optimize-Voxel-Shape-Merging.patch} | 0
 ...-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} | 2 +-
 ...t-Mob-Goal-API.patch => 0465-Implement-Mob-Goal-API.patch} | 0
 ...=> 0466-Use-distance-map-to-optimise-entity-tracker.patch} | 2 +-
 ...> 0467-Optimize-isOutsideRange-to-use-distance-maps.patch} | 2 +-
 ...top-copy-on-write-operations-for-updating-light-dat.patch} | 0
 ....patch => 0469-No-Tick-view-distance-implementation.patch} | 4 ++--
 ...ation-API.patch => 0470-Add-villager-reputation-API.patch} | 0
 ...2-Fix-Light-Command.patch => 0471-Fix-Light-Command.patch} | 0
 ...ag.patch => 0472-Fix-PotionEffect-ignores-icon-flag.patch} | 0
 ...> 0473-Optimize-brigadier-child-sorting-performance.patch} | 0
 ...5-Potential-bed-API.patch => 0474-Potential-bed-API.patch} | 0
 ....patch => 0475-Wait-for-Async-Tasks-during-shutdown.patch} | 2 +-
 ...nsure-EntityRaider-respects-game-and-entity-rules-f.patch} | 0
 ...rotect-Bedrock-and-End-Portal-Frames-from-being-des.patch} | 0
 ... => 0478-Optimize-NibbleArray-to-use-pooled-buffers.patch} | 0
 ...479-Reduce-MutableInt-allocations-from-light-engine.patch} | 0
 ...> 0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} | 0
 ...teleport.patch => 0481-Ensure-safe-gateway-teleport.patch} | 0
 ... 0482-Add-option-for-console-having-all-permissions.patch} | 0
 ...h => 0483-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} | 0
 ... => 0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch} | 0
 ...-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} | 4 ++--
 ...ptimize-sending-packets-to-nearby-locations-sounds-.patch} | 0
 ...patch => 0487-Improve-Chunk-Status-Transition-Speed.patch} | 0
 ...patch => 0488-Fix-villager-trading-demand-MC-163962.patch} | 0
 ...oad-chunks.patch => 0489-Maps-shouldn-t-load-chunks.patch} | 0
 ...se-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} | 0
 ...g.patch => 0491-Optimize-Bit-Operations-by-inlining.patch} | 0
 ...ze-Light-Engine.patch => 0492-Optimize-Light-Engine.patch} | 0
 ...> 0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch} | 2 +-
 ...tch => 0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} | 2 +-
 ... => 0495-Fix-missing-chunks-due-to-integer-overflow.patch} | 0
 ...ix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} | 0
 ... => 0497-Fix-piston-physics-inconsistency-MC-188840.patch} | 0
 ...{0499-Fix-sand-duping.patch => 0498-Fix-sand-duping.patch} | 0
 ...revent-position-desync-in-playerconnection-causing-.patch} | 0
 ...gon-exp-dupe.patch => 0500-Fix-enderdragon-exp-dupe.patch} | 0
 ...1-Inventory-getHolder-method-without-block-snapshot.patch} | 0
 ...etItemStack.patch => 0502-Expose-Arrow-getItemStack.patch} | 0
 ...> 0503-Add-and-implement-PlayerRecipeBookClickEvent.patch} | 0
 ...ag.patch => 0504-Hide-sync-chunk-writes-behind-flag.patch} | 0
 ...atch => 0505-Limit-lightning-strike-effect-distance.patch} | 0
 ...cks.patch => 0506-Add-permission-for-command-blocks.patch} | 0
 ...atch => 0507-Ensure-Entity-AABB-s-are-never-invalid.patch} | 0
 ... 0508-Optimize-WorldBorder-collision-checks-and-air.patch} | 0
 ...509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} | 2 +-
 ...mpitem-command.patch => 0510-Paper-dumpitem-command.patch} | 0
 ...chat.patch => 0511-Don-t-allow-null-UUID-s-for-chat.patch} | 0
 ...=> 0512-Improve-Legacy-Component-serialization-size.patch} | 0
 ...r-NBT.patch => 0513-Support-old-UUID-format-for-NBT.patch} | 0
 ... => 0514-Clean-up-duplicated-GameProfile-Properties.patch} | 0
 ...atch => 0515-Convert-legacy-attributes-in-Item-Meta.patch} | 0
 ...s.patch => 0516-Remove-some-streams-from-structures.patch} | 0
 ...Remove-streams-from-classes-related-villager-gossip.patch} | 0
 ...emMeta.patch => 0518-Support-components-in-ItemMeta.patch} | 0
 ...Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} | 0
 ...tity-liquid-API.patch => 0520-Add-entity-liquid-API.patch} | 0
 ...patch => 0521-Update-itemstack-legacy-name-and-lore.patch} | 0
 ...atch => 0522-Spawn-player-in-correct-world-on-login.patch} | 0
 ...areResultEvent.patch => 0523-Add-PrepareResultEvent.patch} | 0
 ...patch => 0524-Allow-delegation-to-vanilla-chunk-gen.patch} | 2 +-
 ...on-t-check-chunk-for-portal-on-world-gen-entity-add.patch} | 2 +-
 ... => 0526-Optimize-NetworkManager-Exception-Handling.patch} | 0
 ...patch => 0527-Fix-Concurrency-issue-in-WeightedList.patch} | 0
 ...ptimize-the-advancement-data-player-iteration-to-be.patch} | 0
 ...patch => 0529-Fix-arrows-never-despawning-MC-125757.patch} | 0
 ...530-Thread-Safe-Vanilla-Command-permission-checking.patch} | 0
 ...patch => 0531-Move-range-check-for-block-placing-up.patch} | 0
 ...{0533-Fix-SPIGOT-5989.patch => 0532-Fix-SPIGOT-5989.patch} | 0
 ...-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} | 0
 ...0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} | 0
 ...ix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} | 0
 ...dd-missing-strikeLighting-call-to-World-spigot-stri.patch} | 2 +-
 ....patch => 0537-Fix-some-rails-connecting-improperly.patch} | 0
 ...ptimize-Pathfinder-Remove-Streams-Optimized-collect.patch} | 0
 ...ayer-saving.patch => 0539-Incremental-player-saving.patch} | 4 ++--
 ...tutil-classes.patch => 0540-Import-fastutil-classes.patch} | 0
 ...41-Don-t-mark-null-chunk-sections-for-block-updates.patch} | 0
 ...tch => 0542-Remove-armour-stand-double-add-to-world.patch} | 0
 ...t.patch => 0543-Fix-MC-187716-Use-configured-height.patch} | 0
 ...544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} | 0
 ...o-not-let-the-server-load-chunks-from-newer-version.patch} | 0
 .../{0547-Brand-support.patch => 0546-Brand-support.patch}    | 0
 ...ix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch} | 0
 .../{0549-Fix-MC-197271.patch => 0548-Fix-MC-197271.patch}    | 0
 ...-issue.patch => 0549-MC-197883-Bandaid-decode-issue.patch} | 0
 ...tMaxPlayers-API.patch => 0550-Add-setMaxPlayers-API.patch} | 0
 ...=> 0551-Add-playPickupItemAnimation-to-LivingEntity.patch} | 0
 ...FACING-data.patch => 0552-Don-t-require-FACING-data.patch} | 0
 ...3-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} | 2 +-
 ...Add-moon-phase-API.patch => 0554-Add-moon-phase-API.patch} | 2 +-
 ...=> 0555-Prevent-headless-pistons-from-being-created.patch} | 0
 ...7-Add-BellRingEvent.patch => 0556-Add-BellRingEvent.patch} | 0
 ....patch => 0557-Add-zombie-targets-turtle-egg-config.patch} | 0
 ...-joins-to-world.patch => 0558-Buffer-joins-to-world.patch} | 0
 ...algorithm.patch => 0559-Optimize-redstone-algorithm.patch} | 0
 ...60-Fix-hex-colors-not-working-in-some-kick-messages.patch} | 0
 ... => 0561-PortalCreateEvent-needs-to-know-its-entity.patch} | 0
 ...m-null-check.patch => 0562-Fix-CraftTeam-null-check.patch} | 0
 ...d-more-Evoker-API.patch => 0563-Add-more-Evoker-API.patch} | 0
 ...dd-a-way-to-get-translation-keys-for-blocks-entitie.patch} | 0
 ...tch => 0565-Create-HoverEvent-from-ItemStack-Entity.patch} | 0
 ...data-strings.patch => 0566-Cache-block-data-strings.patch} | 2 +-
 ...ix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} | 0
 ...68-Add-additional-open-container-api-to-HumanEntity.patch} | 0
 ...> 0569-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} | 0
 ...xtend-block-drop-capture-to-capture-all-items-added.patch} | 0
 ...1-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} | 0
 ...xpose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} | 0
 ... => 0573-Lazily-track-plugin-scoreboards-by-default.patch} | 0
 ...575-Entity-isTicking.patch => 0574-Entity-isTicking.patch} | 0
 ...ix-deop-kicking-non-whitelisted-player-when-white-l.patch} | 2 +-
 ....patch => 0576-Fix-Not-a-string-Map-Conversion-spam.patch} | 0
 ...Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} | 0
 ...C-147729-Drop-items-that-are-extra-from-a-crafting-.patch} | 0
 ....patch => 0579-Reset-Ender-Crystals-on-Dragon-Spawn.patch} | 0
 ... => 0580-Fix-for-large-move-vectors-crashing-server.patch} | 0
 ...-getType-calls.patch => 0581-Optimise-getType-calls.patch} | 2 +-
 ...ager-resetOffers.patch => 0582-Villager-resetOffers.patch} | 0
 ...583-Improve-inlinig-for-some-hot-IBlockData-methods.patch} | 0
 ...Retain-block-place-order-when-capturing-blockstates.patch} | 0
 ...=> 0585-Reduce-blockpos-allocation-from-pathfinding.patch} | 0
 ...h => 0586-Fix-item-locations-dropped-from-campfires.patch} | 0
 ...tra-boost-API.patch => 0587-Player-elytra-boost-API.patch} | 0
 ...leak.patch => 0588-Fixed-TileEntityBell-memory-leak.patch} | 0
 ...void-error-bubbling-up-when-item-stack-is-empty-in-.patch} | 0
 ...g.patch => 0590-Add-getOfflinePlayerIfCached-String.patch} | 0
 ...iscounts-API.patch => 0591-Add-ignore-discounts-API.patch} | 0
 ...n.patch => 0592-Toggle-for-removing-existing-dragon.patch} | 0
 ...patch => 0593-Fix-client-lag-on-advancement-loading.patch} | 0
 ...r-pickup.patch => 0594-Item-no-age-no-player-pickup.patch} | 0
 ...anges.patch => 0595-Beacon-API-custom-effect-ranges.patch} | 0
 ...r-quit-reason.patch => 0596-Add-API-for-quit-reason.patch} | 2 +-
 ...ture-search.patch => 0597-Seed-based-feature-search.patch} | 0
 ...0598-Add-Wandering-Trader-spawn-rate-config-options.patch} | 2 +-
 ...ignificantly-improve-performance-of-the-end-generat.patch} | 0
 ...-spawn-angle.patch => 0600-Expose-world-spawn-angle.patch} | 2 +-
 ...stroy-Speed-API.patch => 0601-Add-Destroy-Speed-API.patch} | 0
 ... 0602-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} | 0
 ...Item.patch => 0603-Add-LivingEntity-clearActiveItem.patch} | 0
 ...downEvent.patch => 0604-Add-PlayerItemCooldownEvent.patch} | 0
 ...More-lightning-API.patch => 0605-More-lightning-API.patch} | 0
 ...> 0606-Climbing-should-not-bypass-cramming-gamerule.patch} | 2 +-
 ...ch => 0607-Added-missing-default-perms-for-commands.patch} | 0
 ...rBlockEvent.patch => 0608-Add-PlayerShearBlockEvent.patch} | 0
 ...0609-Add-warning-for-servers-not-running-on-Java-11.patch} | 2 +-
 ...0-Set-spigots-verbose-world-setting-to-false-by-def.patch} | 0
 ...=> 0611-Fix-curing-zombie-villager-discount-exploit.patch} | 0
 ...t-recipe-packets.patch => 0612-Limit-recipe-packets.patch} | 0
 ...atch => 0613-Fix-CraftSound-backwards-compatibility.patch} | 0
 ...-desync.patch => 0614-MC-4-Fix-item-position-desync.patch} | 0
 ...vents.patch => 0615-Player-Chunk-Load-Unload-Events.patch} | 0
 ...eys.patch => 0616-Optimize-Dynamic-get-Missing-Keys.patch} | 0
 ...on.patch => 0617-Expose-LivingEntity-hurt-direction.patch} | 0
 ...tch => 0618-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} | 0
 ...o-not-crash-from-invalid-ingredient-lists-in-Villag.patch} | 0
 ...ayerTradeEvent.patch => 0620-added-PlayerTradeEvent.patch} | 0
 ...rgetHitEvent.patch => 0621-Implement-TargetHitEvent.patch} | 0
 ...API-s.patch => 0622-Additional-Block-Material-API-s.patch} | 2 +-
 ...g-potion-dupe.patch => 0623-Fix-harming-potion-dupe.patch} | 0
 ...mplement-API-to-get-Material-from-Boats-and-Minecar.patch} | 0
 ...eady-check.patch => 0625-Optimized-tick-ready-check.patch} | 0
 ...e-burn-durations.patch => 0626-Cache-burn-durations.patch} | 0
 ...llow-disabling-mob-spawner-spawn-egg-transformation.patch} | 0
 ...ch => 0628-Implement-PlayerFlowerPotManipulateEvent.patch} | 0
 ...29-Fix-interact-event-not-being-called-in-adventure.patch} | 0
 ...aking-doors.patch => 0630-Zombie-API-breaking-doors.patch} | 0
 ...tting.patch => 0631-Fix-nerfed-slime-when-splitting.patch} | 0
 ...sbowEvent.patch => 0632-Add-EntityLoadCrossbowEvent.patch} | 0
 ...m-workaround.patch => 0633-Guardian-beam-workaround.patch} | 0
 ...eEvent.patch => 0634-Added-WorldGameRuleChangeEvent.patch} | 2 +-
 ...nt.patch => 0635-Added-ServerResourcesReloadedEvent.patch} | 2 +-
 ... 0636-Added-world-settings-for-mobs-picking-up-loot.patch} | 0
 ....patch => 0637-Implemented-BlockFailedDispenseEvent.patch} | 0
 ...nt.patch => 0638-Added-PlayerLecternPageChangeEvent.patch} | 0
 ...-on-GS4-query.patch => 0639-Fire-event-on-GS4-query.patch} | 0
 ...nt.patch => 0640-Added-PlayerLoomPatternSelectEvent.patch} | 0
 ...patch => 0641-Configurable-door-breaking-difficulty.patch} | 0
 ...atch => 0642-Empty-commands-shall-not-be-dispatched.patch} | 0
 ...643-Implement-API-to-expose-exact-interaction-point.patch} | 0
 ...5-Remove-stale-POIs.patch => 0644-Remove-stale-POIs.patch} | 0
 ...oat-exploit.patch => 0645-Fix-villager-boat-exploit.patch} | 0
 ...hunk.patch => 0646-Entity-load-save-limit-per-chunk.patch} | 0
 ...d-sendOpLevel-API.patch => 0647-Add-sendOpLevel-API.patch} | 0
 ...eLocateEvent.patch => 0648-Add-StructureLocateEvent.patch} | 0
 ...Collision-option-for-requiring-a-player-participant.patch} | 0
 ...e.patch => 0650-Make-ProjectileHitEvent-Cancellable.patch} | 2 +-
 ...eturn-chat-component-with-empty-text-instead-of-thr.patch} | 0
 ...world.patch => 0652-Make-schedule-command-per-world.patch} | 0
 ...tance.patch => 0653-Configurable-max-leash-distance.patch} | 0
 ...Event.patch => 0654-Implement-BlockPreDispenseEvent.patch} | 0
 ...Entity-Tags.patch => 0655-Added-Vanilla-Entity-Tags.patch} | 0
 ...657-added-Wither-API.patch => 0656-added-Wither-API.patch} | 0
 ... 0657-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} | 0
 ...0658-Fix-console-spam-when-removing-chests-in-water.patch} | 0
 ...> 0659-Add-toggle-for-always-placing-the-dragon-egg.patch} | 0
 ...ch => 0660-Added-PlayerStonecutterRecipeSelectEvent.patch} | 0
 ...> 0661-Add-dropLeash-variable-to-EntityUnleashEvent.patch} | 0
 ...662-Skip-distance-map-update-when-spawning-disabled.patch} | 0
 ...h => 0663-Reset-shield-blocking-on-dimension-change.patch} | 2 +-
 ...onEggFormEvent.patch => 0664-add-DragonEggFormEvent.patch} | 0
 ...{0666-EntityMoveEvent.patch => 0665-EntityMoveEvent.patch} | 4 ++--
 ...dded-option-to-disable-pathfinding-updates-on-block.patch} | 2 +-
 ...-fields.patch => 0667-Inline-shift-direction-fields.patch} | 0
 ...ch => 0668-Allow-adding-items-to-BlockDropItemEvent.patch} | 0
 ...> 0669-Add-getMainThreadExecutor-to-BukkitScheduler.patch} | 0
 ... => 0670-living-entity-allow-attribute-registration.patch} | 0
 ....patch => 0671-fix-dead-slime-setSize-invincibility.patch} | 0
 ...Merchant-getRecipes-should-return-an-immutable-list.patch} | 0
 ...-debugging-dumps.patch => 0673-misc-debugging-dumps.patch} | 2 +-
 ... => 0674-Add-support-for-hex-color-codes-in-console.patch} | 0
 ...Clear-SyncLoadInfo.patch => 0675-Clear-SyncLoadInfo.patch} | 0
 ...racked-Players.patch => 0676-Expose-Tracked-Players.patch} | 0
 ...est.patch => 0677-Remove-streams-from-SensorNearest.patch} | 0
 ...-do-not-create-unnecessary-copies-of-passenger-list.patch} | 0
 ... 0679-MC-29274-Fix-Wither-hostility-towards-players.patch} | 0
 ... 0680-Throw-proper-exception-on-empty-JsonList-file.patch} | 0
 ...2-Improve-ServerGUI.patch => 0681-Improve-ServerGUI.patch} | 0
 ...top-firing-pressure-plate-EntityInteractEvent-for-i.patch} | 0
 ...-file.patch => 0683-fix-converting-txt-to-json-file.patch} | 0
 ...dborder-events.patch => 0684-Add-worldborder-events.patch} | 0
 ...tityEvent.patch => 0685-added-PlayerNameEntityEvent.patch} | 0
 ...=> 0686-Prevent-grindstones-from-overstacking-items.patch} | 0
 ...cook-events.patch => 0687-Add-recipe-to-cook-events.patch} | 0
 ...ock-isValidTool.patch => 0688-Add-Block-isValidTool.patch} | 0
 ...h => 0689-Allow-using-signs-inside-spawn-protection.patch} | 0
 ...yed-on-World.patch => 0690-Implement-Keyed-on-World.patch} | 2 +-
 ... 0691-Add-fast-alternative-constructor-for-Vector3f.patch} | 0
 ...{0693-Item-Rarity-API.patch => 0692-Item-Rarity-API.patch} | 0
 ...nly-set-despawnTimer-for-Wandering-Traders-spawned-.patch} | 0
 ...patch => 0694-copy-TESign-isEditable-from-snapshots.patch} | 0
 ...0695-Drop-carried-item-when-player-has-disconnected.patch} | 0
 ...0696-forced-whitelist-use-configurable-kick-message.patch} | 2 +-
 ... 0697-Make-sure-to-remove-correct-TE-during-TE-tick.patch} | 0
 ... => 0698-Don-t-ignore-result-of-PlayerEditBookEvent.patch} | 0
 ...tocol-version.patch => 0699-Expose-protocol-version.patch} | 0
 ...nhance-console-tab-completions-for-brigadier-comman.patch} | 0
 ...0701-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} | 0
 ...pass-host-check.patch => 0702-Add-bypass-host-check.patch} | 0
 ....patch => 0703-don-t-throw-when-loading-invalid-TEs.patch} | 0
 ...tation.patch => 0704-Set-area-affect-cloud-rotation.patch} | 2 +-
 ...y.patch => 0705-add-isDeeplySleeping-to-HumanEntity.patch} | 0
 ...0706-Fix-duplicating-give-items-on-item-drop-cancel.patch} | 0
 ...t.patch => 0707-add-consumeFuel-to-FurnaceBurnEvent.patch} | 0
 ... => 0708-add-get-set-drop-chance-to-EntityEquipment.patch} | 0
 ....patch => 0709-fix-PigZombieAngerEvent-cancellation.patch} | 0
 ...atch => 0710-Fix-checkReach-check-for-Shulker-boxes.patch} | 0
 ....patch => 0711-fix-PlayerItemHeldEvent-firing-twice.patch} | 0
 ...SleepEvent.patch => 0712-Added-PlayerDeepSleepEvent.patch} | 0
 .../{0714-More-World-API.patch => 0713-More-World-API.patch}  | 2 +-
 ...erEvent.patch => 0714-Added-PlayerBedFailEnterEvent.patch} | 0
 ...mplement-methods-to-convert-between-Component-and-B.patch} | 0
 ...ix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} | 0
 ...atch => 0717-add-RespawnFlags-to-PlayerRespawnEvent.patch} | 0
 ...718-Introduce-beacon-activation-deactivation-events.patch} | 0
 ....patch => 0719-Add-Channel-initialization-listeners.patch} | 0
 343 files changed, 67 insertions(+), 67 deletions(-)
 rename Spigot-Server-Patches/{0378-Generator-Settings.patch => 0377-Generator-Settings.patch} (100%)
 rename Spigot-Server-Patches/{0379-Fix-MC-161754.patch => 0378-Fix-MC-161754.patch} (100%)
 rename Spigot-Server-Patches/{0380-Performance-improvement-for-Chunk.getEntities.patch => 0379-Performance-improvement-for-Chunk.getEntities.patch} (100%)
 rename Spigot-Server-Patches/{0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (94%)
 rename Spigot-Server-Patches/{0382-Expose-the-internal-current-tick.patch => 0381-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-Server-Patches/{0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (89%)
 rename Spigot-Server-Patches/{0384-Add-option-to-disable-pillager-patrols.patch => 0383-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename Spigot-Server-Patches/{0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (100%)
 rename Spigot-Server-Patches/{0386-PlayerLaunchProjectileEvent.patch => 0385-PlayerLaunchProjectileEvent.patch} (100%)
 rename Spigot-Server-Patches/{0387-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename Spigot-Server-Patches/{0388-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename Spigot-Server-Patches/{0389-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0388-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename Spigot-Server-Patches/{0390-Optimize-Hoppers.patch => 0389-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0391-PlayerDeathEvent-shouldDropExperience.patch => 0390-PlayerDeathEvent-shouldDropExperience.patch} (91%)
 rename Spigot-Server-Patches/{0392-Prevent-bees-loading-chunks-checking-hive-position.patch => 0391-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename Spigot-Server-Patches/{0393-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename Spigot-Server-Patches/{0394-Guard-against-serializing-mismatching-chunk-coordina.patch => 0393-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename Spigot-Server-Patches/{0395-Optimise-IEntityAccess-getPlayerByUUID.patch => 0394-Optimise-IEntityAccess-getPlayerByUUID.patch} (96%)
 rename Spigot-Server-Patches/{0396-Fix-items-not-falling-correctly.patch => 0395-Fix-items-not-falling-correctly.patch} (100%)
 rename Spigot-Server-Patches/{0397-Lag-compensate-eating.patch => 0396-Lag-compensate-eating.patch} (97%)
 rename Spigot-Server-Patches/{0398-Optimize-call-to-getFluid-for-explosions.patch => 0397-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename Spigot-Server-Patches/{0399-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename Spigot-Server-Patches/{0400-Add-effect-to-block-break-naturally.patch => 0399-Add-effect-to-block-break-naturally.patch} (94%)
 rename Spigot-Server-Patches/{0401-Tracking-Range-Improvements.patch => 0400-Tracking-Range-Improvements.patch} (100%)
 rename Spigot-Server-Patches/{0402-Entity-Activation-Range-2.0.patch => 0401-Entity-Activation-Range-2.0.patch} (100%)
 rename Spigot-Server-Patches/{0403-Fix-items-vanishing-through-end-portal.patch => 0402-Fix-items-vanishing-through-end-portal.patch} (93%)
 rename Spigot-Server-Patches/{0404-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename Spigot-Server-Patches/{0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0406-Allow-overriding-the-java-version-check.patch => 0405-Allow-overriding-the-java-version-check.patch} (100%)
 rename Spigot-Server-Patches/{0407-Add-ThrownEggHatchEvent.patch => 0406-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-Server-Patches/{0408-Optimise-random-block-ticking.patch => 0407-Optimise-random-block-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0409-Entity-Jump-API.patch => 0408-Entity-Jump-API.patch} (96%)
 rename Spigot-Server-Patches/{0410-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0409-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename Spigot-Server-Patches/{0411-Make-the-GUI-graph-fancier.patch => 0410-Make-the-GUI-graph-fancier.patch} (99%)
 rename Spigot-Server-Patches/{0412-add-hand-to-BlockMultiPlaceEvent.patch => 0411-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0413-Prevent-teleporting-dead-entities.patch => 0412-Prevent-teleporting-dead-entities.patch} (100%)
 rename Spigot-Server-Patches/{0414-Validate-tripwire-hook-placement-before-update.patch => 0413-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename Spigot-Server-Patches/{0415-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename Spigot-Server-Patches/{0416-Configurable-chance-of-villager-zombie-infection.patch => 0415-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename Spigot-Server-Patches/{0417-Optimise-Chunk-getFluid.patch => 0416-Optimise-Chunk-getFluid.patch} (100%)
 rename Spigot-Server-Patches/{0418-Optimise-TickListServer-by-rewriting-it.patch => 0417-Optimise-TickListServer-by-rewriting-it.patch} (100%)
 rename Spigot-Server-Patches/{0419-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0418-Pillager-patrol-spawn-settings-and-per-player-option.patch} (98%)
 rename Spigot-Server-Patches/{0420-Ensure-Entity-is-never-double-registered.patch => 0419-Ensure-Entity-is-never-double-registered.patch} (100%)
 rename Spigot-Server-Patches/{0421-Fix-unregistering-entities-from-unloading-chunks.patch => 0420-Fix-unregistering-entities-from-unloading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0422-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0423-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename Spigot-Server-Patches/{0424-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0425-Optimize-Collision-to-not-load-chunks.patch => 0424-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0426-Don-t-tick-dead-players.patch => 0425-Don-t-tick-dead-players.patch} (91%)
 rename Spigot-Server-Patches/{0427-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0426-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename Spigot-Server-Patches/{0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (99%)
 rename Spigot-Server-Patches/{0429-Increase-Light-Queue-Size.patch => 0428-Increase-Light-Queue-Size.patch} (95%)
 rename Spigot-Server-Patches/{0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (99%)
 rename Spigot-Server-Patches/{0431-Don-t-move-existing-players-to-world-spawn.patch => 0430-Don-t-move-existing-players-to-world-spawn.patch} (93%)
 rename Spigot-Server-Patches/{0432-Add-tick-times-API-and-mspt-command.patch => 0431-Add-tick-times-API-and-mspt-command.patch} (98%)
 rename Spigot-Server-Patches/{0433-Expose-MinecraftServer-isRunning.patch => 0432-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-Server-Patches/{0434-Add-Raw-Byte-ItemStack-Serialization.patch => 0433-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename Spigot-Server-Patches/{0435-Remove-streams-from-Mob-AI-System.patch => 0434-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename Spigot-Server-Patches/{0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (100%)
 rename Spigot-Server-Patches/{0437-Async-command-map-building.patch => 0436-Async-command-map-building.patch} (100%)
 rename Spigot-Server-Patches/{0438-Improved-Watchdog-Support.patch => 0437-Improved-Watchdog-Support.patch} (99%)
 rename Spigot-Server-Patches/{0439-Optimize-Pathfinding.patch => 0438-Optimize-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0440-Reduce-Either-Optional-allocation.patch => 0439-Reduce-Either-Optional-allocation.patch} (100%)
 rename Spigot-Server-Patches/{0441-Remove-streams-from-PairedQueue.patch => 0440-Remove-streams-from-PairedQueue.patch} (100%)
 rename Spigot-Server-Patches/{0442-Reduce-memory-footprint-of-NBTTagCompound.patch => 0441-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename Spigot-Server-Patches/{0443-Prevent-opening-inventories-when-frozen.patch => 0442-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename Spigot-Server-Patches/{0444-Optimise-ArraySetSorted-removeIf.patch => 0443-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename Spigot-Server-Patches/{0445-Don-t-run-entity-collision-code-if-not-needed.patch => 0444-Don-t-run-entity-collision-code-if-not-needed.patch} (93%)
 rename Spigot-Server-Patches/{0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (96%)
 rename Spigot-Server-Patches/{0447-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0446-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename Spigot-Server-Patches/{0448-Implement-Player-Client-Options-API.patch => 0447-Implement-Player-Client-Options-API.patch} (100%)
 rename Spigot-Server-Patches/{0449-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0448-Fix-Chunk-Post-Processing-deadlock-risk.patch} (97%)
 rename Spigot-Server-Patches/{0450-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename Spigot-Server-Patches/{0451-Broadcast-join-message-to-console.patch => 0450-Broadcast-join-message-to-console.patch} (91%)
 rename Spigot-Server-Patches/{0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (97%)
 rename Spigot-Server-Patches/{0453-Load-Chunks-for-Login-Asynchronously.patch => 0452-Load-Chunks-for-Login-Asynchronously.patch} (100%)
 rename Spigot-Server-Patches/{0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename Spigot-Server-Patches/{0455-Add-PlayerAttackEntityCooldownResetEvent.patch => 0454-Add-PlayerAttackEntityCooldownResetEvent.patch} (95%)
 rename Spigot-Server-Patches/{0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (100%)
 rename Spigot-Server-Patches/{0457-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0456-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename Spigot-Server-Patches/{0458-Add-phantom-creative-and-insomniac-controls.patch => 0457-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename Spigot-Server-Patches/{0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename Spigot-Server-Patches/{0460-Implement-Brigadier-Mojang-API.patch => 0459-Implement-Brigadier-Mojang-API.patch} (100%)
 rename Spigot-Server-Patches/{0461-Villager-Restocks-API.patch => 0460-Villager-Restocks-API.patch} (100%)
 rename Spigot-Server-Patches/{0462-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0461-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0463-Expose-game-version.patch => 0462-Expose-game-version.patch} (100%)
 rename Spigot-Server-Patches/{0464-Optimize-Voxel-Shape-Merging.patch => 0463-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename Spigot-Server-Patches/{0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (93%)
 rename Spigot-Server-Patches/{0466-Implement-Mob-Goal-API.patch => 0465-Implement-Mob-Goal-API.patch} (100%)
 rename Spigot-Server-Patches/{0467-Use-distance-map-to-optimise-entity-tracker.patch => 0466-Use-distance-map-to-optimise-entity-tracker.patch} (99%)
 rename Spigot-Server-Patches/{0468-Optimize-isOutsideRange-to-use-distance-maps.patch => 0467-Optimize-isOutsideRange-to-use-distance-maps.patch} (99%)
 rename Spigot-Server-Patches/{0469-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0468-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename Spigot-Server-Patches/{0470-No-Tick-view-distance-implementation.patch => 0469-No-Tick-view-distance-implementation.patch} (99%)
 rename Spigot-Server-Patches/{0471-Add-villager-reputation-API.patch => 0470-Add-villager-reputation-API.patch} (100%)
 rename Spigot-Server-Patches/{0472-Fix-Light-Command.patch => 0471-Fix-Light-Command.patch} (100%)
 rename Spigot-Server-Patches/{0473-Fix-PotionEffect-ignores-icon-flag.patch => 0472-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename Spigot-Server-Patches/{0474-Optimize-brigadier-child-sorting-performance.patch => 0473-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename Spigot-Server-Patches/{0475-Potential-bed-API.patch => 0474-Potential-bed-API.patch} (100%)
 rename Spigot-Server-Patches/{0476-Wait-for-Async-Tasks-during-shutdown.patch => 0475-Wait-for-Async-Tasks-during-shutdown.patch} (96%)
 rename Spigot-Server-Patches/{0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0476-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename Spigot-Server-Patches/{0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename Spigot-Server-Patches/{0479-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0478-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename Spigot-Server-Patches/{0480-Reduce-MutableInt-allocations-from-light-engine.patch => 0479-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename Spigot-Server-Patches/{0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0482-Ensure-safe-gateway-teleport.patch => 0481-Ensure-safe-gateway-teleport.patch} (100%)
 rename Spigot-Server-Patches/{0483-Add-option-for-console-having-all-permissions.patch => 0482-Add-option-for-console-having-all-permissions.patch} (100%)
 rename Spigot-Server-Patches/{0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0483-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename Spigot-Server-Patches/{0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch => 0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch} (100%)
 rename Spigot-Server-Patches/{0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (100%)
 rename Spigot-Server-Patches/{0488-Improve-Chunk-Status-Transition-Speed.patch => 0487-Improve-Chunk-Status-Transition-Speed.patch} (100%)
 rename Spigot-Server-Patches/{0489-Fix-villager-trading-demand-MC-163962.patch => 0488-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename Spigot-Server-Patches/{0490-Maps-shouldn-t-load-chunks.patch => 0489-Maps-shouldn-t-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename Spigot-Server-Patches/{0492-Optimize-Bit-Operations-by-inlining.patch => 0491-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0493-Optimize-Light-Engine.patch => 0492-Optimize-Light-Engine.patch} (100%)
 rename Spigot-Server-Patches/{0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (98%)
 rename Spigot-Server-Patches/{0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (98%)
 rename Spigot-Server-Patches/{0496-Fix-missing-chunks-due-to-integer-overflow.patch => 0495-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename Spigot-Server-Patches/{0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename Spigot-Server-Patches/{0498-Fix-piston-physics-inconsistency-MC-188840.patch => 0497-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename Spigot-Server-Patches/{0499-Fix-sand-duping.patch => 0498-Fix-sand-duping.patch} (100%)
 rename Spigot-Server-Patches/{0500-Prevent-position-desync-in-playerconnection-causing-.patch => 0499-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename Spigot-Server-Patches/{0501-Fix-enderdragon-exp-dupe.patch => 0500-Fix-enderdragon-exp-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0502-Inventory-getHolder-method-without-block-snapshot.patch => 0501-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0503-Expose-Arrow-getItemStack.patch => 0502-Expose-Arrow-getItemStack.patch} (100%)
 rename Spigot-Server-Patches/{0504-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0503-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename Spigot-Server-Patches/{0505-Hide-sync-chunk-writes-behind-flag.patch => 0504-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename Spigot-Server-Patches/{0506-Limit-lightning-strike-effect-distance.patch => 0505-Limit-lightning-strike-effect-distance.patch} (100%)
 rename Spigot-Server-Patches/{0507-Add-permission-for-command-blocks.patch => 0506-Add-permission-for-command-blocks.patch} (100%)
 rename Spigot-Server-Patches/{0508-Ensure-Entity-AABB-s-are-never-invalid.patch => 0507-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0509-Optimize-WorldBorder-collision-checks-and-air.patch => 0508-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename Spigot-Server-Patches/{0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (98%)
 rename Spigot-Server-Patches/{0511-Paper-dumpitem-command.patch => 0510-Paper-dumpitem-command.patch} (100%)
 rename Spigot-Server-Patches/{0512-Don-t-allow-null-UUID-s-for-chat.patch => 0511-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename Spigot-Server-Patches/{0513-Improve-Legacy-Component-serialization-size.patch => 0512-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename Spigot-Server-Patches/{0514-Support-old-UUID-format-for-NBT.patch => 0513-Support-old-UUID-format-for-NBT.patch} (100%)
 rename Spigot-Server-Patches/{0515-Clean-up-duplicated-GameProfile-Properties.patch => 0514-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename Spigot-Server-Patches/{0516-Convert-legacy-attributes-in-Item-Meta.patch => 0515-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0517-Remove-some-streams-from-structures.patch => 0516-Remove-some-streams-from-structures.patch} (100%)
 rename Spigot-Server-Patches/{0518-Remove-streams-from-classes-related-villager-gossip.patch => 0517-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename Spigot-Server-Patches/{0519-Support-components-in-ItemMeta.patch => 0518-Support-components-in-ItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0519-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename Spigot-Server-Patches/{0521-Add-entity-liquid-API.patch => 0520-Add-entity-liquid-API.patch} (100%)
 rename Spigot-Server-Patches/{0522-Update-itemstack-legacy-name-and-lore.patch => 0521-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename Spigot-Server-Patches/{0523-Spawn-player-in-correct-world-on-login.patch => 0522-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename Spigot-Server-Patches/{0524-Add-PrepareResultEvent.patch => 0523-Add-PrepareResultEvent.patch} (100%)
 rename Spigot-Server-Patches/{0525-Allow-delegation-to-vanilla-chunk-gen.patch => 0524-Allow-delegation-to-vanilla-chunk-gen.patch} (98%)
 rename Spigot-Server-Patches/{0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (90%)
 rename Spigot-Server-Patches/{0527-Optimize-NetworkManager-Exception-Handling.patch => 0526-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename Spigot-Server-Patches/{0528-Fix-Concurrency-issue-in-WeightedList.patch => 0527-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename Spigot-Server-Patches/{0529-Optimize-the-advancement-data-player-iteration-to-be.patch => 0528-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename Spigot-Server-Patches/{0530-Fix-arrows-never-despawning-MC-125757.patch => 0529-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename Spigot-Server-Patches/{0531-Thread-Safe-Vanilla-Command-permission-checking.patch => 0530-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename Spigot-Server-Patches/{0532-Move-range-check-for-block-placing-up.patch => 0531-Move-range-check-for-block-placing-up.patch} (100%)
 rename Spigot-Server-Patches/{0533-Fix-SPIGOT-5989.patch => 0532-Fix-SPIGOT-5989.patch} (100%)
 rename Spigot-Server-Patches/{0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename Spigot-Server-Patches/{0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename Spigot-Server-Patches/{0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0535-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename Spigot-Server-Patches/{0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (89%)
 rename Spigot-Server-Patches/{0538-Fix-some-rails-connecting-improperly.patch => 0537-Fix-some-rails-connecting-improperly.patch} (100%)
 rename Spigot-Server-Patches/{0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0538-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename Spigot-Server-Patches/{0540-Incremental-player-saving.patch => 0539-Incremental-player-saving.patch} (96%)
 rename Spigot-Server-Patches/{0541-Import-fastutil-classes.patch => 0540-Import-fastutil-classes.patch} (100%)
 rename Spigot-Server-Patches/{0542-Don-t-mark-null-chunk-sections-for-block-updates.patch => 0541-Don-t-mark-null-chunk-sections-for-block-updates.patch} (100%)
 rename Spigot-Server-Patches/{0543-Remove-armour-stand-double-add-to-world.patch => 0542-Remove-armour-stand-double-add-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0544-Fix-MC-187716-Use-configured-height.patch => 0543-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename Spigot-Server-Patches/{0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename Spigot-Server-Patches/{0546-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0545-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename Spigot-Server-Patches/{0547-Brand-support.patch => 0546-Brand-support.patch} (100%)
 rename Spigot-Server-Patches/{0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch => 0547-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch} (100%)
 rename Spigot-Server-Patches/{0549-Fix-MC-197271.patch => 0548-Fix-MC-197271.patch} (100%)
 rename Spigot-Server-Patches/{0550-MC-197883-Bandaid-decode-issue.patch => 0549-MC-197883-Bandaid-decode-issue.patch} (100%)
 rename Spigot-Server-Patches/{0551-Add-setMaxPlayers-API.patch => 0550-Add-setMaxPlayers-API.patch} (100%)
 rename Spigot-Server-Patches/{0552-Add-playPickupItemAnimation-to-LivingEntity.patch => 0551-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0553-Don-t-require-FACING-data.patch => 0552-Don-t-require-FACING-data.patch} (100%)
 rename Spigot-Server-Patches/{0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (96%)
 rename Spigot-Server-Patches/{0555-Add-moon-phase-API.patch => 0554-Add-moon-phase-API.patch} (89%)
 rename Spigot-Server-Patches/{0556-Prevent-headless-pistons-from-being-created.patch => 0555-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename Spigot-Server-Patches/{0557-Add-BellRingEvent.patch => 0556-Add-BellRingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0558-Add-zombie-targets-turtle-egg-config.patch => 0557-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename Spigot-Server-Patches/{0559-Buffer-joins-to-world.patch => 0558-Buffer-joins-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0560-Optimize-redstone-algorithm.patch => 0559-Optimize-redstone-algorithm.patch} (100%)
 rename Spigot-Server-Patches/{0561-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0560-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename Spigot-Server-Patches/{0562-PortalCreateEvent-needs-to-know-its-entity.patch => 0561-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename Spigot-Server-Patches/{0563-Fix-CraftTeam-null-check.patch => 0562-Fix-CraftTeam-null-check.patch} (100%)
 rename Spigot-Server-Patches/{0564-Add-more-Evoker-API.patch => 0563-Add-more-Evoker-API.patch} (100%)
 rename Spigot-Server-Patches/{0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0564-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename Spigot-Server-Patches/{0566-Create-HoverEvent-from-ItemStack-Entity.patch => 0565-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename Spigot-Server-Patches/{0567-Cache-block-data-strings.patch => 0566-Cache-block-data-strings.patch} (97%)
 rename Spigot-Server-Patches/{0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0567-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename Spigot-Server-Patches/{0569-Add-additional-open-container-api-to-HumanEntity.patch => 0568-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename Spigot-Server-Patches/{0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0569-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename Spigot-Server-Patches/{0571-Extend-block-drop-capture-to-capture-all-items-added.patch => 0570-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%)
 rename Spigot-Server-Patches/{0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0571-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename Spigot-Server-Patches/{0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0572-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename Spigot-Server-Patches/{0574-Lazily-track-plugin-scoreboards-by-default.patch => 0573-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename Spigot-Server-Patches/{0575-Entity-isTicking.patch => 0574-Entity-isTicking.patch} (100%)
 rename Spigot-Server-Patches/{0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0575-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (91%)
 rename Spigot-Server-Patches/{0577-Fix-Not-a-string-Map-Conversion-spam.patch => 0576-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename Spigot-Server-Patches/{0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0577-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch => 0578-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch} (100%)
 rename Spigot-Server-Patches/{0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0579-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename Spigot-Server-Patches/{0581-Fix-for-large-move-vectors-crashing-server.patch => 0580-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0582-Optimise-getType-calls.patch => 0581-Optimise-getType-calls.patch} (98%)
 rename Spigot-Server-Patches/{0583-Villager-resetOffers.patch => 0582-Villager-resetOffers.patch} (100%)
 rename Spigot-Server-Patches/{0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0583-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename Spigot-Server-Patches/{0585-Retain-block-place-order-when-capturing-blockstates.patch => 0584-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename Spigot-Server-Patches/{0586-Reduce-blockpos-allocation-from-pathfinding.patch => 0585-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0587-Fix-item-locations-dropped-from-campfires.patch => 0586-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename Spigot-Server-Patches/{0588-Player-elytra-boost-API.patch => 0587-Player-elytra-boost-API.patch} (100%)
 rename Spigot-Server-Patches/{0589-Fixed-TileEntityBell-memory-leak.patch => 0588-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename Spigot-Server-Patches/{0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0589-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%)
 rename Spigot-Server-Patches/{0591-Add-getOfflinePlayerIfCached-String.patch => 0590-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename Spigot-Server-Patches/{0592-Add-ignore-discounts-API.patch => 0591-Add-ignore-discounts-API.patch} (100%)
 rename Spigot-Server-Patches/{0593-Toggle-for-removing-existing-dragon.patch => 0592-Toggle-for-removing-existing-dragon.patch} (100%)
 rename Spigot-Server-Patches/{0594-Fix-client-lag-on-advancement-loading.patch => 0593-Fix-client-lag-on-advancement-loading.patch} (100%)
 rename Spigot-Server-Patches/{0595-Item-no-age-no-player-pickup.patch => 0594-Item-no-age-no-player-pickup.patch} (100%)
 rename Spigot-Server-Patches/{0596-Beacon-API-custom-effect-ranges.patch => 0595-Beacon-API-custom-effect-ranges.patch} (100%)
 rename Spigot-Server-Patches/{0597-Add-API-for-quit-reason.patch => 0596-Add-API-for-quit-reason.patch} (98%)
 rename Spigot-Server-Patches/{0598-Seed-based-feature-search.patch => 0597-Seed-based-feature-search.patch} (100%)
 rename Spigot-Server-Patches/{0599-Add-Wandering-Trader-spawn-rate-config-options.patch => 0598-Add-Wandering-Trader-spawn-rate-config-options.patch} (98%)
 rename Spigot-Server-Patches/{0600-Significantly-improve-performance-of-the-end-generat.patch => 0599-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename Spigot-Server-Patches/{0601-Expose-world-spawn-angle.patch => 0600-Expose-world-spawn-angle.patch} (96%)
 rename Spigot-Server-Patches/{0602-Add-Destroy-Speed-API.patch => 0601-Add-Destroy-Speed-API.patch} (100%)
 rename Spigot-Server-Patches/{0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0602-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename Spigot-Server-Patches/{0604-Add-LivingEntity-clearActiveItem.patch => 0603-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename Spigot-Server-Patches/{0605-Add-PlayerItemCooldownEvent.patch => 0604-Add-PlayerItemCooldownEvent.patch} (100%)
 rename Spigot-Server-Patches/{0606-More-lightning-API.patch => 0605-More-lightning-API.patch} (100%)
 rename Spigot-Server-Patches/{0607-Climbing-should-not-bypass-cramming-gamerule.patch => 0606-Climbing-should-not-bypass-cramming-gamerule.patch} (98%)
 rename Spigot-Server-Patches/{0608-Added-missing-default-perms-for-commands.patch => 0607-Added-missing-default-perms-for-commands.patch} (100%)
 rename Spigot-Server-Patches/{0609-Add-PlayerShearBlockEvent.patch => 0608-Add-PlayerShearBlockEvent.patch} (100%)
 rename Spigot-Server-Patches/{0610-Add-warning-for-servers-not-running-on-Java-11.patch => 0609-Add-warning-for-servers-not-running-on-Java-11.patch} (97%)
 rename Spigot-Server-Patches/{0611-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0610-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename Spigot-Server-Patches/{0612-Fix-curing-zombie-villager-discount-exploit.patch => 0611-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename Spigot-Server-Patches/{0613-Limit-recipe-packets.patch => 0612-Limit-recipe-packets.patch} (100%)
 rename Spigot-Server-Patches/{0614-Fix-CraftSound-backwards-compatibility.patch => 0613-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename Spigot-Server-Patches/{0615-MC-4-Fix-item-position-desync.patch => 0614-MC-4-Fix-item-position-desync.patch} (100%)
 rename Spigot-Server-Patches/{0616-Player-Chunk-Load-Unload-Events.patch => 0615-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename Spigot-Server-Patches/{0617-Optimize-Dynamic-get-Missing-Keys.patch => 0616-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename Spigot-Server-Patches/{0618-Expose-LivingEntity-hurt-direction.patch => 0617-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename Spigot-Server-Patches/{0619-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0618-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename Spigot-Server-Patches/{0620-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0619-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename Spigot-Server-Patches/{0621-added-PlayerTradeEvent.patch => 0620-added-PlayerTradeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0622-Implement-TargetHitEvent.patch => 0621-Implement-TargetHitEvent.patch} (100%)
 rename Spigot-Server-Patches/{0623-Additional-Block-Material-API-s.patch => 0622-Additional-Block-Material-API-s.patch} (93%)
 rename Spigot-Server-Patches/{0624-Fix-harming-potion-dupe.patch => 0623-Fix-harming-potion-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0625-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0624-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename Spigot-Server-Patches/{0626-Optimized-tick-ready-check.patch => 0625-Optimized-tick-ready-check.patch} (100%)
 rename Spigot-Server-Patches/{0627-Cache-burn-durations.patch => 0626-Cache-burn-durations.patch} (100%)
 rename Spigot-Server-Patches/{0628-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0627-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename Spigot-Server-Patches/{0629-Implement-PlayerFlowerPotManipulateEvent.patch => 0628-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename Spigot-Server-Patches/{0630-Fix-interact-event-not-being-called-in-adventure.patch => 0629-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename Spigot-Server-Patches/{0631-Zombie-API-breaking-doors.patch => 0630-Zombie-API-breaking-doors.patch} (100%)
 rename Spigot-Server-Patches/{0632-Fix-nerfed-slime-when-splitting.patch => 0631-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename Spigot-Server-Patches/{0633-Add-EntityLoadCrossbowEvent.patch => 0632-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0634-Guardian-beam-workaround.patch => 0633-Guardian-beam-workaround.patch} (100%)
 rename Spigot-Server-Patches/{0635-Added-WorldGameRuleChangeEvent.patch => 0634-Added-WorldGameRuleChangeEvent.patch} (98%)
 rename Spigot-Server-Patches/{0636-Added-ServerResourcesReloadedEvent.patch => 0635-Added-ServerResourcesReloadedEvent.patch} (97%)
 rename Spigot-Server-Patches/{0637-Added-world-settings-for-mobs-picking-up-loot.patch => 0636-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename Spigot-Server-Patches/{0638-Implemented-BlockFailedDispenseEvent.patch => 0637-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0639-Added-PlayerLecternPageChangeEvent.patch => 0638-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0640-Fire-event-on-GS4-query.patch => 0639-Fire-event-on-GS4-query.patch} (100%)
 rename Spigot-Server-Patches/{0641-Added-PlayerLoomPatternSelectEvent.patch => 0640-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0642-Configurable-door-breaking-difficulty.patch => 0641-Configurable-door-breaking-difficulty.patch} (100%)
 rename Spigot-Server-Patches/{0643-Empty-commands-shall-not-be-dispatched.patch => 0642-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename Spigot-Server-Patches/{0644-Implement-API-to-expose-exact-interaction-point.patch => 0643-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename Spigot-Server-Patches/{0645-Remove-stale-POIs.patch => 0644-Remove-stale-POIs.patch} (100%)
 rename Spigot-Server-Patches/{0646-Fix-villager-boat-exploit.patch => 0645-Fix-villager-boat-exploit.patch} (100%)
 rename Spigot-Server-Patches/{0647-Entity-load-save-limit-per-chunk.patch => 0646-Entity-load-save-limit-per-chunk.patch} (100%)
 rename Spigot-Server-Patches/{0648-Add-sendOpLevel-API.patch => 0647-Add-sendOpLevel-API.patch} (100%)
 rename Spigot-Server-Patches/{0649-Add-StructureLocateEvent.patch => 0648-Add-StructureLocateEvent.patch} (100%)
 rename Spigot-Server-Patches/{0650-Collision-option-for-requiring-a-player-participant.patch => 0649-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename Spigot-Server-Patches/{0651-Make-ProjectileHitEvent-Cancellable.patch => 0650-Make-ProjectileHitEvent-Cancellable.patch} (97%)
 rename Spigot-Server-Patches/{0652-Return-chat-component-with-empty-text-instead-of-thr.patch => 0651-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename Spigot-Server-Patches/{0653-Make-schedule-command-per-world.patch => 0652-Make-schedule-command-per-world.patch} (100%)
 rename Spigot-Server-Patches/{0654-Configurable-max-leash-distance.patch => 0653-Configurable-max-leash-distance.patch} (100%)
 rename Spigot-Server-Patches/{0655-Implement-BlockPreDispenseEvent.patch => 0654-Implement-BlockPreDispenseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0656-Added-Vanilla-Entity-Tags.patch => 0655-Added-Vanilla-Entity-Tags.patch} (100%)
 rename Spigot-Server-Patches/{0657-added-Wither-API.patch => 0656-added-Wither-API.patch} (100%)
 rename Spigot-Server-Patches/{0658-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0657-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0659-Fix-console-spam-when-removing-chests-in-water.patch => 0658-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename Spigot-Server-Patches/{0660-Add-toggle-for-always-placing-the-dragon-egg.patch => 0659-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename Spigot-Server-Patches/{0661-Added-PlayerStonecutterRecipeSelectEvent.patch => 0660-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0662-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0661-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename Spigot-Server-Patches/{0663-Skip-distance-map-update-when-spawning-disabled.patch => 0662-Skip-distance-map-update-when-spawning-disabled.patch} (100%)
 rename Spigot-Server-Patches/{0664-Reset-shield-blocking-on-dimension-change.patch => 0663-Reset-shield-blocking-on-dimension-change.patch} (90%)
 rename Spigot-Server-Patches/{0665-add-DragonEggFormEvent.patch => 0664-add-DragonEggFormEvent.patch} (100%)
 rename Spigot-Server-Patches/{0666-EntityMoveEvent.patch => 0665-EntityMoveEvent.patch} (95%)
 rename Spigot-Server-Patches/{0667-added-option-to-disable-pathfinding-updates-on-block.patch => 0666-added-option-to-disable-pathfinding-updates-on-block.patch} (95%)
 rename Spigot-Server-Patches/{0668-Inline-shift-direction-fields.patch => 0667-Inline-shift-direction-fields.patch} (100%)
 rename Spigot-Server-Patches/{0669-Allow-adding-items-to-BlockDropItemEvent.patch => 0668-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename Spigot-Server-Patches/{0670-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0669-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename Spigot-Server-Patches/{0671-living-entity-allow-attribute-registration.patch => 0670-living-entity-allow-attribute-registration.patch} (100%)
 rename Spigot-Server-Patches/{0672-fix-dead-slime-setSize-invincibility.patch => 0671-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename Spigot-Server-Patches/{0673-Merchant-getRecipes-should-return-an-immutable-list.patch => 0672-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename Spigot-Server-Patches/{0674-misc-debugging-dumps.patch => 0673-misc-debugging-dumps.patch} (97%)
 rename Spigot-Server-Patches/{0675-Add-support-for-hex-color-codes-in-console.patch => 0674-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename Spigot-Server-Patches/{0676-Clear-SyncLoadInfo.patch => 0675-Clear-SyncLoadInfo.patch} (100%)
 rename Spigot-Server-Patches/{0677-Expose-Tracked-Players.patch => 0676-Expose-Tracked-Players.patch} (100%)
 rename Spigot-Server-Patches/{0678-Remove-streams-from-SensorNearest.patch => 0677-Remove-streams-from-SensorNearest.patch} (100%)
 rename Spigot-Server-Patches/{0679-do-not-create-unnecessary-copies-of-passenger-list.patch => 0678-do-not-create-unnecessary-copies-of-passenger-list.patch} (100%)
 rename Spigot-Server-Patches/{0680-MC-29274-Fix-Wither-hostility-towards-players.patch => 0679-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename Spigot-Server-Patches/{0681-Throw-proper-exception-on-empty-JsonList-file.patch => 0680-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename Spigot-Server-Patches/{0682-Improve-ServerGUI.patch => 0681-Improve-ServerGUI.patch} (100%)
 rename Spigot-Server-Patches/{0683-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0682-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename Spigot-Server-Patches/{0684-fix-converting-txt-to-json-file.patch => 0683-fix-converting-txt-to-json-file.patch} (100%)
 rename Spigot-Server-Patches/{0685-Add-worldborder-events.patch => 0684-Add-worldborder-events.patch} (100%)
 rename Spigot-Server-Patches/{0686-added-PlayerNameEntityEvent.patch => 0685-added-PlayerNameEntityEvent.patch} (100%)
 rename Spigot-Server-Patches/{0687-Prevent-grindstones-from-overstacking-items.patch => 0686-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename Spigot-Server-Patches/{0688-Add-recipe-to-cook-events.patch => 0687-Add-recipe-to-cook-events.patch} (100%)
 rename Spigot-Server-Patches/{0689-Add-Block-isValidTool.patch => 0688-Add-Block-isValidTool.patch} (100%)
 rename Spigot-Server-Patches/{0690-Allow-using-signs-inside-spawn-protection.patch => 0689-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename Spigot-Server-Patches/{0691-Implement-Keyed-on-World.patch => 0690-Implement-Keyed-on-World.patch} (98%)
 rename Spigot-Server-Patches/{0692-Add-fast-alternative-constructor-for-Vector3f.patch => 0691-Add-fast-alternative-constructor-for-Vector3f.patch} (100%)
 rename Spigot-Server-Patches/{0693-Item-Rarity-API.patch => 0692-Item-Rarity-API.patch} (100%)
 rename Spigot-Server-Patches/{0694-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0693-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename Spigot-Server-Patches/{0695-copy-TESign-isEditable-from-snapshots.patch => 0694-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename Spigot-Server-Patches/{0696-Drop-carried-item-when-player-has-disconnected.patch => 0695-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 rename Spigot-Server-Patches/{0697-forced-whitelist-use-configurable-kick-message.patch => 0696-forced-whitelist-use-configurable-kick-message.patch} (91%)
 rename Spigot-Server-Patches/{0698-Make-sure-to-remove-correct-TE-during-TE-tick.patch => 0697-Make-sure-to-remove-correct-TE-during-TE-tick.patch} (100%)
 rename Spigot-Server-Patches/{0699-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0698-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename Spigot-Server-Patches/{0700-Expose-protocol-version.patch => 0699-Expose-protocol-version.patch} (100%)
 rename Spigot-Server-Patches/{0701-Enhance-console-tab-completions-for-brigadier-comman.patch => 0700-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename Spigot-Server-Patches/{0702-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0701-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename Spigot-Server-Patches/{0703-Add-bypass-host-check.patch => 0702-Add-bypass-host-check.patch} (100%)
 rename Spigot-Server-Patches/{0704-don-t-throw-when-loading-invalid-TEs.patch => 0703-don-t-throw-when-loading-invalid-TEs.patch} (100%)
 rename Spigot-Server-Patches/{0705-Set-area-affect-cloud-rotation.patch => 0704-Set-area-affect-cloud-rotation.patch} (91%)
 rename Spigot-Server-Patches/{0706-add-isDeeplySleeping-to-HumanEntity.patch => 0705-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename Spigot-Server-Patches/{0707-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0706-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename Spigot-Server-Patches/{0708-add-consumeFuel-to-FurnaceBurnEvent.patch => 0707-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0709-add-get-set-drop-chance-to-EntityEquipment.patch => 0708-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename Spigot-Server-Patches/{0710-fix-PigZombieAngerEvent-cancellation.patch => 0709-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename Spigot-Server-Patches/{0711-Fix-checkReach-check-for-Shulker-boxes.patch => 0710-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename Spigot-Server-Patches/{0712-fix-PlayerItemHeldEvent-firing-twice.patch => 0711-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename Spigot-Server-Patches/{0713-Added-PlayerDeepSleepEvent.patch => 0712-Added-PlayerDeepSleepEvent.patch} (100%)
 rename Spigot-Server-Patches/{0714-More-World-API.patch => 0713-More-World-API.patch} (98%)
 rename Spigot-Server-Patches/{0715-Added-PlayerBedFailEnterEvent.patch => 0714-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename Spigot-Server-Patches/{0716-Implement-methods-to-convert-between-Component-and-B.patch => 0715-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename Spigot-Server-Patches/{0717-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0716-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (100%)
 rename Spigot-Server-Patches/{0718-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0717-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0719-Introduce-beacon-activation-deactivation-events.patch => 0718-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename Spigot-Server-Patches/{0720-Add-Channel-initialization-listeners.patch => 0719-Add-Channel-initialization-listeners.patch} (100%)

diff --git a/Spigot-Server-Patches/0378-Generator-Settings.patch b/Spigot-Server-Patches/0377-Generator-Settings.patch
similarity index 100%
rename from Spigot-Server-Patches/0378-Generator-Settings.patch
rename to Spigot-Server-Patches/0377-Generator-Settings.patch
diff --git a/Spigot-Server-Patches/0379-Fix-MC-161754.patch b/Spigot-Server-Patches/0378-Fix-MC-161754.patch
similarity index 100%
rename from Spigot-Server-Patches/0379-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0378-Fix-MC-161754.patch
diff --git a/Spigot-Server-Patches/0380-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0379-Performance-improvement-for-Chunk.getEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0380-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0379-Performance-improvement-for-Chunk.getEntities.patch
diff --git a/Spigot-Server-Patches/0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 94%
rename from Spigot-Server-Patches/0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
index 84c4e83f5..225102e63 100644
--- a/Spigot-Server-Patches/0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
+++ b/Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e880ce299bd81ad790da7b94fb28c49a5ebab1e7..5a7efa46729a233d3aa8b674b1f6a8043b6c5632 100644
+index 6aaf868cf3213e1935080c64c652c3055cb58e0c..fcad64fcfc22af227be19741b634b773aca7a98d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1886,7 +1886,12 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0382-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0382-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch
diff --git a/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 89%
rename from Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
index b9757db29..51a0ffb5c 100644
--- a/Spigot-Server-Patches/0383-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
+++ b/Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657)
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index d66956b879ad7b05ea2a0252ca14b2d06dba135c..4ab293c49eba44ee3533b07866c5bdd68b1e849b 100644
+index 1e882d9d9b797bb5fb0411f5ecdedf01bcfe5aca..23bb5cd0b10c211019ff0b71128bbf835238e9d8 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -1072,6 +1072,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,7 +18,7 @@ index d66956b879ad7b05ea2a0252ca14b2d06dba135c..4ab293c49eba44ee3533b07866c5bdd6
                  PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
                  this.world.getServer().getPluginManager().callEvent(changeEvent);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f1dd51f30a40613a1fa1e00be43d21684ea9c274..1f74fddfc6d9d9ae38fd35f83fa668e38591b222 100644
+index 54e49dcc56281d02203fdcdb20906a4ee0e43c05..c5116a9c596074a33c98d29bb1e9cf22a8ad53bf 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -846,6 +846,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0384-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0383-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from Spigot-Server-Patches/0384-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0383-Add-option-to-disable-pillager-patrols.patch
diff --git a/Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from Spigot-Server-Patches/0385-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/Spigot-Server-Patches/0386-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0385-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0386-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0385-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-Server-Patches/0387-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from Spigot-Server-Patches/0387-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/Spigot-Server-Patches/0388-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from Spigot-Server-Patches/0388-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/Spigot-Server-Patches/0389-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0388-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from Spigot-Server-Patches/0389-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0388-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/Spigot-Server-Patches/0390-Optimize-Hoppers.patch b/Spigot-Server-Patches/0389-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0390-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0389-Optimize-Hoppers.patch
index c0a65b2b1..375ecefc7 100644
--- a/Spigot-Server-Patches/0390-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0389-Optimize-Hoppers.patch
@@ -31,7 +31,7 @@ index edda2121f8c1046478beaa77030ebb36d403b334..7fbd501d70dccf869a4454e2789a5d68
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b3401b59e0b99b32e3a600b3c33163a85f7c3ab2..6dd9d35eb7f1424edaea43521ab2ab4dbe786b48 100644
+index 0a407b7d2c87e2fc745eedf7b3ea794ab0211716..af7bef41d341218f25943eb1e10831cc0be6840a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -128,6 +128,7 @@ import net.minecraft.world.level.WorldSettings;
diff --git a/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch
similarity index 91%
rename from Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch
index 9961c720c..fa7dbe8cb 100644
--- a/Spigot-Server-Patches/0391-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 4ab293c49eba44ee3533b07866c5bdd68b1e849b..3b3c0b32f4f7b3d97ffc63cc5a9878f96a32712e 100644
+index 23bb5cd0b10c211019ff0b71128bbf835238e9d8..f242330bcf3d63490b5e7be36f8af6eccfb07820 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -821,7 +821,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0392-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0391-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from Spigot-Server-Patches/0392-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0391-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/Spigot-Server-Patches/0393-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from Spigot-Server-Patches/0393-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/Spigot-Server-Patches/0394-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0393-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from Spigot-Server-Patches/0394-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0393-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/Spigot-Server-Patches/0395-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 96%
rename from Spigot-Server-Patches/0395-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch
index f1ffe9ac5..e33401ace 100644
--- a/Spigot-Server-Patches/0395-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID
 Use the world entity map instead of iterating over all players
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 23f88bd794b2c738463e1aa1180b6826d33f3b77..f11617dc37771f65d574cd14ae9cea09103d11e1 100644
+index 71967bc86c2c2ad6bcafc80a5f8ab31c33f022e6..07b2f7f13044ace4db48274da8309c37aaa2d2c4 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -289,6 +289,15 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0396-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0395-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from Spigot-Server-Patches/0396-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0395-Fix-items-not-falling-correctly.patch
diff --git a/Spigot-Server-Patches/0397-Lag-compensate-eating.patch b/Spigot-Server-Patches/0396-Lag-compensate-eating.patch
similarity index 97%
rename from Spigot-Server-Patches/0397-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0396-Lag-compensate-eating.patch
index 274f4b8eb..674e071d4 100644
--- a/Spigot-Server-Patches/0397-Lag-compensate-eating.patch
+++ b/Spigot-Server-Patches/0396-Lag-compensate-eating.patch
@@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 58cf4bb4c6267c4d8d71bbd29ed34575eb93aed3..00f94e94aa302e24d286164ae829c935d2bcce95 100644
+index ec31585099c8376f61496f02f9454cb600104918..f851a9806e3b936093275cf404caca82c6662ab4 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -214,7 +214,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0398-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0397-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from Spigot-Server-Patches/0398-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0397-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/Spigot-Server-Patches/0399-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0399-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/Spigot-Server-Patches/0400-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch
similarity index 94%
rename from Spigot-Server-Patches/0400-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch
index 4338b0b20..e1c6127f7 100644
--- a/Spigot-Server-Patches/0400-Add-effect-to-block-break-naturally.patch
+++ b/Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add effect to block break naturally
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index aab855c64507e4a695c1be8693522b91b24b9cdd..650b80b6e38dffa6b6b211cf4ea1125105748935 100644
+index 724b230259b1b44bc9fdde6c4fcbcdde5f690e05..e3ab0b76e5003553b29215a43bc5a762f2663648 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -633,6 +633,13 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0401-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0401-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch
diff --git a/Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from Spigot-Server-Patches/0402-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch
diff --git a/Spigot-Server-Patches/0403-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch
similarity index 93%
rename from Spigot-Server-Patches/0403-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch
index 6d7c89e57..60a54b1c9 100644
--- a/Spigot-Server-Patches/0403-Fix-items-vanishing-through-end-portal.patch
+++ b/Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch
@@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the
 heightmap resolves the issue without having to load all spawn chunks.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 664ccd8fc43cbf1c9417670d14c937314379ccf9..cc50c0025a98ed1192fdc2e507c63c747e796dc6 100644
+index bc136276cad4e87d8658072b2f62f608670f39ca..d676eaad8179cdeae410038e58ddafe0fe541ccc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2730,6 +2730,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/Spigot-Server-Patches/0404-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from Spigot-Server-Patches/0404-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/Spigot-Server-Patches/0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 422802227..771f7d9a6 100644
--- a/Spigot-Server-Patches/0405-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either,
 then unwrap it...
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index 4998fad49755c08e20ebfb1dc97b558e1cf10b50..2f172f38f817f48fe2e62235c3859b91e60bc0df 100644
+index 372e5268783a84effa8f9f06c3f85b182e209cb8..0c8864eeae6e3b449514f52d95c17f2e4a304f0e 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -470,6 +470,12 @@ public class ChunkProviderServer extends IChunkProvider {
diff --git a/Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0405-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0406-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0405-Allow-overriding-the-java-version-check.patch
diff --git a/Spigot-Server-Patches/0407-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0406-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0407-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0406-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-Server-Patches/0408-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0408-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch
diff --git a/Spigot-Server-Patches/0409-Entity-Jump-API.patch b/Spigot-Server-Patches/0408-Entity-Jump-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0409-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0408-Entity-Jump-API.patch
index ff34d8f05..17e2ec967 100644
--- a/Spigot-Server-Patches/0409-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0408-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 750c568201acf447f598343437e67cb039423111..89abfdd32f47eed07080ff9d70440f0940628b4d 100644
+index 02d3b792cc9769b5daa6fcac57f5cda320a2a29e..86c6a8fd4511dfe426cc1651d289f38b467d3029 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2876,8 +2876,10 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0410-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0409-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0410-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0409-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch
similarity index 99%
rename from Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch
index c8a21d02d..7c19039ff 100644
--- a/Spigot-Server-Patches/0411-Make-the-GUI-graph-fancier.patch
+++ b/Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch
@@ -396,7 +396,7 @@ index 46d82c1548088b8305f758699388edf0d5d4d050..397194b3e90c9df39cfae17b401c7ac8
          consumer.accept(t0);
          return t0;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bf6fbb8e80eb64bdfdf29347b794f01ace31cec0..039c76a07bae4eec407e06adf077d1887919e9d8 100644
+index af7bef41d341218f25943eb1e10831cc0be6840a..dc817d7c7187de2b37485bef126fb0765a5caf63 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -217,7 +217,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0412-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0411-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0412-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0411-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0412-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0413-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0412-Prevent-teleporting-dead-entities.patch
diff --git a/Spigot-Server-Patches/0414-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0413-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from Spigot-Server-Patches/0414-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0413-Validate-tripwire-hook-placement-before-update.patch
diff --git a/Spigot-Server-Patches/0415-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0415-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/Spigot-Server-Patches/0416-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0415-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from Spigot-Server-Patches/0416-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0415-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/Spigot-Server-Patches/0417-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0416-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from Spigot-Server-Patches/0417-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0416-Optimise-Chunk-getFluid.patch
diff --git a/Spigot-Server-Patches/0418-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0418-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch
diff --git a/Spigot-Server-Patches/0419-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from Spigot-Server-Patches/0419-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 32a59081e..238c551c3 100644
--- a/Spigot-Server-Patches/0419-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -36,7 +36,7 @@ index 525d702d78a609af987ebd2c32169b873e5c05ed..6c8e9d498c9a30a1aa88494ba09c3cae
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 3b3c0b32f4f7b3d97ffc63cc5a9878f96a32712e..84b0f40edaff726e63f16611b364a692b332ae2b 100644
+index f242330bcf3d63490b5e7be36f8af6eccfb07820..a37c868addc2e4aab8eb28d92b1c9b3e0c0fc4a9 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -215,6 +215,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0420-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch
similarity index 100%
rename from Spigot-Server-Patches/0420-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch
diff --git a/Spigot-Server-Patches/0421-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0421-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch
diff --git a/Spigot-Server-Patches/0422-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0422-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/Spigot-Server-Patches/0423-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from Spigot-Server-Patches/0423-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/Spigot-Server-Patches/0424-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0424-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/Spigot-Server-Patches/0425-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0425-Optimize-Collision-to-not-load-chunks.patch
rename to Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch
diff --git a/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch
index 6f34d67a7..d22fea452 100644
--- a/Spigot-Server-Patches/0426-Don-t-tick-dead-players.patch
+++ b/Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 84b0f40edaff726e63f16611b364a692b332ae2b..da16b5773e182a10dca8c91b53b9aba7e924d22b 100644
+index a37c868addc2e4aab8eb28d92b1c9b3e0c0fc4a9..e4647849e2fccb68ff9e88ced92c183204b76960 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -608,7 +608,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0427-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0427-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/Spigot-Server-Patches/0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
index e7e8ed2c4..8efda0dd0 100644
--- a/Spigot-Server-Patches/0428-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
+++ b/Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
@@ -243,7 +243,7 @@ index 12cfe9f3c89316557e94c8b944b4f82277fb8877..8050be2ed04fb0b8141f92595680407b
          while (objectbidirectionaliterator.hasNext()) {
              Entry<PlayerChunk> entry = (Entry) objectbidirectionaliterator.next();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2d142699ebe2062947ba3eb228aaad4468c11371..adcb2bd279f1f87d174556cb1b8aac497c11d7d3 100644
+index fcad64fcfc22af227be19741b634b773aca7a98d..c5a4c8c4c9d90a8a081a593488f86ab487adaecb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -294,6 +294,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0429-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch
similarity index 95%
rename from Spigot-Server-Patches/0429-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch
index 3c43cf203..96e4c5ae7 100644
--- a/Spigot-Server-Patches/0429-Increase-Light-Queue-Size.patch
+++ b/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch
@@ -28,7 +28,7 @@ index 6c8e9d498c9a30a1aa88494ba09c3cae012a8fa1..cd248eb6be663e8be33f2c3c6b06b77b
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b9ce6fe70e9c8223ddad8feb46c90e3178ab5fed..072e17fd3a23406fb8818d0f217ba5f176282580 100644
+index dc817d7c7187de2b37485bef126fb0765a5caf63..4218dcb90c36bbac35ef292be32972e0fc22e6d2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -776,7 +776,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 99%
rename from Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
index 97ed6873b..96bcfee8d 100644
--- a/Spigot-Server-Patches/0430-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
+++ b/Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
@@ -56,7 +56,7 @@ index da93d38fe63035e4ff198ada84a4431f52d97c01..ddbc8cb712c50038922eded75dd6ca85
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 31f09291015e805379ee55360bbf262ec371f493..5563fea8b2af7b681bc76c51898100e9915a9e7f 100644
+index 4218dcb90c36bbac35ef292be32972e0fc22e6d2..18d078f85acf33e55e77758746f789af8f8d8076 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1056,6 +1056,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch
similarity index 93%
rename from Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch
index 37e2933dd..813994722 100644
--- a/Spigot-Server-Patches/0431-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch
@@ -10,7 +10,7 @@ larger than the keep loaded range.
 By skipping this, we avoid potential for a large spike on server start.
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index da16b5773e182a10dca8c91b53b9aba7e924d22b..8371d5ac694f469804ad55669fdedb8b3fc627bd 100644
+index e4647849e2fccb68ff9e88ced92c183204b76960..3cf68af488fdd8492c620e6f3438b35cd4aa7737 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -253,7 +253,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -40,7 +40,7 @@ index da16b5773e182a10dca8c91b53b9aba7e924d22b..8371d5ac694f469804ad55669fdedb8b
          this.playerInteractManager.a((WorldServer) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f7a44104c09e4b2ebd5e1a3d7a08267c865c405d..d6a6321e936ce803a3e52e7420ba2bcd096f4649 100644
+index 84c2bc0bac4f388094693859ab7b6ced5e315c27..f35825d4a8574ea75b46be36b9929f8e12405217 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -208,6 +208,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
similarity index 98%
rename from Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
index 7ec2a5ede..fa72e3c21 100644
--- a/Spigot-Server-Patches/0432-Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
@@ -87,7 +87,7 @@ index ddbc8cb712c50038922eded75dd6ca85fe851078..78271b400c79578d043b20a5389a37b1
          version = getInt("config-version", 20);
          set("config-version", 20);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5563fea8b2af7b681bc76c51898100e9915a9e7f..e302c84db5d129c3d302b6361c80af88806c35b4 100644
+index 18d078f85acf33e55e77758746f789af8f8d8076..7ae852296900b0f2ca53311e6884f01e17e9980e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -218,6 +218,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0433-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-Server-Patches/0433-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-Server-Patches/0434-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0434-Add-Raw-Byte-ItemStack-Serialization.patch
rename to Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/Spigot-Server-Patches/0435-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0434-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from Spigot-Server-Patches/0435-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0434-Remove-streams-from-Mob-AI-System.patch
diff --git a/Spigot-Server-Patches/0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0436-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
diff --git a/Spigot-Server-Patches/0437-Async-command-map-building.patch b/Spigot-Server-Patches/0436-Async-command-map-building.patch
similarity index 100%
rename from Spigot-Server-Patches/0437-Async-command-map-building.patch
rename to Spigot-Server-Patches/0436-Async-command-map-building.patch
diff --git a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
similarity index 99%
rename from Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch
rename to Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
index dfd22c193..9373ce23c 100644
--- a/Spigot-Server-Patches/0438-Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
@@ -83,7 +83,7 @@ index 397194b3e90c9df39cfae17b401c7ac891b0dbb7..61b4c42e95994343772a91640b243b8e
          a(SystemUtils.e);
          a(SystemUtils.f);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e302c84db5d129c3d302b6361c80af88806c35b4..701dcbf9d3f23b63d740fbe10a642080128b7f62 100644
+index 7ae852296900b0f2ca53311e6884f01e17e9980e..5c7ded8244187d993d8dda4afff95d9cfc45579b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -270,7 +270,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0439-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0438-Optimize-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0439-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0438-Optimize-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0440-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0439-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0440-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0439-Reduce-Either-Optional-allocation.patch
diff --git a/Spigot-Server-Patches/0441-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0440-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0441-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0440-Remove-streams-from-PairedQueue.patch
diff --git a/Spigot-Server-Patches/0442-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0441-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from Spigot-Server-Patches/0442-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0441-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from Spigot-Server-Patches/0443-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch
diff --git a/Spigot-Server-Patches/0444-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0443-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from Spigot-Server-Patches/0444-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0443-Optimise-ArraySetSorted-removeIf.patch
diff --git a/Spigot-Server-Patches/0445-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 93%
rename from Spigot-Server-Patches/0445-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
index 852ccda44..da7931a45 100644
--- a/Spigot-Server-Patches/0445-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -7,7 +7,7 @@ Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 89abfdd32f47eed07080ff9d70440f0940628b4d..b33f57bc72333a2fee785cb95eb6be09892b136d 100644
+index 86c6a8fd4511dfe426cc1651d289f38b467d3029..dc9e12c38d1682f6c4558ca07b781de2226c0621 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -2944,10 +2944,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 96%
rename from Spigot-Server-Patches/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
index ab0046658..615f5f78e 100644
--- a/Spigot-Server-Patches/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
+++ b/Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
@@ -9,7 +9,7 @@ so inline where possible, and avoid the abstraction of the
 Either class.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index 08e7b20d3ad3a02cab74864cce6fd2a31d80fe59..ff93fd88b1d30ac70ebd1130981e4aa042358f30 100644
+index 99108d2c8145c16943fb29872c55d8e74f75eb77..2d7d2e712a7117e6985e3104097a31a5577c1b82 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -643,21 +643,29 @@ public class ChunkProviderServer extends IChunkProvider {
diff --git a/Spigot-Server-Patches/0447-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0446-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from Spigot-Server-Patches/0447-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0446-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0448-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch
diff --git a/Spigot-Server-Patches/0449-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 97%
rename from Spigot-Server-Patches/0449-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch
index 9c719ad24..58539dda9 100644
--- a/Spigot-Server-Patches/0449-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch
@@ -25,7 +25,7 @@ This successfully fixed a reoccurring and highly reproduceable crash
 for heightmaps.
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index ff93fd88b1d30ac70ebd1130981e4aa042358f30..612a05f493981f9fb22522da4f3a5379bce4b786 100644
+index 2d7d2e712a7117e6985e3104097a31a5577c1b82..6e5d21af43261dc2f12ceec7b7e3269be635cf7a 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -1019,6 +1019,7 @@ public class ChunkProviderServer extends IChunkProvider {
diff --git a/Spigot-Server-Patches/0450-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0450-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/Spigot-Server-Patches/0451-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch
similarity index 91%
rename from Spigot-Server-Patches/0451-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch
index da5ea409a..680595c2b 100644
--- a/Spigot-Server-Patches/0451-Broadcast-join-message-to-console.patch
+++ b/Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f58dd78e5984ace42ccd6121a5836fed29b82af0..b5600711c29b00f2d7863c0493a21f5080127e9c 100644
+index 48d4f8310d79d0eb78f4ace42c8778ee4addf7d0..599470c2158222be9202a96fc7d9bcf4b0ca0fe1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -288,7 +288,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 15b0b958f..9b911a647 100644
--- a/Spigot-Server-Patches/0452-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 5b9778c0a7a52ddb05ca7a6864e3b8852cec03e4..eaeac60b2d54d8e7d298ea412d888471a7ea9e79 100644
+index d010aed07a1e608897ca5f87afcb7661e295d933..abd2554b6e98c25b59b9989936af8b0624e255a3 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -239,6 +239,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -61,7 +61,7 @@ index 80c7ff059b78f55ec9c390bd728186a94074e603..94860c06717e8dcf969277562e88687e
          if (!(entity instanceof EntityComplexPart)) {
              EntityTypes<?> entitytypes = entity.getEntityType();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b5600711c29b00f2d7863c0493a21f5080127e9c..c9a8e5c04a10c28ce79368a783dfe3c8e3709583 100644
+index 599470c2158222be9202a96fc7d9bcf4b0ca0fe1..7305bba223229d9aa5315a8dff5fdc5af8faba6a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -276,6 +276,12 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from Spigot-Server-Patches/0453-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from Spigot-Server-Patches/0454-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch
index 90f040857..325aa1c5a 100644
--- a/Spigot-Server-Patches/0455-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index b33f57bc72333a2fee785cb95eb6be09892b136d..f2721cf55dd8edc7376b27250f83029e2b3b4e93 100644
+index dc9e12c38d1682f6c4558ca07b781de2226c0621..850225509a5398ddcc9335bf88e99bde662bfc91 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1931,7 +1931,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from Spigot-Server-Patches/0456-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0456-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0457-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0456-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0457-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0457-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from Spigot-Server-Patches/0459-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0460-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch
diff --git a/Spigot-Server-Patches/0461-Villager-Restocks-API.patch b/Spigot-Server-Patches/0460-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0461-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0460-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0462-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/Spigot-Server-Patches/0463-Expose-game-version.patch b/Spigot-Server-Patches/0462-Expose-game-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0463-Expose-game-version.patch
rename to Spigot-Server-Patches/0462-Expose-game-version.patch
diff --git a/Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0463-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0464-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0463-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 93%
rename from Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 8569184c6..d031bd1af 100644
--- a/Spigot-Server-Patches/0465-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
@@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3348d0466e340acc8f143ec98a4b26f23939d8a7..23389d0a0e7bd8aeb2f1ab0ea6a149ef99e800fb 100644
+index f9a1f1a83be91e302e9a2d29fefc5b21d9f0e590..154f3a6a3d37b94c40cb29c305e3aa5fb494850c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -22,6 +22,7 @@ public class Main {
diff --git a/Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0466-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch
diff --git a/Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch
index 5227d9957..2d9c70c8b 100644
--- a/Spigot-Server-Patches/0467-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 701dcbf9d3f23b63d740fbe10a642080128b7f62..b94f7f4fed3d0d5bab2a9c9b6c7f3fb2f0311a50 100644
+index 5c7ded8244187d993d8dda4afff95d9cfc45579b..25cb877dc3879ff5a1bfaf616ba9942f951eba10 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1652,6 +1652,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 99%
rename from Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch
index 56df30f84..4e33c3445 100644
--- a/Spigot-Server-Patches/0468-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -148,7 +148,7 @@ index ecf4cd6dfea777ab9daea0b40724d247df7ddb53..42bb00364375e5cf324b435573853458
                              }
  
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 36b4792687a5c6316bf95995e761bf4aa49779f6..d50b53ae3b8f463eb1caa93b1c21f5c6a5a6484c 100644
+index 56a4de74d665b5dba97340bb6d9d35ec112c11f9..ea62c27302d3ce3234ffa421f8c1a585dab0759b 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -249,6 +249,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0468-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0469-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0468-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
index cfa9f4fc0..7a42842a2 100644
--- a/Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
@@ -73,7 +73,7 @@ index 335666db1854e8aa4b2ba71d5bdc2658305cb70a..2bbdcedf4856080ea9232effdf3bdae9
                  if (flag1) {
                      ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index d50b53ae3b8f463eb1caa93b1c21f5c6a5a6484c..d4f0cb8d18a185e58892a42fb7151cf1065fc362 100644
+index ea62c27302d3ce3234ffa421f8c1a585dab0759b..5b3ccc8e623712cef2afeb16dac001ee4d3423d1 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -251,6 +251,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -699,7 +699,7 @@ index bb2ff043f0d159fa18769c31b08683ee12037c58..90e895e9eac6158a28de4a30589bf753
  
                  this.n[i].clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a6c1ef15784f7ae7bc703e5bc24cd2c97ad5b1a8..400499f32c59dcb3e850f5b52d84d4564c42c033 100644
+index c5a4c8c4c9d90a8a081a593488f86ab487adaecb..2d90ecf04f522a4e16f44c905450a61becaa1ed2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -32,6 +32,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
diff --git a/Spigot-Server-Patches/0471-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0470-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0471-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0470-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0472-Fix-Light-Command.patch b/Spigot-Server-Patches/0471-Fix-Light-Command.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0471-Fix-Light-Command.patch
diff --git a/Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0472-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0472-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0473-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0473-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0475-Potential-bed-API.patch b/Spigot-Server-Patches/0474-Potential-bed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0475-Potential-bed-API.patch
rename to Spigot-Server-Patches/0474-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0475-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 96%
rename from Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0475-Wait-for-Async-Tasks-during-shutdown.patch
index 920b7b4a7..e9b6d87eb 100644
--- a/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/Spigot-Server-Patches/0475-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,7 +10,7 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b94f7f4fed3d0d5bab2a9c9b6c7f3fb2f0311a50..7ee8074a356df5db227bca78a545d14c5e8794e8 100644
+index 25cb877dc3879ff5a1bfaf616ba9942f951eba10..5b9f03f3118e6d19ed5c3d41a94b06172d594a81 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -892,6 +892,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0476-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0476-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0479-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0479-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0481-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0481-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0482-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0482-Add-option-for-console-having-all-permissions.patch
diff --git a/Spigot-Server-Patches/0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0483-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0484-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0483-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Workaround-for-Client-Lag-Spikes-MC-162253.patch
rename to Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch
diff --git a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index dfabc6dd5..119b1dd40 100644
--- a/Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -598,7 +598,7 @@ index 42bb00364375e5cf324b43557385345868b37ffe..19e02d12bb0c5a73066f7c57da402779
          boolean flag1 = this.playerChunkMap.b();
  
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index d4f0cb8d18a185e58892a42fb7151cf1065fc362..bb4c6b3790192c0e9f21859b6b3fd62a847787b7 100644
+index 5b3ccc8e623712cef2afeb16dac001ee4d3423d1..21d1b4e0fe93b28cdadac043d081306d32032f81 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -73,6 +73,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
@@ -1275,7 +1275,7 @@ index 9a88791be443a5b18934e7d752aee6dcdb8aa38f..e41d63596c32eee5f0c04a6f043d576d
          return new BlockPosition(this.d(), 0, this.e());
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 400499f32c59dcb3e850f5b52d84d4564c42c033..2511c44cc62b7cdce17741c786a58f73f4252955 100644
+index 2d90ecf04f522a4e16f44c905450a61becaa1ed2..6034ef65ee6030948a5b76fa493addb44188ef62 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2541,6 +2541,10 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0488-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0488-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0489-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0489-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0491-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0491-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0493-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0492-Optimize-Light-Engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0492-Optimize-Light-Engine.patch
diff --git a/Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 98%
rename from Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 64b10f07f..d2c3fa925 100644
--- a/Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -35,7 +35,7 @@ index 6463d3e4837d032a35654a035f42b8a805e0e286..1655bca0502e7b871de4addaa163536d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMapDistance.java b/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
-index fb4e587e86c76ea720bddcdbb969f21d50aa7527..2f8bca35508640f6b8c312fff17d55f129431599 100644
+index a3c44fdfca8290313b9b1117b984533183b583ad..3644e8b24b082e17752ef52934625416130aaa08 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
 @@ -185,6 +185,27 @@ public abstract class ChunkMapDistance {
diff --git a/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 6b2a11e0b..42e7e5149 100644
--- a/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/Spigot-Server-Patches/0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -44,7 +44,7 @@ index 32e68e403950be62bd0330b268738225c2e70edd..d0c951878600a4227e558bc68d68098c
          printSaveWarning = false;
          console.autosavePeriod = configuration.getInt("ticks-per.autosave");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2511c44cc62b7cdce17741c786a58f73f4252955..03761fd7367e184c808f4ef55bdef0838f7427b0 100644
+index 6034ef65ee6030948a5b76fa493addb44188ef62..80cd8ce4e70dbb740439ac530a7bc70a7a54cb85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -30,6 +30,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutCustomSoundEffect;
diff --git a/Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0495-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0495-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0497-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0497-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/Spigot-Server-Patches/0499-Fix-sand-duping.patch b/Spigot-Server-Patches/0498-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0498-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0499-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0499-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0500-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0500-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0501-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0501-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0502-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0502-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0503-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0503-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0504-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0504-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0505-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0505-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0506-Add-permission-for-command-blocks.patch
similarity index 100%
rename from Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0506-Add-permission-for-command-blocks.patch
diff --git a/Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0507-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0507-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0508-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0508-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 98%
rename from Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index a56d7e3a6..49bfb0b70 100644
--- a/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/Spigot-Server-Patches/0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,7 +8,7 @@ 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 7ee8074a356df5db227bca78a545d14c5e8794e8..2c66ea1bda456da10d70ed180547bf73b7942f8b 100644
+index 5b9f03f3118e6d19ed5c3d41a94b06172d594a81..50c1c6cc53eead25d03ed45427cb9fb80bc2fc36 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1645,11 +1645,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0511-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0510-Paper-dumpitem-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Paper-dumpitem-command.patch
rename to Spigot-Server-Patches/0510-Paper-dumpitem-command.patch
diff --git a/Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0511-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch
rename to Spigot-Server-Patches/0511-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0512-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch
rename to Spigot-Server-Patches/0512-Improve-Legacy-Component-serialization-size.patch
diff --git a/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0513-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch
rename to Spigot-Server-Patches/0513-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0514-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch
rename to Spigot-Server-Patches/0514-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0515-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch
rename to Spigot-Server-Patches/0515-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0516-Remove-some-streams-from-structures.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch
rename to Spigot-Server-Patches/0516-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0517-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch
rename to Spigot-Server-Patches/0517-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0518-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch
rename to Spigot-Server-Patches/0518-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0519-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to Spigot-Server-Patches/0519-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0521-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0520-Add-entity-liquid-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0521-Add-entity-liquid-API.patch
rename to Spigot-Server-Patches/0520-Add-entity-liquid-API.patch
diff --git a/Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch
rename to Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch
diff --git a/Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0522-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch
rename to Spigot-Server-Patches/0522-Spawn-player-in-correct-world-on-login.patch
diff --git a/Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0523-Add-PrepareResultEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch
rename to Spigot-Server-Patches/0523-Add-PrepareResultEvent.patch
diff --git a/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0524-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 98%
rename from Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-Server-Patches/0524-Allow-delegation-to-vanilla-chunk-gen.patch
index 93e032f20..84f508bd3 100644
--- a/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/Spigot-Server-Patches/0524-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -90,7 +90,7 @@ index afca0038bb74ac53f07a25729a3c1542e244c6fd..d02281f954aac8d8b65f5d36ec70f035
          return tiles;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 3e6d78a1fac2690ab7113f236a1442ae7ab6dd42..cbb241b420065e016e5bbc340d42c383d9da6478 100644
+index 7ce7e13032fe43b8998410937d07bfffa6f01527..fb7f68887efb1de8ff9167dd110fcb52627e9206 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -33,7 +33,7 @@ import org.bukkit.generator.ChunkGenerator.ChunkData;
diff --git a/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 90%
rename from Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to Spigot-Server-Patches/0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 2e684cdea..af390a029 100644
--- a/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/Spigot-Server-Patches/0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index f2721cf55dd8edc7376b27250f83029e2b3b4e93..593805ac08e783546be99b025b22e40c654e05d1 100644
+index 850225509a5398ddcc9335bf88e99bde662bfc91..a5b731bab16bf05351fee7e64ab6ae4d830309f7 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -3041,7 +3041,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0526-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch
rename to Spigot-Server-Patches/0526-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0527-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch
rename to Spigot-Server-Patches/0527-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0528-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to Spigot-Server-Patches/0528-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0529-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch
rename to Spigot-Server-Patches/0529-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0530-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to Spigot-Server-Patches/0530-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0531-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch
rename to Spigot-Server-Patches/0531-Move-range-check-for-block-placing-up.patch
diff --git a/Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0532-Fix-SPIGOT-5989.patch
similarity index 100%
rename from Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch
rename to Spigot-Server-Patches/0532-Fix-SPIGOT-5989.patch
diff --git a/Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to Spigot-Server-Patches/0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to Spigot-Server-Patches/0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0535-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to Spigot-Server-Patches/0535-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 89%
rename from Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
index da0f3139d..6c0360c41 100644
--- a/Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
+++ b/Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 03761fd7367e184c808f4ef55bdef0838f7427b0..68445b7f32d2cf4c199666a732a36e02459a7b60 100644
+index 80cd8ce4e70dbb740439ac530a7bc70a7a54cb85..74ee2013a47855cdd1d56a06a2e209776513fd14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2627,6 +2627,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0537-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch
rename to Spigot-Server-Patches/0537-Fix-some-rails-connecting-improperly.patch
diff --git a/Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0538-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to Spigot-Server-Patches/0538-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/Spigot-Server-Patches/0540-Incremental-player-saving.patch b/Spigot-Server-Patches/0539-Incremental-player-saving.patch
similarity index 96%
rename from Spigot-Server-Patches/0540-Incremental-player-saving.patch
rename to Spigot-Server-Patches/0539-Incremental-player-saving.patch
index 8a6d7b6c1..cd0076d69 100644
--- a/Spigot-Server-Patches/0540-Incremental-player-saving.patch
+++ b/Spigot-Server-Patches/0539-Incremental-player-saving.patch
@@ -25,7 +25,7 @@ index b67ba8f75e4a3358d7c2462918b85b0bf9b5a922..fdbd8b89bb8bf3b61f60b812b90483c9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2c66ea1bda456da10d70ed180547bf73b7942f8b..07dd48fd300ac72edfa768632287c49ecf57fa75 100644
+index 50c1c6cc53eead25d03ed45427cb9fb80bc2fc36..483abe5b3c0c00ebdea405e9bb24509f743bfc2c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1347,9 +1347,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -47,7 +47,7 @@ index 2c66ea1bda456da10d70ed180547bf73b7942f8b..07dd48fd300ac72edfa768632287c49e
              // Paper start
              for (WorldServer world : getWorlds()) {
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index bb4c6b3790192c0e9f21859b6b3fd62a847787b7..c4f2c164927db4917f85a8bd65fdbf00e9b062a3 100644
+index 21d1b4e0fe93b28cdadac043d081306d32032f81..1a08be6a490f0b94f86ee87ad06e60b66afc63f9 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -175,6 +175,7 @@ import org.bukkit.inventory.MainHand;
diff --git a/Spigot-Server-Patches/0541-Import-fastutil-classes.patch b/Spigot-Server-Patches/0540-Import-fastutil-classes.patch
similarity index 100%
rename from Spigot-Server-Patches/0541-Import-fastutil-classes.patch
rename to Spigot-Server-Patches/0540-Import-fastutil-classes.patch
diff --git a/Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0541-Don-t-mark-null-chunk-sections-for-block-updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch
rename to Spigot-Server-Patches/0541-Don-t-mark-null-chunk-sections-for-block-updates.patch
diff --git a/Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0542-Remove-armour-stand-double-add-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch
rename to Spigot-Server-Patches/0542-Remove-armour-stand-double-add-to-world.patch
diff --git a/Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0543-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch
rename to Spigot-Server-Patches/0543-Fix-MC-187716-Use-configured-height.patch
diff --git a/Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to Spigot-Server-Patches/0544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0545-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to Spigot-Server-Patches/0545-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/Spigot-Server-Patches/0547-Brand-support.patch b/Spigot-Server-Patches/0546-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0547-Brand-support.patch
rename to Spigot-Server-Patches/0546-Brand-support.patch
diff --git a/Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0547-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
rename to Spigot-Server-Patches/0547-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
diff --git a/Spigot-Server-Patches/0549-Fix-MC-197271.patch b/Spigot-Server-Patches/0548-Fix-MC-197271.patch
similarity index 100%
rename from Spigot-Server-Patches/0549-Fix-MC-197271.patch
rename to Spigot-Server-Patches/0548-Fix-MC-197271.patch
diff --git a/Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0549-MC-197883-Bandaid-decode-issue.patch
similarity index 100%
rename from Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch
rename to Spigot-Server-Patches/0549-MC-197883-Bandaid-decode-issue.patch
diff --git a/Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0550-Add-setMaxPlayers-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch
rename to Spigot-Server-Patches/0550-Add-setMaxPlayers-API.patch
diff --git a/Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0551-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-Server-Patches/0551-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0552-Don-t-require-FACING-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch
rename to Spigot-Server-Patches/0552-Don-t-require-FACING-data.patch
diff --git a/Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 96%
rename from Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 5407e8094..01aa4440d 100644
--- a/Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -24,7 +24,7 @@ index 1a7d06d8a3d1fe0a2a943eae5efd23d28fe4bd62..246708808cbcd9a5c1b8690c869a514d
              // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add
              this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4a5027d6fbd6c68d0e3b43f74afdd49ffa22188c..0d22a15f91b1613f5f289ed570af3410d987f0dd 100644
+index 74ee2013a47855cdd1d56a06a2e209776513fd14..d3f5a3d4872665b4c52a6cfad1518016919557d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -389,11 +389,13 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0555-Add-moon-phase-API.patch b/Spigot-Server-Patches/0554-Add-moon-phase-API.patch
similarity index 89%
rename from Spigot-Server-Patches/0555-Add-moon-phase-API.patch
rename to Spigot-Server-Patches/0554-Add-moon-phase-API.patch
index dfb33917e..c49db8704 100644
--- a/Spigot-Server-Patches/0555-Add-moon-phase-API.patch
+++ b/Spigot-Server-Patches/0554-Add-moon-phase-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1d1b150215c1e226fa2583829f0260cba4133f23..4fe821c5bac2f713529668b2001f95cc3cb2c388 100644
+index d3f5a3d4872665b4c52a6cfad1518016919557d0..76a7889b49a16ddeb8f310d3a79cfee80ad9a1db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -328,6 +328,11 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0555-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch
rename to Spigot-Server-Patches/0555-Prevent-headless-pistons-from-being-created.patch
diff --git a/Spigot-Server-Patches/0557-Add-BellRingEvent.patch b/Spigot-Server-Patches/0556-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0557-Add-BellRingEvent.patch
rename to Spigot-Server-Patches/0556-Add-BellRingEvent.patch
diff --git a/Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0557-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch
rename to Spigot-Server-Patches/0557-Add-zombie-targets-turtle-egg-config.patch
diff --git a/Spigot-Server-Patches/0559-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0558-Buffer-joins-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0559-Buffer-joins-to-world.patch
rename to Spigot-Server-Patches/0558-Buffer-joins-to-world.patch
diff --git a/Spigot-Server-Patches/0560-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0559-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0560-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0559-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0560-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to Spigot-Server-Patches/0560-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0561-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch
rename to Spigot-Server-Patches/0561-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/Spigot-Server-Patches/0563-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0562-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0563-Fix-CraftTeam-null-check.patch
rename to Spigot-Server-Patches/0562-Fix-CraftTeam-null-check.patch
diff --git a/Spigot-Server-Patches/0564-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0563-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0564-Add-more-Evoker-API.patch
rename to Spigot-Server-Patches/0563-Add-more-Evoker-API.patch
diff --git a/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0564-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-Server-Patches/0564-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-Server-Patches/0566-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0565-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0566-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-Server-Patches/0565-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/Spigot-Server-Patches/0567-Cache-block-data-strings.patch b/Spigot-Server-Patches/0566-Cache-block-data-strings.patch
similarity index 97%
rename from Spigot-Server-Patches/0567-Cache-block-data-strings.patch
rename to Spigot-Server-Patches/0566-Cache-block-data-strings.patch
index e88329ea8..dfbe6fe8e 100644
--- a/Spigot-Server-Patches/0567-Cache-block-data-strings.patch
+++ b/Spigot-Server-Patches/0566-Cache-block-data-strings.patch
@@ -5,7 +5,7 @@ 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 07dd48fd300ac72edfa768632287c49ecf57fa75..604646affe004fce68a61640326fdaefeae72802 100644
+index 483abe5b3c0c00ebdea405e9bb24509f743bfc2c..ef980b8cba0e30fc65b119d08a034ced7fdb2bc8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1953,6 +1953,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0567-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to Spigot-Server-Patches/0567-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/Spigot-Server-Patches/0569-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0568-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0569-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-Server-Patches/0568-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0569-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from Spigot-Server-Patches/0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to Spigot-Server-Patches/0569-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0570-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 100%
rename from Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to Spigot-Server-Patches/0570-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0571-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to Spigot-Server-Patches/0571-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0572-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to Spigot-Server-Patches/0572-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0573-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch
rename to Spigot-Server-Patches/0573-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/Spigot-Server-Patches/0575-Entity-isTicking.patch b/Spigot-Server-Patches/0574-Entity-isTicking.patch
similarity index 100%
rename from Spigot-Server-Patches/0575-Entity-isTicking.patch
rename to Spigot-Server-Patches/0574-Entity-isTicking.patch
diff --git a/Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0575-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 91%
rename from Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to Spigot-Server-Patches/0575-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 5fb98700e..e48f7dcbc 100644
--- a/Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/Spigot-Server-Patches/0575-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,7 +6,7 @@ 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 604646affe004fce68a61640326fdaefeae72802..cd1cd1d4adbe6d304fd7634fa2fe712a0874e189 100644
+index ef980b8cba0e30fc65b119d08a034ced7fdb2bc8..43b713476c6f841aafaac9f2a1216b937261efc2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2018,6 +2018,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0577-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0576-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from Spigot-Server-Patches/0577-Fix-Not-a-string-Map-Conversion-spam.patch
rename to Spigot-Server-Patches/0576-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0577-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0577-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0578-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
similarity index 100%
rename from Spigot-Server-Patches/0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
rename to Spigot-Server-Patches/0578-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
diff --git a/Spigot-Server-Patches/0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0579-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to Spigot-Server-Patches/0579-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0580-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch
rename to Spigot-Server-Patches/0580-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/Spigot-Server-Patches/0582-Optimise-getType-calls.patch b/Spigot-Server-Patches/0581-Optimise-getType-calls.patch
similarity index 98%
rename from Spigot-Server-Patches/0582-Optimise-getType-calls.patch
rename to Spigot-Server-Patches/0581-Optimise-getType-calls.patch
index 214867df3..16993ab18 100644
--- a/Spigot-Server-Patches/0582-Optimise-getType-calls.patch
+++ b/Spigot-Server-Patches/0581-Optimise-getType-calls.patch
@@ -43,7 +43,7 @@ index aa20cecc93ac53ce7f1b956ea5065ae80b55cff5..fc65c138bab242d5b533381ea496a2a4
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index c0238ba202b9f6c215788671652c768948acf753..44e1d80ec871142d3b498d3897d8ceb82452c1f2 100644
+index ee8977a1e4a83598ba7873c4c482fea828c6b26c..f1f03bd0162a158761f300cbd96aa32101542abb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -214,7 +214,7 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0583-Villager-resetOffers.patch b/Spigot-Server-Patches/0582-Villager-resetOffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0583-Villager-resetOffers.patch
rename to Spigot-Server-Patches/0582-Villager-resetOffers.patch
diff --git a/Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0583-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to Spigot-Server-Patches/0583-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0584-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch
rename to Spigot-Server-Patches/0584-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0585-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch
rename to Spigot-Server-Patches/0585-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch b/Spigot-Server-Patches/0586-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch
rename to Spigot-Server-Patches/0586-Fix-item-locations-dropped-from-campfires.patch
diff --git a/Spigot-Server-Patches/0588-Player-elytra-boost-API.patch b/Spigot-Server-Patches/0587-Player-elytra-boost-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0588-Player-elytra-boost-API.patch
rename to Spigot-Server-Patches/0587-Player-elytra-boost-API.patch
diff --git a/Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch b/Spigot-Server-Patches/0588-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch
rename to Spigot-Server-Patches/0588-Fixed-TileEntityBell-memory-leak.patch
diff --git a/Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/Spigot-Server-Patches/0589-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 100%
rename from Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to Spigot-Server-Patches/0589-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0590-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch
rename to Spigot-Server-Patches/0590-Add-getOfflinePlayerIfCached-String.patch
diff --git a/Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch b/Spigot-Server-Patches/0591-Add-ignore-discounts-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch
rename to Spigot-Server-Patches/0591-Add-ignore-discounts-API.patch
diff --git a/Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch b/Spigot-Server-Patches/0592-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch
rename to Spigot-Server-Patches/0592-Toggle-for-removing-existing-dragon.patch
diff --git a/Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch b/Spigot-Server-Patches/0593-Fix-client-lag-on-advancement-loading.patch
similarity index 100%
rename from Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch
rename to Spigot-Server-Patches/0593-Fix-client-lag-on-advancement-loading.patch
diff --git a/Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch b/Spigot-Server-Patches/0594-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch
rename to Spigot-Server-Patches/0594-Item-no-age-no-player-pickup.patch
diff --git a/Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch b/Spigot-Server-Patches/0595-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch
rename to Spigot-Server-Patches/0595-Beacon-API-custom-effect-ranges.patch
diff --git a/Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch b/Spigot-Server-Patches/0596-Add-API-for-quit-reason.patch
similarity index 98%
rename from Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch
rename to Spigot-Server-Patches/0596-Add-API-for-quit-reason.patch
index 4dade570e..afea5814c 100644
--- a/Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch
+++ b/Spigot-Server-Patches/0596-Add-API-for-quit-reason.patch
@@ -25,7 +25,7 @@ index 878f879f8d410c428ad8a4c49e0c86c559bc47a9..f86f430598026a3a7e27fb8d40cfc5fe
                          NetworkManager.LOGGER.debug("Failed to sent packet", throwable);
                          this.sendPacket(new PacketPlayOutKickDisconnect(chatmessage), (future) -> {
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index c4f2c164927db4917f85a8bd65fdbf00e9b062a3..b420e93590d0f109ad13b8ddaa5cd093da9e067d 100644
+index 1a08be6a490f0b94f86ee87ad06e60b66afc63f9..d850721afc33230890353f16c5bc5579c9efb1bf 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -260,6 +260,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0598-Seed-based-feature-search.patch b/Spigot-Server-Patches/0597-Seed-based-feature-search.patch
similarity index 100%
rename from Spigot-Server-Patches/0598-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0597-Seed-based-feature-search.patch
diff --git a/Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch b/Spigot-Server-Patches/0598-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 98%
rename from Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to Spigot-Server-Patches/0598-Add-Wandering-Trader-spawn-rate-config-options.patch
index 68c326d6f..7ec0e046e 100644
--- a/Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/Spigot-Server-Patches/0598-Add-Wandering-Trader-spawn-rate-config-options.patch
@@ -33,7 +33,7 @@ index a98e25917193043633e2120beb4fe2d49d0e4500..b4d76494851601d61a69e2f060727a68
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/MobSpawnerTrader.java b/src/main/java/net/minecraft/world/entity/npc/MobSpawnerTrader.java
-index 0e878b4e4523ec6de9181c10157e4d89844292a4..8b5707df910cdc4d52dd5305f05322cc26683502 100644
+index b74a262a62642f63fdbd17579d58d5eae68ed169..e57938b4591bb103b9dd0d0145a62b5a901f2c63 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/MobSpawnerTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/MobSpawnerTrader.java
 @@ -30,49 +30,59 @@ public class MobSpawnerTrader implements MobSpawner {
diff --git a/Spigot-Server-Patches/0600-Significantly-improve-performance-of-the-end-generat.patch b/Spigot-Server-Patches/0599-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from Spigot-Server-Patches/0600-Significantly-improve-performance-of-the-end-generat.patch
rename to Spigot-Server-Patches/0599-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch b/Spigot-Server-Patches/0600-Expose-world-spawn-angle.patch
similarity index 96%
rename from Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch
rename to Spigot-Server-Patches/0600-Expose-world-spawn-angle.patch
index 89f9d522f..60fec8c67 100644
--- a/Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch
+++ b/Spigot-Server-Patches/0600-Expose-world-spawn-angle.patch
@@ -30,7 +30,7 @@ index 81ad90ba93481decdfaa38fc9fa81bca0e402781..7599488f7d4b168c92078c2d2987cb38
  
      long getTime();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4fe821c5bac2f713529668b2001f95cc3cb2c388..50b6829394af843350d70604d9151453e4c8bbef 100644
+index 76a7889b49a16ddeb8f310d3a79cfee80ad9a1db..776733a4a913d232126b48f2d0eadbe27aa84e59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -380,7 +380,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch b/Spigot-Server-Patches/0601-Add-Destroy-Speed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch
rename to Spigot-Server-Patches/0601-Add-Destroy-Speed-API.patch
diff --git a/Spigot-Server-Patches/0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/Spigot-Server-Patches/0602-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from Spigot-Server-Patches/0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to Spigot-Server-Patches/0602-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/Spigot-Server-Patches/0604-Add-LivingEntity-clearActiveItem.patch b/Spigot-Server-Patches/0603-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from Spigot-Server-Patches/0604-Add-LivingEntity-clearActiveItem.patch
rename to Spigot-Server-Patches/0603-Add-LivingEntity-clearActiveItem.patch
diff --git a/Spigot-Server-Patches/0605-Add-PlayerItemCooldownEvent.patch b/Spigot-Server-Patches/0604-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0605-Add-PlayerItemCooldownEvent.patch
rename to Spigot-Server-Patches/0604-Add-PlayerItemCooldownEvent.patch
diff --git a/Spigot-Server-Patches/0606-More-lightning-API.patch b/Spigot-Server-Patches/0605-More-lightning-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0606-More-lightning-API.patch
rename to Spigot-Server-Patches/0605-More-lightning-API.patch
diff --git a/Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch b/Spigot-Server-Patches/0606-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 98%
rename from Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch
rename to Spigot-Server-Patches/0606-Climbing-should-not-bypass-cramming-gamerule.patch
index 20c9ba05e..4c501b7ba 100644
--- a/Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/Spigot-Server-Patches/0606-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -36,7 +36,7 @@ index 2a3025793db52a18e58f832c9da78c6c3b39d33c..d801486565865cf3b56e9d80b7c1643e
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 593805ac08e783546be99b025b22e40c654e05d1..9a826ae0319dd52ca7d98ea5d7312fb773736ddb 100644
+index a5b731bab16bf05351fee7e64ab6ae4d830309f7..358bb6244b7b9e785c7dcc3725ee00cfbb917cec 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -137,7 +137,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
diff --git a/Spigot-Server-Patches/0608-Added-missing-default-perms-for-commands.patch b/Spigot-Server-Patches/0607-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0608-Added-missing-default-perms-for-commands.patch
rename to Spigot-Server-Patches/0607-Added-missing-default-perms-for-commands.patch
diff --git a/Spigot-Server-Patches/0609-Add-PlayerShearBlockEvent.patch b/Spigot-Server-Patches/0608-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0609-Add-PlayerShearBlockEvent.patch
rename to Spigot-Server-Patches/0608-Add-PlayerShearBlockEvent.patch
diff --git a/Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch b/Spigot-Server-Patches/0609-Add-warning-for-servers-not-running-on-Java-11.patch
similarity index 97%
rename from Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch
rename to Spigot-Server-Patches/0609-Add-warning-for-servers-not-running-on-Java-11.patch
index 42dcd22bd..a10fd0e94 100644
--- a/Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch
+++ b/Spigot-Server-Patches/0609-Add-warning-for-servers-not-running-on-Java-11.patch
@@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..c6ea429819c07e7f4bc257cad73463a0
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cd1cd1d4adbe6d304fd7634fa2fe712a0874e189..6ae5dc6fe52fb172bec709d4ab80c624535b8e43 100644
+index 43b713476c6f841aafaac9f2a1216b937261efc2..07021c760b0d734b91240ca96c6480be469a1005 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -181,6 +181,7 @@ import org.bukkit.event.server.ServerLoadEvent;
diff --git a/Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch b/Spigot-Server-Patches/0610-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to Spigot-Server-Patches/0610-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/Spigot-Server-Patches/0612-Fix-curing-zombie-villager-discount-exploit.patch b/Spigot-Server-Patches/0611-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0612-Fix-curing-zombie-villager-discount-exploit.patch
rename to Spigot-Server-Patches/0611-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/Spigot-Server-Patches/0613-Limit-recipe-packets.patch b/Spigot-Server-Patches/0612-Limit-recipe-packets.patch
similarity index 100%
rename from Spigot-Server-Patches/0613-Limit-recipe-packets.patch
rename to Spigot-Server-Patches/0612-Limit-recipe-packets.patch
diff --git a/Spigot-Server-Patches/0614-Fix-CraftSound-backwards-compatibility.patch b/Spigot-Server-Patches/0613-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from Spigot-Server-Patches/0614-Fix-CraftSound-backwards-compatibility.patch
rename to Spigot-Server-Patches/0613-Fix-CraftSound-backwards-compatibility.patch
diff --git a/Spigot-Server-Patches/0615-MC-4-Fix-item-position-desync.patch b/Spigot-Server-Patches/0614-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from Spigot-Server-Patches/0615-MC-4-Fix-item-position-desync.patch
rename to Spigot-Server-Patches/0614-MC-4-Fix-item-position-desync.patch
diff --git a/Spigot-Server-Patches/0616-Player-Chunk-Load-Unload-Events.patch b/Spigot-Server-Patches/0615-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0616-Player-Chunk-Load-Unload-Events.patch
rename to Spigot-Server-Patches/0615-Player-Chunk-Load-Unload-Events.patch
diff --git a/Spigot-Server-Patches/0617-Optimize-Dynamic-get-Missing-Keys.patch b/Spigot-Server-Patches/0616-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from Spigot-Server-Patches/0617-Optimize-Dynamic-get-Missing-Keys.patch
rename to Spigot-Server-Patches/0616-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/Spigot-Server-Patches/0618-Expose-LivingEntity-hurt-direction.patch b/Spigot-Server-Patches/0617-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from Spigot-Server-Patches/0618-Expose-LivingEntity-hurt-direction.patch
rename to Spigot-Server-Patches/0617-Expose-LivingEntity-hurt-direction.patch
diff --git a/Spigot-Server-Patches/0619-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/Spigot-Server-Patches/0618-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from Spigot-Server-Patches/0619-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to Spigot-Server-Patches/0618-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/Spigot-Server-Patches/0620-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/Spigot-Server-Patches/0619-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from Spigot-Server-Patches/0620-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to Spigot-Server-Patches/0619-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/Spigot-Server-Patches/0621-added-PlayerTradeEvent.patch b/Spigot-Server-Patches/0620-added-PlayerTradeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0621-added-PlayerTradeEvent.patch
rename to Spigot-Server-Patches/0620-added-PlayerTradeEvent.patch
diff --git a/Spigot-Server-Patches/0622-Implement-TargetHitEvent.patch b/Spigot-Server-Patches/0621-Implement-TargetHitEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0622-Implement-TargetHitEvent.patch
rename to Spigot-Server-Patches/0621-Implement-TargetHitEvent.patch
diff --git a/Spigot-Server-Patches/0623-Additional-Block-Material-API-s.patch b/Spigot-Server-Patches/0622-Additional-Block-Material-API-s.patch
similarity index 93%
rename from Spigot-Server-Patches/0623-Additional-Block-Material-API-s.patch
rename to Spigot-Server-Patches/0622-Additional-Block-Material-API-s.patch
index 2d53ac563..ba38cd24b 100644
--- a/Spigot-Server-Patches/0623-Additional-Block-Material-API-s.patch
+++ b/Spigot-Server-Patches/0622-Additional-Block-Material-API-s.patch
@@ -9,7 +9,7 @@ process to do this in the Bukkit API
 Adds API for buildable, replaceable, burnable too.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index f0f56b757ca77f7ae445761299c1a4f616c67d55..13b0a5d44860a997fdad7fdf0e68ce72d1b375af 100644
+index fab9e1e5d63c22faceae093dc88769d203d359c6..ed1c92d9f2770f7d0503c6facebc51ddcbdf75cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -621,6 +621,25 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0624-Fix-harming-potion-dupe.patch b/Spigot-Server-Patches/0623-Fix-harming-potion-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0624-Fix-harming-potion-dupe.patch
rename to Spigot-Server-Patches/0623-Fix-harming-potion-dupe.patch
diff --git a/Spigot-Server-Patches/0625-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/Spigot-Server-Patches/0624-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from Spigot-Server-Patches/0625-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to Spigot-Server-Patches/0624-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/Spigot-Server-Patches/0626-Optimized-tick-ready-check.patch b/Spigot-Server-Patches/0625-Optimized-tick-ready-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0626-Optimized-tick-ready-check.patch
rename to Spigot-Server-Patches/0625-Optimized-tick-ready-check.patch
diff --git a/Spigot-Server-Patches/0627-Cache-burn-durations.patch b/Spigot-Server-Patches/0626-Cache-burn-durations.patch
similarity index 100%
rename from Spigot-Server-Patches/0627-Cache-burn-durations.patch
rename to Spigot-Server-Patches/0626-Cache-burn-durations.patch
diff --git a/Spigot-Server-Patches/0628-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/Spigot-Server-Patches/0627-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from Spigot-Server-Patches/0628-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to Spigot-Server-Patches/0627-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/Spigot-Server-Patches/0629-Implement-PlayerFlowerPotManipulateEvent.patch b/Spigot-Server-Patches/0628-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0629-Implement-PlayerFlowerPotManipulateEvent.patch
rename to Spigot-Server-Patches/0628-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/Spigot-Server-Patches/0630-Fix-interact-event-not-being-called-in-adventure.patch b/Spigot-Server-Patches/0629-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from Spigot-Server-Patches/0630-Fix-interact-event-not-being-called-in-adventure.patch
rename to Spigot-Server-Patches/0629-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/Spigot-Server-Patches/0631-Zombie-API-breaking-doors.patch b/Spigot-Server-Patches/0630-Zombie-API-breaking-doors.patch
similarity index 100%
rename from Spigot-Server-Patches/0631-Zombie-API-breaking-doors.patch
rename to Spigot-Server-Patches/0630-Zombie-API-breaking-doors.patch
diff --git a/Spigot-Server-Patches/0632-Fix-nerfed-slime-when-splitting.patch b/Spigot-Server-Patches/0631-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from Spigot-Server-Patches/0632-Fix-nerfed-slime-when-splitting.patch
rename to Spigot-Server-Patches/0631-Fix-nerfed-slime-when-splitting.patch
diff --git a/Spigot-Server-Patches/0633-Add-EntityLoadCrossbowEvent.patch b/Spigot-Server-Patches/0632-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0633-Add-EntityLoadCrossbowEvent.patch
rename to Spigot-Server-Patches/0632-Add-EntityLoadCrossbowEvent.patch
diff --git a/Spigot-Server-Patches/0634-Guardian-beam-workaround.patch b/Spigot-Server-Patches/0633-Guardian-beam-workaround.patch
similarity index 100%
rename from Spigot-Server-Patches/0634-Guardian-beam-workaround.patch
rename to Spigot-Server-Patches/0633-Guardian-beam-workaround.patch
diff --git a/Spigot-Server-Patches/0635-Added-WorldGameRuleChangeEvent.patch b/Spigot-Server-Patches/0634-Added-WorldGameRuleChangeEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0635-Added-WorldGameRuleChangeEvent.patch
rename to Spigot-Server-Patches/0634-Added-WorldGameRuleChangeEvent.patch
index e963bb0ec..6eec09567 100644
--- a/Spigot-Server-Patches/0635-Added-WorldGameRuleChangeEvent.patch
+++ b/Spigot-Server-Patches/0634-Added-WorldGameRuleChangeEvent.patch
@@ -74,7 +74,7 @@ index 276c28170b2a177dab6b2a0d5425044cd9f8df22..3783f3a83e3e70d77cf0fa1021f62a89
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ac0fc981c1d6a9e75a062363535630ebf4937840..ef353e21f7e04162d886e70012f845334962459b 100644
+index 776733a4a913d232126b48f2d0eadbe27aa84e59..05a7f5f61330bd52705640345524cdedbf105285 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2363,8 +2363,13 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0636-Added-ServerResourcesReloadedEvent.patch b/Spigot-Server-Patches/0635-Added-ServerResourcesReloadedEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0636-Added-ServerResourcesReloadedEvent.patch
rename to Spigot-Server-Patches/0635-Added-ServerResourcesReloadedEvent.patch
index 7227b3bd1..49af0db96 100644
--- a/Spigot-Server-Patches/0636-Added-ServerResourcesReloadedEvent.patch
+++ b/Spigot-Server-Patches/0635-Added-ServerResourcesReloadedEvent.patch
@@ -5,7 +5,7 @@ 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 6ae5dc6fe52fb172bec709d4ab80c624535b8e43..3b5df83d3a7d12fb23ac488a8936e1b4921fb5fd 100644
+index 07021c760b0d734b91240ca96c6480be469a1005..0ff63eede271b555e9de9b61dc76045d450cd990 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2,9 +2,6 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0637-Added-world-settings-for-mobs-picking-up-loot.patch b/Spigot-Server-Patches/0636-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from Spigot-Server-Patches/0637-Added-world-settings-for-mobs-picking-up-loot.patch
rename to Spigot-Server-Patches/0636-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/Spigot-Server-Patches/0638-Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/0637-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0638-Implemented-BlockFailedDispenseEvent.patch
rename to Spigot-Server-Patches/0637-Implemented-BlockFailedDispenseEvent.patch
diff --git a/Spigot-Server-Patches/0639-Added-PlayerLecternPageChangeEvent.patch b/Spigot-Server-Patches/0638-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0639-Added-PlayerLecternPageChangeEvent.patch
rename to Spigot-Server-Patches/0638-Added-PlayerLecternPageChangeEvent.patch
diff --git a/Spigot-Server-Patches/0640-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0639-Fire-event-on-GS4-query.patch
similarity index 100%
rename from Spigot-Server-Patches/0640-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0639-Fire-event-on-GS4-query.patch
diff --git a/Spigot-Server-Patches/0641-Added-PlayerLoomPatternSelectEvent.patch b/Spigot-Server-Patches/0640-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0641-Added-PlayerLoomPatternSelectEvent.patch
rename to Spigot-Server-Patches/0640-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/Spigot-Server-Patches/0642-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0641-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0642-Configurable-door-breaking-difficulty.patch
rename to Spigot-Server-Patches/0641-Configurable-door-breaking-difficulty.patch
diff --git a/Spigot-Server-Patches/0643-Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/0642-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from Spigot-Server-Patches/0643-Empty-commands-shall-not-be-dispatched.patch
rename to Spigot-Server-Patches/0642-Empty-commands-shall-not-be-dispatched.patch
diff --git a/Spigot-Server-Patches/0644-Implement-API-to-expose-exact-interaction-point.patch b/Spigot-Server-Patches/0643-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from Spigot-Server-Patches/0644-Implement-API-to-expose-exact-interaction-point.patch
rename to Spigot-Server-Patches/0643-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/Spigot-Server-Patches/0645-Remove-stale-POIs.patch b/Spigot-Server-Patches/0644-Remove-stale-POIs.patch
similarity index 100%
rename from Spigot-Server-Patches/0645-Remove-stale-POIs.patch
rename to Spigot-Server-Patches/0644-Remove-stale-POIs.patch
diff --git a/Spigot-Server-Patches/0646-Fix-villager-boat-exploit.patch b/Spigot-Server-Patches/0645-Fix-villager-boat-exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0646-Fix-villager-boat-exploit.patch
rename to Spigot-Server-Patches/0645-Fix-villager-boat-exploit.patch
diff --git a/Spigot-Server-Patches/0647-Entity-load-save-limit-per-chunk.patch b/Spigot-Server-Patches/0646-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from Spigot-Server-Patches/0647-Entity-load-save-limit-per-chunk.patch
rename to Spigot-Server-Patches/0646-Entity-load-save-limit-per-chunk.patch
diff --git a/Spigot-Server-Patches/0648-Add-sendOpLevel-API.patch b/Spigot-Server-Patches/0647-Add-sendOpLevel-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0648-Add-sendOpLevel-API.patch
rename to Spigot-Server-Patches/0647-Add-sendOpLevel-API.patch
diff --git a/Spigot-Server-Patches/0649-Add-StructureLocateEvent.patch b/Spigot-Server-Patches/0648-Add-StructureLocateEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0649-Add-StructureLocateEvent.patch
rename to Spigot-Server-Patches/0648-Add-StructureLocateEvent.patch
diff --git a/Spigot-Server-Patches/0650-Collision-option-for-requiring-a-player-participant.patch b/Spigot-Server-Patches/0649-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from Spigot-Server-Patches/0650-Collision-option-for-requiring-a-player-participant.patch
rename to Spigot-Server-Patches/0649-Collision-option-for-requiring-a-player-participant.patch
diff --git a/Spigot-Server-Patches/0651-Make-ProjectileHitEvent-Cancellable.patch b/Spigot-Server-Patches/0650-Make-ProjectileHitEvent-Cancellable.patch
similarity index 97%
rename from Spigot-Server-Patches/0651-Make-ProjectileHitEvent-Cancellable.patch
rename to Spigot-Server-Patches/0650-Make-ProjectileHitEvent-Cancellable.patch
index b9672876c..46a138e0e 100644
--- a/Spigot-Server-Patches/0651-Make-ProjectileHitEvent-Cancellable.patch
+++ b/Spigot-Server-Patches/0650-Make-ProjectileHitEvent-Cancellable.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make ProjectileHitEvent Cancellable
 Allows cancelling things like detonating TNT from Fire Arrows
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
-index ede7b4dbf2dce7bac83c5e17eecfdaf0e8a84fe7..b9680f6f2e30ec9397d6a9c83e79563d9253aff6 100644
+index 09e547a299286c47750325fe3c44ee9cd45748a0..c4248531d4a6a11259d9d78ce1d7683a86840d40 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFireball.java
 @@ -87,7 +87,7 @@ public abstract class EntityFireball extends IProjectile {
diff --git a/Spigot-Server-Patches/0652-Return-chat-component-with-empty-text-instead-of-thr.patch b/Spigot-Server-Patches/0651-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from Spigot-Server-Patches/0652-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to Spigot-Server-Patches/0651-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/Spigot-Server-Patches/0653-Make-schedule-command-per-world.patch b/Spigot-Server-Patches/0652-Make-schedule-command-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0653-Make-schedule-command-per-world.patch
rename to Spigot-Server-Patches/0652-Make-schedule-command-per-world.patch
diff --git a/Spigot-Server-Patches/0654-Configurable-max-leash-distance.patch b/Spigot-Server-Patches/0653-Configurable-max-leash-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0654-Configurable-max-leash-distance.patch
rename to Spigot-Server-Patches/0653-Configurable-max-leash-distance.patch
diff --git a/Spigot-Server-Patches/0655-Implement-BlockPreDispenseEvent.patch b/Spigot-Server-Patches/0654-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0655-Implement-BlockPreDispenseEvent.patch
rename to Spigot-Server-Patches/0654-Implement-BlockPreDispenseEvent.patch
diff --git a/Spigot-Server-Patches/0656-Added-Vanilla-Entity-Tags.patch b/Spigot-Server-Patches/0655-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from Spigot-Server-Patches/0656-Added-Vanilla-Entity-Tags.patch
rename to Spigot-Server-Patches/0655-Added-Vanilla-Entity-Tags.patch
diff --git a/Spigot-Server-Patches/0657-added-Wither-API.patch b/Spigot-Server-Patches/0656-added-Wither-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0657-added-Wither-API.patch
rename to Spigot-Server-Patches/0656-added-Wither-API.patch
diff --git a/Spigot-Server-Patches/0658-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/Spigot-Server-Patches/0657-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0658-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to Spigot-Server-Patches/0657-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/Spigot-Server-Patches/0659-Fix-console-spam-when-removing-chests-in-water.patch b/Spigot-Server-Patches/0658-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from Spigot-Server-Patches/0659-Fix-console-spam-when-removing-chests-in-water.patch
rename to Spigot-Server-Patches/0658-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/Spigot-Server-Patches/0660-Add-toggle-for-always-placing-the-dragon-egg.patch b/Spigot-Server-Patches/0659-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from Spigot-Server-Patches/0660-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to Spigot-Server-Patches/0659-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/Spigot-Server-Patches/0661-Added-PlayerStonecutterRecipeSelectEvent.patch b/Spigot-Server-Patches/0660-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0661-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to Spigot-Server-Patches/0660-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/Spigot-Server-Patches/0662-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/Spigot-Server-Patches/0661-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0662-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to Spigot-Server-Patches/0661-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/Spigot-Server-Patches/0663-Skip-distance-map-update-when-spawning-disabled.patch b/Spigot-Server-Patches/0662-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from Spigot-Server-Patches/0663-Skip-distance-map-update-when-spawning-disabled.patch
rename to Spigot-Server-Patches/0662-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/Spigot-Server-Patches/0664-Reset-shield-blocking-on-dimension-change.patch b/Spigot-Server-Patches/0663-Reset-shield-blocking-on-dimension-change.patch
similarity index 90%
rename from Spigot-Server-Patches/0664-Reset-shield-blocking-on-dimension-change.patch
rename to Spigot-Server-Patches/0663-Reset-shield-blocking-on-dimension-change.patch
index 5e114383e..878a2e6a5 100644
--- a/Spigot-Server-Patches/0664-Reset-shield-blocking-on-dimension-change.patch
+++ b/Spigot-Server-Patches/0663-Reset-shield-blocking-on-dimension-change.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change
 
 
 diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
-index 9522a4a2060fc8b1bda53f72414810ac09915275..37c9b5fd712e30a9a0faccc840f738f4b2cfc723 100644
+index 45c6eb96310146adab802dc3da019f7ee15e0fe5..1161605d9f4f9727282ac3677a916a9ebdb1263b 100644
 --- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
 @@ -1117,6 +1117,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0665-add-DragonEggFormEvent.patch b/Spigot-Server-Patches/0664-add-DragonEggFormEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0665-add-DragonEggFormEvent.patch
rename to Spigot-Server-Patches/0664-add-DragonEggFormEvent.patch
diff --git a/Spigot-Server-Patches/0666-EntityMoveEvent.patch b/Spigot-Server-Patches/0665-EntityMoveEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0666-EntityMoveEvent.patch
rename to Spigot-Server-Patches/0665-EntityMoveEvent.patch
index fc9f74b87..a98c5daef 100644
--- a/Spigot-Server-Patches/0666-EntityMoveEvent.patch
+++ b/Spigot-Server-Patches/0665-EntityMoveEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3b5df83d3a7d12fb23ac488a8936e1b4921fb5fd..fdbe97912f53cfba5ed23ef05e0ad4b9dd010f54 100644
+index 0ff63eede271b555e9de9b61dc76045d450cd990..697ce13c7c32e4badcd171c1e9eefc49620ae525 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -12,6 +12,7 @@ import com.mojang.datafixers.DataFixer;
@@ -25,7 +25,7 @@ index 3b5df83d3a7d12fb23ac488a8936e1b4921fb5fd..fdbe97912f53cfba5ed23ef05e0ad4b9
  
              this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index bf9bf8368b345bf0ac3b14a08e8342f7bd63dead..be7f210bd8be1e393c0c449274ff1a1b030d660e 100644
+index c38ef337f9a662d689994a0d530e8e655b843177..bab75b2232f1fa1def09517610179ca1529d195e 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -213,6 +213,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0667-added-option-to-disable-pathfinding-updates-on-block.patch b/Spigot-Server-Patches/0666-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 95%
rename from Spigot-Server-Patches/0667-added-option-to-disable-pathfinding-updates-on-block.patch
rename to Spigot-Server-Patches/0666-added-option-to-disable-pathfinding-updates-on-block.patch
index a23610ad9..998ea4ba3 100644
--- a/Spigot-Server-Patches/0667-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/Spigot-Server-Patches/0666-added-option-to-disable-pathfinding-updates-on-block.patch
@@ -19,7 +19,7 @@ index 1ceacb6bbfe99069763845a8aef48a3fb4841e32..d2f6e1308a4dfec663770e2c7f4de0cf
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index be7f210bd8be1e393c0c449274ff1a1b030d660e..ef9b08df58d9d28df6b8ade076d95bf7e5cb1b18 100644
+index bab75b2232f1fa1def09517610179ca1529d195e..bea183ba796f2acf5465ad91e4e7fe3e73c9da74 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1685,6 +1685,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0668-Inline-shift-direction-fields.patch b/Spigot-Server-Patches/0667-Inline-shift-direction-fields.patch
similarity index 100%
rename from Spigot-Server-Patches/0668-Inline-shift-direction-fields.patch
rename to Spigot-Server-Patches/0667-Inline-shift-direction-fields.patch
diff --git a/Spigot-Server-Patches/0669-Allow-adding-items-to-BlockDropItemEvent.patch b/Spigot-Server-Patches/0668-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0669-Allow-adding-items-to-BlockDropItemEvent.patch
rename to Spigot-Server-Patches/0668-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/Spigot-Server-Patches/0670-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/Spigot-Server-Patches/0669-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from Spigot-Server-Patches/0670-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to Spigot-Server-Patches/0669-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/Spigot-Server-Patches/0671-living-entity-allow-attribute-registration.patch b/Spigot-Server-Patches/0670-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from Spigot-Server-Patches/0671-living-entity-allow-attribute-registration.patch
rename to Spigot-Server-Patches/0670-living-entity-allow-attribute-registration.patch
diff --git a/Spigot-Server-Patches/0672-fix-dead-slime-setSize-invincibility.patch b/Spigot-Server-Patches/0671-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from Spigot-Server-Patches/0672-fix-dead-slime-setSize-invincibility.patch
rename to Spigot-Server-Patches/0671-fix-dead-slime-setSize-invincibility.patch
diff --git a/Spigot-Server-Patches/0673-Merchant-getRecipes-should-return-an-immutable-list.patch b/Spigot-Server-Patches/0672-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from Spigot-Server-Patches/0673-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to Spigot-Server-Patches/0672-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/Spigot-Server-Patches/0674-misc-debugging-dumps.patch b/Spigot-Server-Patches/0673-misc-debugging-dumps.patch
similarity index 97%
rename from Spigot-Server-Patches/0674-misc-debugging-dumps.patch
rename to Spigot-Server-Patches/0673-misc-debugging-dumps.patch
index 069b7fed3..02b602485 100644
--- a/Spigot-Server-Patches/0674-misc-debugging-dumps.patch
+++ b/Spigot-Server-Patches/0673-misc-debugging-dumps.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fdbe97912f53cfba5ed23ef05e0ad4b9dd010f54..2aaddbe9cad6433f0243c658716825641b6c64c8 100644
+index 697ce13c7c32e4badcd171c1e9eefc49620ae525..84c3110ea03f9121fc4ab0aaa80ddad5efe28e5c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -13,6 +13,7 @@ import io.netty.buffer.ByteBuf;
diff --git a/Spigot-Server-Patches/0675-Add-support-for-hex-color-codes-in-console.patch b/Spigot-Server-Patches/0674-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from Spigot-Server-Patches/0675-Add-support-for-hex-color-codes-in-console.patch
rename to Spigot-Server-Patches/0674-Add-support-for-hex-color-codes-in-console.patch
diff --git a/Spigot-Server-Patches/0676-Clear-SyncLoadInfo.patch b/Spigot-Server-Patches/0675-Clear-SyncLoadInfo.patch
similarity index 100%
rename from Spigot-Server-Patches/0676-Clear-SyncLoadInfo.patch
rename to Spigot-Server-Patches/0675-Clear-SyncLoadInfo.patch
diff --git a/Spigot-Server-Patches/0677-Expose-Tracked-Players.patch b/Spigot-Server-Patches/0676-Expose-Tracked-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0677-Expose-Tracked-Players.patch
rename to Spigot-Server-Patches/0676-Expose-Tracked-Players.patch
diff --git a/Spigot-Server-Patches/0678-Remove-streams-from-SensorNearest.patch b/Spigot-Server-Patches/0677-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from Spigot-Server-Patches/0678-Remove-streams-from-SensorNearest.patch
rename to Spigot-Server-Patches/0677-Remove-streams-from-SensorNearest.patch
diff --git a/Spigot-Server-Patches/0679-do-not-create-unnecessary-copies-of-passenger-list.patch b/Spigot-Server-Patches/0678-do-not-create-unnecessary-copies-of-passenger-list.patch
similarity index 100%
rename from Spigot-Server-Patches/0679-do-not-create-unnecessary-copies-of-passenger-list.patch
rename to Spigot-Server-Patches/0678-do-not-create-unnecessary-copies-of-passenger-list.patch
diff --git a/Spigot-Server-Patches/0680-MC-29274-Fix-Wither-hostility-towards-players.patch b/Spigot-Server-Patches/0679-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0680-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to Spigot-Server-Patches/0679-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/Spigot-Server-Patches/0681-Throw-proper-exception-on-empty-JsonList-file.patch b/Spigot-Server-Patches/0680-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from Spigot-Server-Patches/0681-Throw-proper-exception-on-empty-JsonList-file.patch
rename to Spigot-Server-Patches/0680-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/Spigot-Server-Patches/0682-Improve-ServerGUI.patch b/Spigot-Server-Patches/0681-Improve-ServerGUI.patch
similarity index 100%
rename from Spigot-Server-Patches/0682-Improve-ServerGUI.patch
rename to Spigot-Server-Patches/0681-Improve-ServerGUI.patch
diff --git a/Spigot-Server-Patches/0683-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/Spigot-Server-Patches/0682-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0683-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to Spigot-Server-Patches/0682-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/Spigot-Server-Patches/0684-fix-converting-txt-to-json-file.patch b/Spigot-Server-Patches/0683-fix-converting-txt-to-json-file.patch
similarity index 100%
rename from Spigot-Server-Patches/0684-fix-converting-txt-to-json-file.patch
rename to Spigot-Server-Patches/0683-fix-converting-txt-to-json-file.patch
diff --git a/Spigot-Server-Patches/0685-Add-worldborder-events.patch b/Spigot-Server-Patches/0684-Add-worldborder-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0685-Add-worldborder-events.patch
rename to Spigot-Server-Patches/0684-Add-worldborder-events.patch
diff --git a/Spigot-Server-Patches/0686-added-PlayerNameEntityEvent.patch b/Spigot-Server-Patches/0685-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0686-added-PlayerNameEntityEvent.patch
rename to Spigot-Server-Patches/0685-added-PlayerNameEntityEvent.patch
diff --git a/Spigot-Server-Patches/0687-Prevent-grindstones-from-overstacking-items.patch b/Spigot-Server-Patches/0686-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0687-Prevent-grindstones-from-overstacking-items.patch
rename to Spigot-Server-Patches/0686-Prevent-grindstones-from-overstacking-items.patch
diff --git a/Spigot-Server-Patches/0688-Add-recipe-to-cook-events.patch b/Spigot-Server-Patches/0687-Add-recipe-to-cook-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0688-Add-recipe-to-cook-events.patch
rename to Spigot-Server-Patches/0687-Add-recipe-to-cook-events.patch
diff --git a/Spigot-Server-Patches/0689-Add-Block-isValidTool.patch b/Spigot-Server-Patches/0688-Add-Block-isValidTool.patch
similarity index 100%
rename from Spigot-Server-Patches/0689-Add-Block-isValidTool.patch
rename to Spigot-Server-Patches/0688-Add-Block-isValidTool.patch
diff --git a/Spigot-Server-Patches/0690-Allow-using-signs-inside-spawn-protection.patch b/Spigot-Server-Patches/0689-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from Spigot-Server-Patches/0690-Allow-using-signs-inside-spawn-protection.patch
rename to Spigot-Server-Patches/0689-Allow-using-signs-inside-spawn-protection.patch
diff --git a/Spigot-Server-Patches/0691-Implement-Keyed-on-World.patch b/Spigot-Server-Patches/0690-Implement-Keyed-on-World.patch
similarity index 98%
rename from Spigot-Server-Patches/0691-Implement-Keyed-on-World.patch
rename to Spigot-Server-Patches/0690-Implement-Keyed-on-World.patch
index 138f3341b..b35c52bb8 100644
--- a/Spigot-Server-Patches/0691-Implement-Keyed-on-World.patch
+++ b/Spigot-Server-Patches/0690-Implement-Keyed-on-World.patch
@@ -93,7 +93,7 @@ index cbac3c96c5d3c1551912f5769bfc50d690519495..03b8d67a5f0088c0254b2099f27e8dca
          // Check if a World already exists with the UID.
          if (getWorld(world.getUID()) != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ef353e21f7e04162d886e70012f845334962459b..05098332d83b1abfaa0a6d3bd4a9e801ea90d2ad 100644
+index 05a7f5f61330bd52705640345524cdedbf105285..a152d5bec8bf0dd87239b0a3432fb589cea61bd8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2584,6 +2584,11 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0692-Add-fast-alternative-constructor-for-Vector3f.patch b/Spigot-Server-Patches/0691-Add-fast-alternative-constructor-for-Vector3f.patch
similarity index 100%
rename from Spigot-Server-Patches/0692-Add-fast-alternative-constructor-for-Vector3f.patch
rename to Spigot-Server-Patches/0691-Add-fast-alternative-constructor-for-Vector3f.patch
diff --git a/Spigot-Server-Patches/0693-Item-Rarity-API.patch b/Spigot-Server-Patches/0692-Item-Rarity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0693-Item-Rarity-API.patch
rename to Spigot-Server-Patches/0692-Item-Rarity-API.patch
diff --git a/Spigot-Server-Patches/0694-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/Spigot-Server-Patches/0693-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from Spigot-Server-Patches/0694-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to Spigot-Server-Patches/0693-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/Spigot-Server-Patches/0695-copy-TESign-isEditable-from-snapshots.patch b/Spigot-Server-Patches/0694-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from Spigot-Server-Patches/0695-copy-TESign-isEditable-from-snapshots.patch
rename to Spigot-Server-Patches/0694-copy-TESign-isEditable-from-snapshots.patch
diff --git a/Spigot-Server-Patches/0696-Drop-carried-item-when-player-has-disconnected.patch b/Spigot-Server-Patches/0695-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from Spigot-Server-Patches/0696-Drop-carried-item-when-player-has-disconnected.patch
rename to Spigot-Server-Patches/0695-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/Spigot-Server-Patches/0697-forced-whitelist-use-configurable-kick-message.patch b/Spigot-Server-Patches/0696-forced-whitelist-use-configurable-kick-message.patch
similarity index 91%
rename from Spigot-Server-Patches/0697-forced-whitelist-use-configurable-kick-message.patch
rename to Spigot-Server-Patches/0696-forced-whitelist-use-configurable-kick-message.patch
index 9450a6476..43be5f2fc 100644
--- a/Spigot-Server-Patches/0697-forced-whitelist-use-configurable-kick-message.patch
+++ b/Spigot-Server-Patches/0696-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 2aaddbe9cad6433f0243c658716825641b6c64c8..8ee622108cebff2bba8a44fb255a3b6c03ed0220 100644
+index 84c3110ea03f9121fc4ab0aaa80ddad5efe28e5c..61712ae515b329a6b85dbe2e5960e4e864dc7731 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2040,7 +2040,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/Spigot-Server-Patches/0698-Make-sure-to-remove-correct-TE-during-TE-tick.patch b/Spigot-Server-Patches/0697-Make-sure-to-remove-correct-TE-during-TE-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0698-Make-sure-to-remove-correct-TE-during-TE-tick.patch
rename to Spigot-Server-Patches/0697-Make-sure-to-remove-correct-TE-during-TE-tick.patch
diff --git a/Spigot-Server-Patches/0699-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0698-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0699-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0698-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/Spigot-Server-Patches/0700-Expose-protocol-version.patch b/Spigot-Server-Patches/0699-Expose-protocol-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0700-Expose-protocol-version.patch
rename to Spigot-Server-Patches/0699-Expose-protocol-version.patch
diff --git a/Spigot-Server-Patches/0701-Enhance-console-tab-completions-for-brigadier-comman.patch b/Spigot-Server-Patches/0700-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from Spigot-Server-Patches/0701-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to Spigot-Server-Patches/0700-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/Spigot-Server-Patches/0702-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/Spigot-Server-Patches/0701-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from Spigot-Server-Patches/0702-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to Spigot-Server-Patches/0701-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/Spigot-Server-Patches/0703-Add-bypass-host-check.patch b/Spigot-Server-Patches/0702-Add-bypass-host-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0703-Add-bypass-host-check.patch
rename to Spigot-Server-Patches/0702-Add-bypass-host-check.patch
diff --git a/Spigot-Server-Patches/0704-don-t-throw-when-loading-invalid-TEs.patch b/Spigot-Server-Patches/0703-don-t-throw-when-loading-invalid-TEs.patch
similarity index 100%
rename from Spigot-Server-Patches/0704-don-t-throw-when-loading-invalid-TEs.patch
rename to Spigot-Server-Patches/0703-don-t-throw-when-loading-invalid-TEs.patch
diff --git a/Spigot-Server-Patches/0705-Set-area-affect-cloud-rotation.patch b/Spigot-Server-Patches/0704-Set-area-affect-cloud-rotation.patch
similarity index 91%
rename from Spigot-Server-Patches/0705-Set-area-affect-cloud-rotation.patch
rename to Spigot-Server-Patches/0704-Set-area-affect-cloud-rotation.patch
index e13e93502..25e0a9b5a 100644
--- a/Spigot-Server-Patches/0705-Set-area-affect-cloud-rotation.patch
+++ b/Spigot-Server-Patches/0704-Set-area-affect-cloud-rotation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Set area affect cloud rotation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 05098332d83b1abfaa0a6d3bd4a9e801ea90d2ad..6c2a4607028c61e4a01ff200d301878e2d63b456 100644
+index a152d5bec8bf0dd87239b0a3432fb589cea61bd8..42417aee4796d39d110e69cb707bd3b7bac30027 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1977,6 +1977,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0706-add-isDeeplySleeping-to-HumanEntity.patch b/Spigot-Server-Patches/0705-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0706-add-isDeeplySleeping-to-HumanEntity.patch
rename to Spigot-Server-Patches/0705-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0707-Fix-duplicating-give-items-on-item-drop-cancel.patch b/Spigot-Server-Patches/0706-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from Spigot-Server-Patches/0707-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to Spigot-Server-Patches/0706-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/Spigot-Server-Patches/0708-add-consumeFuel-to-FurnaceBurnEvent.patch b/Spigot-Server-Patches/0707-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0708-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to Spigot-Server-Patches/0707-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/Spigot-Server-Patches/0709-add-get-set-drop-chance-to-EntityEquipment.patch b/Spigot-Server-Patches/0708-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from Spigot-Server-Patches/0709-add-get-set-drop-chance-to-EntityEquipment.patch
rename to Spigot-Server-Patches/0708-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/Spigot-Server-Patches/0710-fix-PigZombieAngerEvent-cancellation.patch b/Spigot-Server-Patches/0709-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from Spigot-Server-Patches/0710-fix-PigZombieAngerEvent-cancellation.patch
rename to Spigot-Server-Patches/0709-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/Spigot-Server-Patches/0711-Fix-checkReach-check-for-Shulker-boxes.patch b/Spigot-Server-Patches/0710-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from Spigot-Server-Patches/0711-Fix-checkReach-check-for-Shulker-boxes.patch
rename to Spigot-Server-Patches/0710-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/Spigot-Server-Patches/0712-fix-PlayerItemHeldEvent-firing-twice.patch b/Spigot-Server-Patches/0711-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from Spigot-Server-Patches/0712-fix-PlayerItemHeldEvent-firing-twice.patch
rename to Spigot-Server-Patches/0711-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/Spigot-Server-Patches/0713-Added-PlayerDeepSleepEvent.patch b/Spigot-Server-Patches/0712-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0713-Added-PlayerDeepSleepEvent.patch
rename to Spigot-Server-Patches/0712-Added-PlayerDeepSleepEvent.patch
diff --git a/Spigot-Server-Patches/0714-More-World-API.patch b/Spigot-Server-Patches/0713-More-World-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0714-More-World-API.patch
rename to Spigot-Server-Patches/0713-More-World-API.patch
index 88a8d987c..2cbb6e8eb 100644
--- a/Spigot-Server-Patches/0714-More-World-API.patch
+++ b/Spigot-Server-Patches/0713-More-World-API.patch
@@ -65,7 +65,7 @@ index 72bc1a1e1c2153550313e93cf7df901a514a9bef..be6d63bcf15027e02a0bfbee0792c24f
          Tag<Block> tag = TagsBlock.a().a(this.infiniburn);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6c2a4607028c61e4a01ff200d301878e2d63b456..80de9f687d9acd7425e7c8a453c2759450869497 100644
+index 42417aee4796d39d110e69cb707bd3b7bac30027..3b3eda95c0ff8b129adedbae6561bba2d01c2f3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2533,6 +2533,75 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0715-Added-PlayerBedFailEnterEvent.patch b/Spigot-Server-Patches/0714-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0715-Added-PlayerBedFailEnterEvent.patch
rename to Spigot-Server-Patches/0714-Added-PlayerBedFailEnterEvent.patch
diff --git a/Spigot-Server-Patches/0716-Implement-methods-to-convert-between-Component-and-B.patch b/Spigot-Server-Patches/0715-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from Spigot-Server-Patches/0716-Implement-methods-to-convert-between-Component-and-B.patch
rename to Spigot-Server-Patches/0715-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/Spigot-Server-Patches/0717-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/Spigot-Server-Patches/0716-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 100%
rename from Spigot-Server-Patches/0717-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to Spigot-Server-Patches/0716-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
diff --git a/Spigot-Server-Patches/0718-add-RespawnFlags-to-PlayerRespawnEvent.patch b/Spigot-Server-Patches/0717-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0718-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to Spigot-Server-Patches/0717-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/Spigot-Server-Patches/0719-Introduce-beacon-activation-deactivation-events.patch b/Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0719-Introduce-beacon-activation-deactivation-events.patch
rename to Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch
diff --git a/Spigot-Server-Patches/0720-Add-Channel-initialization-listeners.patch b/Spigot-Server-Patches/0719-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from Spigot-Server-Patches/0720-Add-Channel-initialization-listeners.patch
rename to Spigot-Server-Patches/0719-Add-Channel-initialization-listeners.patch