From e90e7829ee41273099fe5d2b9d69998cd57414a1 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <15055071+Machine-Maker@users.noreply.github.com>
Date: Sat, 15 May 2021 16:42:36 -0700
Subject: [PATCH] remove unneeded patch (#5641)

---
 ...-Log4J-Configuration-Plugin-Loggers.patch} |  0
 ...-Include-Log4J2-SLF4J-implementation.patch | 22 -------------------
 ...t.patch => 0169-Add-PlayerJumpEvent.patch} |  0
 ...-handle-PacketPlayInKeepAlive-async.patch} |  0
 ...t-protocol-version-and-virtual-host.patch} |  2 +-
 ...t-serverside-behavior-of-keepalives.patch} |  0
 ...Effects-only-to-players-who-can-see.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ... => 0175-Add-PlayerArmorChangeEvent.patch} |  2 +-
 ...om-being-processed-when-the-player-.patch} |  2 +-
 ...-implementations-for-captured-block.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  4 ++--
 ...patch => 0179-AsyncTabCompleteEvent.patch} |  0
 ...80-Avoid-NPE-in-PathfinderGoalTempt.patch} |  0
 ...=> 0181-PlayerPickupExperienceEvent.patch} |  0
 ...tch => 0182-ExperienceOrbMergeEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...max-squid-spawn-height-configurable.patch} |  0
 ...patch => 0185-PreCreatureSpawnEvent.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0188-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0190-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0192-Tameable-getOwnerUniqueId-API.patch} |  4 ++--
 ...-crits-helps-mitigate-hacked-client.patch} |  0
 ...ted-Ice-from-loading-holding-chunks.patch} |  0
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  0
 ... 0197-Improved-Async-Task-Scheduler.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  0
 ...=> 0199-Player.setPlayerProfile-API.patch} |  0
 ...h => 0200-Fix-Dragon-Server-Crashes.patch} |  0
 ...patch => 0201-getPlayerUniqueId-API.patch} |  0
 ...ake-player-data-saving-configurable.patch} |  0
 ...e-legacy-ping-handler-more-reliable.patch} |  0
 ...erverListPingEvent-for-legacy-pings.patch} |  0
 ...5-Flag-to-disable-the-channel-limit.patch} |  0
 ...-method-to-open-already-placed-sign.patch} |  0
 ...rable-sprint-interruption-on-attack.patch} |  0
 ...allowed-colored-signs-to-be-created.patch} |  0
 ...t.patch => 0209-EndermanEscapeEvent.patch} |  0
 ...h => 0210-Enderman.teleportRandomly.patch} |  0
 ...211-Block-Enderpearl-Travel-Exploit.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  0
 ...h => 0213-EndermanAttackPlayerEvent.patch} |  0
 ...tch => 0214-WitchConsumePotionEvent.patch} |  0
 ...patch => 0215-WitchThrowPotionEvent.patch} |  0
 ...tem-entities-with-World.spawnEntity.patch} |  2 +-
 ...patch => 0217-WitchReadyPotionEvent.patch} |  0
 ...218-ItemStack-getMaxItemUseDuration.patch} |  2 +-
 ...ement-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  0
 ...ch => 0221-Fix-CraftEntity-hashCode.patch} |  0
 ...e-Alternative-LootPool-Luck-Formula.patch} |  0
 ...ls-when-failing-to-save-player-data.patch} |  0
 ...-shield-blocking-delay-configurable.patch} |  2 +-
 ...=> 0225-Improve-EntityShootBowEvent.patch} |  0
 ...patch => 0226-PlayerReadyArrowEvent.patch} |  0
 ...lement-EntityKnockbackByEntityEvent.patch} |  2 +-
 ...patch => 0228-Expand-Explosions-API.patch} |  2 +-
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  2 +-
 ...-API.patch => 0230-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  0
 ...-Implement-World.getEntity-UUID-API.patch} |  2 +-
 ...0233-InventoryCloseEvent-Reason-API.patch} |  0
 ...I.patch => 0234-Vex-getSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  0
 ...e-the-Entity-Random-seed-for-squids.patch} |  0
 ...illa-entity-warnings-for-duplicates.patch} |  2 +-
 ...-if-stack-size-above-max-stack-size.patch} |  0
 ...39-Use-asynchronous-Log4j-2-loggers.patch} |  4 ++--
 ...more-information-to-Entity.toString.patch} |  2 +-
 ...es-option-to-debug-dupe-uuid-issues.patch} |  0
 ...ts.patch => 0242-EnderDragon-Events.patch} |  0
 ...atch => 0243-PlayerElytraBoostEvent.patch} |  0
 ...0244-Improve-BlockPosition-inlining.patch} |  0
 ...patch => 0245-Optimize-RegistryID.c.patch} |  0
 ...-armor-stands-from-doing-entity-loo.patch} |  0
 ...-Vanished-players-don-t-have-rights.patch} |  0
 ...anytime-entities-change-to-guarante.patch} |  0
 ...d-some-Debug-to-Chunk-Entity-slices.patch} |  0
 ...tch => 0250-SkeletonHorse-Additions.patch} |  0
 ...event-Saving-Bad-entities-to-chunks.patch} |  2 +-
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...ad-Entities-in-entityList-iteration.patch} |  4 ++--
 ...4-Implement-Expanded-ArmorStand-API.patch} |  0
 ...vent.patch => 0255-AnvilDamageEvent.patch} |  0
 ...ent.patch => 0256-Add-TNTPrimeEvent.patch} |  0
 ...d-make-tab-spam-limits-configurable.patch} |  0
 ...h => 0258-Add-hand-to-bucket-events.patch} |  0
 ...-Experience-should-save-as-Integers.patch} |  0
 ...ent-rendering-skulls-from-same-user.patch} |  2 +-
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  2 +-
 ...0262-Make-EnderDragon-implement-Mob.patch} |  0
 ...3-Use-ConcurrentHashMap-in-JsonList.patch} |  2 +-
 ...4-Use-a-Queue-for-Queueing-Commands.patch} |  0
 ...le-Entities-from-a-chunk-without-sn.patch} |  0
 ...llow-disabling-armour-stand-ticking.patch} |  0
 ...timize-BlockPosition-helper-methods.patch} |  0
 ...tore-vanlla-default-mob-spawn-range.patch} |  2 +-
 ...tch => 0269-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ...71-Optimize-CraftBlockData-Creation.patch} |  0
 ... => 0272-Optimize-RegistryMaterials.patch} |  0
 ...ch => 0273-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0274-Add-More-Creeper-API.patch} |  0
 ...=> 0275-Inventory-removeItemAnySlot.patch} |  2 +-
 ...oadChunk-int-int-false-load-unconve.patch} |  2 +-
 ...ray-tracing-methods-to-LivingEntity.patch} |  2 +-
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0279-Improve-death-events.patch} |  0
 ...w-chests-to-be-placed-with-NBT-data.patch} |  2 +-
 ...I.patch => 0281-Mob-Pathfinding-API.patch} |  0
 ...nt-chunk-loading-from-Fluid-Flowing.patch} |  0
 ...for-CanPlaceOn-and-CanDestroy-NBT-v.patch} |  0
 ...nt-Mob-AI-Rules-from-Loading-Chunks.patch} |  0
 ...ning-from-loading-generating-chunks.patch} |  0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |  0
 ...t-furnace-cook-speed-multiplier-API.patch} |  0
 ....patch => 0288-PreSpawnerSpawnEvent.patch} |  0
 ...rseException-in-Entity-and-TE-names.patch} |  0
 ...=> 0290-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  0
 ...> 0292-Hook-into-CB-plugin-rewrites.patch} |  0
 ...93-Allow-setting-the-vex-s-summoner.patch} |  0
 ...I.patch => 0294-Add-sun-related-API.patch} |  2 +-
 ...Turtle-API.patch => 0295-Turtle-API.patch} |  0
 ...her-worlds-for-shooter-of-projectil.patch} |  0
 ...ator-target-events-and-improve-impl.patch} |  0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  2 +-
 ...PI.patch => 0299-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...-Johnny.patch => 0301-Here-s-Johnny.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  0
 ...3-Reset-players-airTicks-on-respawn.patch} |  0
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  0
 ...=> 0306-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0308-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0309-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  0
 ...mits.patch => 0311-Book-Size-Limits.patch} |  0
 ...ult-permission-message-configurable.patch} |  0
 ...revent-rayTrace-from-loading-chunks.patch} |  0
 ...-Large-Packets-disconnecting-client.patch} |  0
 ...ntity-dismount-during-teleportation.patch} |  0
 ...I.patch => 0316-Add-more-Zombie-API.patch} |  0
 ...0317-Add-PlayerConnectionCloseEvent.patch} |  2 +-
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 ...ehicle-tracking-issue-on-disconnect.patch} |  0
 ...nRetractEvent-for-all-empty-pistons.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  0
 ...ent.patch => 0323-BlockDestroyEvent.patch} |  0
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ...h => 0325-Fix-sign-edit-memory-leak.patch} |  0
 ... 0326-Limit-Client-Sign-length-more.patch} |  0
 ...onvertSigns-boolean-every-sign-save.patch} |  0
 ...Manager-and-add-advanced-packet-sup.patch} |  0
 ...e-Oversized-Tile-Entities-in-chunks.patch} |  0
 ...-Fix-Whitelist-On-Off-inconsistency.patch} |  2 +-
 ...t-tick-at-start-of-drowning-process.patch} |  0
 ...32-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...ggleEvent-when-whitelist-is-toggled.patch} |  2 +-
 ...34-Add-LivingEntity-getTargetEntity.patch} |  4 ++--
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0336-Entity-getEntitySpawnReason.patch} |  4 ++--
 ...ty-Metadata-for-all-tracked-players.patch} |  0
 ...38-Implement-PlayerPostRespawnEvent.patch} |  2 +-
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...ts.patch => 0340-Server-Tick-Events.patch} |  0
 ...341-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0343-Add-Heightmap-API.patch} |  2 +-
 ...> 0344-Mob-Spawner-API-Enhancements.patch} |  0
 ...ayer-View-Distance-API-placeholders.patch} |  0
 ...-to-changed-postToMainThread-method.patch} |  0
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...-entity-loss-due-to-unloaded-chunks.patch} |  2 +-
 ... 0350-Duplicate-UUID-Resolve-Option.patch} |  0
 ...51-improve-CraftWorld-isChunkLoaded.patch} |  2 +-
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  0
 ...ityAreaEffectCloud-from-going-negat.patch} |  0
 ....patch => 0354-ChunkMapDistance-CME.patch} |  0
 ...0355-Implement-CraftBlockSoundGroup.patch} |  0
 ...d.patch => 0356-Chunk-debug-command.patch} |  4 ++--
 ...ptions-from-dispenser-entity-spawns.patch} |  0
 ...58-Fix-World-isChunkGenerated-calls.patch} |  2 +-
 ...te-location-if-we-failed-to-read-it.patch} |  2 +-
 ...aletteBlock-instead-of-ReentrantLoc.patch} |  0
 ...ch => 0361-incremental-chunk-saving.patch} |  0
 ...3-Anti-Xray.patch => 0362-Anti-Xray.patch} |  2 +-
 ...l-Spawned-mobs-towards-natural-spaw.patch} |  0
 ...urable-projectile-relative-velocity.patch} |  0
 ...being-ticked-when-notifying-navigat.patch} |  0
 ...h => 0366-offset-item-frame-ticking.patch} |  0
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...8-Asynchronous-chunk-IO-and-loading.patch} |  0
 ...tChunkIfLoadedImmediately-in-places.patch} |  2 +-
 ...ads.patch => 0370-Reduce-sync-loads.patch} |  4 ++--
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...f-we-have-a-custom-Bukkit-generator.patch} |  0
 ...-158900.patch => 0373-Fix-MC-158900.patch} |  2 +-
 ...ment-optional-per-player-mob-spawns.patch} |  0
 ...event-consuming-the-wrong-itemstack.patch} |  2 +-
 ...gs.patch => 0376-Generator-Settings.patch} |  0
 ...-161754.patch => 0377-Fix-MC-161754.patch} |  0
 ...e-improvement-for-Chunk.getEntities.patch} |  0
 ...anging-entities-that-are-not-ItemFr.patch} |  0
 ...80-Expose-the-internal-current-tick.patch} |  0
 ...sneak-when-changing-worlds-MC-10657.patch} |  0
 ...-option-to-disable-pillager-patrols.patch} |  0
 ...r-when-player-hand-set-to-empty-typ.patch} |  0
 ...=> 0384-PlayerLaunchProjectileEvent.patch} |  0
 ...tMagicNumbers.isSupportedApiVersion.patch} |  0
 ...k-loads-when-villagers-try-to-find-.patch} |  0
 ...656-Fix-Follow-Range-Initial-Target.patch} |  0
 ...pers.patch => 0388-Optimize-Hoppers.patch} |  2 +-
 ...ayerDeathEvent-shouldDropExperience.patch} |  0
 ...ading-chunks-checking-hive-position.patch} |  0
 ...hunks-from-Hoppers-and-other-things.patch} |  0
 ...ializing-mismatching-chunk-coordina.patch} |  0
 ...imise-IEntityAccess-getPlayerByUUID.patch} |  2 +-
 ...394-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0395-Lag-compensate-eating.patch} |  0
 ...ize-call-to-getFluid-for-explosions.patch} |  0
 ...-in-stack-not-having-effects-when-d.patch} |  0
 ...Add-effect-to-block-break-naturally.patch} |  0
 ...=> 0399-Tracking-Range-Improvements.patch} |  2 +-
 ...=> 0400-Entity-Activation-Range-2.0.patch} |  0
 ...-items-vanishing-through-end-portal.patch} |  0
 ...et-gravity-in-void.-Fixes-MC-167279.patch} |  0
 ...-getChunkAt-calls-for-loaded-chunks.patch} |  0
 ...w-overriding-the-java-version-check.patch} |  0
 ...tch => 0405-Add-ThrownEggHatchEvent.patch} |  0
 ... 0406-Optimise-random-block-ticking.patch} |  2 +-
 ...p-API.patch => 0407-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0409-Make-the-GUI-graph-fancier.patch} |  0
 ...10-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...1-Prevent-teleporting-dead-entities.patch} |  0
 ...ipwire-hook-placement-before-update.patch} |  0
 ...o-allow-iron-golems-to-spawn-in-air.patch} |  0
 ...chance-of-villager-zombie-infection.patch} |  0
 ...tch => 0415-Optimise-Chunk-getFluid.patch} |  0
 ...mise-TickListServer-by-rewriting-it.patch} |  2 +-
 ...pawn-settings-and-per-player-option.patch} |  0
 ...e-Entity-is-never-double-registered.patch} |  2 +-
 ...ring-entities-from-unloading-chunks.patch} |  2 +-
 ...nections-shouldn-t-hold-up-shutdown.patch} |  0
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} |  2 +-
 ...timize-Collision-to-not-load-chunks.patch} |  2 +-
 ...tch => 0424-Don-t-tick-dead-players.patch} |  0
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  0
 ...unkMap-memory-use-for-visibleChunks.patch} |  2 +-
 ...h => 0427-Increase-Light-Queue-Size.patch} |  0
 ...sks-Speed-up-processing-of-chunk-lo.patch} |  0
 ...ove-existing-players-to-world-spawn.patch} |  0
 ...Add-tick-times-API-and-mspt-command.patch} |  0
 ...31-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  2 +-
 ...3-Remove-streams-from-Mob-AI-System.patch} |  0
 ...ons-until-after-entity-ticking-is-d.patch} |  2 +-
 ... => 0435-Async-command-map-building.patch} |  0
 ...h => 0436-Improved-Watchdog-Support.patch} |  0
 ....patch => 0437-Optimize-Pathfinding.patch} |  0
 ...8-Reduce-Either-Optional-allocation.patch} |  0
 ...439-Remove-streams-from-PairedQueue.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...42-Optimise-ArraySetSorted-removeIf.patch} |  0
 ...entity-collision-code-if-not-needed.patch} |  0
 ...viderServer-s-chunk-level-checking-.patch} |  0
 ...teleport-command-to-valid-locations.patch} |  0
 ...Implement-Player-Client-Options-API.patch} |  0
 ...Chunk-Post-Processing-deadlock-risk.patch} |  2 +-
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...9-Broadcast-join-message-to-console.patch} |  2 +-
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  0
 ...oad-Chunks-for-Login-Asynchronously.patch} |  0
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...llbacks-to-schedule-for-Callback-Ex.patch} |  2 +-
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  0
 ...0458-Implement-Brigadier-Mojang-API.patch} |  0
 ...patch => 0459-Villager-Restocks-API.patch} |  2 +-
 ...ickItem-Packet-and-kick-for-invalid.patch} |  0
 ...n.patch => 0461-Expose-game-version.patch} |  2 +-
 ...> 0462-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ...atch => 0464-Implement-Mob-Goal-API.patch} |  4 ++--
 ...ance-map-to-optimise-entity-tracker.patch} |  0
 ...isOutsideRange-to-use-distance-maps.patch} |  0
 ...e-operations-for-updating-light-dat.patch} |  0
 ...o-Tick-view-distance-implementation.patch} |  0
 ...=> 0469-Add-villager-reputation-API.patch} |  0
 ...and.patch => 0470-Fix-Light-Command.patch} |  2 +-
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...API.patch => 0473-Potential-bed-API.patch} |  0
 ...ait-for-Async-Tasks-during-shutdown.patch} |  2 +-
 ...er-respects-game-and-entity-rules-f.patch} |  0
 ...nd-End-Portal-Frames-from-being-des.patch} |  0
 ...e-NibbleArray-to-use-pooled-buffers.patch} |  0
 ...leInt-allocations-from-light-engine.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  2 +-
 ...> 0480-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |  0
 ...und-for-Client-Lag-Spikes-MC-162253.patch} |  2 +-
 ...-Priority-Urgency-System-for-Chunks.patch} |  0
 ...packets-to-nearby-locations-sounds-.patch} |  2 +-
 ...prove-Chunk-Status-Transition-Speed.patch} |  2 +-
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0488-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  2 +-
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...patch => 0491-Optimize-Light-Engine.patch} |  2 +-
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  2 +-
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  0
 ...uping.patch => 0497-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  0
 ...ch => 0499-Fix-enderdragon-exp-dupe.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0501-Expose-Arrow-getItemStack.patch} |  2 +-
 ...mplement-PlayerRecipeBookClickEvent.patch} |  0
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...it-lightning-strike-effect-distance.patch} |  0
 ...5-Add-permission-for-command-blocks.patch} |  0
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...orldBorder-collision-checks-and-air.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  0
 ...atch => 0509-Paper-dumpitem-command.patch} |  0
 ...10-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...512-Support-old-UUID-format-for-NBT.patch} |  0
 ...p-duplicated-GameProfile-Properties.patch} |  0
 ...vert-legacy-attributes-in-Item-Meta.patch} |  0
 ...Remove-some-streams-from-structures.patch} |  0
 ...rom-classes-related-villager-gossip.patch} |  0
 ...0517-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0519-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  2 +-
 ...wn-player-in-correct-world-on-login.patch} |  2 +-
 ...atch => 0522-Add-PrepareResultEvent.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...-for-portal-on-world-gen-entity-add.patch} |  0
 ...e-NetworkManager-Exception-Handling.patch} |  0
 ...x-Concurrency-issue-in-WeightedList.patch} |  0
 ...ncement-data-player-iteration-to-be.patch} |  0
 ...x-arrows-never-despawning-MC-125757.patch} |  2 +-
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  0
 ...-5989.patch => 0531-Fix-SPIGOT-5989.patch} |  2 +-
 ...-Bukkit-world-container-is-not-used.patch} |  0
 ...5885-Unable-to-disable-advancements.patch} |  0
 ...taPlayer-leak-due-from-quitting-ear.patch} |  0
 ...eLighting-call-to-World-spigot-stri.patch} |  0
 ...ix-some-rails-connecting-improperly.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...h => 0538-Incremental-player-saving.patch} |  0
 ...tch => 0539-Import-fastutil-classes.patch} |  0
 ...ll-chunk-sections-for-block-updates.patch} |  0
 ...ve-armour-stand-double-add-to-world.patch} |  0
 ...Fix-MC-187716-Use-configured-height.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0545-Brand-support.patch} |  0
 ...er-Boss-Bar-doesn-t-update-until-in.patch} |  0
 ...-197271.patch => 0547-Fix-MC-197271.patch} |  0
 ...0548-MC-197883-Bandaid-decode-issue.patch} |  0
 ...patch => 0549-Add-setMaxPlayers-API.patch} |  4 ++--
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0551-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0553-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...ent.patch => 0555-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0557-Buffer-joins-to-world.patch} |  0
 ...=> 0558-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  2 +-
 ...ch => 0561-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0562-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0565-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...aFixerUpper-Rewrite-Rules-on-demand.patch} |  0
 ...-capture-to-capture-all-items-added.patch} |  2 +-
 ...ty-in-invalid-locations-SPIGOT-6086.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...track-plugin-scoreboards-by-default.patch} |  0
 ...king.patch => 0573-Entity-isTicking.patch} |  0
 ...non-whitelisted-player-when-white-l.patch} |  0
 ...ix-Not-a-string-Map-Conversion-spam.patch} |  0
 ...g-a-passenger-in-CreatureSpawnEvent.patch} |  0
 ...ems-that-are-extra-from-a-crafting-.patch} |  0
 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} |  0
 ...-large-move-vectors-crashing-server.patch} |  0
 ...atch => 0580-Optimise-getType-calls.patch} |  0
 ....patch => 0581-Villager-resetOffers.patch} |  0
 ...nig-for-some-hot-IBlockData-methods.patch} |  0
 ...ce-order-when-capturing-blockstates.patch} |  0
 ...lockpos-allocation-from-pathfinding.patch} |  0
 ...em-locations-dropped-from-campfires.patch} |  0
 ...tch => 0586-Player-elytra-boost-API.patch} |  0
 ...87-Fixed-TileEntityBell-memory-leak.patch} |  0
 ...ing-up-when-item-stack-is-empty-in-.patch} |  2 +-
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0590-Add-ignore-discounts-API.patch} |  2 +-
 ...Toggle-for-removing-existing-dragon.patch} |  0
 ...x-client-lag-on-advancement-loading.patch} |  2 +-
 ...> 0593-Item-no-age-no-player-pickup.patch} |  0
 ...594-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0595-Add-API-for-quit-reason.patch} |  0
 ...h => 0596-Seed-based-feature-search.patch} |  0
 ...ng-Trader-spawn-rate-config-options.patch} |  0
 ...rove-performance-of-the-end-generat.patch} |  0
 ...ch => 0599-Expose-world-spawn-angle.patch} |  2 +-
 ...patch => 0600-Add-Destroy-Speed-API.patch} |  0
 ...-spawnParticle-x-y-z-precision-loss.patch} |  0
 ...02-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0603-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0604-More-lightning-API.patch} |  0
 ...should-not-bypass-cramming-gamerule.patch} |  0
 ...-missing-default-perms-for-commands.patch} |  0
 ...h => 0607-Add-PlayerShearBlockEvent.patch} |  2 +-
 ...-for-servers-not-running-on-Java-16.patch} |  0
 ...rbose-world-setting-to-false-by-def.patch} |  0
 ...ng-zombie-villager-discount-exploit.patch} |  0
 ....patch => 0611-Limit-recipe-packets.patch} |  0
 ...-CraftSound-backwards-compatibility.patch} |  0
 ... 0613-MC-4-Fix-item-position-desync.patch} |  0
 ...614-Player-Chunk-Load-Unload-Events.patch} |  0
 ...5-Optimize-Dynamic-get-Missing-Keys.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...-invalid-ingredient-lists-in-Villag.patch} |  0
 ...atch => 0619-added-PlayerTradeEvent.patch} |  0
 ...ch => 0620-Implement-TargetHitEvent.patch} |  0
 ...621-Additional-Block-Material-API-s.patch} |  0
 ...tch => 0622-Fix-harming-potion-dupe.patch} |  0
 ...get-Material-from-Boats-and-Minecar.patch} |  0
 ... => 0624-Optimized-tick-ready-check.patch} |  0
 ....patch => 0625-Cache-burn-durations.patch} |  0
 ...ob-spawner-spawn-egg-transformation.patch} |  0
 ...ment-PlayerFlowerPotManipulateEvent.patch} |  0
 ...event-not-being-called-in-adventure.patch} |  0
 ...h => 0629-Zombie-API-breaking-doors.patch} |  0
 ...630-Fix-nerfed-slime-when-splitting.patch} |  0
 ...=> 0631-Add-EntityLoadCrossbowEvent.patch} |  0
 ...ch => 0632-Guardian-beam-workaround.patch} |  0
 ...0633-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...d-settings-for-mobs-picking-up-loot.patch} |  0
 ...mplemented-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...tch => 0638-Fire-event-on-GS4-query.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...nfigurable-door-breaking-difficulty.patch} |  0
 ...ty-commands-shall-not-be-dispatched.patch} |  0
 ...I-to-expose-exact-interaction-point.patch} |  0
 ...OIs.patch => 0643-Remove-stale-POIs.patch} |  0
 ...h => 0644-Fix-villager-boat-exploit.patch} |  2 +-
 ...45-Entity-load-save-limit-per-chunk.patch} |  0
 ...I.patch => 0646-Add-sendOpLevel-API.patch} |  2 +-
 ...ch => 0647-Add-StructureLocateEvent.patch} |  0
 ...-for-requiring-a-player-participant.patch} |  0
 ...ectileHitEvent-cancel-where-missing.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...651-Make-schedule-command-per-world.patch} |  0
 ...652-Configurable-max-leash-distance.patch} |  0
 ...653-Implement-BlockPreDispenseEvent.patch} |  0
 ...h => 0654-Added-Vanilla-Entity-Tags.patch} |  2 +-
 ...-API.patch => 0655-added-Wither-API.patch} |  0
 ...ng-of-PlayerChangeBeaconEffectEvent.patch} |  0
 ...-spam-when-removing-chests-in-water.patch} |  0
 ...e-for-always-placing-the-dragon-egg.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  0
 ...e-map-update-when-spawning-disabled.patch} |  0
 ...shield-blocking-on-dimension-change.patch} |  0
 ...atch => 0663-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0664-EntityMoveEvent.patch} |  0
 ...isable-pathfinding-updates-on-block.patch} |  0
 ... 0666-Inline-shift-direction-fields.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...ix-dead-slime-setSize-invincibility.patch} |  0
 ...pes-should-return-an-immutable-list.patch} |  0
 ....patch => 0672-misc-debugging-dumps.patch} |  2 +-
 ...port-for-hex-color-codes-in-console.patch} |  0
 ...fo.patch => 0674-Clear-SyncLoadInfo.patch} |  0
 ...atch => 0675-Expose-Tracked-Players.patch} |  0
 ...6-Remove-streams-from-SensorNearest.patch} |  0
 ...nnecessary-copies-of-passenger-list.patch} |  2 +-
 ...ix-Wither-hostility-towards-players.patch} |  0
 ...er-exception-on-empty-JsonList-file.patch} |  0
 ...GUI.patch => 0680-Improve-ServerGUI.patch} |  0
 ...ure-plate-EntityInteractEvent-for-i.patch} |  0
 ...682-fix-converting-txt-to-json-file.patch} |  2 +-
 ...atch => 0683-Add-worldborder-events.patch} |  0
 ...=> 0684-added-PlayerNameEntityEvent.patch} |  0
 ...grindstones-from-overstacking-items.patch} |  0
 ...h => 0686-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0687-Add-Block-isValidTool.patch} |  0
 ...using-signs-inside-spawn-protection.patch} |  0
 ...ch => 0689-Implement-Keyed-on-World.patch} |  0
 ...lternative-constructor-for-Vector3f.patch} |  0
 ...y-API.patch => 0691-Item-Rarity-API.patch} |  0
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...py-TESign-isEditable-from-snapshots.patch} |  0
 ...d-item-when-player-has-disconnected.patch} |  2 +-
 ...elist-use-configurable-kick-message.patch} |  0
 ...to-remove-correct-TE-during-TE-tick.patch} |  0
 ...gnore-result-of-PlayerEditBookEvent.patch} |  0
 ...block-falling-causing-client-desync.patch} |  0
 ...tch => 0699-Expose-protocol-version.patch} |  0
 ...nt-suggestion-tooltips-in-AsyncTabC.patch} |  0
 ...ab-completions-for-brigadier-comman.patch} |  0
 ...temConsumeEvent-cancelling-properly.patch} |  0
 ...patch => 0703-Add-bypass-host-check.patch} |  0
 ...on-t-throw-when-loading-invalid-TEs.patch} |  0
 ...0705-Set-area-affect-cloud-rotation.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...ting-give-items-on-item-drop-cancel.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ...ix-PigZombieAngerEvent-cancellation.patch} |  0
 ...-checkReach-check-for-Shulker-boxes.patch} |  0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |  0
 ... => 0713-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0714-More-World-API.patch} |  0
 ... 0715-Added-PlayerBedFailEnterEvent.patch} |  0
 ...-to-convert-between-Component-and-B.patch} |  0
 ...n-acting-as-a-bed-respawn-from-the-.patch} |  2 +-
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  2 +-
 ...acon-activation-deactivation-events.patch} |  0
 ...dd-Channel-initialization-listeners.patch} |  0
 ...mands-if-tab-completion-is-disabled.patch} |  0
 ...> 0722-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0726-Inventory-close.patch} |  0
 ...reateEvent-players-and-end-platform.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...=> 0729-Fix-CraftPotionBrewer-cache.patch} |  0
 563 files changed, 103 insertions(+), 125 deletions(-)
 rename Spigot-Server-Patches/{0169-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0168-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 delete mode 100644 Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
 rename Spigot-Server-Patches/{0170-Add-PlayerJumpEvent.patch => 0169-Add-PlayerJumpEvent.patch} (100%)
 rename Spigot-Server-Patches/{0171-handle-PacketPlayInKeepAlive-async.patch => 0170-handle-PacketPlayInKeepAlive-async.patch} (100%)
 rename Spigot-Server-Patches/{0172-Expose-client-protocol-version-and-virtual-host.patch => 0171-Expose-client-protocol-version-and-virtual-host.patch} (98%)
 rename Spigot-Server-Patches/{0173-revert-serverside-behavior-of-keepalives.patch => 0172-revert-serverside-behavior-of-keepalives.patch} (100%)
 rename Spigot-Server-Patches/{0174-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0173-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (100%)
 rename Spigot-Server-Patches/{0175-Option-for-maximum-exp-value-when-merging-orbs.patch => 0174-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename Spigot-Server-Patches/{0176-Add-PlayerArmorChangeEvent.patch => 0175-Add-PlayerArmorChangeEvent.patch} (95%)
 rename Spigot-Server-Patches/{0177-Prevent-logins-from-being-processed-when-the-player-.patch => 0176-Prevent-logins-from-being-processed-when-the-player-.patch} (92%)
 rename Spigot-Server-Patches/{0178-use-CB-BlockState-implementations-for-captured-block.patch => 0177-use-CB-BlockState-implementations-for-captured-block.patch} (100%)
 rename Spigot-Server-Patches/{0179-API-to-get-a-BlockState-without-a-snapshot.patch => 0178-API-to-get-a-BlockState-without-a-snapshot.patch} (97%)
 rename Spigot-Server-Patches/{0180-AsyncTabCompleteEvent.patch => 0179-AsyncTabCompleteEvent.patch} (100%)
 rename Spigot-Server-Patches/{0181-Avoid-NPE-in-PathfinderGoalTempt.patch => 0180-Avoid-NPE-in-PathfinderGoalTempt.patch} (100%)
 rename Spigot-Server-Patches/{0182-PlayerPickupExperienceEvent.patch => 0181-PlayerPickupExperienceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0183-ExperienceOrbMergeEvent.patch => 0182-ExperienceOrbMergeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0184-Ability-to-apply-mending-to-XP-API.patch => 0183-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename Spigot-Server-Patches/{0185-Make-max-squid-spawn-height-configurable.patch => 0184-Make-max-squid-spawn-height-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0186-PreCreatureSpawnEvent.patch => 0185-PreCreatureSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0187-PlayerNaturallySpawnCreaturesEvent.patch => 0186-PlayerNaturallySpawnCreaturesEvent.patch} (100%)
 rename Spigot-Server-Patches/{0188-Add-setPlayerProfile-API-for-Skulls.patch => 0187-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename Spigot-Server-Patches/{0189-Fill-Profile-Property-Events.patch => 0188-Fill-Profile-Property-Events.patch} (100%)
 rename Spigot-Server-Patches/{0190-PlayerAdvancementCriterionGrantEvent.patch => 0189-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename Spigot-Server-Patches/{0191-Add-ArmorStand-Item-Meta.patch => 0190-Add-ArmorStand-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0192-Extend-Player-Interact-cancellation.patch => 0191-Extend-Player-Interact-cancellation.patch} (100%)
 rename Spigot-Server-Patches/{0193-Tameable-getOwnerUniqueId-API.patch => 0192-Tameable-getOwnerUniqueId-API.patch} (88%)
 rename Spigot-Server-Patches/{0194-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0193-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (100%)
 rename Spigot-Server-Patches/{0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0196-Disable-Explicit-Network-Manager-Flushing.patch => 0195-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename Spigot-Server-Patches/{0197-Implement-extended-PaperServerListPingEvent.patch => 0196-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0198-Improved-Async-Task-Scheduler.patch => 0197-Improved-Async-Task-Scheduler.patch} (100%)
 rename Spigot-Server-Patches/{0199-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0198-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename Spigot-Server-Patches/{0200-Player.setPlayerProfile-API.patch => 0199-Player.setPlayerProfile-API.patch} (100%)
 rename Spigot-Server-Patches/{0201-Fix-Dragon-Server-Crashes.patch => 0200-Fix-Dragon-Server-Crashes.patch} (100%)
 rename Spigot-Server-Patches/{0202-getPlayerUniqueId-API.patch => 0201-getPlayerUniqueId-API.patch} (100%)
 rename Spigot-Server-Patches/{0203-Make-player-data-saving-configurable.patch => 0202-Make-player-data-saving-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0204-Make-legacy-ping-handler-more-reliable.patch => 0203-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename Spigot-Server-Patches/{0205-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0204-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename Spigot-Server-Patches/{0206-Flag-to-disable-the-channel-limit.patch => 0205-Flag-to-disable-the-channel-limit.patch} (100%)
 rename Spigot-Server-Patches/{0207-Add-method-to-open-already-placed-sign.patch => 0206-Add-method-to-open-already-placed-sign.patch} (100%)
 rename Spigot-Server-Patches/{0208-Configurable-sprint-interruption-on-attack.patch => 0207-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename Spigot-Server-Patches/{0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (100%)
 rename Spigot-Server-Patches/{0210-EndermanEscapeEvent.patch => 0209-EndermanEscapeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0211-Enderman.teleportRandomly.patch => 0210-Enderman.teleportRandomly.patch} (100%)
 rename Spigot-Server-Patches/{0212-Block-Enderpearl-Travel-Exploit.patch => 0211-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename Spigot-Server-Patches/{0213-Expand-World.spawnParticle-API-and-add-Builder.patch => 0212-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename Spigot-Server-Patches/{0214-EndermanAttackPlayerEvent.patch => 0213-EndermanAttackPlayerEvent.patch} (100%)
 rename Spigot-Server-Patches/{0215-WitchConsumePotionEvent.patch => 0214-WitchConsumePotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0216-WitchThrowPotionEvent.patch => 0215-WitchThrowPotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (93%)
 rename Spigot-Server-Patches/{0218-WitchReadyPotionEvent.patch => 0217-WitchReadyPotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0219-ItemStack-getMaxItemUseDuration.patch => 0218-ItemStack-getMaxItemUseDuration.patch} (94%)
 rename Spigot-Server-Patches/{0220-Implement-EntityTeleportEndGatewayEvent.patch => 0219-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename Spigot-Server-Patches/{0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename Spigot-Server-Patches/{0222-Fix-CraftEntity-hashCode.patch => 0221-Fix-CraftEntity-hashCode.patch} (100%)
 rename Spigot-Server-Patches/{0223-Configurable-Alternative-LootPool-Luck-Formula.patch => 0222-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename Spigot-Server-Patches/{0224-Print-Error-details-when-failing-to-save-player-data.patch => 0223-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename Spigot-Server-Patches/{0225-Make-shield-blocking-delay-configurable.patch => 0224-Make-shield-blocking-delay-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0226-Improve-EntityShootBowEvent.patch => 0225-Improve-EntityShootBowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0227-PlayerReadyArrowEvent.patch => 0226-PlayerReadyArrowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0228-Implement-EntityKnockbackByEntityEvent.patch => 0227-Implement-EntityKnockbackByEntityEvent.patch} (98%)
 rename Spigot-Server-Patches/{0229-Expand-Explosions-API.patch => 0228-Expand-Explosions-API.patch} (93%)
 rename Spigot-Server-Patches/{0230-LivingEntity-Hand-Raised-Item-Use-API.patch => 0229-LivingEntity-Hand-Raised-Item-Use-API.patch} (96%)
 rename Spigot-Server-Patches/{0231-RangedEntity-API.patch => 0230-RangedEntity-API.patch} (100%)
 rename Spigot-Server-Patches/{0232-Add-config-to-disable-ender-dragon-legacy-check.patch => 0231-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename Spigot-Server-Patches/{0233-Implement-World.getEntity-UUID-API.patch => 0232-Implement-World.getEntity-UUID-API.patch} (90%)
 rename Spigot-Server-Patches/{0234-InventoryCloseEvent-Reason-API.patch => 0233-InventoryCloseEvent-Reason-API.patch} (100%)
 rename Spigot-Server-Patches/{0235-Vex-getSummoner-API.patch => 0234-Vex-getSummoner-API.patch} (100%)
 rename Spigot-Server-Patches/{0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (100%)
 rename Spigot-Server-Patches/{0237-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0236-Don-t-change-the-Entity-Random-seed-for-squids.patch} (100%)
 rename Spigot-Server-Patches/{0238-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0237-Re-add-vanilla-entity-warnings-for-duplicates.patch} (93%)
 rename Spigot-Server-Patches/{0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (100%)
 rename Spigot-Server-Patches/{0240-Use-asynchronous-Log4j-2-loggers.patch => 0239-Use-asynchronous-Log4j-2-loggers.patch} (94%)
 rename Spigot-Server-Patches/{0241-add-more-information-to-Entity.toString.patch => 0240-add-more-information-to-Entity.toString.patch} (93%)
 rename Spigot-Server-Patches/{0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (100%)
 rename Spigot-Server-Patches/{0243-EnderDragon-Events.patch => 0242-EnderDragon-Events.patch} (100%)
 rename Spigot-Server-Patches/{0244-PlayerElytraBoostEvent.patch => 0243-PlayerElytraBoostEvent.patch} (100%)
 rename Spigot-Server-Patches/{0245-Improve-BlockPosition-inlining.patch => 0244-Improve-BlockPosition-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0246-Optimize-RegistryID.c.patch => 0245-Optimize-RegistryID.c.patch} (100%)
 rename Spigot-Server-Patches/{0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (100%)
 rename Spigot-Server-Patches/{0248-Vanished-players-don-t-have-rights.patch => 0247-Vanished-players-don-t-have-rights.patch} (100%)
 rename Spigot-Server-Patches/{0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (100%)
 rename Spigot-Server-Patches/{0250-Add-some-Debug-to-Chunk-Entity-slices.patch => 0249-Add-some-Debug-to-Chunk-Entity-slices.patch} (100%)
 rename Spigot-Server-Patches/{0251-SkeletonHorse-Additions.patch => 0250-SkeletonHorse-Additions.patch} (100%)
 rename Spigot-Server-Patches/{0252-Prevent-Saving-Bad-entities-to-chunks.patch => 0251-Prevent-Saving-Bad-entities-to-chunks.patch} (98%)
 rename Spigot-Server-Patches/{0253-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0252-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0254-Ignore-Dead-Entities-in-entityList-iteration.patch => 0253-Ignore-Dead-Entities-in-entityList-iteration.patch} (97%)
 rename Spigot-Server-Patches/{0255-Implement-Expanded-ArmorStand-API.patch => 0254-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename Spigot-Server-Patches/{0256-AnvilDamageEvent.patch => 0255-AnvilDamageEvent.patch} (100%)
 rename Spigot-Server-Patches/{0257-Add-TNTPrimeEvent.patch => 0256-Add-TNTPrimeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0258-Break-up-and-make-tab-spam-limits-configurable.patch => 0257-Break-up-and-make-tab-spam-limits-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0259-Add-hand-to-bucket-events.patch => 0258-Add-hand-to-bucket-events.patch} (100%)
 rename Spigot-Server-Patches/{0260-MC-135506-Experience-should-save-as-Integers.patch => 0259-MC-135506-Experience-should-save-as-Integers.patch} (100%)
 rename Spigot-Server-Patches/{0261-Fix-client-rendering-skulls-from-same-user.patch => 0260-Fix-client-rendering-skulls-from-same-user.patch} (98%)
 rename Spigot-Server-Patches/{0262-Add-Early-Warning-Feature-to-WatchDog.patch => 0261-Add-Early-Warning-Feature-to-WatchDog.patch} (99%)
 rename Spigot-Server-Patches/{0263-Make-EnderDragon-implement-Mob.patch => 0262-Make-EnderDragon-implement-Mob.patch} (100%)
 rename Spigot-Server-Patches/{0264-Use-ConcurrentHashMap-in-JsonList.patch => 0263-Use-ConcurrentHashMap-in-JsonList.patch} (98%)
 rename Spigot-Server-Patches/{0265-Use-a-Queue-for-Queueing-Commands.patch => 0264-Use-a-Queue-for-Queueing-Commands.patch} (100%)
 rename Spigot-Server-Patches/{0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename Spigot-Server-Patches/{0267-Allow-disabling-armour-stand-ticking.patch => 0266-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0268-Optimize-BlockPosition-helper-methods.patch => 0267-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename Spigot-Server-Patches/{0269-Restore-vanlla-default-mob-spawn-range.patch => 0268-Restore-vanlla-default-mob-spawn-range.patch} (88%)
 rename Spigot-Server-Patches/{0270-Slime-Pathfinder-Events.patch => 0269-Slime-Pathfinder-Events.patch} (100%)
 rename Spigot-Server-Patches/{0271-Configurable-speed-for-water-flowing-over-lava.patch => 0270-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename Spigot-Server-Patches/{0272-Optimize-CraftBlockData-Creation.patch => 0271-Optimize-CraftBlockData-Creation.patch} (100%)
 rename Spigot-Server-Patches/{0273-Optimize-RegistryMaterials.patch => 0272-Optimize-RegistryMaterials.patch} (100%)
 rename Spigot-Server-Patches/{0274-Add-PhantomPreSpawnEvent.patch => 0273-Add-PhantomPreSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0275-Add-More-Creeper-API.patch => 0274-Add-More-Creeper-API.patch} (100%)
 rename Spigot-Server-Patches/{0276-Inventory-removeItemAnySlot.patch => 0275-Inventory-removeItemAnySlot.patch} (96%)
 rename Spigot-Server-Patches/{0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (92%)
 rename Spigot-Server-Patches/{0278-Add-ray-tracing-methods-to-LivingEntity.patch => 0277-Add-ray-tracing-methods-to-LivingEntity.patch} (98%)
 rename Spigot-Server-Patches/{0279-Expose-attack-cooldown-methods-for-Player.patch => 0278-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename Spigot-Server-Patches/{0280-Improve-death-events.patch => 0279-Improve-death-events.patch} (100%)
 rename Spigot-Server-Patches/{0281-Allow-chests-to-be-placed-with-NBT-data.patch => 0280-Allow-chests-to-be-placed-with-NBT-data.patch} (94%)
 rename Spigot-Server-Patches/{0282-Mob-Pathfinding-API.patch => 0281-Mob-Pathfinding-API.patch} (100%)
 rename Spigot-Server-Patches/{0283-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0282-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename Spigot-Server-Patches/{0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename Spigot-Server-Patches/{0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0286-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0285-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename Spigot-Server-Patches/{0288-Implement-furnace-cook-speed-multiplier-API.patch => 0287-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename Spigot-Server-Patches/{0289-PreSpawnerSpawnEvent.patch => 0288-PreSpawnerSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0290-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0289-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename Spigot-Server-Patches/{0291-Honor-EntityAgeable.ageLock.patch => 0290-Honor-EntityAgeable.ageLock.patch} (100%)
 rename Spigot-Server-Patches/{0292-Configurable-connection-throttle-kick-message.patch => 0291-Configurable-connection-throttle-kick-message.patch} (100%)
 rename Spigot-Server-Patches/{0293-Hook-into-CB-plugin-rewrites.patch => 0292-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename Spigot-Server-Patches/{0294-Allow-setting-the-vex-s-summoner.patch => 0293-Allow-setting-the-vex-s-summoner.patch} (100%)
 rename Spigot-Server-Patches/{0295-Add-sun-related-API.patch => 0294-Add-sun-related-API.patch} (95%)
 rename Spigot-Server-Patches/{0296-Turtle-API.patch => 0295-Turtle-API.patch} (100%)
 rename Spigot-Server-Patches/{0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename Spigot-Server-Patches/{0298-Call-player-spectator-target-events-and-improve-impl.patch => 0297-Call-player-spectator-target-events-and-improve-impl.patch} (100%)
 rename Spigot-Server-Patches/{0299-Add-Velocity-IP-Forwarding-Support.patch => 0298-Add-Velocity-IP-Forwarding-Support.patch} (99%)
 rename Spigot-Server-Patches/{0300-Add-more-Witch-API.patch => 0299-Add-more-Witch-API.patch} (100%)
 rename Spigot-Server-Patches/{0301-Check-Drowned-for-Villager-Aggression-Config.patch => 0300-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename Spigot-Server-Patches/{0302-Here-s-Johnny.patch => 0301-Here-s-Johnny.patch} (100%)
 rename Spigot-Server-Patches/{0303-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0302-Add-option-to-prevent-players-from-moving-into-unloa.patch} (100%)
 rename Spigot-Server-Patches/{0304-Reset-players-airTicks-on-respawn.patch => 0303-Reset-players-airTicks-on-respawn.patch} (100%)
 rename Spigot-Server-Patches/{0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0304-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename Spigot-Server-Patches/{0307-Optimize-World-Time-Updates.patch => 0306-Optimize-World-Time-Updates.patch} (100%)
 rename Spigot-Server-Patches/{0308-Restore-custom-InventoryHolder-support.patch => 0307-Restore-custom-InventoryHolder-support.patch} (100%)
 rename Spigot-Server-Patches/{0309-Use-Vanilla-Minecart-Speeds.patch => 0308-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename Spigot-Server-Patches/{0310-Fix-SpongeAbsortEvent-handling.patch => 0309-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename Spigot-Server-Patches/{0311-Don-t-allow-digging-into-unloaded-chunks.patch => 0310-Don-t-allow-digging-into-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0312-Book-Size-Limits.patch => 0311-Book-Size-Limits.patch} (100%)
 rename Spigot-Server-Patches/{0313-Make-the-default-permission-message-configurable.patch => 0312-Make-the-default-permission-message-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0314-Prevent-rayTrace-from-loading-chunks.patch => 0313-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0315-Handle-Large-Packets-disconnecting-client.patch => 0314-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename Spigot-Server-Patches/{0316-force-entity-dismount-during-teleportation.patch => 0315-force-entity-dismount-during-teleportation.patch} (100%)
 rename Spigot-Server-Patches/{0317-Add-more-Zombie-API.patch => 0316-Add-more-Zombie-API.patch} (100%)
 rename Spigot-Server-Patches/{0318-Add-PlayerConnectionCloseEvent.patch => 0317-Add-PlayerConnectionCloseEvent.patch} (98%)
 rename Spigot-Server-Patches/{0319-Prevent-Enderman-from-loading-chunks.patch => 0318-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename Spigot-Server-Patches/{0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename Spigot-Server-Patches/{0322-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0321-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename Spigot-Server-Patches/{0323-Block-Entity-remove-from-being-called-on-Players.patch => 0322-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename Spigot-Server-Patches/{0324-BlockDestroyEvent.patch => 0323-BlockDestroyEvent.patch} (100%)
 rename Spigot-Server-Patches/{0325-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0324-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename Spigot-Server-Patches/{0326-Fix-sign-edit-memory-leak.patch => 0325-Fix-sign-edit-memory-leak.patch} (100%)
 rename Spigot-Server-Patches/{0327-Limit-Client-Sign-length-more.patch => 0326-Limit-Client-Sign-length-more.patch} (100%)
 rename Spigot-Server-Patches/{0328-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0327-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename Spigot-Server-Patches/{0329-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0328-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename Spigot-Server-Patches/{0330-Handle-Oversized-Tile-Entities-in-chunks.patch => 0329-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (95%)
 rename Spigot-Server-Patches/{0332-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0331-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename Spigot-Server-Patches/{0333-Allow-Saving-of-Oversized-Chunks.patch => 0332-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (88%)
 rename Spigot-Server-Patches/{0335-Add-LivingEntity-getTargetEntity.patch => 0334-Add-LivingEntity-getTargetEntity.patch} (98%)
 rename Spigot-Server-Patches/{0336-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0335-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename Spigot-Server-Patches/{0337-Entity-getEntitySpawnReason.patch => 0336-Entity-getEntitySpawnReason.patch} (97%)
 rename Spigot-Server-Patches/{0338-Update-entity-Metadata-for-all-tracked-players.patch => 0337-Update-entity-Metadata-for-all-tracked-players.patch} (100%)
 rename Spigot-Server-Patches/{0339-Implement-PlayerPostRespawnEvent.patch => 0338-Implement-PlayerPostRespawnEvent.patch} (95%)
 rename Spigot-Server-Patches/{0340-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0339-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename Spigot-Server-Patches/{0341-Server-Tick-Events.patch => 0340-Server-Tick-Events.patch} (100%)
 rename Spigot-Server-Patches/{0342-PlayerDeathEvent-getItemsToKeep.patch => 0341-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename Spigot-Server-Patches/{0343-Optimize-Captured-TileEntity-Lookup.patch => 0342-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename Spigot-Server-Patches/{0344-Add-Heightmap-API.patch => 0343-Add-Heightmap-API.patch} (96%)
 rename Spigot-Server-Patches/{0345-Mob-Spawner-API-Enhancements.patch => 0344-Mob-Spawner-API-Enhancements.patch} (100%)
 rename Spigot-Server-Patches/{0346-Per-Player-View-Distance-API-placeholders.patch => 0345-Per-Player-View-Distance-API-placeholders.patch} (100%)
 rename Spigot-Server-Patches/{0347-Fix-CB-call-to-changed-postToMainThread-method.patch => 0346-Fix-CB-call-to-changed-postToMainThread-method.patch} (100%)
 rename Spigot-Server-Patches/{0348-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename Spigot-Server-Patches/{0349-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename Spigot-Server-Patches/{0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (96%)
 rename Spigot-Server-Patches/{0351-Duplicate-UUID-Resolve-Option.patch => 0350-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename Spigot-Server-Patches/{0352-improve-CraftWorld-isChunkLoaded.patch => 0351-improve-CraftWorld-isChunkLoaded.patch} (94%)
 rename Spigot-Server-Patches/{0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (100%)
 rename Spigot-Server-Patches/{0354-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0353-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (100%)
 rename Spigot-Server-Patches/{0355-ChunkMapDistance-CME.patch => 0354-ChunkMapDistance-CME.patch} (100%)
 rename Spigot-Server-Patches/{0356-Implement-CraftBlockSoundGroup.patch => 0355-Implement-CraftBlockSoundGroup.patch} (100%)
 rename Spigot-Server-Patches/{0357-Chunk-debug-command.patch => 0356-Chunk-debug-command.patch} (99%)
 rename Spigot-Server-Patches/{0358-Catch-exceptions-from-dispenser-entity-spawns.patch => 0357-Catch-exceptions-from-dispenser-entity-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0359-Fix-World-isChunkGenerated-calls.patch => 0358-Fix-World-isChunkGenerated-calls.patch} (99%)
 rename Spigot-Server-Patches/{0360-Show-blockstate-location-if-we-failed-to-read-it.patch => 0359-Show-blockstate-location-if-we-failed-to-read-it.patch} (94%)
 rename Spigot-Server-Patches/{0361-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch => 0360-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch} (100%)
 rename Spigot-Server-Patches/{0362-incremental-chunk-saving.patch => 0361-incremental-chunk-saving.patch} (100%)
 rename Spigot-Server-Patches/{0363-Anti-Xray.patch => 0362-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename Spigot-Server-Patches/{0365-Configurable-projectile-relative-velocity.patch => 0364-Configurable-projectile-relative-velocity.patch} (100%)
 rename Spigot-Server-Patches/{0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0365-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (100%)
 rename Spigot-Server-Patches/{0367-offset-item-frame-ticking.patch => 0366-offset-item-frame-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0368-Avoid-hopper-searches-if-there-are-no-items.patch => 0367-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename Spigot-Server-Patches/{0369-Asynchronous-chunk-IO-and-loading.patch => 0368-Asynchronous-chunk-IO-and-loading.patch} (100%)
 rename Spigot-Server-Patches/{0370-Use-getChunkIfLoadedImmediately-in-places.patch => 0369-Use-getChunkIfLoadedImmediately-in-places.patch} (98%)
 rename Spigot-Server-Patches/{0371-Reduce-sync-loads.patch => 0370-Reduce-sync-loads.patch} (98%)
 rename Spigot-Server-Patches/{0372-Implement-alternative-item-despawn-rate.patch => 0371-Implement-alternative-item-despawn-rate.patch} (100%)
 rename Spigot-Server-Patches/{0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (100%)
 rename Spigot-Server-Patches/{0374-Fix-MC-158900.patch => 0373-Fix-MC-158900.patch} (94%)
 rename Spigot-Server-Patches/{0375-implement-optional-per-player-mob-spawns.patch => 0374-implement-optional-per-player-mob-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0376-Prevent-consuming-the-wrong-itemstack.patch => 0375-Prevent-consuming-the-wrong-itemstack.patch} (95%)
 rename Spigot-Server-Patches/{0377-Generator-Settings.patch => 0376-Generator-Settings.patch} (100%)
 rename Spigot-Server-Patches/{0378-Fix-MC-161754.patch => 0377-Fix-MC-161754.patch} (100%)
 rename Spigot-Server-Patches/{0379-Performance-improvement-for-Chunk.getEntities.patch => 0378-Performance-improvement-for-Chunk.getEntities.patch} (100%)
 rename Spigot-Server-Patches/{0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0379-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename Spigot-Server-Patches/{0381-Expose-the-internal-current-tick.patch => 0380-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-Server-Patches/{0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0381-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (100%)
 rename Spigot-Server-Patches/{0383-Add-option-to-disable-pillager-patrols.patch => 0382-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename Spigot-Server-Patches/{0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0383-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (100%)
 rename Spigot-Server-Patches/{0385-PlayerLaunchProjectileEvent.patch => 0384-PlayerLaunchProjectileEvent.patch} (100%)
 rename Spigot-Server-Patches/{0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0385-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename Spigot-Server-Patches/{0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0386-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename Spigot-Server-Patches/{0388-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0387-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename Spigot-Server-Patches/{0389-Optimize-Hoppers.patch => 0388-Optimize-Hoppers.patch} (99%)
 rename Spigot-Server-Patches/{0390-PlayerDeathEvent-shouldDropExperience.patch => 0389-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename Spigot-Server-Patches/{0391-Prevent-bees-loading-chunks-checking-hive-position.patch => 0390-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename Spigot-Server-Patches/{0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0391-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename Spigot-Server-Patches/{0393-Guard-against-serializing-mismatching-chunk-coordina.patch => 0392-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename Spigot-Server-Patches/{0394-Optimise-IEntityAccess-getPlayerByUUID.patch => 0393-Optimise-IEntityAccess-getPlayerByUUID.patch} (96%)
 rename Spigot-Server-Patches/{0395-Fix-items-not-falling-correctly.patch => 0394-Fix-items-not-falling-correctly.patch} (100%)
 rename Spigot-Server-Patches/{0396-Lag-compensate-eating.patch => 0395-Lag-compensate-eating.patch} (100%)
 rename Spigot-Server-Patches/{0397-Optimize-call-to-getFluid-for-explosions.patch => 0396-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename Spigot-Server-Patches/{0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0397-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename Spigot-Server-Patches/{0399-Add-effect-to-block-break-naturally.patch => 0398-Add-effect-to-block-break-naturally.patch} (100%)
 rename Spigot-Server-Patches/{0400-Tracking-Range-Improvements.patch => 0399-Tracking-Range-Improvements.patch} (97%)
 rename Spigot-Server-Patches/{0401-Entity-Activation-Range-2.0.patch => 0400-Entity-Activation-Range-2.0.patch} (100%)
 rename Spigot-Server-Patches/{0402-Fix-items-vanishing-through-end-portal.patch => 0401-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename Spigot-Server-Patches/{0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0402-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename Spigot-Server-Patches/{0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0403-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0405-Allow-overriding-the-java-version-check.patch => 0404-Allow-overriding-the-java-version-check.patch} (100%)
 rename Spigot-Server-Patches/{0406-Add-ThrownEggHatchEvent.patch => 0405-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-Server-Patches/{0407-Optimise-random-block-ticking.patch => 0406-Optimise-random-block-ticking.patch} (99%)
 rename Spigot-Server-Patches/{0408-Entity-Jump-API.patch => 0407-Entity-Jump-API.patch} (100%)
 rename Spigot-Server-Patches/{0409-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0408-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename Spigot-Server-Patches/{0410-Make-the-GUI-graph-fancier.patch => 0409-Make-the-GUI-graph-fancier.patch} (100%)
 rename Spigot-Server-Patches/{0411-add-hand-to-BlockMultiPlaceEvent.patch => 0410-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0412-Prevent-teleporting-dead-entities.patch => 0411-Prevent-teleporting-dead-entities.patch} (100%)
 rename Spigot-Server-Patches/{0413-Validate-tripwire-hook-placement-before-update.patch => 0412-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename Spigot-Server-Patches/{0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0413-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename Spigot-Server-Patches/{0415-Configurable-chance-of-villager-zombie-infection.patch => 0414-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename Spigot-Server-Patches/{0416-Optimise-Chunk-getFluid.patch => 0415-Optimise-Chunk-getFluid.patch} (100%)
 rename Spigot-Server-Patches/{0417-Optimise-TickListServer-by-rewriting-it.patch => 0416-Optimise-TickListServer-by-rewriting-it.patch} (99%)
 rename Spigot-Server-Patches/{0418-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0417-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename Spigot-Server-Patches/{0419-Ensure-Entity-is-never-double-registered.patch => 0418-Ensure-Entity-is-never-double-registered.patch} (97%)
 rename Spigot-Server-Patches/{0420-Fix-unregistering-entities-from-unloading-chunks.patch => 0419-Fix-unregistering-entities-from-unloading-chunks.patch} (94%)
 rename Spigot-Server-Patches/{0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0420-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0421-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename Spigot-Server-Patches/{0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0422-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (96%)
 rename Spigot-Server-Patches/{0424-Optimize-Collision-to-not-load-chunks.patch => 0423-Optimize-Collision-to-not-load-chunks.patch} (99%)
 rename Spigot-Server-Patches/{0425-Don-t-tick-dead-players.patch => 0424-Don-t-tick-dead-players.patch} (100%)
 rename Spigot-Server-Patches/{0426-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0425-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename Spigot-Server-Patches/{0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0426-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (99%)
 rename Spigot-Server-Patches/{0428-Increase-Light-Queue-Size.patch => 0427-Increase-Light-Queue-Size.patch} (100%)
 rename Spigot-Server-Patches/{0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0428-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (100%)
 rename Spigot-Server-Patches/{0430-Don-t-move-existing-players-to-world-spawn.patch => 0429-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename Spigot-Server-Patches/{0431-Add-tick-times-API-and-mspt-command.patch => 0430-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename Spigot-Server-Patches/{0432-Expose-MinecraftServer-isRunning.patch => 0431-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-Server-Patches/{0433-Add-Raw-Byte-ItemStack-Serialization.patch => 0432-Add-Raw-Byte-ItemStack-Serialization.patch} (98%)
 rename Spigot-Server-Patches/{0434-Remove-streams-from-Mob-AI-System.patch => 0433-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename Spigot-Server-Patches/{0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0434-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (95%)
 rename Spigot-Server-Patches/{0436-Async-command-map-building.patch => 0435-Async-command-map-building.patch} (100%)
 rename Spigot-Server-Patches/{0437-Improved-Watchdog-Support.patch => 0436-Improved-Watchdog-Support.patch} (100%)
 rename Spigot-Server-Patches/{0438-Optimize-Pathfinding.patch => 0437-Optimize-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0439-Reduce-Either-Optional-allocation.patch => 0438-Reduce-Either-Optional-allocation.patch} (100%)
 rename Spigot-Server-Patches/{0440-Remove-streams-from-PairedQueue.patch => 0439-Remove-streams-from-PairedQueue.patch} (100%)
 rename Spigot-Server-Patches/{0441-Reduce-memory-footprint-of-NBTTagCompound.patch => 0440-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename Spigot-Server-Patches/{0442-Prevent-opening-inventories-when-frozen.patch => 0441-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename Spigot-Server-Patches/{0443-Optimise-ArraySetSorted-removeIf.patch => 0442-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename Spigot-Server-Patches/{0444-Don-t-run-entity-collision-code-if-not-needed.patch => 0443-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0444-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (100%)
 rename Spigot-Server-Patches/{0446-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0445-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename Spigot-Server-Patches/{0447-Implement-Player-Client-Options-API.patch => 0446-Implement-Player-Client-Options-API.patch} (100%)
 rename Spigot-Server-Patches/{0448-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0447-Fix-Chunk-Post-Processing-deadlock-risk.patch} (97%)
 rename Spigot-Server-Patches/{0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0448-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename Spigot-Server-Patches/{0450-Broadcast-join-message-to-console.patch => 0449-Broadcast-join-message-to-console.patch} (91%)
 rename Spigot-Server-Patches/{0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0450-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename Spigot-Server-Patches/{0452-Load-Chunks-for-Login-Asynchronously.patch => 0451-Load-Chunks-for-Login-Asynchronously.patch} (100%)
 rename Spigot-Server-Patches/{0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0452-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename Spigot-Server-Patches/{0454-Add-PlayerAttackEntityCooldownResetEvent.patch => 0453-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-Server-Patches/{0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0454-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (96%)
 rename Spigot-Server-Patches/{0456-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0455-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename Spigot-Server-Patches/{0457-Add-phantom-creative-and-insomniac-controls.patch => 0456-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename Spigot-Server-Patches/{0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0457-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename Spigot-Server-Patches/{0459-Implement-Brigadier-Mojang-API.patch => 0458-Implement-Brigadier-Mojang-API.patch} (100%)
 rename Spigot-Server-Patches/{0460-Villager-Restocks-API.patch => 0459-Villager-Restocks-API.patch} (96%)
 rename Spigot-Server-Patches/{0461-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0460-Validate-PickItem-Packet-and-kick-for-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0462-Expose-game-version.patch => 0461-Expose-game-version.patch} (89%)
 rename Spigot-Server-Patches/{0463-Optimize-Voxel-Shape-Merging.patch => 0462-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename Spigot-Server-Patches/{0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0463-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename Spigot-Server-Patches/{0465-Implement-Mob-Goal-API.patch => 0464-Implement-Mob-Goal-API.patch} (99%)
 rename Spigot-Server-Patches/{0466-Use-distance-map-to-optimise-entity-tracker.patch => 0465-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0467-Optimize-isOutsideRange-to-use-distance-maps.patch => 0466-Optimize-isOutsideRange-to-use-distance-maps.patch} (100%)
 rename Spigot-Server-Patches/{0468-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0467-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename Spigot-Server-Patches/{0469-No-Tick-view-distance-implementation.patch => 0468-No-Tick-view-distance-implementation.patch} (100%)
 rename Spigot-Server-Patches/{0470-Add-villager-reputation-API.patch => 0469-Add-villager-reputation-API.patch} (100%)
 rename Spigot-Server-Patches/{0471-Fix-Light-Command.patch => 0470-Fix-Light-Command.patch} (99%)
 rename Spigot-Server-Patches/{0472-Fix-PotionEffect-ignores-icon-flag.patch => 0471-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename Spigot-Server-Patches/{0473-Optimize-brigadier-child-sorting-performance.patch => 0472-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename Spigot-Server-Patches/{0474-Potential-bed-API.patch => 0473-Potential-bed-API.patch} (100%)
 rename Spigot-Server-Patches/{0475-Wait-for-Async-Tasks-during-shutdown.patch => 0474-Wait-for-Async-Tasks-during-shutdown.patch} (96%)
 rename Spigot-Server-Patches/{0476-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0475-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename Spigot-Server-Patches/{0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0476-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename Spigot-Server-Patches/{0478-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0477-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename Spigot-Server-Patches/{0479-Reduce-MutableInt-allocations-from-light-engine.patch => 0478-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename Spigot-Server-Patches/{0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0479-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (97%)
 rename Spigot-Server-Patches/{0481-Ensure-safe-gateway-teleport.patch => 0480-Ensure-safe-gateway-teleport.patch} (100%)
 rename Spigot-Server-Patches/{0482-Add-option-for-console-having-all-permissions.patch => 0481-Add-option-for-console-having-all-permissions.patch} (100%)
 rename Spigot-Server-Patches/{0483-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0482-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename Spigot-Server-Patches/{0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch => 0483-Workaround-for-Client-Lag-Spikes-MC-162253.patch} (98%)
 rename Spigot-Server-Patches/{0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0484-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0485-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (97%)
 rename Spigot-Server-Patches/{0487-Improve-Chunk-Status-Transition-Speed.patch => 0486-Improve-Chunk-Status-Transition-Speed.patch} (98%)
 rename Spigot-Server-Patches/{0488-Fix-villager-trading-demand-MC-163962.patch => 0487-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename Spigot-Server-Patches/{0489-Maps-shouldn-t-load-chunks.patch => 0488-Maps-shouldn-t-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0489-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (95%)
 rename Spigot-Server-Patches/{0491-Optimize-Bit-Operations-by-inlining.patch => 0490-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0492-Optimize-Light-Engine.patch => 0491-Optimize-Light-Engine.patch} (99%)
 rename Spigot-Server-Patches/{0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0492-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename Spigot-Server-Patches/{0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0493-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (98%)
 rename Spigot-Server-Patches/{0495-Fix-missing-chunks-due-to-integer-overflow.patch => 0494-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename Spigot-Server-Patches/{0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0495-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename Spigot-Server-Patches/{0497-Fix-piston-physics-inconsistency-MC-188840.patch => 0496-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename Spigot-Server-Patches/{0498-Fix-sand-duping.patch => 0497-Fix-sand-duping.patch} (100%)
 rename Spigot-Server-Patches/{0499-Prevent-position-desync-in-playerconnection-causing-.patch => 0498-Prevent-position-desync-in-playerconnection-causing-.patch} (100%)
 rename Spigot-Server-Patches/{0500-Fix-enderdragon-exp-dupe.patch => 0499-Fix-enderdragon-exp-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0501-Inventory-getHolder-method-without-block-snapshot.patch => 0500-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0502-Expose-Arrow-getItemStack.patch => 0501-Expose-Arrow-getItemStack.patch} (94%)
 rename Spigot-Server-Patches/{0503-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0502-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename Spigot-Server-Patches/{0504-Hide-sync-chunk-writes-behind-flag.patch => 0503-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename Spigot-Server-Patches/{0505-Limit-lightning-strike-effect-distance.patch => 0504-Limit-lightning-strike-effect-distance.patch} (100%)
 rename Spigot-Server-Patches/{0506-Add-permission-for-command-blocks.patch => 0505-Add-permission-for-command-blocks.patch} (100%)
 rename Spigot-Server-Patches/{0507-Ensure-Entity-AABB-s-are-never-invalid.patch => 0506-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0508-Optimize-WorldBorder-collision-checks-and-air.patch => 0507-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename Spigot-Server-Patches/{0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0508-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%)
 rename Spigot-Server-Patches/{0510-Paper-dumpitem-command.patch => 0509-Paper-dumpitem-command.patch} (100%)
 rename Spigot-Server-Patches/{0511-Don-t-allow-null-UUID-s-for-chat.patch => 0510-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename Spigot-Server-Patches/{0512-Improve-Legacy-Component-serialization-size.patch => 0511-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename Spigot-Server-Patches/{0513-Support-old-UUID-format-for-NBT.patch => 0512-Support-old-UUID-format-for-NBT.patch} (100%)
 rename Spigot-Server-Patches/{0514-Clean-up-duplicated-GameProfile-Properties.patch => 0513-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename Spigot-Server-Patches/{0515-Convert-legacy-attributes-in-Item-Meta.patch => 0514-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0516-Remove-some-streams-from-structures.patch => 0515-Remove-some-streams-from-structures.patch} (100%)
 rename Spigot-Server-Patches/{0517-Remove-streams-from-classes-related-villager-gossip.patch => 0516-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename Spigot-Server-Patches/{0518-Support-components-in-ItemMeta.patch => 0517-Support-components-in-ItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0519-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0518-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename Spigot-Server-Patches/{0520-Add-entity-liquid-API.patch => 0519-Add-entity-liquid-API.patch} (100%)
 rename Spigot-Server-Patches/{0521-Update-itemstack-legacy-name-and-lore.patch => 0520-Update-itemstack-legacy-name-and-lore.patch} (97%)
 rename Spigot-Server-Patches/{0522-Spawn-player-in-correct-world-on-login.patch => 0521-Spawn-player-in-correct-world-on-login.patch} (94%)
 rename Spigot-Server-Patches/{0523-Add-PrepareResultEvent.patch => 0522-Add-PrepareResultEvent.patch} (100%)
 rename Spigot-Server-Patches/{0524-Allow-delegation-to-vanilla-chunk-gen.patch => 0523-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename Spigot-Server-Patches/{0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0524-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename Spigot-Server-Patches/{0526-Optimize-NetworkManager-Exception-Handling.patch => 0525-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename Spigot-Server-Patches/{0527-Fix-Concurrency-issue-in-WeightedList.patch => 0526-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename Spigot-Server-Patches/{0528-Optimize-the-advancement-data-player-iteration-to-be.patch => 0527-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename Spigot-Server-Patches/{0529-Fix-arrows-never-despawning-MC-125757.patch => 0528-Fix-arrows-never-despawning-MC-125757.patch} (94%)
 rename Spigot-Server-Patches/{0530-Thread-Safe-Vanilla-Command-permission-checking.patch => 0529-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename Spigot-Server-Patches/{0531-Move-range-check-for-block-placing-up.patch => 0530-Move-range-check-for-block-placing-up.patch} (100%)
 rename Spigot-Server-Patches/{0532-Fix-SPIGOT-5989.patch => 0531-Fix-SPIGOT-5989.patch} (97%)
 rename Spigot-Server-Patches/{0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0532-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename Spigot-Server-Patches/{0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0533-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename Spigot-Server-Patches/{0535-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0534-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename Spigot-Server-Patches/{0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0535-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename Spigot-Server-Patches/{0537-Fix-some-rails-connecting-improperly.patch => 0536-Fix-some-rails-connecting-improperly.patch} (100%)
 rename Spigot-Server-Patches/{0538-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0537-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename Spigot-Server-Patches/{0539-Incremental-player-saving.patch => 0538-Incremental-player-saving.patch} (100%)
 rename Spigot-Server-Patches/{0540-Import-fastutil-classes.patch => 0539-Import-fastutil-classes.patch} (100%)
 rename Spigot-Server-Patches/{0541-Don-t-mark-null-chunk-sections-for-block-updates.patch => 0540-Don-t-mark-null-chunk-sections-for-block-updates.patch} (100%)
 rename Spigot-Server-Patches/{0542-Remove-armour-stand-double-add-to-world.patch => 0541-Remove-armour-stand-double-add-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0543-Fix-MC-187716-Use-configured-height.patch => 0542-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename Spigot-Server-Patches/{0544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0543-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename Spigot-Server-Patches/{0545-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0544-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename Spigot-Server-Patches/{0546-Brand-support.patch => 0545-Brand-support.patch} (100%)
 rename Spigot-Server-Patches/{0547-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch => 0546-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch} (100%)
 rename Spigot-Server-Patches/{0548-Fix-MC-197271.patch => 0547-Fix-MC-197271.patch} (100%)
 rename Spigot-Server-Patches/{0549-MC-197883-Bandaid-decode-issue.patch => 0548-MC-197883-Bandaid-decode-issue.patch} (100%)
 rename Spigot-Server-Patches/{0550-Add-setMaxPlayers-API.patch => 0549-Add-setMaxPlayers-API.patch} (89%)
 rename Spigot-Server-Patches/{0551-Add-playPickupItemAnimation-to-LivingEntity.patch => 0550-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0552-Don-t-require-FACING-data.patch => 0551-Don-t-require-FACING-data.patch} (100%)
 rename Spigot-Server-Patches/{0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0552-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename Spigot-Server-Patches/{0554-Add-moon-phase-API.patch => 0553-Add-moon-phase-API.patch} (100%)
 rename Spigot-Server-Patches/{0555-Prevent-headless-pistons-from-being-created.patch => 0554-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename Spigot-Server-Patches/{0556-Add-BellRingEvent.patch => 0555-Add-BellRingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0557-Add-zombie-targets-turtle-egg-config.patch => 0556-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename Spigot-Server-Patches/{0558-Buffer-joins-to-world.patch => 0557-Buffer-joins-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0559-Optimize-redstone-algorithm.patch => 0558-Optimize-redstone-algorithm.patch} (100%)
 rename Spigot-Server-Patches/{0560-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0559-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename Spigot-Server-Patches/{0561-PortalCreateEvent-needs-to-know-its-entity.patch => 0560-PortalCreateEvent-needs-to-know-its-entity.patch} (98%)
 rename Spigot-Server-Patches/{0562-Fix-CraftTeam-null-check.patch => 0561-Fix-CraftTeam-null-check.patch} (100%)
 rename Spigot-Server-Patches/{0563-Add-more-Evoker-API.patch => 0562-Add-more-Evoker-API.patch} (100%)
 rename Spigot-Server-Patches/{0564-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0563-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename Spigot-Server-Patches/{0565-Create-HoverEvent-from-ItemStack-Entity.patch => 0564-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename Spigot-Server-Patches/{0566-Cache-block-data-strings.patch => 0565-Cache-block-data-strings.patch} (100%)
 rename Spigot-Server-Patches/{0567-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0566-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%)
 rename Spigot-Server-Patches/{0568-Add-additional-open-container-api-to-HumanEntity.patch => 0567-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename Spigot-Server-Patches/{0569-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0568-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%)
 rename Spigot-Server-Patches/{0570-Extend-block-drop-capture-to-capture-all-items-added.patch => 0569-Extend-block-drop-capture-to-capture-all-items-added.patch} (97%)
 rename Spigot-Server-Patches/{0571-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0570-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%)
 rename Spigot-Server-Patches/{0572-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0571-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename Spigot-Server-Patches/{0573-Lazily-track-plugin-scoreboards-by-default.patch => 0572-Lazily-track-plugin-scoreboards-by-default.patch} (100%)
 rename Spigot-Server-Patches/{0574-Entity-isTicking.patch => 0573-Entity-isTicking.patch} (100%)
 rename Spigot-Server-Patches/{0575-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0574-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%)
 rename Spigot-Server-Patches/{0576-Fix-Not-a-string-Map-Conversion-spam.patch => 0575-Fix-Not-a-string-Map-Conversion-spam.patch} (100%)
 rename Spigot-Server-Patches/{0577-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch => 0576-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0578-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch => 0577-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch} (100%)
 rename Spigot-Server-Patches/{0579-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0578-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%)
 rename Spigot-Server-Patches/{0580-Fix-for-large-move-vectors-crashing-server.patch => 0579-Fix-for-large-move-vectors-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0581-Optimise-getType-calls.patch => 0580-Optimise-getType-calls.patch} (100%)
 rename Spigot-Server-Patches/{0582-Villager-resetOffers.patch => 0581-Villager-resetOffers.patch} (100%)
 rename Spigot-Server-Patches/{0583-Improve-inlinig-for-some-hot-IBlockData-methods.patch => 0582-Improve-inlinig-for-some-hot-IBlockData-methods.patch} (100%)
 rename Spigot-Server-Patches/{0584-Retain-block-place-order-when-capturing-blockstates.patch => 0583-Retain-block-place-order-when-capturing-blockstates.patch} (100%)
 rename Spigot-Server-Patches/{0585-Reduce-blockpos-allocation-from-pathfinding.patch => 0584-Reduce-blockpos-allocation-from-pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0586-Fix-item-locations-dropped-from-campfires.patch => 0585-Fix-item-locations-dropped-from-campfires.patch} (100%)
 rename Spigot-Server-Patches/{0587-Player-elytra-boost-API.patch => 0586-Player-elytra-boost-API.patch} (100%)
 rename Spigot-Server-Patches/{0588-Fixed-TileEntityBell-memory-leak.patch => 0587-Fixed-TileEntityBell-memory-leak.patch} (100%)
 rename Spigot-Server-Patches/{0589-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0588-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (97%)
 rename Spigot-Server-Patches/{0590-Add-getOfflinePlayerIfCached-String.patch => 0589-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename Spigot-Server-Patches/{0591-Add-ignore-discounts-API.patch => 0590-Add-ignore-discounts-API.patch} (98%)
 rename Spigot-Server-Patches/{0592-Toggle-for-removing-existing-dragon.patch => 0591-Toggle-for-removing-existing-dragon.patch} (100%)
 rename Spigot-Server-Patches/{0593-Fix-client-lag-on-advancement-loading.patch => 0592-Fix-client-lag-on-advancement-loading.patch} (96%)
 rename Spigot-Server-Patches/{0594-Item-no-age-no-player-pickup.patch => 0593-Item-no-age-no-player-pickup.patch} (100%)
 rename Spigot-Server-Patches/{0595-Beacon-API-custom-effect-ranges.patch => 0594-Beacon-API-custom-effect-ranges.patch} (100%)
 rename Spigot-Server-Patches/{0596-Add-API-for-quit-reason.patch => 0595-Add-API-for-quit-reason.patch} (100%)
 rename Spigot-Server-Patches/{0597-Seed-based-feature-search.patch => 0596-Seed-based-feature-search.patch} (100%)
 rename Spigot-Server-Patches/{0598-Add-Wandering-Trader-spawn-rate-config-options.patch => 0597-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%)
 rename Spigot-Server-Patches/{0599-Significantly-improve-performance-of-the-end-generat.patch => 0598-Significantly-improve-performance-of-the-end-generat.patch} (100%)
 rename Spigot-Server-Patches/{0600-Expose-world-spawn-angle.patch => 0599-Expose-world-spawn-angle.patch} (96%)
 rename Spigot-Server-Patches/{0601-Add-Destroy-Speed-API.patch => 0600-Add-Destroy-Speed-API.patch} (100%)
 rename Spigot-Server-Patches/{0602-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0601-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%)
 rename Spigot-Server-Patches/{0603-Add-LivingEntity-clearActiveItem.patch => 0602-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename Spigot-Server-Patches/{0604-Add-PlayerItemCooldownEvent.patch => 0603-Add-PlayerItemCooldownEvent.patch} (100%)
 rename Spigot-Server-Patches/{0605-More-lightning-API.patch => 0604-More-lightning-API.patch} (100%)
 rename Spigot-Server-Patches/{0606-Climbing-should-not-bypass-cramming-gamerule.patch => 0605-Climbing-should-not-bypass-cramming-gamerule.patch} (100%)
 rename Spigot-Server-Patches/{0607-Added-missing-default-perms-for-commands.patch => 0606-Added-missing-default-perms-for-commands.patch} (100%)
 rename Spigot-Server-Patches/{0608-Add-PlayerShearBlockEvent.patch => 0607-Add-PlayerShearBlockEvent.patch} (98%)
 rename Spigot-Server-Patches/{0609-Add-warning-for-servers-not-running-on-Java-16.patch => 0608-Add-warning-for-servers-not-running-on-Java-16.patch} (100%)
 rename Spigot-Server-Patches/{0610-Set-spigots-verbose-world-setting-to-false-by-def.patch => 0609-Set-spigots-verbose-world-setting-to-false-by-def.patch} (100%)
 rename Spigot-Server-Patches/{0611-Fix-curing-zombie-villager-discount-exploit.patch => 0610-Fix-curing-zombie-villager-discount-exploit.patch} (100%)
 rename Spigot-Server-Patches/{0612-Limit-recipe-packets.patch => 0611-Limit-recipe-packets.patch} (100%)
 rename Spigot-Server-Patches/{0613-Fix-CraftSound-backwards-compatibility.patch => 0612-Fix-CraftSound-backwards-compatibility.patch} (100%)
 rename Spigot-Server-Patches/{0614-MC-4-Fix-item-position-desync.patch => 0613-MC-4-Fix-item-position-desync.patch} (100%)
 rename Spigot-Server-Patches/{0615-Player-Chunk-Load-Unload-Events.patch => 0614-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename Spigot-Server-Patches/{0616-Optimize-Dynamic-get-Missing-Keys.patch => 0615-Optimize-Dynamic-get-Missing-Keys.patch} (100%)
 rename Spigot-Server-Patches/{0617-Expose-LivingEntity-hurt-direction.patch => 0616-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename Spigot-Server-Patches/{0618-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0617-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename Spigot-Server-Patches/{0619-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch => 0618-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch} (100%)
 rename Spigot-Server-Patches/{0620-added-PlayerTradeEvent.patch => 0619-added-PlayerTradeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0621-Implement-TargetHitEvent.patch => 0620-Implement-TargetHitEvent.patch} (100%)
 rename Spigot-Server-Patches/{0622-Additional-Block-Material-API-s.patch => 0621-Additional-Block-Material-API-s.patch} (100%)
 rename Spigot-Server-Patches/{0623-Fix-harming-potion-dupe.patch => 0622-Fix-harming-potion-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0624-Implement-API-to-get-Material-from-Boats-and-Minecar.patch => 0623-Implement-API-to-get-Material-from-Boats-and-Minecar.patch} (100%)
 rename Spigot-Server-Patches/{0625-Optimized-tick-ready-check.patch => 0624-Optimized-tick-ready-check.patch} (100%)
 rename Spigot-Server-Patches/{0626-Cache-burn-durations.patch => 0625-Cache-burn-durations.patch} (100%)
 rename Spigot-Server-Patches/{0627-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0626-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%)
 rename Spigot-Server-Patches/{0628-Implement-PlayerFlowerPotManipulateEvent.patch => 0627-Implement-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename Spigot-Server-Patches/{0629-Fix-interact-event-not-being-called-in-adventure.patch => 0628-Fix-interact-event-not-being-called-in-adventure.patch} (100%)
 rename Spigot-Server-Patches/{0630-Zombie-API-breaking-doors.patch => 0629-Zombie-API-breaking-doors.patch} (100%)
 rename Spigot-Server-Patches/{0631-Fix-nerfed-slime-when-splitting.patch => 0630-Fix-nerfed-slime-when-splitting.patch} (100%)
 rename Spigot-Server-Patches/{0632-Add-EntityLoadCrossbowEvent.patch => 0631-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0633-Guardian-beam-workaround.patch => 0632-Guardian-beam-workaround.patch} (100%)
 rename Spigot-Server-Patches/{0634-Added-WorldGameRuleChangeEvent.patch => 0633-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0635-Added-ServerResourcesReloadedEvent.patch => 0634-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename Spigot-Server-Patches/{0636-Added-world-settings-for-mobs-picking-up-loot.patch => 0635-Added-world-settings-for-mobs-picking-up-loot.patch} (100%)
 rename Spigot-Server-Patches/{0637-Implemented-BlockFailedDispenseEvent.patch => 0636-Implemented-BlockFailedDispenseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0638-Added-PlayerLecternPageChangeEvent.patch => 0637-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0639-Fire-event-on-GS4-query.patch => 0638-Fire-event-on-GS4-query.patch} (100%)
 rename Spigot-Server-Patches/{0640-Added-PlayerLoomPatternSelectEvent.patch => 0639-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0641-Configurable-door-breaking-difficulty.patch => 0640-Configurable-door-breaking-difficulty.patch} (100%)
 rename Spigot-Server-Patches/{0642-Empty-commands-shall-not-be-dispatched.patch => 0641-Empty-commands-shall-not-be-dispatched.patch} (100%)
 rename Spigot-Server-Patches/{0643-Implement-API-to-expose-exact-interaction-point.patch => 0642-Implement-API-to-expose-exact-interaction-point.patch} (100%)
 rename Spigot-Server-Patches/{0644-Remove-stale-POIs.patch => 0643-Remove-stale-POIs.patch} (100%)
 rename Spigot-Server-Patches/{0645-Fix-villager-boat-exploit.patch => 0644-Fix-villager-boat-exploit.patch} (94%)
 rename Spigot-Server-Patches/{0646-Entity-load-save-limit-per-chunk.patch => 0645-Entity-load-save-limit-per-chunk.patch} (100%)
 rename Spigot-Server-Patches/{0647-Add-sendOpLevel-API.patch => 0646-Add-sendOpLevel-API.patch} (95%)
 rename Spigot-Server-Patches/{0648-Add-StructureLocateEvent.patch => 0647-Add-StructureLocateEvent.patch} (100%)
 rename Spigot-Server-Patches/{0649-Collision-option-for-requiring-a-player-participant.patch => 0648-Collision-option-for-requiring-a-player-participant.patch} (100%)
 rename Spigot-Server-Patches/{0650-Respect-ProjectileHitEvent-cancel-where-missing.patch => 0649-Respect-ProjectileHitEvent-cancel-where-missing.patch} (100%)
 rename Spigot-Server-Patches/{0651-Return-chat-component-with-empty-text-instead-of-thr.patch => 0650-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename Spigot-Server-Patches/{0652-Make-schedule-command-per-world.patch => 0651-Make-schedule-command-per-world.patch} (100%)
 rename Spigot-Server-Patches/{0653-Configurable-max-leash-distance.patch => 0652-Configurable-max-leash-distance.patch} (100%)
 rename Spigot-Server-Patches/{0654-Implement-BlockPreDispenseEvent.patch => 0653-Implement-BlockPreDispenseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0655-Added-Vanilla-Entity-Tags.patch => 0654-Added-Vanilla-Entity-Tags.patch} (98%)
 rename Spigot-Server-Patches/{0656-added-Wither-API.patch => 0655-added-Wither-API.patch} (100%)
 rename Spigot-Server-Patches/{0657-Added-firing-of-PlayerChangeBeaconEffectEvent.patch => 0656-Added-firing-of-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0658-Fix-console-spam-when-removing-chests-in-water.patch => 0657-Fix-console-spam-when-removing-chests-in-water.patch} (100%)
 rename Spigot-Server-Patches/{0659-Add-toggle-for-always-placing-the-dragon-egg.patch => 0658-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%)
 rename Spigot-Server-Patches/{0660-Added-PlayerStonecutterRecipeSelectEvent.patch => 0659-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename Spigot-Server-Patches/{0661-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0660-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename Spigot-Server-Patches/{0662-Skip-distance-map-update-when-spawning-disabled.patch => 0661-Skip-distance-map-update-when-spawning-disabled.patch} (100%)
 rename Spigot-Server-Patches/{0663-Reset-shield-blocking-on-dimension-change.patch => 0662-Reset-shield-blocking-on-dimension-change.patch} (100%)
 rename Spigot-Server-Patches/{0664-add-DragonEggFormEvent.patch => 0663-add-DragonEggFormEvent.patch} (100%)
 rename Spigot-Server-Patches/{0665-EntityMoveEvent.patch => 0664-EntityMoveEvent.patch} (100%)
 rename Spigot-Server-Patches/{0666-added-option-to-disable-pathfinding-updates-on-block.patch => 0665-added-option-to-disable-pathfinding-updates-on-block.patch} (100%)
 rename Spigot-Server-Patches/{0667-Inline-shift-direction-fields.patch => 0666-Inline-shift-direction-fields.patch} (100%)
 rename Spigot-Server-Patches/{0668-Allow-adding-items-to-BlockDropItemEvent.patch => 0667-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename Spigot-Server-Patches/{0669-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0668-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename Spigot-Server-Patches/{0670-living-entity-allow-attribute-registration.patch => 0669-living-entity-allow-attribute-registration.patch} (100%)
 rename Spigot-Server-Patches/{0671-fix-dead-slime-setSize-invincibility.patch => 0670-fix-dead-slime-setSize-invincibility.patch} (100%)
 rename Spigot-Server-Patches/{0672-Merchant-getRecipes-should-return-an-immutable-list.patch => 0671-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%)
 rename Spigot-Server-Patches/{0673-misc-debugging-dumps.patch => 0672-misc-debugging-dumps.patch} (97%)
 rename Spigot-Server-Patches/{0674-Add-support-for-hex-color-codes-in-console.patch => 0673-Add-support-for-hex-color-codes-in-console.patch} (100%)
 rename Spigot-Server-Patches/{0675-Clear-SyncLoadInfo.patch => 0674-Clear-SyncLoadInfo.patch} (100%)
 rename Spigot-Server-Patches/{0676-Expose-Tracked-Players.patch => 0675-Expose-Tracked-Players.patch} (100%)
 rename Spigot-Server-Patches/{0677-Remove-streams-from-SensorNearest.patch => 0676-Remove-streams-from-SensorNearest.patch} (100%)
 rename Spigot-Server-Patches/{0678-do-not-create-unnecessary-copies-of-passenger-list.patch => 0677-do-not-create-unnecessary-copies-of-passenger-list.patch} (99%)
 rename Spigot-Server-Patches/{0679-MC-29274-Fix-Wither-hostility-towards-players.patch => 0678-MC-29274-Fix-Wither-hostility-towards-players.patch} (100%)
 rename Spigot-Server-Patches/{0680-Throw-proper-exception-on-empty-JsonList-file.patch => 0679-Throw-proper-exception-on-empty-JsonList-file.patch} (100%)
 rename Spigot-Server-Patches/{0681-Improve-ServerGUI.patch => 0680-Improve-ServerGUI.patch} (100%)
 rename Spigot-Server-Patches/{0682-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch => 0681-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch} (100%)
 rename Spigot-Server-Patches/{0683-fix-converting-txt-to-json-file.patch => 0682-fix-converting-txt-to-json-file.patch} (97%)
 rename Spigot-Server-Patches/{0684-Add-worldborder-events.patch => 0683-Add-worldborder-events.patch} (100%)
 rename Spigot-Server-Patches/{0685-added-PlayerNameEntityEvent.patch => 0684-added-PlayerNameEntityEvent.patch} (100%)
 rename Spigot-Server-Patches/{0686-Prevent-grindstones-from-overstacking-items.patch => 0685-Prevent-grindstones-from-overstacking-items.patch} (100%)
 rename Spigot-Server-Patches/{0687-Add-recipe-to-cook-events.patch => 0686-Add-recipe-to-cook-events.patch} (100%)
 rename Spigot-Server-Patches/{0688-Add-Block-isValidTool.patch => 0687-Add-Block-isValidTool.patch} (100%)
 rename Spigot-Server-Patches/{0689-Allow-using-signs-inside-spawn-protection.patch => 0688-Allow-using-signs-inside-spawn-protection.patch} (100%)
 rename Spigot-Server-Patches/{0690-Implement-Keyed-on-World.patch => 0689-Implement-Keyed-on-World.patch} (100%)
 rename Spigot-Server-Patches/{0691-Add-fast-alternative-constructor-for-Vector3f.patch => 0690-Add-fast-alternative-constructor-for-Vector3f.patch} (100%)
 rename Spigot-Server-Patches/{0692-Item-Rarity-API.patch => 0691-Item-Rarity-API.patch} (100%)
 rename Spigot-Server-Patches/{0693-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0692-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename Spigot-Server-Patches/{0694-copy-TESign-isEditable-from-snapshots.patch => 0693-copy-TESign-isEditable-from-snapshots.patch} (100%)
 rename Spigot-Server-Patches/{0695-Drop-carried-item-when-player-has-disconnected.patch => 0694-Drop-carried-item-when-player-has-disconnected.patch} (94%)
 rename Spigot-Server-Patches/{0696-forced-whitelist-use-configurable-kick-message.patch => 0695-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename Spigot-Server-Patches/{0697-Make-sure-to-remove-correct-TE-during-TE-tick.patch => 0696-Make-sure-to-remove-correct-TE-during-TE-tick.patch} (100%)
 rename Spigot-Server-Patches/{0698-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0697-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename Spigot-Server-Patches/{0699-fix-cancelling-block-falling-causing-client-desync.patch => 0698-fix-cancelling-block-falling-causing-client-desync.patch} (100%)
 rename Spigot-Server-Patches/{0700-Expose-protocol-version.patch => 0699-Expose-protocol-version.patch} (100%)
 rename Spigot-Server-Patches/{0701-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0700-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (100%)
 rename Spigot-Server-Patches/{0702-Enhance-console-tab-completions-for-brigadier-comman.patch => 0701-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename Spigot-Server-Patches/{0703-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0702-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename Spigot-Server-Patches/{0704-Add-bypass-host-check.patch => 0703-Add-bypass-host-check.patch} (100%)
 rename Spigot-Server-Patches/{0705-don-t-throw-when-loading-invalid-TEs.patch => 0704-don-t-throw-when-loading-invalid-TEs.patch} (100%)
 rename Spigot-Server-Patches/{0706-Set-area-affect-cloud-rotation.patch => 0705-Set-area-affect-cloud-rotation.patch} (100%)
 rename Spigot-Server-Patches/{0707-add-isDeeplySleeping-to-HumanEntity.patch => 0706-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename Spigot-Server-Patches/{0708-Fix-duplicating-give-items-on-item-drop-cancel.patch => 0707-Fix-duplicating-give-items-on-item-drop-cancel.patch} (100%)
 rename Spigot-Server-Patches/{0709-add-consumeFuel-to-FurnaceBurnEvent.patch => 0708-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0710-add-get-set-drop-chance-to-EntityEquipment.patch => 0709-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename Spigot-Server-Patches/{0711-fix-PigZombieAngerEvent-cancellation.patch => 0710-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename Spigot-Server-Patches/{0712-Fix-checkReach-check-for-Shulker-boxes.patch => 0711-Fix-checkReach-check-for-Shulker-boxes.patch} (100%)
 rename Spigot-Server-Patches/{0713-fix-PlayerItemHeldEvent-firing-twice.patch => 0712-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename Spigot-Server-Patches/{0714-Added-PlayerDeepSleepEvent.patch => 0713-Added-PlayerDeepSleepEvent.patch} (100%)
 rename Spigot-Server-Patches/{0715-More-World-API.patch => 0714-More-World-API.patch} (100%)
 rename Spigot-Server-Patches/{0716-Added-PlayerBedFailEnterEvent.patch => 0715-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename Spigot-Server-Patches/{0717-Implement-methods-to-convert-between-Component-and-B.patch => 0716-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename Spigot-Server-Patches/{0718-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch => 0717-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch} (95%)
 rename Spigot-Server-Patches/{0719-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0718-add-RespawnFlags-to-PlayerRespawnEvent.patch} (97%)
 rename Spigot-Server-Patches/{0720-Introduce-beacon-activation-deactivation-events.patch => 0719-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename Spigot-Server-Patches/{0721-Add-Channel-initialization-listeners.patch => 0720-Add-Channel-initialization-listeners.patch} (100%)
 rename Spigot-Server-Patches/{0722-Send-empty-commands-if-tab-completion-is-disabled.patch => 0721-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename Spigot-Server-Patches/{0723-Add-more-WanderingTrader-API.patch => 0722-Add-more-WanderingTrader-API.patch} (100%)
 rename Spigot-Server-Patches/{0724-Add-EntityBlockStorage-clearEntities.patch => 0723-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename Spigot-Server-Patches/{0725-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0724-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename Spigot-Server-Patches/{0726-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0725-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename Spigot-Server-Patches/{0727-Inventory-close.patch => 0726-Inventory-close.patch} (100%)
 rename Spigot-Server-Patches/{0728-call-PortalCreateEvent-players-and-end-platform.patch => 0727-call-PortalCreateEvent-players-and-end-platform.patch} (100%)
 rename Spigot-Server-Patches/{0729-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0728-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename Spigot-Server-Patches/{0730-Fix-CraftPotionBrewer-cache.patch => 0729-Fix-CraftPotionBrewer-cache.patch} (100%)

diff --git a/Spigot-Server-Patches/0169-Improve-Log4J-Configuration-Plugin-Loggers.patch b/Spigot-Server-Patches/0168-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from Spigot-Server-Patches/0169-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to Spigot-Server-Patches/0168-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
deleted file mode 100644
index 395d0aac73..0000000000
--- a/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Thu, 21 Sep 2017 16:33:35 +0200
-Subject: [PATCH] Include Log4J2 SLF4J implementation
-
-
-diff --git a/pom.xml b/pom.xml
-index 70a7778ae19941bb78b8669b1429cb3d525f58a4..3ebdf97dd88e9461331434da4a8cd02bd25148ca 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -83,6 +83,11 @@
-             <artifactId>log4j-api</artifactId>
-             <scope>compile</scope>
-         </dependency>
-+        <dependency>
-+            <groupId>org.apache.logging.log4j</groupId>
-+            <artifactId>log4j-slf4j-impl</artifactId>
-+            <scope>runtime</scope>
-+        </dependency>
-         <dependency>
-             <groupId>org.apache.logging.log4j</groupId>
-             <artifactId>log4j-iostreams</artifactId>
diff --git a/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0169-Add-PlayerJumpEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0169-Add-PlayerJumpEvent.patch
diff --git a/Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0170-handle-PacketPlayInKeepAlive-async.patch
similarity index 100%
rename from Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0170-handle-PacketPlayInKeepAlive-async.patch
diff --git a/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0171-Expose-client-protocol-version-and-virtual-host.patch
similarity index 98%
rename from Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0171-Expose-client-protocol-version-and-virtual-host.patch
index 1c39e9400f..f04306c601 100644
--- a/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch
+++ b/Spigot-Server-Patches/0171-Expose-client-protocol-version-and-virtual-host.patch
@@ -103,7 +103,7 @@ index 5047a742d2e6a9749aa7d37e761d023a3425944b..24486bc7290ec6ef1e00a94e289ca35b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c3058d6fca2fd58aea5001e4310592aa8bd20640..cf9ae60db30ef09bb4c89935a42632e562b6d61e 100644
+index 3ab71629699f4978cd2dab36ec7e3b32a1681f91..b9a12d59e0144becc7e9c06d9a3c3079d006b583 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -188,6 +188,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0172-revert-serverside-behavior-of-keepalives.patch
similarity index 100%
rename from Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0172-revert-serverside-behavior-of-keepalives.patch
diff --git a/Spigot-Server-Patches/0174-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0173-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from Spigot-Server-Patches/0174-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0173-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/Spigot-Server-Patches/0175-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0174-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from Spigot-Server-Patches/0175-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0174-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0175-Add-PlayerArmorChangeEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0175-Add-PlayerArmorChangeEvent.patch
index 4fceab56e8..5adb2dda30 100644
--- a/Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0175-Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 851aed157a233ab690a57e5736fa01beaff45b5c..1dcdf9e328670b42d656e8ab65cb3da8a2312fe6 100644
+index ff26ddce40d7ba74396360603a97bfab835b6202..8a43a85a728c15dbc0fdd2fc8dc5dfff9a589358 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0177-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0176-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 92%
rename from Spigot-Server-Patches/0177-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0176-Prevent-logins-from-being-processed-when-the-player-.patch
index e619c605b1..ad5a02fae5 100644
--- a/Spigot-Server-Patches/0177-Prevent-logins-from-being-processed-when-the-player-.patch
+++ b/Spigot-Server-Patches/0176-Prevent-logins-from-being-processed-when-the-player-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
-index 5b96c69014dbfb8eb3e2ecf370ad69f2ffc31453..714f44a668eb35b3c61bb9ab140f884917efd6f5 100644
+index 9e175747e110e32be80498ed27a71d21e8c01c5e..f95f5a8b30f42c8f5b6cee3ef6adb1f4e09832dc 100644
 --- a/src/main/java/net/minecraft/server/network/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/network/LoginListener.java
 @@ -75,7 +75,11 @@ public class LoginListener implements PacketLoginInListener {
diff --git a/Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0177-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0177-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/Spigot-Server-Patches/0179-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 97%
rename from Spigot-Server-Patches/0179-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch
index a1bb3b5796..5fe5db1a81 100644
--- a/Spigot-Server-Patches/0179-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0178-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
-index fd6364dfc68c2eb9f560e7bc403dea874193828e..3ff9e389fcf15044c2740fb884c9438428d7a681 100644
+index 9b44ca96669ce423e5649f11743226dfdd9ce746..48daa039ffa8ccb7b6f3ca47bdc56394addf9254 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
 @@ -47,6 +47,7 @@ public abstract class TileEntity implements net.minecraft.server.KeyedObject { /
@@ -56,7 +56,7 @@ index fd6364dfc68c2eb9f560e7bc403dea874193828e..3ff9e389fcf15044c2740fb884c94384
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 7654c0f8b57785225ecaa0c22e34c92f1d058d21..e4fe55bb830cd43680de9d61652448b1ea879063 100644
+index 255aac0803b436434bc00822f3698c4f3ba7e0ac..8a6d8f21937ce7e2ac4623a3083421ed5ef9aa63 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -316,6 +316,20 @@ public class CraftBlock implements Block {
diff --git a/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch
diff --git a/Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0180-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 100%
rename from Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0180-Avoid-NPE-in-PathfinderGoalTempt.patch
diff --git a/Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0181-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0181-PlayerPickupExperienceEvent.patch
diff --git a/Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0182-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0182-ExperienceOrbMergeEvent.patch
diff --git a/Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0183-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0183-Ability-to-apply-mending-to-XP-API.patch
diff --git a/Spigot-Server-Patches/0185-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0184-Make-max-squid-spawn-height-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0185-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0184-Make-max-squid-spawn-height-configurable.patch
diff --git a/Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0185-PreCreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0185-PreCreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0186-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0186-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0187-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0187-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/Spigot-Server-Patches/0189-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0188-Fill-Profile-Property-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0189-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0188-Fill-Profile-Property-Events.patch
diff --git a/Spigot-Server-Patches/0190-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0189-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0190-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0189-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/Spigot-Server-Patches/0191-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0190-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0191-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0190-Add-ArmorStand-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0191-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0191-Extend-Player-Interact-cancellation.patch
diff --git a/Spigot-Server-Patches/0193-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0192-Tameable-getOwnerUniqueId-API.patch
similarity index 88%
rename from Spigot-Server-Patches/0193-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0192-Tameable-getOwnerUniqueId-API.patch
index 2951cd45d3..eae20f237a 100644
--- a/Spigot-Server-Patches/0193-Tameable-getOwnerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0192-Tameable-getOwnerUniqueId-API.patch
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 8c59b9ce12d4148b209c3824d44f6e9c736de16c..218a2190d1203ca0fbc2a5ad87e145f436aac314 100644
+index 62ccef35e4b4238c50faf778fbf3ea9a494ca387..5b66165471197aad57e23f9a6669b11f25a5e4f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -21,7 +21,7 @@ index 8c59b9ce12d4148b209c3824d44f6e9c736de16c..218a2190d1203ca0fbc2a5ad87e145f4
          return getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index 58d9cd8172dcb8d3df93355d8ff51053b7469c45..6a642155cf387f7d0e2cf9bdf1a78c62aef8205b 100644
+index 3ac6623199f991ba16dbd62f4d6eed9982b22bcb..73a8ae346fb2ca5af172d96fa6b28e4d41a8c294 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
diff --git a/Spigot-Server-Patches/0194-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0193-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0194-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0193-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/Spigot-Server-Patches/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0195-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from Spigot-Server-Patches/0196-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0195-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/Spigot-Server-Patches/0197-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0196-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0197-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0196-Implement-extended-PaperServerListPingEvent.patch
diff --git a/Spigot-Server-Patches/0198-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0197-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from Spigot-Server-Patches/0198-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0197-Improved-Async-Task-Scheduler.patch
diff --git a/Spigot-Server-Patches/0199-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0198-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from Spigot-Server-Patches/0199-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0198-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0199-Player.setPlayerProfile-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0200-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0199-Player.setPlayerProfile-API.patch
diff --git a/Spigot-Server-Patches/0201-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0200-Fix-Dragon-Server-Crashes.patch
similarity index 100%
rename from Spigot-Server-Patches/0201-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0200-Fix-Dragon-Server-Crashes.patch
diff --git a/Spigot-Server-Patches/0202-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0201-getPlayerUniqueId-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0202-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0201-getPlayerUniqueId-API.patch
diff --git a/Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0202-Make-player-data-saving-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0203-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0202-Make-player-data-saving-configurable.patch
diff --git a/Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0203-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from Spigot-Server-Patches/0204-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0203-Make-legacy-ping-handler-more-reliable.patch
diff --git a/Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0204-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from Spigot-Server-Patches/0205-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0204-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from Spigot-Server-Patches/0206-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0205-Flag-to-disable-the-channel-limit.patch
diff --git a/Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0206-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from Spigot-Server-Patches/0207-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0206-Add-method-to-open-already-placed-sign.patch
diff --git a/Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from Spigot-Server-Patches/0208-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0207-Configurable-sprint-interruption-on-attack.patch
diff --git a/Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0209-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0208-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
diff --git a/Spigot-Server-Patches/0210-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0209-EndermanEscapeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0210-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0209-EndermanEscapeEvent.patch
diff --git a/Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0210-Enderman.teleportRandomly.patch
similarity index 100%
rename from Spigot-Server-Patches/0211-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0210-Enderman.teleportRandomly.patch
diff --git a/Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0211-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0212-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0211-Block-Enderpearl-Travel-Exploit.patch
diff --git a/Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0212-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0213-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0214-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0213-EndermanAttackPlayerEvent.patch
diff --git a/Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0214-WitchConsumePotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0215-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0214-WitchConsumePotionEvent.patch
diff --git a/Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0215-WitchThrowPotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0216-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0215-WitchThrowPotionEvent.patch
diff --git a/Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 93%
rename from Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch
index f3468383d8..e6991dda17 100644
--- a/Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0216-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3855b8264d3223f3b1609a3cb81e009b1cd61268..f9af209170b5dccf425b2ca35c416ed61ccda3eb 100644
+index 13d3b6accfb86383660a7d0e991519fd930bd518..2cc25177110d669e0f425668e26a38794c11c101 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1515,6 +1515,10 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0217-WitchReadyPotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0218-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0217-WitchReadyPotionEvent.patch
diff --git a/Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch
similarity index 94%
rename from Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch
index 3c41349491..e22c07338a 100644
--- a/Spigot-Server-Patches/0219-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0218-ItemStack-getMaxItemUseDuration.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 58045d500a6fbb7eb568f48c7d8ce7730d357577..c525afbc7d73488db2cae1501cdbe80ec05aeb7c 100644
+index cac92ccacc9d5ff17c70ee266cf12bacce6242ea..2ac8b6ac38bdca26cddfb8652f13b0be0c4000fe 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -606,6 +606,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0219-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0220-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0219-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0220-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0221-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from Spigot-Server-Patches/0222-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0221-Fix-CraftEntity-hashCode.patch
diff --git a/Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0222-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from Spigot-Server-Patches/0223-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0222-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0223-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0224-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0223-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch
index 4c22bde487..a569f09272 100644
--- a/Spigot-Server-Patches/0225-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch
@@ -19,7 +19,7 @@ index e8e1e7dafaf1c105b2f58cf3e118e3d665dc50ec..3e4bd1d6718d3ad2498fe9bd72eaac45
 +    }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 1dcdf9e328670b42d656e8ab65cb3da8a2312fe6..9f6f6ac15688a1010d466e6f0cc3ac5b8297eb21 100644
+index 8a43a85a728c15dbc0fdd2fc8dc5dfff9a589358..d4ffff5ecb24af8439e5bfaa02e8136a10fdde90 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -3311,7 +3311,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/0225-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0226-Improve-EntityShootBowEvent.patch
rename to Spigot-Server-Patches/0225-Improve-EntityShootBowEvent.patch
diff --git a/Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0227-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch
diff --git a/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch
index 55ceef10ee..b18f3dbaa7 100644
--- a/Spigot-Server-Patches/0228-Implement-EntityKnockbackByEntityEvent.patch
+++ b/Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch
@@ -19,7 +19,7 @@ index c22b5f8fcdd4aa7dac242f634ef73edcd8745fc6..41566398f5eee6cf93376f2e2200728b
              }
  
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 9f6f6ac15688a1010d466e6f0cc3ac5b8297eb21..61bd7afdafc77725c24c6af978578df0b2d8ca0f 100644
+index d4ffff5ecb24af8439e5bfaa02e8136a10fdde90..4798eac1498ebeecf0476a61a093d3871c00d5a5 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -1339,7 +1339,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0229-Expand-Explosions-API.patch b/Spigot-Server-Patches/0228-Expand-Explosions-API.patch
similarity index 93%
rename from Spigot-Server-Patches/0229-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0228-Expand-Explosions-API.patch
index 1ae7cd1b54..2dcb0871e7 100644
--- a/Spigot-Server-Patches/0229-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0228-Expand-Explosions-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f9af209170b5dccf425b2ca35c416ed61ccda3eb..36c9ee703660d0ef558481ef0fea0984502bc14e 100644
+index 2cc25177110d669e0f425668e26a38794c11c101..1fce5548544f00fd79839a23e05ec5690f6f0621 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -889,6 +889,11 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch
index 0b809b05d3..4f4303b92c 100644
--- a/Spigot-Server-Patches/0230-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 61bd7afdafc77725c24c6af978578df0b2d8ca0f..189a00cb68ce9a9060117b79c5356ebb93d7fa62 100644
+index 4798eac1498ebeecf0476a61a093d3871c00d5a5..2b10ae84ee8e9f63382d732e8c051fc47f0c5d9f 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -212,7 +212,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0231-RangedEntity-API.patch b/Spigot-Server-Patches/0230-RangedEntity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0231-RangedEntity-API.patch
rename to Spigot-Server-Patches/0230-RangedEntity-API.patch
diff --git a/Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0231-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0232-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0231-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0232-Implement-World.getEntity-UUID-API.patch
similarity index 90%
rename from Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0232-Implement-World.getEntity-UUID-API.patch
index b4f7eca0b2..8856ce729b 100644
--- a/Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0232-Implement-World.getEntity-UUID-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 36c9ee703660d0ef558481ef0fea0984502bc14e..945ea6022d89bfb6ee4429233909f8294141fbb6 100644
+index 1fce5548544f00fd79839a23e05ec5690f6f0621..a2b3f5106edc8328ba7edd65dedd56e0dc8d33d2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1304,6 +1304,15 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0234-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0233-InventoryCloseEvent-Reason-API.patch
diff --git a/Spigot-Server-Patches/0235-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0234-Vex-getSummoner-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0235-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0234-Vex-getSummoner-API.patch
diff --git a/Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from Spigot-Server-Patches/0236-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0235-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0236-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 100%
rename from Spigot-Server-Patches/0237-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0236-Don-t-change-the-Entity-Random-seed-for-squids.patch
diff --git a/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 93%
rename from Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch
index 9a588302c8..e2a6edf92c 100644
--- a/Spigot-Server-Patches/0238-Re-add-vanilla-entity-warnings-for-duplicates.patch
+++ b/Spigot-Server-Patches/0237-Re-add-vanilla-entity-warnings-for-duplicates.patch
@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index c7e54920b40bdf049f2192310bfdb9d1749580d0..9af581339884d99709242735ad655d90faf7224a 100644
+index eb19b6fc87bfd4e500ea7836c1010a80b36abab2..d6a4ec132cadf8134a21f625f4ca978d37c643d0 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1077,7 +1077,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0239-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0238-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch
similarity index 94%
rename from Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch
index 10fdc401da..39cafbddfc 100644
--- a/Spigot-Server-Patches/0240-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0239-Use-asynchronous-Log4j-2-loggers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 3ebdf97dd88e9461331434da4a8cd02bd25148ca..325dc0a46666d5e0cd050fd1fb793c08866c2a43 100644
+index 6b2eac7aac7e9a343472cc033b34cbe3e3a82e32..dd5f7dba3610b63aa16088a94bf3b459d496cb3c 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -93,6 +93,13 @@
+@@ -88,6 +88,13 @@
              <artifactId>log4j-iostreams</artifactId>
              <scope>compile</scope>
          </dependency>
diff --git a/Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch
similarity index 93%
rename from Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch
index e46c3eac6c..a507bf2bac 100644
--- a/Spigot-Server-Patches/0241-add-more-information-to-Entity.toString.patch
+++ b/Spigot-Server-Patches/0240-add-more-information-to-Entity.toString.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6b6de18e368d48b61482a7210794b756d805a460..a4915d330d9df8773ce2643a17f353045fff7965 100644
+index 828f238e8f3b1a98310532e07c72161582c91c5b..bd9cd050c72792c3d5a2094991b21e3a998b2cd9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2522,7 +2522,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from Spigot-Server-Patches/0242-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/Spigot-Server-Patches/0243-EnderDragon-Events.patch b/Spigot-Server-Patches/0242-EnderDragon-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0243-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0242-EnderDragon-Events.patch
diff --git a/Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0243-PlayerElytraBoostEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0244-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0243-PlayerElytraBoostEvent.patch
diff --git a/Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch b/Spigot-Server-Patches/0244-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0245-Improve-BlockPosition-inlining.patch
rename to Spigot-Server-Patches/0244-Improve-BlockPosition-inlining.patch
diff --git a/Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0245-Optimize-RegistryID.c.patch
similarity index 100%
rename from Spigot-Server-Patches/0246-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0245-Optimize-RegistryID.c.patch
diff --git a/Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from Spigot-Server-Patches/0247-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from Spigot-Server-Patches/0248-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch
diff --git a/Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 100%
rename from Spigot-Server-Patches/0249-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0248-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
diff --git a/Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0249-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 100%
rename from Spigot-Server-Patches/0250-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0249-Add-some-Debug-to-Chunk-Entity-slices.patch
diff --git a/Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0250-SkeletonHorse-Additions.patch
similarity index 100%
rename from Spigot-Server-Patches/0251-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0250-SkeletonHorse-Additions.patch
diff --git a/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 98%
rename from Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch
index d16a82a8f8..f9e9f4cd9f 100644
--- a/Spigot-Server-Patches/0252-Prevent-Saving-Bad-entities-to-chunks.patch
+++ b/Spigot-Server-Patches/0251-Prevent-Saving-Bad-entities-to-chunks.patch
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 14321bc6ecc5ca70e71c1eef9578091822aa94cd..ce7431ea8597c645bb2c97f596796dbf12206e72 100644
+index 650015f08ef4defe7510ff2f5cbd25364b733515..e39f1ea4eefb0d8e0ca379b116b3699c13bb3f35 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1157,6 +1157,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0252-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0253-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0252-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 97%
rename from Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch
index 1a77ecf605..e45940928c 100644
--- a/Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -23,7 +23,7 @@ index 6943524c2dd8b12691b8ac5b08daee823ce50c3d..b67bd98cca4a06bc0ebaed577195dffc
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ);
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index ce7431ea8597c645bb2c97f596796dbf12206e72..4eda8d2065d72c67b1e1cf9e9560e13e7f24d470 100644
+index e39f1ea4eefb0d8e0ca379b116b3699c13bb3f35..9151d84e2f6fb316525c74466589178769fbc8ef 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1309,6 +1309,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -83,7 +83,7 @@ index e4accac8f2e8daa58f9b0c279ffcad9347448bb0..79ff96f18c53f3d1ce4a00be2e2d8fe6
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 945ea6022d89bfb6ee4429233909f8294141fbb6..716974f9f455a8b35a2bee0ef17e795676f44105 100644
+index a2b3f5106edc8328ba7edd65dedd56e0dc8d33d2..e7103b8021141071712759b1056eccb5e3da93b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1040,6 +1040,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0255-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch
diff --git a/Spigot-Server-Patches/0256-AnvilDamageEvent.patch b/Spigot-Server-Patches/0255-AnvilDamageEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0256-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0255-AnvilDamageEvent.patch
diff --git a/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0256-Add-TNTPrimeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0256-Add-TNTPrimeEvent.patch
diff --git a/Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0257-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0258-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0257-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0259-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch
diff --git a/Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0259-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from Spigot-Server-Patches/0260-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0259-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch
similarity index 98%
rename from Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch
index 192b8c8a60..93f74c95ce 100644
--- a/Spigot-Server-Patches/0261-Fix-client-rendering-skulls-from-same-user.patch
+++ b/Spigot-Server-Patches/0260-Fix-client-rendering-skulls-from-same-user.patch
@@ -82,7 +82,7 @@ index b6b55d5baa5e8a6b69a3e4865c06bc8a4d61a4f3..152118729b1a95dcae05d32aa4289034
                  this.g.add(nbttagcompound);
              }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index c525afbc7d73488db2cae1501cdbe80ec05aeb7c..ce5d8463763dd39e1225d9dec0514b1754df5411 100644
+index 2ac8b6ac38bdca26cddfb8652f13b0be0c4000fe..24db5dedf8b41b26fa990a7c7317cdb3e89e7fcd 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -114,7 +114,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 99%
rename from Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
index 09050bf5bd..0d0602c19e 100644
--- a/Spigot-Server-Patches/0262-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -48,7 +48,7 @@ index 925dd2dc2b4af5596c9dc891f756bad66baadbea..540250a9610e2ee51685b655a7d6c080
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6b0b55aa2ac4dec4e6005f557b9ba6975a7b58ed..d2e8d50adc49cc00d95f928a65a3c23fff0c4c80 100644
+index d15314af5ed58c846b97997fdfdf28786873ae01..72e2c6f731c1d2cb0eafedef7317b35a45b55dd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -813,6 +813,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0262-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from Spigot-Server-Patches/0263-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0262-Make-EnderDragon-implement-Mob.patch
diff --git a/Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch
index d9c827597c..8582eff151 100644
--- a/Spigot-Server-Patches/0264-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0263-Use-ConcurrentHashMap-in-JsonList.patch
@@ -122,7 +122,7 @@ index 52256f72b00d3b868ef1a60e15a3836197c769d9..cd35b833d3047a38be980ee550641e87
  
          this.d.values().stream().map((jsonlistentry) -> {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 349bd74e7e4d1dea9587e55cb6afc1968628ca01..3aaa6313a33865b9823aa38e5d0cce7edce04592 100644
+index 80934fc662b33b1c88dd7a3033792d612a7c7930..2299581fa889c0e8ddc6b2cc1d3551d02ff8dc2d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -618,7 +618,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0264-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0265-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0264-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from Spigot-Server-Patches/0266-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0265-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0267-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch
diff --git a/Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0267-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0268-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0267-Optimize-BlockPosition-helper-methods.patch
diff --git a/Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch
similarity index 88%
rename from Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch
index 85e9776191..9574b666a3 100644
--- a/Spigot-Server-Patches/0269-Restore-vanlla-default-mob-spawn-range.patch
+++ b/Spigot-Server-Patches/0268-Restore-vanlla-default-mob-spawn-range.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Restore vanlla default mob-spawn-range
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5c394d26e2d2dbc5d65e38c1273b7e5d02464f3a..f0ad5fa235adfd165b8e56be7352568a3b3ae54a 100644
+index 0efcbab8f8806aeb8dd8bd6384e5a7cee375d100..34ee684901906fc2ef5f0d09680d2686b813e52b 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -165,7 +165,7 @@ public class SpigotWorldConfig
diff --git a/Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0269-Slime-Pathfinder-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0270-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0269-Slime-Pathfinder-Events.patch
diff --git a/Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0270-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from Spigot-Server-Patches/0271-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0270-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0271-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0272-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0271-Optimize-CraftBlockData-Creation.patch
diff --git a/Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0272-Optimize-RegistryMaterials.patch
similarity index 100%
rename from Spigot-Server-Patches/0273-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0272-Optimize-RegistryMaterials.patch
diff --git a/Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0273-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0274-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0273-Add-PhantomPreSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0275-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0274-Add-More-Creeper-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0275-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0274-Add-More-Creeper-API.patch
diff --git a/Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0275-Inventory-removeItemAnySlot.patch
similarity index 96%
rename from Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0275-Inventory-removeItemAnySlot.patch
index fb782929de..8d4a86803e 100644
--- a/Spigot-Server-Patches/0276-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0275-Inventory-removeItemAnySlot.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Inventory#removeItemAnySlot
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 28b8f5f61872f4c21c81c524029454a2aaf74ea6..5e0180ac658db9d7c9d90fd3d3c4eddf6f34c90d 100644
+index 4211bdfb213db0781107c67f1522e9689aa7ecfe..45634fded9916dca35a246921efb87964c860339 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory {
diff --git a/Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 92%
rename from Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
index ffa06f4aad..9fbcd0bc70 100644
--- a/Spigot-Server-Patches/0277-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
+++ b/Spigot-Server-Patches/0276-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index be028a80247dfb3bf7c726b1868c6e5c5bd99264..bf7b572e455dfc9dfdacce9d2b93266ec5eac0b4 100644
+index e7103b8021141071712759b1056eccb5e3da93b7..880bbf09f77f59824184c1c9dd1ca3c3df09dae9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -508,7 +508,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 98%
rename from Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
index f88cf54034..a8ed3ec817 100644
--- a/Spigot-Server-Patches/0278-Add-ray-tracing-methods-to-LivingEntity.patch
+++ b/Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 189a00cb68ce9a9060117b79c5356ebb93d7fa62..9d8f92c313829bb32c17907bf2ef23d069517dc3 100644
+index 2b10ae84ee8e9f63382d732e8c051fc47f0c5d9f..a64b2953c43138491cdab3e3e24e2e7ed969e171 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -3585,6 +3585,23 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from Spigot-Server-Patches/0279-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/Spigot-Server-Patches/0280-Improve-death-events.patch b/Spigot-Server-Patches/0279-Improve-death-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0280-Improve-death-events.patch
rename to Spigot-Server-Patches/0279-Improve-death-events.patch
diff --git a/Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 94%
rename from Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch
index b2c6dc0b13..d861678244 100644
--- a/Spigot-Server-Patches/0281-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0280-Allow-chests-to-be-placed-with-NBT-data.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index ce5d8463763dd39e1225d9dec0514b1754df5411..30db766c54db08a472caef82fdcc7cf1b7855fbf 100644
+index 24db5dedf8b41b26fa990a7c7317cdb3e89e7fcd..852f9d99001b35f8c97f4445d8f605533d7f6f2f 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -298,6 +298,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0281-Mob-Pathfinding-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0282-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0281-Mob-Pathfinding-API.patch
diff --git a/Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0282-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from Spigot-Server-Patches/0283-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0282-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from Spigot-Server-Patches/0284-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0283-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0285-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0284-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0285-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0286-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0285-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from Spigot-Server-Patches/0287-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0286-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0287-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0288-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0287-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0288-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0289-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0288-PreSpawnerSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0289-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from Spigot-Server-Patches/0290-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0289-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0290-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from Spigot-Server-Patches/0291-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0290-Honor-EntityAgeable.ageLock.patch
diff --git a/Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0291-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from Spigot-Server-Patches/0292-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0291-Configurable-connection-throttle-kick-message.patch
diff --git a/Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0292-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from Spigot-Server-Patches/0293-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0292-Hook-into-CB-plugin-rewrites.patch
diff --git a/Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0293-Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from Spigot-Server-Patches/0294-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0293-Allow-setting-the-vex-s-summoner.patch
diff --git a/Spigot-Server-Patches/0295-Add-sun-related-API.patch b/Spigot-Server-Patches/0294-Add-sun-related-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0295-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0294-Add-sun-related-API.patch
index d88e5b7aec..bf9961871d 100644
--- a/Spigot-Server-Patches/0295-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0294-Add-sun-related-API.patch
@@ -17,7 +17,7 @@ index 41566398f5eee6cf93376f2e2200728bb6d2181c..db72b685f4a4b95f345f1d34f9eeb83b
          if (this.world.isDay() && !this.world.isClientSide) {
              float f = this.aR();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 796fd718f3fe57618aedc9f5a41aac64422e3e34..2197dad881bf5e9d90902c4526db18e19a087230 100644
+index 880bbf09f77f59824184c1c9dd1ca3c3df09dae9..95b4774b7696fa9711d7169d06a23c70364bfdb2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -865,6 +865,13 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0296-Turtle-API.patch b/Spigot-Server-Patches/0295-Turtle-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0296-Turtle-API.patch
rename to Spigot-Server-Patches/0295-Turtle-API.patch
diff --git a/Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from Spigot-Server-Patches/0297-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0296-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0297-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from Spigot-Server-Patches/0298-Call-player-spectator-target-events-and-improve-impl.patch
rename to Spigot-Server-Patches/0297-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch
index f64674f188..906a881656 100644
--- a/Spigot-Server-Patches/0299-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch
@@ -288,7 +288,7 @@ index 21e70a133278d85ecd65fec36a273ed4faabf6cc..36f747af18347197bab7c335d5d7dfc0
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85975c5a1acca101d182dfd01879161e34bfe5c3..ed541a9782d09d3537e04e3651833208a83d7b12 100644
+index 72e2c6f731c1d2cb0eafedef7317b35a45b55dd7..54fa963faab3289d014299a38099eb72ff541065 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -685,7 +685,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0300-Add-more-Witch-API.patch b/Spigot-Server-Patches/0299-Add-more-Witch-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0300-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0299-Add-more-Witch-API.patch
diff --git a/Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0300-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from Spigot-Server-Patches/0301-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0300-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/Spigot-Server-Patches/0302-Here-s-Johnny.patch b/Spigot-Server-Patches/0301-Here-s-Johnny.patch
similarity index 100%
rename from Spigot-Server-Patches/0302-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0301-Here-s-Johnny.patch
diff --git a/Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0302-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from Spigot-Server-Patches/0303-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0302-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0304-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0303-Reset-players-airTicks-on-respawn.patch
diff --git a/Spigot-Server-Patches/0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0304-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0305-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0304-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from Spigot-Server-Patches/0306-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to Spigot-Server-Patches/0305-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/Spigot-Server-Patches/0307-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0306-Optimize-World-Time-Updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0307-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0306-Optimize-World-Time-Updates.patch
diff --git a/Spigot-Server-Patches/0308-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0307-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0308-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0307-Restore-custom-InventoryHolder-support.patch
diff --git a/Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0308-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from Spigot-Server-Patches/0309-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0308-Use-Vanilla-Minecart-Speeds.patch
diff --git a/Spigot-Server-Patches/0310-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0309-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0310-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0309-Fix-SpongeAbsortEvent-handling.patch
diff --git a/Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0310-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0311-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0310-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0312-Book-Size-Limits.patch b/Spigot-Server-Patches/0311-Book-Size-Limits.patch
similarity index 100%
rename from Spigot-Server-Patches/0312-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0311-Book-Size-Limits.patch
diff --git a/Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0313-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch
diff --git a/Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0313-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0314-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0313-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0314-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0315-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0314-Handle-Large-Packets-disconnecting-client.patch
diff --git a/Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from Spigot-Server-Patches/0316-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch
diff --git a/Spigot-Server-Patches/0317-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0316-Add-more-Zombie-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0317-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0316-Add-more-Zombie-API.patch
diff --git a/Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0317-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0317-Add-PlayerConnectionCloseEvent.patch
index 292fb6107f..ddc9e05522 100644
--- a/Spigot-Server-Patches/0318-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0317-Add-PlayerConnectionCloseEvent.patch
@@ -65,7 +65,7 @@ index dc788d75a6a34fbbae990609bfbbd13ca6cdee5a..6d40ade5a52383ed86d28d272c3dc83d
  
          }
 diff --git a/src/main/java/net/minecraft/server/network/LoginListener.java b/src/main/java/net/minecraft/server/network/LoginListener.java
-index a3c989ef850919fa90590b942f037c1f6d519608..4dd2f7fb32b8618d752e0988acadcb41223c0e4c 100644
+index 36f747af18347197bab7c335d5d7dfc01a5aff80..09ceac61f873ee0cb689c66a403c42677961011d 100644
 --- a/src/main/java/net/minecraft/server/network/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/network/LoginListener.java
 @@ -57,9 +57,9 @@ public class LoginListener implements PacketLoginInListener {
diff --git a/Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0318-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0319-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0318-Prevent-Enderman-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from Spigot-Server-Patches/0320-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0319-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/Spigot-Server-Patches/0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from Spigot-Server-Patches/0321-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0320-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/Spigot-Server-Patches/0322-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0321-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from Spigot-Server-Patches/0322-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0321-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/Spigot-Server-Patches/0323-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0322-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0323-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0322-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/Spigot-Server-Patches/0324-BlockDestroyEvent.patch b/Spigot-Server-Patches/0323-BlockDestroyEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0324-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0323-BlockDestroyEvent.patch
diff --git a/Spigot-Server-Patches/0325-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0324-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from Spigot-Server-Patches/0325-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0324-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0325-Fix-sign-edit-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0326-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0325-Fix-sign-edit-memory-leak.patch
diff --git a/Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0326-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from Spigot-Server-Patches/0327-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0326-Limit-Client-Sign-length-more.patch
diff --git a/Spigot-Server-Patches/0328-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0327-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from Spigot-Server-Patches/0328-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0327-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/Spigot-Server-Patches/0329-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0328-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from Spigot-Server-Patches/0329-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to Spigot-Server-Patches/0328-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/Spigot-Server-Patches/0330-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0329-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0330-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to Spigot-Server-Patches/0329-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/Spigot-Server-Patches/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 95%
rename from Spigot-Server-Patches/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
index 922aab5b43..fe3dd5e8b2 100644
--- a/Spigot-Server-Patches/0331-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
+++ b/Spigot-Server-Patches/0330-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
@@ -11,7 +11,7 @@ everything to the Whitelist object.
 https://github.com/PaperMC/Paper/issues/1880
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3ef632928bf93a8af5eccada3b1cc76354ed5617..317c921eaf734e890706f962b29233e3306a13be 100644
+index 7515e9ddbc89de882373469cf3c46046c76af974..1a4ae92065f729ec521752bb87df8343d747f566 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -55,6 +55,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutViewDistance;
diff --git a/Spigot-Server-Patches/0332-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0331-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from Spigot-Server-Patches/0332-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0331-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/Spigot-Server-Patches/0333-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0332-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0333-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0332-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/Spigot-Server-Patches/0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 88%
rename from Spigot-Server-Patches/0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
index 157897ec7b..f3f9b1eb62 100644
--- a/Spigot-Server-Patches/0334-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
+++ b/Spigot-Server-Patches/0333-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 317c921eaf734e890706f962b29233e3306a13be..aebde5e6ec24aff073dfd4eae1ce5a008134658a 100644
+index 1a4ae92065f729ec521752bb87df8343d747f566..1ae969aff1d44ad9af28fc94d8821884b9ad0563 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1135,6 +1135,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0335-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch
similarity index 98%
rename from Spigot-Server-Patches/0335-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch
index 3e94f14b60..d556d1b4ec 100644
--- a/Spigot-Server-Patches/0335-Add-LivingEntity-getTargetEntity.patch
+++ b/Spigot-Server-Patches/0334-Add-LivingEntity-getTargetEntity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f0c18a55900774ba67eaf094f175a9e37c16e56c..36e9a33d22fc2572e23e457adf62bd2bcebd10d3 100644
+index 1e5930f5ae75b82abf6ea2a50558449fb667016f..e9b535622d6c33083c575ee4691598014dba0e2c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1504,6 +1504,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -25,7 +25,7 @@ index f0c18a55900774ba67eaf094f175a9e37c16e56c..36e9a33d22fc2572e23e457adf62bd2b
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index 58270f45de665b5c1cfd9fc548eadb263ad230e9..ecceb272028e1ae1dd40c0c39d6f687fccfabb58 100644
+index 6ada2fe58966553b52a8a890088c78d5ea0dfd73..c98562980ca02c85f2f777a31983c164f2dd5e1e 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -108,6 +108,7 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParameterSet
diff --git a/Spigot-Server-Patches/0336-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0335-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from Spigot-Server-Patches/0336-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0335-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0336-Entity-getEntitySpawnReason.patch
similarity index 97%
rename from Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0336-Entity-getEntitySpawnReason.patch
index 4523ff9267..04f236f973 100644
--- a/Spigot-Server-Patches/0337-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0336-Entity-getEntitySpawnReason.patch
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 0c1867c00be9ecda5294298c5b9d22098e213a81..b8a32742b2b2558a6155fc72e277a693c2306302 100644
+index ecb4cb5df868673e5aa2eec3fdd8618dbea09655..d7c6f49ba1c84c45b387e155d9ae7452e5171df6 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1041,6 +1041,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -22,7 +22,7 @@ index 0c1867c00be9ecda5294298c5b9d22098e213a81..b8a32742b2b2558a6155fc72e277a693
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fa288b099b17adafc085fb0fc5da6e810d078952..33b5825d753029e98ea7a11a4758280eddd2584c 100644
+index 1ae969aff1d44ad9af28fc94d8821884b9ad0563..47aa69dfe43390b811c264adc0af1d01bcd5ce4d 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -335,7 +335,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0338-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0337-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0338-Implement-PlayerPostRespawnEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0338-Implement-PlayerPostRespawnEvent.patch
index 1b1cb8bbc5..8a761d4f0c 100644
--- a/Spigot-Server-Patches/0339-Implement-PlayerPostRespawnEvent.patch
+++ b/Spigot-Server-Patches/0338-Implement-PlayerPostRespawnEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ea6c5c9305994e64831c5444666c22a96f9d36da..ae0aaaf129c44901ac72c67e50c663333ab57f9d 100644
+index 47aa69dfe43390b811c264adc0af1d01bcd5ce4d..ec4e84f6275f8b305fb5a64f9c0cff24729d73ec 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -741,9 +741,14 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0340-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0339-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0340-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0339-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/Spigot-Server-Patches/0341-Server-Tick-Events.patch b/Spigot-Server-Patches/0340-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0341-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0340-Server-Tick-Events.patch
diff --git a/Spigot-Server-Patches/0342-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from Spigot-Server-Patches/0342-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0341-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/Spigot-Server-Patches/0343-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from Spigot-Server-Patches/0343-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/Spigot-Server-Patches/0344-Add-Heightmap-API.patch b/Spigot-Server-Patches/0343-Add-Heightmap-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0344-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0343-Add-Heightmap-API.patch
index 82b558d009..f2e6c95731 100644
--- a/Spigot-Server-Patches/0344-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0343-Add-Heightmap-API.patch
@@ -20,7 +20,7 @@ index b6b9a471426ddf911a1f6bf38543c0304bfc31f6..12ac3608736b45447afe6b0d35ead144
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8bfb7a5bf6aa2ee568ceee3d2e4efe9dd57d9c1b..294a06c998a84523f8a2a0702aa6a9048d204722 100644
+index 95b4774b7696fa9711d7169d06a23c70364bfdb2..9e44b60843a6463951382cb66c93f1fab24e5e5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -343,6 +343,29 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0345-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0344-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0345-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0344-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-Server-Patches/0346-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0345-Per-Player-View-Distance-API-placeholders.patch
similarity index 100%
rename from Spigot-Server-Patches/0346-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0345-Per-Player-View-Distance-API-placeholders.patch
diff --git a/Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0346-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from Spigot-Server-Patches/0347-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0346-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/Spigot-Server-Patches/0348-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from Spigot-Server-Patches/0348-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/Spigot-Server-Patches/0349-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from Spigot-Server-Patches/0349-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/Spigot-Server-Patches/0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 96%
rename from Spigot-Server-Patches/0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
index fcbd18cfef..d4d71ad5e6 100644
--- a/Spigot-Server-Patches/0350-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0349-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
@@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index b8a32742b2b2558a6155fc72e277a693c2306302..61d3524e962b97ed032af1990f8dc6513fbe51d6 100644
+index d7c6f49ba1c84c45b387e155d9ae7452e5171df6..4e26db120e544d8867d895395241e425f23f575b 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -854,11 +854,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0351-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0350-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from Spigot-Server-Patches/0351-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0350-Duplicate-UUID-Resolve-Option.patch
diff --git a/Spigot-Server-Patches/0352-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0351-improve-CraftWorld-isChunkLoaded.patch
similarity index 94%
rename from Spigot-Server-Patches/0352-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0351-improve-CraftWorld-isChunkLoaded.patch
index 9af1d59ae2..111ce24a81 100644
--- a/Spigot-Server-Patches/0352-improve-CraftWorld-isChunkLoaded.patch
+++ b/Spigot-Server-Patches/0351-improve-CraftWorld-isChunkLoaded.patch
@@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3757ab5a2a0c6282d822c22415cc2861eba2f236..1a198ad238fb92c22a971e6fe540e9834eb65056 100644
+index 9e44b60843a6463951382cb66c93f1fab24e5e5d..5a5f920954effbe549cacdaa39474989dc98ad75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -414,13 +414,13 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0352-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/Spigot-Server-Patches/0354-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0353-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 100%
rename from Spigot-Server-Patches/0354-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0353-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
diff --git a/Spigot-Server-Patches/0355-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0354-ChunkMapDistance-CME.patch
similarity index 100%
rename from Spigot-Server-Patches/0355-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0354-ChunkMapDistance-CME.patch
diff --git a/Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0355-Implement-CraftBlockSoundGroup.patch
diff --git a/Spigot-Server-Patches/0357-Chunk-debug-command.patch b/Spigot-Server-Patches/0356-Chunk-debug-command.patch
similarity index 99%
rename from Spigot-Server-Patches/0357-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0356-Chunk-debug-command.patch
index a8b19fb2f7..bcb44d3073 100644
--- a/Spigot-Server-Patches/0357-Chunk-debug-command.patch
+++ b/Spigot-Server-Patches/0356-Chunk-debug-command.patch
@@ -423,7 +423,7 @@ index 35d1444c5b75d9a3a6cface5dd70aea0a08ac89d..fbd33aef21b4539d249c367609a36491
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index eb576566708d50c002e73aa746d2bc58b9b04c2b..b80c3bd702141ca4a88078386845d731b3ecc539 100644
+index b9bde85a90b429659e1a4ab111253cddd797368e..94af98e250fe7ef37c16d432c05c6f2b68625fe1 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -46,7 +46,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; // Paper
@@ -449,7 +449,7 @@ index 2c3d9a5d118cc4f3b5e78daf943911bb7386488a..9891cf98f8c740f84f9135ee8176e67a
      private final ShortSet[] dirtyBlocks;
      private int r;
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index aeed11cfee42fbde2c2e5731f46ac24de6469e0e..a0fcd20d4a7e951437756edb60a44c627612e04c 100644
+index b736917891afb17e412f94c5d8713aa653b8dc46..e10c661755796e9c4e40f62a649b45dd1a71b46c 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -106,7 +106,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0357-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0358-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0357-Catch-exceptions-from-dispenser-entity-spawns.patch
diff --git a/Spigot-Server-Patches/0359-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0358-Fix-World-isChunkGenerated-calls.patch
similarity index 99%
rename from Spigot-Server-Patches/0359-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0358-Fix-World-isChunkGenerated-calls.patch
index a6a85b6e35..a8057528d3 100644
--- a/Spigot-Server-Patches/0359-Fix-World-isChunkGenerated-calls.patch
+++ b/Spigot-Server-Patches/0358-Fix-World-isChunkGenerated-calls.patch
@@ -76,7 +76,7 @@ index 9891cf98f8c740f84f9135ee8176e67abb648b3a..6bced8533df49d7bfdb32dfa0caad9d7
  
      public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 27211cb52bf227e2c40313390f49ca18a1d947fb..1272d26124685e19f73e277b5a74108f3363b71a 100644
+index e10c661755796e9c4e40f62a649b45dd1a71b46c..ed454f8dff7b0d94d4bde914a6f26bb019e82296 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -993,12 +993,61 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0360-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0359-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 94%
rename from Spigot-Server-Patches/0360-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0359-Show-blockstate-location-if-we-failed-to-read-it.patch
index bdabcc0cc8..8c64eb071a 100644
--- a/Spigot-Server-Patches/0360-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/Spigot-Server-Patches/0359-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Show blockstate location if we failed to read it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index feeae1a9eb309ae4101783b191bb2bffe9aeb7d3..6e9eff2c29528b857cf758e9e45606c8a1c1cc8d 100644
+index 2f0b48869077c27d0cacea81a99c9e34ff59c684..a4bd0d352c2babdbb31cdf49d63e2db3af4de146 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -19,6 +19,8 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
diff --git a/Spigot-Server-Patches/0361-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch b/Spigot-Server-Patches/0360-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
similarity index 100%
rename from Spigot-Server-Patches/0361-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
rename to Spigot-Server-Patches/0360-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
diff --git a/Spigot-Server-Patches/0362-incremental-chunk-saving.patch b/Spigot-Server-Patches/0361-incremental-chunk-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0362-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0361-incremental-chunk-saving.patch
diff --git a/Spigot-Server-Patches/0363-Anti-Xray.patch b/Spigot-Server-Patches/0362-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0363-Anti-Xray.patch
rename to Spigot-Server-Patches/0362-Anti-Xray.patch
index dc1bdee487..ff640d6ee9 100644
--- a/Spigot-Server-Patches/0363-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0362-Anti-Xray.patch
@@ -1135,7 +1135,7 @@ index a7d10d124021f3427f23fcd533f885367b64515c..3047cf8c4ec1b664d6b790f18d2b1657
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 0a8447327d2b6719b635b0362f725c0c6233d805..ec3c717cf63848f1d949e932b081a8db65294d65 100644
+index ca05fe4ed0773b94035c63f8f8db6c034f0b92e2..5a11765c8a7d754ec86d829fa5e85d2809dd937e 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -656,7 +656,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from Spigot-Server-Patches/0364-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0363-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/Spigot-Server-Patches/0365-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0364-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from Spigot-Server-Patches/0365-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0364-Configurable-projectile-relative-velocity.patch
diff --git a/Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0365-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 100%
rename from Spigot-Server-Patches/0366-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0365-Mark-entities-as-being-ticked-when-notifying-navigat.patch
diff --git a/Spigot-Server-Patches/0367-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0366-offset-item-frame-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0367-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0366-offset-item-frame-ticking.patch
diff --git a/Spigot-Server-Patches/0368-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0368-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0368-Asynchronous-chunk-IO-and-loading.patch
similarity index 100%
rename from Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0368-Asynchronous-chunk-IO-and-loading.patch
diff --git a/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 98%
rename from Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch
index 29d310d326..797e054aa8 100644
--- a/Spigot-Server-Patches/0370-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch
@@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk
 load in that case).
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index a68be9b72daca6353d51141a8771e00240375315..fe662ea8acb873aac2fc3b29addbef77854494ed 100644
+index bb6c59237702bf82d2c344c864f233c606fd429f..96723cac5723ea97780dd3b8697c4ba598788afc 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -207,7 +207,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0371-Reduce-sync-loads.patch b/Spigot-Server-Patches/0370-Reduce-sync-loads.patch
similarity index 98%
rename from Spigot-Server-Patches/0371-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0370-Reduce-sync-loads.patch
index d52a10aa0d..5bdc3d95e4 100644
--- a/Spigot-Server-Patches/0371-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0370-Reduce-sync-loads.patch
@@ -281,7 +281,7 @@ index 0000000000000000000000000000000000000000..d381f91cf105bfc01846ada90da8971a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
-index df71f8c42ac488153257614b58202bb5d7083251..2530c5ddfc8469329b411ad5c98ed718a3771890 100644
+index 1e74299bb3a368dcbc813408804d25cf58a75b0b..662d7f418e8acc9503ebf43e09410e7bd50f6bb3 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkProviderServer.java
 @@ -494,6 +494,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -293,7 +293,7 @@ index df71f8c42ac488153257614b58202bb5d7083251..2530c5ddfc8469329b411ad5c98ed718
              this.serverThreadQueue.awaitTasks(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index a67462e10c6f8cb0eecb9a81fdc55f353c258368..23f88bd794b2c738463e1aa1180b6826d33f3b77 100644
+index 96723cac5723ea97780dd3b8697c4ba598788afc..02a64a132502fff19a41d4fa5ffafd61992865a4 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -282,6 +282,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0372-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0371-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from Spigot-Server-Patches/0372-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0371-Implement-alternative-item-despawn-rate.patch
diff --git a/Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from Spigot-Server-Patches/0373-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0372-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/Spigot-Server-Patches/0374-Fix-MC-158900.patch b/Spigot-Server-Patches/0373-Fix-MC-158900.patch
similarity index 94%
rename from Spigot-Server-Patches/0374-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0373-Fix-MC-158900.patch
index 4a59df3b05..023ce89b91 100644
--- a/Spigot-Server-Patches/0374-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0373-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ae0aaaf129c44901ac72c67e50c663333ab57f9d..f1dd51f30a40613a1fa1e00be43d21684ea9c274 100644
+index ec4e84f6275f8b305fb5a64f9c0cff24729d73ec..553b14f7167673938d1bc83d79c730692a4ef105 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -607,8 +607,10 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0375-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0374-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0375-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0374-implement-optional-per-player-mob-spawns.patch
diff --git a/Spigot-Server-Patches/0376-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch
similarity index 95%
rename from Spigot-Server-Patches/0376-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch
index 743d331f2f..0f8ff9bd80 100644
--- a/Spigot-Server-Patches/0376-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
-index ecceb272028e1ae1dd40c0c39d6f687fccfabb58..903c3cfdaae3dd1750aa2f32f6cdbb423909eb47 100644
+index c98562980ca02c85f2f777a31983c164f2dd5e1e..06119a87338d48128ddd71fe8396e10b6e83744a 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
 @@ -3201,10 +3201,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0377-Generator-Settings.patch b/Spigot-Server-Patches/0376-Generator-Settings.patch
similarity index 100%
rename from Spigot-Server-Patches/0377-Generator-Settings.patch
rename to Spigot-Server-Patches/0376-Generator-Settings.patch
diff --git a/Spigot-Server-Patches/0378-Fix-MC-161754.patch b/Spigot-Server-Patches/0377-Fix-MC-161754.patch
similarity index 100%
rename from Spigot-Server-Patches/0378-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0377-Fix-MC-161754.patch
diff --git a/Spigot-Server-Patches/0379-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0378-Performance-improvement-for-Chunk.getEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0379-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0378-Performance-improvement-for-Chunk.getEntities.patch
diff --git a/Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0379-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from Spigot-Server-Patches/0380-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0379-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0380-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0380-Expose-the-internal-current-tick.patch
diff --git a/Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0381-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from Spigot-Server-Patches/0382-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0381-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/Spigot-Server-Patches/0383-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0382-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from Spigot-Server-Patches/0383-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0382-Add-option-to-disable-pillager-patrols.patch
diff --git a/Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0383-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0383-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/Spigot-Server-Patches/0385-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0384-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0385-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0384-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-Server-Patches/0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0385-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from Spigot-Server-Patches/0386-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0385-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/Spigot-Server-Patches/0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0386-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from Spigot-Server-Patches/0387-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0386-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/Spigot-Server-Patches/0388-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0387-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from Spigot-Server-Patches/0388-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0387-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/Spigot-Server-Patches/0389-Optimize-Hoppers.patch b/Spigot-Server-Patches/0388-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0389-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0388-Optimize-Hoppers.patch
index 1cc8d2302c..14f5affd0b 100644
--- a/Spigot-Server-Patches/0389-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0388-Optimize-Hoppers.patch
@@ -51,7 +51,7 @@ index a118187e86238fd4019ba5c25269d5ee80fc56f2..94525c8bd49334fb5aa1b113ed992e85
              this.methodProfiler.a(() -> {
                  return worldserver + " " + worldserver.getDimensionKey().a();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 30db766c54db08a472caef82fdcc7cf1b7855fbf..661f400ae4f5cebef5d1743819529ecf647b6681 100644
+index 852f9d99001b35f8c97f4445d8f605533d7f6f2f..7b1df591007b9c50bcaf4bcd30562396a9549193 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -540,11 +540,12 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0389-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from Spigot-Server-Patches/0390-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0389-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/Spigot-Server-Patches/0391-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0390-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from Spigot-Server-Patches/0391-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0390-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/Spigot-Server-Patches/0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0391-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from Spigot-Server-Patches/0392-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0391-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/Spigot-Server-Patches/0393-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0392-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from Spigot-Server-Patches/0393-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0392-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0393-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 96%
rename from Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0393-Optimise-IEntityAccess-getPlayerByUUID.patch
index e33401ace0..aaf887304c 100644
--- a/Spigot-Server-Patches/0394-Optimise-IEntityAccess-getPlayerByUUID.patch
+++ b/Spigot-Server-Patches/0393-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 71967bc86c2c2ad6bcafc80a5f8ab31c33f022e6..07b2f7f13044ace4db48274da8309c37aaa2d2c4 100644
+index 02a64a132502fff19a41d4fa5ffafd61992865a4..6cbf8d00da6d99719f9ece14aa46c0abf38666e3 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/0395-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0394-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from Spigot-Server-Patches/0395-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0394-Fix-items-not-falling-correctly.patch
diff --git a/Spigot-Server-Patches/0396-Lag-compensate-eating.patch b/Spigot-Server-Patches/0395-Lag-compensate-eating.patch
similarity index 100%
rename from Spigot-Server-Patches/0396-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0395-Lag-compensate-eating.patch
diff --git a/Spigot-Server-Patches/0397-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0396-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from Spigot-Server-Patches/0397-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0396-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0397-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0398-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0397-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0398-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-Server-Patches/0399-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0398-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0399-Tracking-Range-Improvements.patch
similarity index 97%
rename from Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0399-Tracking-Range-Improvements.patch
index 55deb6fc42..8754eec0d1 100644
--- a/Spigot-Server-Patches/0400-Tracking-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0399-Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index cee5a73c2e5b9eed0ed5b271a9648d8929bb829b..fd1924016518d6edc0508311704763841d8c8493 100644
+index d00dc8d7933be61f1401f598e5d675f5ae5d7029..baef98331c07b0f8c95351f39c5e471f96a59c05 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -1797,6 +1797,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0400-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0400-Entity-Activation-Range-2.0.patch
diff --git a/Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0401-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from Spigot-Server-Patches/0402-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0401-Fix-items-vanishing-through-end-portal.patch
diff --git a/Spigot-Server-Patches/0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0402-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from Spigot-Server-Patches/0403-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0402-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0403-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0404-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0403-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/Spigot-Server-Patches/0405-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0404-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0405-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0404-Allow-overriding-the-java-version-check.patch
diff --git a/Spigot-Server-Patches/0406-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0405-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0406-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0405-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0406-Optimise-random-block-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0406-Optimise-random-block-ticking.patch
index 340a9f9e53..02e11131e9 100644
--- a/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch
+++ b/Spigot-Server-Patches/0406-Optimise-random-block-ticking.patch
@@ -83,7 +83,7 @@ index 4c9ec211470f95d538d1d95c74796190edf99b87..8c0aeb51f5e230fd6109e750732eb545
              return this.d(baseblockposition.getX(), baseblockposition.getY(), baseblockposition.getZ());
          }
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 18169d48598b873b0d7507bb55a1a0bad0ab6566..291c8091dbe58bc8e2c9ed8f3c80428386a2a1d1 100644
+index fda19e1639cfbae00c8ba946b41c16faa09acbd5..cf6e9a949a864df12ca1670dbc456494d2b5e473 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -675,7 +675,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0408-Entity-Jump-API.patch b/Spigot-Server-Patches/0407-Entity-Jump-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0408-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0407-Entity-Jump-API.patch
diff --git a/Spigot-Server-Patches/0409-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0408-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0409-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0408-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0409-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from Spigot-Server-Patches/0410-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0409-Make-the-GUI-graph-fancier.patch
diff --git a/Spigot-Server-Patches/0411-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0410-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0411-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0410-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/Spigot-Server-Patches/0412-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0411-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0412-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0411-Prevent-teleporting-dead-entities.patch
diff --git a/Spigot-Server-Patches/0413-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0412-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from Spigot-Server-Patches/0413-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0412-Validate-tripwire-hook-placement-before-update.patch
diff --git a/Spigot-Server-Patches/0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0413-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0414-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0413-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/Spigot-Server-Patches/0415-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0414-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from Spigot-Server-Patches/0415-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0414-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/Spigot-Server-Patches/0416-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0415-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from Spigot-Server-Patches/0416-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0415-Optimise-Chunk-getFluid.patch
diff --git a/Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0416-Optimise-TickListServer-by-rewriting-it.patch
similarity index 99%
rename from Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0416-Optimise-TickListServer-by-rewriting-it.patch
index 69a2d46d75..39ac08740a 100644
--- a/Spigot-Server-Patches/0417-Optimise-TickListServer-by-rewriting-it.patch
+++ b/Spigot-Server-Patches/0416-Optimise-TickListServer-by-rewriting-it.patch
@@ -942,7 +942,7 @@ index 6433463938d8bb717840c8f57fe6e7079e1030f2..445dba8ed210407664904b707c36c78a
                  }
              });
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 291c8091dbe58bc8e2c9ed8f3c80428386a2a1d1..12be2c5406ece16a21abaebb3ca89171304cb929 100644
+index cf6e9a949a864df12ca1670dbc456494d2b5e473..5b1dfcf231e9736552b8a2ad9cd91306dd36e5d5 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -298,6 +298,15 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0417-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from Spigot-Server-Patches/0418-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0417-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0418-Ensure-Entity-is-never-double-registered.patch
similarity index 97%
rename from Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0418-Ensure-Entity-is-never-double-registered.patch
index d92d3aaeba..0eaa76de2f 100644
--- a/Spigot-Server-Patches/0419-Ensure-Entity-is-never-double-registered.patch
+++ b/Spigot-Server-Patches/0418-Ensure-Entity-is-never-double-registered.patch
@@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state.
 We will now simply log a warning when this happens instead of crashing the server.
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 12be2c5406ece16a21abaebb3ca89171304cb929..7dbb7e75c10d443fe9c90eadec8e9cdf01024548 100644
+index 5b1dfcf231e9736552b8a2ad9cd91306dd36e5d5..b97682e967ea1d9a9f9142dba4089a9f15302913 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -649,6 +649,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0419-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 94%
rename from Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0419-Fix-unregistering-entities-from-unloading-chunks.patch
index 26ec699415..87b2b3c46a 100644
--- a/Spigot-Server-Patches/0420-Fix-unregistering-entities-from-unloading-chunks.patch
+++ b/Spigot-Server-Patches/0419-Fix-unregistering-entities-from-unloading-chunks.patch
@@ -15,7 +15,7 @@ Combine that with a buggy detail of the previous implementation of
 the Dupe UUID patch, then this was the likely source of the "Ghost entities"
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 7dbb7e75c10d443fe9c90eadec8e9cdf01024548..49a4c2ab35e00cc30bcfad7c702f9278db7b1155 100644
+index b97682e967ea1d9a9f9142dba4089a9f15302913..a71531d6d329b11b9ad535786d26c4c2327bcbb9 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1565,9 +1565,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0420-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0421-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0420-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/Spigot-Server-Patches/0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0421-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from Spigot-Server-Patches/0422-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0421-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0422-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 96%
rename from Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0422-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 41fb717144..3a8c5c03df 100644
--- a/Spigot-Server-Patches/0423-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/Spigot-Server-Patches/0422-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
@@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding
 Stack will identify any causer of this and warn instead of crashing.
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index fd1924016518d6edc0508311704763841d8c8493..adc7cd577fe8ea5de5de2ba8b32c4578d27748cc 100644
+index baef98331c07b0f8c95351f39c5e471f96a59c05..c7619bba9115e8695b5aea2b4d059bea577e748e 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -1503,6 +1503,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0423-Optimize-Collision-to-not-load-chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch
rename to Spigot-Server-Patches/0423-Optimize-Collision-to-not-load-chunks.patch
index 96dd9daa1f..b289eb0159 100644
--- a/Spigot-Server-Patches/0424-Optimize-Collision-to-not-load-chunks.patch
+++ b/Spigot-Server-Patches/0423-Optimize-Collision-to-not-load-chunks.patch
@@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading
 massive amounts of surrounding chunks due to large AABB lookups.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c5116a9c596074a33c98d29bb1e9cf22a8ad53bf..84c2bc0bac4f388094693859ab7b6ced5e315c27 100644
+index 9af1d81475d2def60a682ed23e88f1afbbc4c7e6..0a99ee6221c46043ecdf9e9df7a064aa63ee6951 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -61,6 +61,7 @@ import net.minecraft.server.ScoreboardServer;
diff --git a/Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0424-Don-t-tick-dead-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0425-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0424-Don-t-tick-dead-players.patch
diff --git a/Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0425-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0426-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0425-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0426-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0426-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
index 994c9b3537..a08aa23bac 100644
--- a/Spigot-Server-Patches/0427-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
+++ b/Spigot-Server-Patches/0426-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
@@ -83,7 +83,7 @@ index a444f6214b90f7707be2265f4b2ab12632986c53..138676e5b03bc80a777a1f4c12f3f4b5
  
                  if (optional.isPresent()) {
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index adc7cd577fe8ea5de5de2ba8b32c4578d27748cc..c308c5eb0c1ce4b10cef97a9cbb2e2bb79a7ea43 100644
+index c7619bba9115e8695b5aea2b4d059bea577e748e..5ccc70f36616e1bd8cdb8b23315f7422ec5acc61 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -106,8 +106,33 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0427-Increase-Light-Queue-Size.patch
similarity index 100%
rename from Spigot-Server-Patches/0428-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0427-Increase-Light-Queue-Size.patch
diff --git a/Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0428-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 100%
rename from Spigot-Server-Patches/0429-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0428-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
diff --git a/Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0429-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0430-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0429-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0430-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0430-Add-tick-times-API-and-mspt-command.patch
diff --git a/Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0431-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0431-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0432-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 98%
rename from Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch
rename to Spigot-Server-Patches/0432-Add-Raw-Byte-ItemStack-Serialization.patch
index 80b4197074..292ccedef1 100644
--- a/Spigot-Server-Patches/0433-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/Spigot-Server-Patches/0432-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -38,7 +38,7 @@ index 6527509e6aed7187667c681af682e9a02937a224..28e36ee76da533f8aa0a09cfc4f1fc0f
          return DataConverterRegistry.c;
      }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 661f400ae4f5cebef5d1743819529ecf647b6681..0468f80b7f52ee45fc9364470b23f80f7cd0cb57 100644
+index 7b1df591007b9c50bcaf4bcd30562396a9549193..b88aec3b97d43018cf2733bad069a90338aa98cb 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -198,6 +198,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0434-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0433-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from Spigot-Server-Patches/0434-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0433-Remove-streams-from-Mob-AI-System.patch
diff --git a/Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0434-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 95%
rename from Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0434-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
index ace543ae0c..ed808f345d 100644
--- a/Spigot-Server-Patches/0435-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
+++ b/Spigot-Server-Patches/0434-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Delay unsafe actions until after entity ticking is done
 This will help prevent many cases of unregistering entities during entity ticking
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index c34ec6440b3c081a6e573b213f483c9ccf345c2b..ae99f3fb3a4b37c737fb276590004b2e10beab5a 100644
+index 6f15e2d0302108d64b14b3449e81f18f985db7ae..cfe784560ea4c368d6e3a0797d09c0a717eb146e 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -178,6 +178,16 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0436-Async-command-map-building.patch b/Spigot-Server-Patches/0435-Async-command-map-building.patch
similarity index 100%
rename from Spigot-Server-Patches/0436-Async-command-map-building.patch
rename to Spigot-Server-Patches/0435-Async-command-map-building.patch
diff --git a/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch
similarity index 100%
rename from Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
rename to Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch
diff --git a/Spigot-Server-Patches/0438-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0437-Optimize-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0438-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0437-Optimize-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0439-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0438-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0439-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0438-Reduce-Either-Optional-allocation.patch
diff --git a/Spigot-Server-Patches/0440-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0439-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0440-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0439-Remove-streams-from-PairedQueue.patch
diff --git a/Spigot-Server-Patches/0441-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0440-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from Spigot-Server-Patches/0441-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0440-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0441-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from Spigot-Server-Patches/0442-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0441-Prevent-opening-inventories-when-frozen.patch
diff --git a/Spigot-Server-Patches/0443-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0442-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from Spigot-Server-Patches/0443-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0442-Optimise-ArraySetSorted-removeIf.patch
diff --git a/Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0443-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0443-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0444-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 100%
rename from Spigot-Server-Patches/0445-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0444-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
diff --git a/Spigot-Server-Patches/0446-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0445-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from Spigot-Server-Patches/0446-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0445-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0446-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0447-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0446-Implement-Player-Client-Options-API.patch
diff --git a/Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0447-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 97%
rename from Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0447-Fix-Chunk-Post-Processing-deadlock-risk.patch
index 78245f6194..3f1b970f53 100644
--- a/Spigot-Server-Patches/0448-Fix-Chunk-Post-Processing-deadlock-risk.patch
+++ b/Spigot-Server-Patches/0447-Fix-Chunk-Post-Processing-deadlock-risk.patch
@@ -37,7 +37,7 @@ index 2d7d2e712a7117e6985e3104097a31a5577c1b82..6e5d21af43261dc2f12ceec7b7e3269b
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 21bd5524af246cd19996dc8ec2e969d981cf8ee9..a7efc5c7e4da8f18ecfd6a335a01709db4259367 100644
+index b00c5a7eaf456e6d6ce250ee790ce33dfa9bb496..6279846a92489b5dade21ad55a1bec1157073e27 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -183,6 +183,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0448-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0449-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0448-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0449-Broadcast-join-message-to-console.patch
similarity index 91%
rename from Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0449-Broadcast-join-message-to-console.patch
index 680595c2bd..6ffc693706 100644
--- a/Spigot-Server-Patches/0450-Broadcast-join-message-to-console.patch
+++ b/Spigot-Server-Patches/0449-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 48d4f8310d79d0eb78f4ace42c8778ee4addf7d0..599470c2158222be9202a96fc7d9bcf4b0ca0fe1 100644
+index 9eec320ca5a63a313138dc84367e93038b457c0d..7d336c23a57c06c3744ae5b187960da798dd07c8 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/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0450-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0451-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0450-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0451-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from Spigot-Server-Patches/0452-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0451-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/Spigot-Server-Patches/0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0452-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from Spigot-Server-Patches/0453-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0452-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0453-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0453-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0454-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 96%
rename from Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0454-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
index 561eeffb91..df3e2c58ef 100644
--- a/Spigot-Server-Patches/0455-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
+++ b/Spigot-Server-Patches/0454-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
@@ -14,7 +14,7 @@ Use an ArrayDeque to store this Queue
 We make sure to also implement a pattern that is recursion safe too.
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index e5d94dedc88e8bbcf8d9517dfb5c6ec6f62de5aa..042a6beb8cada116d54bed18181de291bf5ed1bb 100644
+index 6e4a47581843be42b77034fec16b1d531a5b5759..d509cfd2da99233e5142abd176cc50ccea7c32b6 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -162,24 +162,32 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0456-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0455-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0456-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0455-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0457-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0456-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from Spigot-Server-Patches/0457-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0456-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/Spigot-Server-Patches/0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0457-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0457-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0458-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0459-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0458-Implement-Brigadier-Mojang-API.patch
diff --git a/Spigot-Server-Patches/0460-Villager-Restocks-API.patch b/Spigot-Server-Patches/0459-Villager-Restocks-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0460-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0459-Villager-Restocks-API.patch
index 07a9844dc0..d136893c45 100644
--- a/Spigot-Server-Patches/0460-Villager-Restocks-API.patch
+++ b/Spigot-Server-Patches/0459-Villager-Restocks-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Villager Restocks API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-index 07f87ee8f5df9d7a40001dd28f50457344308a03..c37dd836c284ed8beac6699ec4f5f91886cf3f63 100644
+index d7e152f7147bb599ce21dc605ebbd76e82eced26..d2850b003f8672122e70da0d52da1de59b2b01dd 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
 @@ -113,7 +113,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
diff --git a/Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0460-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0461-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0460-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/Spigot-Server-Patches/0462-Expose-game-version.patch b/Spigot-Server-Patches/0461-Expose-game-version.patch
similarity index 89%
rename from Spigot-Server-Patches/0462-Expose-game-version.patch
rename to Spigot-Server-Patches/0461-Expose-game-version.patch
index 5d5f8c7da1..adc8f3c549 100644
--- a/Spigot-Server-Patches/0462-Expose-game-version.patch
+++ b/Spigot-Server-Patches/0461-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 55890ff463eb122934e8ba1fc550cf0cccaf8451..96652862531301c08aefa0baa79b1258b5b307ec 100644
+index b55b2a27adba357faee0f260c8d7cc247d8d8238..688bf56b331cc4b6b9664365f97a98720ec522a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -518,6 +518,13 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0463-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0462-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0463-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0462-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0463-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from Spigot-Server-Patches/0464-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0463-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0464-Implement-Mob-Goal-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0464-Implement-Mob-Goal-API.patch
index dafc8040d6..a314291416 100644
--- a/Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0464-Implement-Mob-Goal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/pom.xml b/pom.xml
-index 451aff0bdc4b53bc14cdae7734ac132484b94b4e..c8e74f0fa14df5fe5113779d910c6395b32981ca 100644
+index dd5f7dba3610b63aa16088a94bf3b459d496cb3c..1869a7fdb8e48dc94cd9c22c7d85298a06729b5b 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -181,6 +181,13 @@
+@@ -176,6 +176,13 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>
diff --git a/Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0465-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0466-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0465-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0466-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from Spigot-Server-Patches/0467-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0466-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/Spigot-Server-Patches/0468-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0467-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0467-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0468-No-Tick-view-distance-implementation.patch
similarity index 100%
rename from Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0468-No-Tick-view-distance-implementation.patch
diff --git a/Spigot-Server-Patches/0470-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0469-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0470-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0469-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0471-Fix-Light-Command.patch b/Spigot-Server-Patches/0470-Fix-Light-Command.patch
similarity index 99%
rename from Spigot-Server-Patches/0471-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0470-Fix-Light-Command.patch
index 3a0aaf19d2..6b3d2eed34 100644
--- a/Spigot-Server-Patches/0471-Fix-Light-Command.patch
+++ b/Spigot-Server-Patches/0470-Fix-Light-Command.patch
@@ -166,7 +166,7 @@ index 1f6333c2c26ad04e23d2881235ed1dcf707be038..e53054fc46e528f9c713eb4c03add613
          // Paper start - per player view distance
          // there can be potential desync with player's last mapped section and the view distance map, so use the
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 762598b1dc8c6fb4beaad01e5777d0a950845eaf..5538d97e237e448a7d3eb76a57609980c3a6bddb 100644
+index e4b5649fbc8cb9662e818581fe2891641de419b6..a7e3a979dca4dd7705a8f80366677378f0643f27 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -346,11 +346,12 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0472-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0471-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0471-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0473-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0472-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0472-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0474-Potential-bed-API.patch b/Spigot-Server-Patches/0473-Potential-bed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Potential-bed-API.patch
rename to Spigot-Server-Patches/0473-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0475-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0474-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 96%
rename from Spigot-Server-Patches/0475-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0474-Wait-for-Async-Tasks-during-shutdown.patch
index 825e7a84ce..0e7e30a5fe 100644
--- a/Spigot-Server-Patches/0475-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/Spigot-Server-Patches/0474-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index e25539dd54956225e8b14d3b8c636130267f226d..9074646e8111c69c4875b0633a424b25
          // CraftBukkit end
          if (this.getServerConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e20e3d69ac1c4cf97afd522340464e53d2497c08..8a8d492bfeb8eb559dbd325978b92878545a9778 100644
+index 3b7a7791a221aaf39b4b6974b2f37efd403e4b25..81627e0774442c15c62b8a13db865378411d7801 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -942,6 +942,35 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0476-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0475-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0476-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0475-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0476-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from Spigot-Server-Patches/0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0476-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/Spigot-Server-Patches/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0477-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0477-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0479-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0478-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0478-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0479-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0479-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index dc0f04cb8e..40cf990128 100644
--- a/Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/Spigot-Server-Patches/0479-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -39,7 +39,7 @@ index b64aa6c9ce906b08e43891f8c465fa4e8b2a8906..58dd349adf2bc9bac6569464ef7a7aec
  
                      if (!flag4 && this.o <= 400 && !this.q && this.r == this.tracker.isOnGround()) {
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 21b43df57fbb65b2f39482d15e8c813403e80de1..b7bf5f7cf7f48be5d7c694de3deddab7a2d889d5 100644
+index a7e3a979dca4dd7705a8f80366677378f0643f27..c3394b22d1a22fd83ff43473da34704ad547836f 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -2235,9 +2235,14 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
diff --git a/Spigot-Server-Patches/0481-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0480-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0481-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0480-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0482-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0481-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0481-Add-option-for-console-having-all-permissions.patch
diff --git a/Spigot-Server-Patches/0483-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0482-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0482-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0483-Workaround-for-Client-Lag-Spikes-MC-162253.patch
similarity index 98%
rename from Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch
rename to Spigot-Server-Patches/0483-Workaround-for-Client-Lag-Spikes-MC-162253.patch
index e82421b1e8..3581cde231 100644
--- a/Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch
+++ b/Spigot-Server-Patches/0483-Workaround-for-Client-Lag-Spikes-MC-162253.patch
@@ -12,7 +12,7 @@ to the client, so that it doesn't attempt to calculate them.
 This mitigates the frametime impact to a minimum (but it's still there).
 
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index b7bf5f7cf7f48be5d7c694de3deddab7a2d889d5..1d7891005c7e4ff0c7b817cda987b3bc263f7010 100644
+index c3394b22d1a22fd83ff43473da34704ad547836f..6ddbc83a08be4e7aa5cd85cf78f14604d4759f30 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -85,6 +85,7 @@ import net.minecraft.world.level.World;
diff --git a/Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0484-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0484-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/Spigot-Server-Patches/0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0485-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 97%
rename from Spigot-Server-Patches/0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0485-Optimize-sending-packets-to-nearby-locations-sounds-.patch
index 3a4024e267..ee6a2dd544 100644
--- a/Spigot-Server-Patches/0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch
+++ b/Spigot-Server-Patches/0485-Optimize-sending-packets-to-nearby-locations-sounds-.patch
@@ -11,7 +11,7 @@ This will drastically cut down on packet sending cost for worlds with
 lots of players in them.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 65e01b98c74d2fa9ff6d6db18f9f8c684b7bdac4..fa9fae3979caaaef16a21d7407bb05e796963d7c 100644
+index b4c5915cc68a838259129b8973b3a6a39c1fc963..4c3a2e3cfd60321b3b74d143a32aa5f5d59d7e1e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1153,16 +1153,40 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0486-Improve-Chunk-Status-Transition-Speed.patch
similarity index 98%
rename from Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0486-Improve-Chunk-Status-Transition-Speed.patch
index 4df93b2bf2..969bc53a1c 100644
--- a/Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch
+++ b/Spigot-Server-Patches/0486-Improve-Chunk-Status-Transition-Speed.patch
@@ -54,7 +54,7 @@ index fc79a73c884ceb7e0ce56443c36b135c4e525193..88022e3ccd04f9c041ced68be66a9524
      // Paper start - no-tick view distance
      public final Chunk getSendingChunk() {
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 01cce21eeed25b2bb36a0f32b9708afb83690f90..7318103feafd12ed631f907a450c9dc3d665a9a3 100644
+index 5bea15ba1ee3d2c8e8d78ab34ba75723164b7117..74146ab6bd172807fb8545c1a29e376b1224e34d 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -795,7 +795,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0488-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0487-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0487-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0489-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0488-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0488-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0489-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 95%
rename from Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0489-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 8e7eb59958..e62a5c265f 100644
--- a/Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/Spigot-Server-Patches/0489-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use seed based lookup for Treasure Maps - Fixes lag from
 
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 06fa9b91cc103a5d5f39ab8fcfb5ccad4cf0e5de..1a7d06d8a3d1fe0a2a943eae5efd23d28fe4bd62 100644
+index 795c4a9e3e33660af888ff80204bfd47a3b327fd..5401db70b4516ab960cffae0aae9b3ea297288b5 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -421,8 +421,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
diff --git a/Spigot-Server-Patches/0491-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0490-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0490-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0492-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0491-Optimize-Light-Engine.patch
similarity index 99%
rename from Spigot-Server-Patches/0492-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0491-Optimize-Light-Engine.patch
index be7ebd1442..58ff4e0601 100644
--- a/Spigot-Server-Patches/0492-Optimize-Light-Engine.patch
+++ b/Spigot-Server-Patches/0491-Optimize-Light-Engine.patch
@@ -387,7 +387,7 @@ index 88022e3ccd04f9c041ced68be66a95247c1017e9..d6a5a0b17308913a5efd97cd27fabd08
          if (getCurrentPriority() != priority) {
              this.u.a(this.location, this::getCurrentPriority, priority, this::setPriority); // use preferred priority
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 7318103feafd12ed631f907a450c9dc3d665a9a3..b47cd2a8fb4920531d80acfcfe40f8211fedc9ae 100644
+index 74146ab6bd172807fb8545c1a29e376b1224e34d..169fa174f86f8a8dc42d3b9c4954a39d0a738c06 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -99,6 +99,7 @@ import net.minecraft.world.level.chunk.storage.RegionFile;
diff --git a/Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0492-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0492-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/Spigot-Server-Patches/0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0493-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 98%
rename from Spigot-Server-Patches/0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0493-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 42e7e5149d..bdda9347f5 100644
--- a/Spigot-Server-Patches/0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/Spigot-Server-Patches/0493-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 32e68e403950be62bd0330b268738225c2e70edd..d0c951878600a4227e558bc68d68098c59fb7b2b 100644
+index 81627e0774442c15c62b8a13db865378411d7801..02de2c985e0dcb43ff10e686b608052e83629064 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -346,7 +346,7 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0495-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0494-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0494-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0495-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0495-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0497-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0496-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0496-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/Spigot-Server-Patches/0498-Fix-sand-duping.patch b/Spigot-Server-Patches/0497-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0498-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0497-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0499-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0498-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0498-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/Spigot-Server-Patches/0500-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0499-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0500-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0499-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0501-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0500-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0500-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0502-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0501-Expose-Arrow-getItemStack.patch
similarity index 94%
rename from Spigot-Server-Patches/0502-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0501-Expose-Arrow-getItemStack.patch
index 5bc5621e30..07e4be3370 100644
--- a/Spigot-Server-Patches/0502-Expose-Arrow-getItemStack.patch
+++ b/Spigot-Server-Patches/0501-Expose-Arrow-getItemStack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose Arrow getItemStack
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
-index 5ecbe9135a71dd84e0722fa9c039c272a11d206f..4cd1ddec701252269de0ce8520ee492f1e1cbacb 100644
+index c325c9fe680d9033b20909bcd6100ecc4b0195f6..ce754e0da047050daa08e5e0564fa399d334c04b 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 @@ -558,6 +558,7 @@ public abstract class EntityArrow extends IProjectile {
diff --git a/Spigot-Server-Patches/0503-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0502-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0502-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/Spigot-Server-Patches/0504-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0503-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0503-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0505-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0504-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0504-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0506-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0505-Add-permission-for-command-blocks.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0505-Add-permission-for-command-blocks.patch
diff --git a/Spigot-Server-Patches/0507-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0506-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0507-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0506-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/Spigot-Server-Patches/0508-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0507-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0507-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/Spigot-Server-Patches/0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0508-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0508-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/Spigot-Server-Patches/0510-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0509-Paper-dumpitem-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0510-Paper-dumpitem-command.patch
rename to Spigot-Server-Patches/0509-Paper-dumpitem-command.patch
diff --git a/Spigot-Server-Patches/0511-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0510-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Don-t-allow-null-UUID-s-for-chat.patch
rename to Spigot-Server-Patches/0510-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0512-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0511-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0512-Improve-Legacy-Component-serialization-size.patch
rename to Spigot-Server-Patches/0511-Improve-Legacy-Component-serialization-size.patch
diff --git a/Spigot-Server-Patches/0513-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0512-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from Spigot-Server-Patches/0513-Support-old-UUID-format-for-NBT.patch
rename to Spigot-Server-Patches/0512-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0514-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0513-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Clean-up-duplicated-GameProfile-Properties.patch
rename to Spigot-Server-Patches/0513-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0515-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0514-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0515-Convert-legacy-attributes-in-Item-Meta.patch
rename to Spigot-Server-Patches/0514-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0516-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0515-Remove-some-streams-from-structures.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Remove-some-streams-from-structures.patch
rename to Spigot-Server-Patches/0515-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0517-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0516-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Remove-streams-from-classes-related-villager-gossip.patch
rename to Spigot-Server-Patches/0516-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0518-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0517-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Support-components-in-ItemMeta.patch
rename to Spigot-Server-Patches/0517-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0519-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0518-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to Spigot-Server-Patches/0518-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0520-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0519-Add-entity-liquid-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0520-Add-entity-liquid-API.patch
rename to Spigot-Server-Patches/0519-Add-entity-liquid-API.patch
diff --git a/Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0520-Update-itemstack-legacy-name-and-lore.patch
similarity index 97%
rename from Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch
rename to Spigot-Server-Patches/0520-Update-itemstack-legacy-name-and-lore.patch
index 0c77743434..2398718e40 100644
--- a/Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch
+++ b/Spigot-Server-Patches/0520-Update-itemstack-legacy-name-and-lore.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 0468f80b7f52ee45fc9364470b23f80f7cd0cb57..158c7a30af8326fa419af391167c07d75b8611ac 100644
+index b88aec3b97d43018cf2733bad069a90338aa98cb..800d10db92a956d3ca8a3d569d12862f36044ee9 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -27,6 +27,7 @@ import net.minecraft.core.IRegistry;
diff --git a/Spigot-Server-Patches/0522-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0521-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from Spigot-Server-Patches/0522-Spawn-player-in-correct-world-on-login.patch
rename to Spigot-Server-Patches/0521-Spawn-player-in-correct-world-on-login.patch
index d3f4b9b844..0810b4a11b 100644
--- a/Spigot-Server-Patches/0522-Spawn-player-in-correct-world-on-login.patch
+++ b/Spigot-Server-Patches/0521-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fa9fae3979caaaef16a21d7407bb05e796963d7c..b33e610fee244e4791f6a88e8699c999913cb2d3 100644
+index 4c3a2e3cfd60321b3b74d143a32aa5f5d59d7e1e..34b45a6818209245fa5692a83cf4143030057095 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -196,7 +196,18 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0523-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0522-Add-PrepareResultEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0523-Add-PrepareResultEvent.patch
rename to Spigot-Server-Patches/0522-Add-PrepareResultEvent.patch
diff --git a/Spigot-Server-Patches/0524-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0523-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-Server-Patches/0523-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-Server-Patches/0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0524-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from Spigot-Server-Patches/0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to Spigot-Server-Patches/0524-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/Spigot-Server-Patches/0526-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0525-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0526-Optimize-NetworkManager-Exception-Handling.patch
rename to Spigot-Server-Patches/0525-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0527-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0526-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from Spigot-Server-Patches/0527-Fix-Concurrency-issue-in-WeightedList.patch
rename to Spigot-Server-Patches/0526-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0528-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0527-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0528-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to Spigot-Server-Patches/0527-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0529-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0528-Fix-arrows-never-despawning-MC-125757.patch
similarity index 94%
rename from Spigot-Server-Patches/0529-Fix-arrows-never-despawning-MC-125757.patch
rename to Spigot-Server-Patches/0528-Fix-arrows-never-despawning-MC-125757.patch
index 38c97d91fd..384b4e0382 100644
--- a/Spigot-Server-Patches/0529-Fix-arrows-never-despawning-MC-125757.patch
+++ b/Spigot-Server-Patches/0528-Fix-arrows-never-despawning-MC-125757.patch
@@ -9,7 +9,7 @@ instead of getting stuck in a never despawn state (bubble columns,
 etc).
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
-index 4cd1ddec701252269de0ce8520ee492f1e1cbacb..2f8b3587f527620152609d5be342b328a7621e0f 100644
+index ce754e0da047050daa08e5e0564fa399d334c04b..b0e8e9934edbb0cf7ac063e4903452be526afbc7 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
 @@ -171,6 +171,7 @@ public abstract class EntityArrow extends IProjectile {
diff --git a/Spigot-Server-Patches/0530-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0529-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0530-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to Spigot-Server-Patches/0529-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0531-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0530-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from Spigot-Server-Patches/0531-Move-range-check-for-block-placing-up.patch
rename to Spigot-Server-Patches/0530-Move-range-check-for-block-placing-up.patch
diff --git a/Spigot-Server-Patches/0532-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0531-Fix-SPIGOT-5989.patch
similarity index 97%
rename from Spigot-Server-Patches/0532-Fix-SPIGOT-5989.patch
rename to Spigot-Server-Patches/0531-Fix-SPIGOT-5989.patch
index 308e978126..06e7d808b5 100644
--- a/Spigot-Server-Patches/0532-Fix-SPIGOT-5989.patch
+++ b/Spigot-Server-Patches/0531-Fix-SPIGOT-5989.patch
@@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is
 still at a respawn anchor.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b33e610fee244e4791f6a88e8699c999913cb2d3..1b78f53d09cc26fe881933df8aa1a7e77337acf1 100644
+index 34b45a6818209245fa5692a83cf4143030057095..7f5311770f0a461f02039255fbbf1a48df4178f3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -83,6 +83,7 @@ import net.minecraft.world.level.EnumGamemode;
diff --git a/Spigot-Server-Patches/0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0532-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from Spigot-Server-Patches/0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to Spigot-Server-Patches/0532-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/Spigot-Server-Patches/0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0533-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to Spigot-Server-Patches/0533-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/Spigot-Server-Patches/0535-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0534-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from Spigot-Server-Patches/0535-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to Spigot-Server-Patches/0534-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0535-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to Spigot-Server-Patches/0535-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/Spigot-Server-Patches/0537-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0536-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from Spigot-Server-Patches/0537-Fix-some-rails-connecting-improperly.patch
rename to Spigot-Server-Patches/0536-Fix-some-rails-connecting-improperly.patch
diff --git a/Spigot-Server-Patches/0538-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0537-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from Spigot-Server-Patches/0538-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to Spigot-Server-Patches/0537-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/Spigot-Server-Patches/0539-Incremental-player-saving.patch b/Spigot-Server-Patches/0538-Incremental-player-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0539-Incremental-player-saving.patch
rename to Spigot-Server-Patches/0538-Incremental-player-saving.patch
diff --git a/Spigot-Server-Patches/0540-Import-fastutil-classes.patch b/Spigot-Server-Patches/0539-Import-fastutil-classes.patch
similarity index 100%
rename from Spigot-Server-Patches/0540-Import-fastutil-classes.patch
rename to Spigot-Server-Patches/0539-Import-fastutil-classes.patch
diff --git a/Spigot-Server-Patches/0541-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0540-Don-t-mark-null-chunk-sections-for-block-updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0541-Don-t-mark-null-chunk-sections-for-block-updates.patch
rename to Spigot-Server-Patches/0540-Don-t-mark-null-chunk-sections-for-block-updates.patch
diff --git a/Spigot-Server-Patches/0542-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0541-Remove-armour-stand-double-add-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0542-Remove-armour-stand-double-add-to-world.patch
rename to Spigot-Server-Patches/0541-Remove-armour-stand-double-add-to-world.patch
diff --git a/Spigot-Server-Patches/0543-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0542-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from Spigot-Server-Patches/0543-Fix-MC-187716-Use-configured-height.patch
rename to Spigot-Server-Patches/0542-Fix-MC-187716-Use-configured-height.patch
diff --git a/Spigot-Server-Patches/0544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0543-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to Spigot-Server-Patches/0543-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/Spigot-Server-Patches/0545-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0544-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0545-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to Spigot-Server-Patches/0544-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/Spigot-Server-Patches/0546-Brand-support.patch b/Spigot-Server-Patches/0545-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0546-Brand-support.patch
rename to Spigot-Server-Patches/0545-Brand-support.patch
diff --git a/Spigot-Server-Patches/0547-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0546-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
similarity index 100%
rename from Spigot-Server-Patches/0547-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
rename to Spigot-Server-Patches/0546-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
diff --git a/Spigot-Server-Patches/0548-Fix-MC-197271.patch b/Spigot-Server-Patches/0547-Fix-MC-197271.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Fix-MC-197271.patch
rename to Spigot-Server-Patches/0547-Fix-MC-197271.patch
diff --git a/Spigot-Server-Patches/0549-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0548-MC-197883-Bandaid-decode-issue.patch
similarity index 100%
rename from Spigot-Server-Patches/0549-MC-197883-Bandaid-decode-issue.patch
rename to Spigot-Server-Patches/0548-MC-197883-Bandaid-decode-issue.patch
diff --git a/Spigot-Server-Patches/0550-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0549-Add-setMaxPlayers-API.patch
similarity index 89%
rename from Spigot-Server-Patches/0550-Add-setMaxPlayers-API.patch
rename to Spigot-Server-Patches/0549-Add-setMaxPlayers-API.patch
index 3d97a9da0a..2ee36075a0 100644
--- a/Spigot-Server-Patches/0550-Add-setMaxPlayers-API.patch
+++ b/Spigot-Server-Patches/0549-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 939e3721af52069f1abad79d28c0555be3ac2d59..272a899c4d599a97201f1c11d829abe40101377d 100644
+index d3f3dc4ad2c758482b7a8d5c07caa526ce1e3424..8bd55e3d2b5142081a7dfe1dbbd36f2f995e5856 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -145,7 +145,7 @@ public abstract class PlayerList {
@@ -18,7 +18,7 @@ index 939e3721af52069f1abad79d28c0555be3ac2d59..272a899c4d599a97201f1c11d829abe4
      private EnumGamemode u;
      private boolean v;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f8d040ba6c8b3a1294a8ac8d55cbd09705d4be76..1199644c6342379df21840aa144e731e9e9245ca 100644
+index 1e0546a14506a41d1a7b74d306b992cfbdf6e0cf..53254ad9e775e9e78da238a54be7d3fc4b8a6ced 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -618,6 +618,13 @@ public final class CraftServer implements Server {
diff --git a/Spigot-Server-Patches/0551-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0550-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0551-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-Server-Patches/0550-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0552-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0551-Don-t-require-FACING-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0552-Don-t-require-FACING-data.patch
rename to Spigot-Server-Patches/0551-Don-t-require-FACING-data.patch
diff --git a/Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0552-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to Spigot-Server-Patches/0552-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/Spigot-Server-Patches/0554-Add-moon-phase-API.patch b/Spigot-Server-Patches/0553-Add-moon-phase-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0554-Add-moon-phase-API.patch
rename to Spigot-Server-Patches/0553-Add-moon-phase-API.patch
diff --git a/Spigot-Server-Patches/0555-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0554-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0555-Prevent-headless-pistons-from-being-created.patch
rename to Spigot-Server-Patches/0554-Prevent-headless-pistons-from-being-created.patch
diff --git a/Spigot-Server-Patches/0556-Add-BellRingEvent.patch b/Spigot-Server-Patches/0555-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0556-Add-BellRingEvent.patch
rename to Spigot-Server-Patches/0555-Add-BellRingEvent.patch
diff --git a/Spigot-Server-Patches/0557-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0556-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from Spigot-Server-Patches/0557-Add-zombie-targets-turtle-egg-config.patch
rename to Spigot-Server-Patches/0556-Add-zombie-targets-turtle-egg-config.patch
diff --git a/Spigot-Server-Patches/0558-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0557-Buffer-joins-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0558-Buffer-joins-to-world.patch
rename to Spigot-Server-Patches/0557-Buffer-joins-to-world.patch
diff --git a/Spigot-Server-Patches/0559-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0558-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0559-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0558-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0560-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0559-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0560-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to Spigot-Server-Patches/0559-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/Spigot-Server-Patches/0561-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0560-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 98%
rename from Spigot-Server-Patches/0561-PortalCreateEvent-needs-to-know-its-entity.patch
rename to Spigot-Server-Patches/0560-PortalCreateEvent-needs-to-know-its-entity.patch
index 51e748ada1..66018f4db8 100644
--- a/Spigot-Server-Patches/0561-PortalCreateEvent-needs-to-know-its-entity.patch
+++ b/Spigot-Server-Patches/0560-PortalCreateEvent-needs-to-know-its-entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 158c7a30af8326fa419af391167c07d75b8611ac..fee862951f2767d4a3c5268dff157c185378a939 100644
+index 800d10db92a956d3ca8a3d569d12862f36044ee9..366ceb65d40c685117d1c79a933864ab91d8aa11 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -368,7 +368,7 @@ public final class ItemStack {
diff --git a/Spigot-Server-Patches/0562-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0561-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0562-Fix-CraftTeam-null-check.patch
rename to Spigot-Server-Patches/0561-Fix-CraftTeam-null-check.patch
diff --git a/Spigot-Server-Patches/0563-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0562-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0563-Add-more-Evoker-API.patch
rename to Spigot-Server-Patches/0562-Add-more-Evoker-API.patch
diff --git a/Spigot-Server-Patches/0564-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0563-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-Server-Patches/0564-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-Server-Patches/0563-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-Server-Patches/0565-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0564-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0565-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-Server-Patches/0564-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/Spigot-Server-Patches/0566-Cache-block-data-strings.patch b/Spigot-Server-Patches/0565-Cache-block-data-strings.patch
similarity index 100%
rename from Spigot-Server-Patches/0566-Cache-block-data-strings.patch
rename to Spigot-Server-Patches/0565-Cache-block-data-strings.patch
diff --git a/Spigot-Server-Patches/0567-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0566-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 100%
rename from Spigot-Server-Patches/0567-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to Spigot-Server-Patches/0566-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
diff --git a/Spigot-Server-Patches/0568-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0567-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0568-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-Server-Patches/0567-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0569-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0568-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
similarity index 100%
rename from Spigot-Server-Patches/0569-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
rename to Spigot-Server-Patches/0568-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/Spigot-Server-Patches/0570-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0569-Extend-block-drop-capture-to-capture-all-items-added.patch
similarity index 97%
rename from Spigot-Server-Patches/0570-Extend-block-drop-capture-to-capture-all-items-added.patch
rename to Spigot-Server-Patches/0569-Extend-block-drop-capture-to-capture-all-items-added.patch
index 2c4e30d307..8353773dbd 100644
--- a/Spigot-Server-Patches/0570-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/Spigot-Server-Patches/0569-Extend-block-drop-capture-to-capture-all-items-added.patch
@@ -33,7 +33,7 @@ index 984209e4f66ad23d85d2c5d02318caab1aff7324..31012963815a5c7355753b8cd2749976
                  // Drop event experience
                  if (flag && event != null) {
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 246708808cbcd9a5c1b8690c869a514d02fddb5c..4a87b9ebc2a584d8a2fca874342057e81fbbc1c6 100644
+index 68a2fef79eae006ea7a8de1fc903e7000b6aab85..7942f492f7688fab52acbefbe5703221b0435752 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -99,6 +99,7 @@ import net.minecraft.world.entity.animal.EntityWaterAnimal;
diff --git a/Spigot-Server-Patches/0571-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0570-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
similarity index 100%
rename from Spigot-Server-Patches/0571-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
rename to Spigot-Server-Patches/0570-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch
diff --git a/Spigot-Server-Patches/0572-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0571-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from Spigot-Server-Patches/0572-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to Spigot-Server-Patches/0571-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/Spigot-Server-Patches/0573-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0572-Lazily-track-plugin-scoreboards-by-default.patch
similarity index 100%
rename from Spigot-Server-Patches/0573-Lazily-track-plugin-scoreboards-by-default.patch
rename to Spigot-Server-Patches/0572-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/Spigot-Server-Patches/0574-Entity-isTicking.patch b/Spigot-Server-Patches/0573-Entity-isTicking.patch
similarity index 100%
rename from Spigot-Server-Patches/0574-Entity-isTicking.patch
rename to Spigot-Server-Patches/0573-Entity-isTicking.patch
diff --git a/Spigot-Server-Patches/0575-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0574-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
similarity index 100%
rename from Spigot-Server-Patches/0575-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
rename to Spigot-Server-Patches/0574-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
diff --git a/Spigot-Server-Patches/0576-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0575-Fix-Not-a-string-Map-Conversion-spam.patch
similarity index 100%
rename from Spigot-Server-Patches/0576-Fix-Not-a-string-Map-Conversion-spam.patch
rename to Spigot-Server-Patches/0575-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/Spigot-Server-Patches/0577-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0576-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0577-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0576-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0578-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0577-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
similarity index 100%
rename from Spigot-Server-Patches/0578-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
rename to Spigot-Server-Patches/0577-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch
diff --git a/Spigot-Server-Patches/0579-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0578-Reset-Ender-Crystals-on-Dragon-Spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0579-Reset-Ender-Crystals-on-Dragon-Spawn.patch
rename to Spigot-Server-Patches/0578-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/Spigot-Server-Patches/0580-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0579-Fix-for-large-move-vectors-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0580-Fix-for-large-move-vectors-crashing-server.patch
rename to Spigot-Server-Patches/0579-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/Spigot-Server-Patches/0581-Optimise-getType-calls.patch b/Spigot-Server-Patches/0580-Optimise-getType-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0581-Optimise-getType-calls.patch
rename to Spigot-Server-Patches/0580-Optimise-getType-calls.patch
diff --git a/Spigot-Server-Patches/0582-Villager-resetOffers.patch b/Spigot-Server-Patches/0581-Villager-resetOffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0582-Villager-resetOffers.patch
rename to Spigot-Server-Patches/0581-Villager-resetOffers.patch
diff --git a/Spigot-Server-Patches/0583-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0582-Improve-inlinig-for-some-hot-IBlockData-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0583-Improve-inlinig-for-some-hot-IBlockData-methods.patch
rename to Spigot-Server-Patches/0582-Improve-inlinig-for-some-hot-IBlockData-methods.patch
diff --git a/Spigot-Server-Patches/0584-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0583-Retain-block-place-order-when-capturing-blockstates.patch
similarity index 100%
rename from Spigot-Server-Patches/0584-Retain-block-place-order-when-capturing-blockstates.patch
rename to Spigot-Server-Patches/0583-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/Spigot-Server-Patches/0585-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0584-Reduce-blockpos-allocation-from-pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0585-Reduce-blockpos-allocation-from-pathfinding.patch
rename to Spigot-Server-Patches/0584-Reduce-blockpos-allocation-from-pathfinding.patch
diff --git a/Spigot-Server-Patches/0586-Fix-item-locations-dropped-from-campfires.patch b/Spigot-Server-Patches/0585-Fix-item-locations-dropped-from-campfires.patch
similarity index 100%
rename from Spigot-Server-Patches/0586-Fix-item-locations-dropped-from-campfires.patch
rename to Spigot-Server-Patches/0585-Fix-item-locations-dropped-from-campfires.patch
diff --git a/Spigot-Server-Patches/0587-Player-elytra-boost-API.patch b/Spigot-Server-Patches/0586-Player-elytra-boost-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0587-Player-elytra-boost-API.patch
rename to Spigot-Server-Patches/0586-Player-elytra-boost-API.patch
diff --git a/Spigot-Server-Patches/0588-Fixed-TileEntityBell-memory-leak.patch b/Spigot-Server-Patches/0587-Fixed-TileEntityBell-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0588-Fixed-TileEntityBell-memory-leak.patch
rename to Spigot-Server-Patches/0587-Fixed-TileEntityBell-memory-leak.patch
diff --git a/Spigot-Server-Patches/0589-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/Spigot-Server-Patches/0588-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
similarity index 97%
rename from Spigot-Server-Patches/0589-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
rename to Spigot-Server-Patches/0588-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 775fe3cc1e..183a7c372f 100644
--- a/Spigot-Server-Patches/0589-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/Spigot-Server-Patches/0588-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
@@ -8,7 +8,7 @@ This can realistically only happen if there's custom loot active on fishing
 which can return 0 items. This would disconnect the player who's fishing.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java
-index d40b056b2ff14033113bd7108a3295f8783b8bdf..addea9c1309a308b76c93ee71e839c915bc773e8 100644
+index 38bcc5a4435c4018b3233cc5e4c9142259e4396d..45f0f004e97b20e5c6c5b1f205b088bf8aa86017 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFishingHook.java
 @@ -484,9 +484,15 @@ public class EntityFishingHook extends IProjectile {
diff --git a/Spigot-Server-Patches/0590-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0589-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from Spigot-Server-Patches/0590-Add-getOfflinePlayerIfCached-String.patch
rename to Spigot-Server-Patches/0589-Add-getOfflinePlayerIfCached-String.patch
diff --git a/Spigot-Server-Patches/0591-Add-ignore-discounts-API.patch b/Spigot-Server-Patches/0590-Add-ignore-discounts-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0591-Add-ignore-discounts-API.patch
rename to Spigot-Server-Patches/0590-Add-ignore-discounts-API.patch
index 9904971520..6a4454312b 100644
--- a/Spigot-Server-Patches/0591-Add-ignore-discounts-API.patch
+++ b/Spigot-Server-Patches/0590-Add-ignore-discounts-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ignore discounts API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
-index 80a9eecfd2eb17db6a7d0b3973f4acdb80f873e8..382059b2c2b6a7b8231b3c3a5c9a401091b1ad18 100644
+index b7c16dfa4ed7d68596c5b5d5037ce0ac3810ecfa..e24c598c9d662144b91075ac80a193db2e0cb111 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
 @@ -460,6 +460,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
diff --git a/Spigot-Server-Patches/0592-Toggle-for-removing-existing-dragon.patch b/Spigot-Server-Patches/0591-Toggle-for-removing-existing-dragon.patch
similarity index 100%
rename from Spigot-Server-Patches/0592-Toggle-for-removing-existing-dragon.patch
rename to Spigot-Server-Patches/0591-Toggle-for-removing-existing-dragon.patch
diff --git a/Spigot-Server-Patches/0593-Fix-client-lag-on-advancement-loading.patch b/Spigot-Server-Patches/0592-Fix-client-lag-on-advancement-loading.patch
similarity index 96%
rename from Spigot-Server-Patches/0593-Fix-client-lag-on-advancement-loading.patch
rename to Spigot-Server-Patches/0592-Fix-client-lag-on-advancement-loading.patch
index 28cd03fb92..c2ef60d3c7 100644
--- a/Spigot-Server-Patches/0593-Fix-client-lag-on-advancement-loading.patch
+++ b/Spigot-Server-Patches/0592-Fix-client-lag-on-advancement-loading.patch
@@ -35,7 +35,7 @@ index 8e760445885f6ab92f60db0ee2a02d098b5e5f03..7a8a1960882e291c46301d07da3e1c54
          if (this.m || !this.i.isEmpty() || !this.j.isEmpty()) {
              Map<MinecraftKey, AdvancementProgress> map = Maps.newHashMap();
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a1c918e84627d79f6665237851f614880a9da6f7..74ebd6257ca7c87bcedff831d213273e7d542612 100644
+index 5b03187f4d76e3052ee9abe0ee2774218d41b864..36ad77a5a3987c1de5d0de7cbcb94cb6fe841d44 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -309,7 +309,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/Spigot-Server-Patches/0594-Item-no-age-no-player-pickup.patch b/Spigot-Server-Patches/0593-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from Spigot-Server-Patches/0594-Item-no-age-no-player-pickup.patch
rename to Spigot-Server-Patches/0593-Item-no-age-no-player-pickup.patch
diff --git a/Spigot-Server-Patches/0595-Beacon-API-custom-effect-ranges.patch b/Spigot-Server-Patches/0594-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from Spigot-Server-Patches/0595-Beacon-API-custom-effect-ranges.patch
rename to Spigot-Server-Patches/0594-Beacon-API-custom-effect-ranges.patch
diff --git a/Spigot-Server-Patches/0596-Add-API-for-quit-reason.patch b/Spigot-Server-Patches/0595-Add-API-for-quit-reason.patch
similarity index 100%
rename from Spigot-Server-Patches/0596-Add-API-for-quit-reason.patch
rename to Spigot-Server-Patches/0595-Add-API-for-quit-reason.patch
diff --git a/Spigot-Server-Patches/0597-Seed-based-feature-search.patch b/Spigot-Server-Patches/0596-Seed-based-feature-search.patch
similarity index 100%
rename from Spigot-Server-Patches/0597-Seed-based-feature-search.patch
rename to Spigot-Server-Patches/0596-Seed-based-feature-search.patch
diff --git a/Spigot-Server-Patches/0598-Add-Wandering-Trader-spawn-rate-config-options.patch b/Spigot-Server-Patches/0597-Add-Wandering-Trader-spawn-rate-config-options.patch
similarity index 100%
rename from Spigot-Server-Patches/0598-Add-Wandering-Trader-spawn-rate-config-options.patch
rename to Spigot-Server-Patches/0597-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/Spigot-Server-Patches/0599-Significantly-improve-performance-of-the-end-generat.patch b/Spigot-Server-Patches/0598-Significantly-improve-performance-of-the-end-generat.patch
similarity index 100%
rename from Spigot-Server-Patches/0599-Significantly-improve-performance-of-the-end-generat.patch
rename to Spigot-Server-Patches/0598-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/Spigot-Server-Patches/0600-Expose-world-spawn-angle.patch b/Spigot-Server-Patches/0599-Expose-world-spawn-angle.patch
similarity index 96%
rename from Spigot-Server-Patches/0600-Expose-world-spawn-angle.patch
rename to Spigot-Server-Patches/0599-Expose-world-spawn-angle.patch
index 60fec8c679..881cbed405 100644
--- a/Spigot-Server-Patches/0600-Expose-world-spawn-angle.patch
+++ b/Spigot-Server-Patches/0599-Expose-world-spawn-angle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 61513e3c27cf95090e61f7085bb2f0435c774df9..a7ca1dbebf30262d7c526f96b7a45482b1f898f4 100644
+index e0bbb7f3ea7ce4902cd14e64357472087ce6912a..66fbbc4c91e16a3dfb4bb756972e667121693501 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -894,7 +894,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0601-Add-Destroy-Speed-API.patch b/Spigot-Server-Patches/0600-Add-Destroy-Speed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0601-Add-Destroy-Speed-API.patch
rename to Spigot-Server-Patches/0600-Add-Destroy-Speed-API.patch
diff --git a/Spigot-Server-Patches/0602-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/Spigot-Server-Patches/0601-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
similarity index 100%
rename from Spigot-Server-Patches/0602-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
rename to Spigot-Server-Patches/0601-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
diff --git a/Spigot-Server-Patches/0603-Add-LivingEntity-clearActiveItem.patch b/Spigot-Server-Patches/0602-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from Spigot-Server-Patches/0603-Add-LivingEntity-clearActiveItem.patch
rename to Spigot-Server-Patches/0602-Add-LivingEntity-clearActiveItem.patch
diff --git a/Spigot-Server-Patches/0604-Add-PlayerItemCooldownEvent.patch b/Spigot-Server-Patches/0603-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0604-Add-PlayerItemCooldownEvent.patch
rename to Spigot-Server-Patches/0603-Add-PlayerItemCooldownEvent.patch
diff --git a/Spigot-Server-Patches/0605-More-lightning-API.patch b/Spigot-Server-Patches/0604-More-lightning-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0605-More-lightning-API.patch
rename to Spigot-Server-Patches/0604-More-lightning-API.patch
diff --git a/Spigot-Server-Patches/0606-Climbing-should-not-bypass-cramming-gamerule.patch b/Spigot-Server-Patches/0605-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 100%
rename from Spigot-Server-Patches/0606-Climbing-should-not-bypass-cramming-gamerule.patch
rename to Spigot-Server-Patches/0605-Climbing-should-not-bypass-cramming-gamerule.patch
diff --git a/Spigot-Server-Patches/0607-Added-missing-default-perms-for-commands.patch b/Spigot-Server-Patches/0606-Added-missing-default-perms-for-commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0607-Added-missing-default-perms-for-commands.patch
rename to Spigot-Server-Patches/0606-Added-missing-default-perms-for-commands.patch
diff --git a/Spigot-Server-Patches/0608-Add-PlayerShearBlockEvent.patch b/Spigot-Server-Patches/0607-Add-PlayerShearBlockEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0608-Add-PlayerShearBlockEvent.patch
rename to Spigot-Server-Patches/0607-Add-PlayerShearBlockEvent.patch
index b63c910557..3404ded8f3 100644
--- a/Spigot-Server-Patches/0608-Add-PlayerShearBlockEvent.patch
+++ b/Spigot-Server-Patches/0607-Add-PlayerShearBlockEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerShearBlockEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 768934fa4158a9773d06f5b23bfb19db75f6d179..596b4597313b87296d39027b13555b5ad1cba9e6 100644
+index d4903842aebeff3e32dbf7d3f4b670af4ebad174..7279893d599351785652279c8827fe0efbd72f12 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -262,7 +262,7 @@ public class Block extends BlockBase implements IMaterial {
diff --git a/Spigot-Server-Patches/0609-Add-warning-for-servers-not-running-on-Java-16.patch b/Spigot-Server-Patches/0608-Add-warning-for-servers-not-running-on-Java-16.patch
similarity index 100%
rename from Spigot-Server-Patches/0609-Add-warning-for-servers-not-running-on-Java-16.patch
rename to Spigot-Server-Patches/0608-Add-warning-for-servers-not-running-on-Java-16.patch
diff --git a/Spigot-Server-Patches/0610-Set-spigots-verbose-world-setting-to-false-by-def.patch b/Spigot-Server-Patches/0609-Set-spigots-verbose-world-setting-to-false-by-def.patch
similarity index 100%
rename from Spigot-Server-Patches/0610-Set-spigots-verbose-world-setting-to-false-by-def.patch
rename to Spigot-Server-Patches/0609-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/Spigot-Server-Patches/0611-Fix-curing-zombie-villager-discount-exploit.patch b/Spigot-Server-Patches/0610-Fix-curing-zombie-villager-discount-exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0611-Fix-curing-zombie-villager-discount-exploit.patch
rename to Spigot-Server-Patches/0610-Fix-curing-zombie-villager-discount-exploit.patch
diff --git a/Spigot-Server-Patches/0612-Limit-recipe-packets.patch b/Spigot-Server-Patches/0611-Limit-recipe-packets.patch
similarity index 100%
rename from Spigot-Server-Patches/0612-Limit-recipe-packets.patch
rename to Spigot-Server-Patches/0611-Limit-recipe-packets.patch
diff --git a/Spigot-Server-Patches/0613-Fix-CraftSound-backwards-compatibility.patch b/Spigot-Server-Patches/0612-Fix-CraftSound-backwards-compatibility.patch
similarity index 100%
rename from Spigot-Server-Patches/0613-Fix-CraftSound-backwards-compatibility.patch
rename to Spigot-Server-Patches/0612-Fix-CraftSound-backwards-compatibility.patch
diff --git a/Spigot-Server-Patches/0614-MC-4-Fix-item-position-desync.patch b/Spigot-Server-Patches/0613-MC-4-Fix-item-position-desync.patch
similarity index 100%
rename from Spigot-Server-Patches/0614-MC-4-Fix-item-position-desync.patch
rename to Spigot-Server-Patches/0613-MC-4-Fix-item-position-desync.patch
diff --git a/Spigot-Server-Patches/0615-Player-Chunk-Load-Unload-Events.patch b/Spigot-Server-Patches/0614-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0615-Player-Chunk-Load-Unload-Events.patch
rename to Spigot-Server-Patches/0614-Player-Chunk-Load-Unload-Events.patch
diff --git a/Spigot-Server-Patches/0616-Optimize-Dynamic-get-Missing-Keys.patch b/Spigot-Server-Patches/0615-Optimize-Dynamic-get-Missing-Keys.patch
similarity index 100%
rename from Spigot-Server-Patches/0616-Optimize-Dynamic-get-Missing-Keys.patch
rename to Spigot-Server-Patches/0615-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/Spigot-Server-Patches/0617-Expose-LivingEntity-hurt-direction.patch b/Spigot-Server-Patches/0616-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from Spigot-Server-Patches/0617-Expose-LivingEntity-hurt-direction.patch
rename to Spigot-Server-Patches/0616-Expose-LivingEntity-hurt-direction.patch
diff --git a/Spigot-Server-Patches/0618-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/Spigot-Server-Patches/0617-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from Spigot-Server-Patches/0618-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to Spigot-Server-Patches/0617-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/Spigot-Server-Patches/0619-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/Spigot-Server-Patches/0618-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
similarity index 100%
rename from Spigot-Server-Patches/0619-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
rename to Spigot-Server-Patches/0618-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch
diff --git a/Spigot-Server-Patches/0620-added-PlayerTradeEvent.patch b/Spigot-Server-Patches/0619-added-PlayerTradeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0620-added-PlayerTradeEvent.patch
rename to Spigot-Server-Patches/0619-added-PlayerTradeEvent.patch
diff --git a/Spigot-Server-Patches/0621-Implement-TargetHitEvent.patch b/Spigot-Server-Patches/0620-Implement-TargetHitEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0621-Implement-TargetHitEvent.patch
rename to Spigot-Server-Patches/0620-Implement-TargetHitEvent.patch
diff --git a/Spigot-Server-Patches/0622-Additional-Block-Material-API-s.patch b/Spigot-Server-Patches/0621-Additional-Block-Material-API-s.patch
similarity index 100%
rename from Spigot-Server-Patches/0622-Additional-Block-Material-API-s.patch
rename to Spigot-Server-Patches/0621-Additional-Block-Material-API-s.patch
diff --git a/Spigot-Server-Patches/0623-Fix-harming-potion-dupe.patch b/Spigot-Server-Patches/0622-Fix-harming-potion-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0623-Fix-harming-potion-dupe.patch
rename to Spigot-Server-Patches/0622-Fix-harming-potion-dupe.patch
diff --git a/Spigot-Server-Patches/0624-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/Spigot-Server-Patches/0623-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
similarity index 100%
rename from Spigot-Server-Patches/0624-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
rename to Spigot-Server-Patches/0623-Implement-API-to-get-Material-from-Boats-and-Minecar.patch
diff --git a/Spigot-Server-Patches/0625-Optimized-tick-ready-check.patch b/Spigot-Server-Patches/0624-Optimized-tick-ready-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0625-Optimized-tick-ready-check.patch
rename to Spigot-Server-Patches/0624-Optimized-tick-ready-check.patch
diff --git a/Spigot-Server-Patches/0626-Cache-burn-durations.patch b/Spigot-Server-Patches/0625-Cache-burn-durations.patch
similarity index 100%
rename from Spigot-Server-Patches/0626-Cache-burn-durations.patch
rename to Spigot-Server-Patches/0625-Cache-burn-durations.patch
diff --git a/Spigot-Server-Patches/0627-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/Spigot-Server-Patches/0626-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
similarity index 100%
rename from Spigot-Server-Patches/0627-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
rename to Spigot-Server-Patches/0626-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/Spigot-Server-Patches/0628-Implement-PlayerFlowerPotManipulateEvent.patch b/Spigot-Server-Patches/0627-Implement-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0628-Implement-PlayerFlowerPotManipulateEvent.patch
rename to Spigot-Server-Patches/0627-Implement-PlayerFlowerPotManipulateEvent.patch
diff --git a/Spigot-Server-Patches/0629-Fix-interact-event-not-being-called-in-adventure.patch b/Spigot-Server-Patches/0628-Fix-interact-event-not-being-called-in-adventure.patch
similarity index 100%
rename from Spigot-Server-Patches/0629-Fix-interact-event-not-being-called-in-adventure.patch
rename to Spigot-Server-Patches/0628-Fix-interact-event-not-being-called-in-adventure.patch
diff --git a/Spigot-Server-Patches/0630-Zombie-API-breaking-doors.patch b/Spigot-Server-Patches/0629-Zombie-API-breaking-doors.patch
similarity index 100%
rename from Spigot-Server-Patches/0630-Zombie-API-breaking-doors.patch
rename to Spigot-Server-Patches/0629-Zombie-API-breaking-doors.patch
diff --git a/Spigot-Server-Patches/0631-Fix-nerfed-slime-when-splitting.patch b/Spigot-Server-Patches/0630-Fix-nerfed-slime-when-splitting.patch
similarity index 100%
rename from Spigot-Server-Patches/0631-Fix-nerfed-slime-when-splitting.patch
rename to Spigot-Server-Patches/0630-Fix-nerfed-slime-when-splitting.patch
diff --git a/Spigot-Server-Patches/0632-Add-EntityLoadCrossbowEvent.patch b/Spigot-Server-Patches/0631-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0632-Add-EntityLoadCrossbowEvent.patch
rename to Spigot-Server-Patches/0631-Add-EntityLoadCrossbowEvent.patch
diff --git a/Spigot-Server-Patches/0633-Guardian-beam-workaround.patch b/Spigot-Server-Patches/0632-Guardian-beam-workaround.patch
similarity index 100%
rename from Spigot-Server-Patches/0633-Guardian-beam-workaround.patch
rename to Spigot-Server-Patches/0632-Guardian-beam-workaround.patch
diff --git a/Spigot-Server-Patches/0634-Added-WorldGameRuleChangeEvent.patch b/Spigot-Server-Patches/0633-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0634-Added-WorldGameRuleChangeEvent.patch
rename to Spigot-Server-Patches/0633-Added-WorldGameRuleChangeEvent.patch
diff --git a/Spigot-Server-Patches/0635-Added-ServerResourcesReloadedEvent.patch b/Spigot-Server-Patches/0634-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0635-Added-ServerResourcesReloadedEvent.patch
rename to Spigot-Server-Patches/0634-Added-ServerResourcesReloadedEvent.patch
diff --git a/Spigot-Server-Patches/0636-Added-world-settings-for-mobs-picking-up-loot.patch b/Spigot-Server-Patches/0635-Added-world-settings-for-mobs-picking-up-loot.patch
similarity index 100%
rename from Spigot-Server-Patches/0636-Added-world-settings-for-mobs-picking-up-loot.patch
rename to Spigot-Server-Patches/0635-Added-world-settings-for-mobs-picking-up-loot.patch
diff --git a/Spigot-Server-Patches/0637-Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/0636-Implemented-BlockFailedDispenseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0637-Implemented-BlockFailedDispenseEvent.patch
rename to Spigot-Server-Patches/0636-Implemented-BlockFailedDispenseEvent.patch
diff --git a/Spigot-Server-Patches/0638-Added-PlayerLecternPageChangeEvent.patch b/Spigot-Server-Patches/0637-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0638-Added-PlayerLecternPageChangeEvent.patch
rename to Spigot-Server-Patches/0637-Added-PlayerLecternPageChangeEvent.patch
diff --git a/Spigot-Server-Patches/0639-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0638-Fire-event-on-GS4-query.patch
similarity index 100%
rename from Spigot-Server-Patches/0639-Fire-event-on-GS4-query.patch
rename to Spigot-Server-Patches/0638-Fire-event-on-GS4-query.patch
diff --git a/Spigot-Server-Patches/0640-Added-PlayerLoomPatternSelectEvent.patch b/Spigot-Server-Patches/0639-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0640-Added-PlayerLoomPatternSelectEvent.patch
rename to Spigot-Server-Patches/0639-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/Spigot-Server-Patches/0641-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0640-Configurable-door-breaking-difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0641-Configurable-door-breaking-difficulty.patch
rename to Spigot-Server-Patches/0640-Configurable-door-breaking-difficulty.patch
diff --git a/Spigot-Server-Patches/0642-Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/0641-Empty-commands-shall-not-be-dispatched.patch
similarity index 100%
rename from Spigot-Server-Patches/0642-Empty-commands-shall-not-be-dispatched.patch
rename to Spigot-Server-Patches/0641-Empty-commands-shall-not-be-dispatched.patch
diff --git a/Spigot-Server-Patches/0643-Implement-API-to-expose-exact-interaction-point.patch b/Spigot-Server-Patches/0642-Implement-API-to-expose-exact-interaction-point.patch
similarity index 100%
rename from Spigot-Server-Patches/0643-Implement-API-to-expose-exact-interaction-point.patch
rename to Spigot-Server-Patches/0642-Implement-API-to-expose-exact-interaction-point.patch
diff --git a/Spigot-Server-Patches/0644-Remove-stale-POIs.patch b/Spigot-Server-Patches/0643-Remove-stale-POIs.patch
similarity index 100%
rename from Spigot-Server-Patches/0644-Remove-stale-POIs.patch
rename to Spigot-Server-Patches/0643-Remove-stale-POIs.patch
diff --git a/Spigot-Server-Patches/0645-Fix-villager-boat-exploit.patch b/Spigot-Server-Patches/0644-Fix-villager-boat-exploit.patch
similarity index 94%
rename from Spigot-Server-Patches/0645-Fix-villager-boat-exploit.patch
rename to Spigot-Server-Patches/0644-Fix-villager-boat-exploit.patch
index 33fa1b3d4e..06ed0a695a 100644
--- a/Spigot-Server-Patches/0645-Fix-villager-boat-exploit.patch
+++ b/Spigot-Server-Patches/0644-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a7ca1dbebf30262d7c526f96b7a45482b1f898f4..0757cfcb96778258ba2593756e4ca9cbb16e2f87 100644
+index 66fbbc4c91e16a3dfb4bb756972e667121693501..cf457f6b6ee2968f68f4eede30bb703a6a4f990b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -77,6 +77,7 @@ import net.minecraft.util.MathHelper;
diff --git a/Spigot-Server-Patches/0646-Entity-load-save-limit-per-chunk.patch b/Spigot-Server-Patches/0645-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from Spigot-Server-Patches/0646-Entity-load-save-limit-per-chunk.patch
rename to Spigot-Server-Patches/0645-Entity-load-save-limit-per-chunk.patch
diff --git a/Spigot-Server-Patches/0647-Add-sendOpLevel-API.patch b/Spigot-Server-Patches/0646-Add-sendOpLevel-API.patch
similarity index 95%
rename from Spigot-Server-Patches/0647-Add-sendOpLevel-API.patch
rename to Spigot-Server-Patches/0646-Add-sendOpLevel-API.patch
index c874716144..382d088024 100644
--- a/Spigot-Server-Patches/0647-Add-sendOpLevel-API.patch
+++ b/Spigot-Server-Patches/0646-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0757cfcb96778258ba2593756e4ca9cbb16e2f87..24b3a893a2b76a4ecfbc6b2cc1eac242e5c6e9d6 100644
+index cf457f6b6ee2968f68f4eede30bb703a6a4f990b..1358993217e601e3bab6e0a4e8c55d555865a13e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1138,6 +1138,11 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0648-Add-StructureLocateEvent.patch b/Spigot-Server-Patches/0647-Add-StructureLocateEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0648-Add-StructureLocateEvent.patch
rename to Spigot-Server-Patches/0647-Add-StructureLocateEvent.patch
diff --git a/Spigot-Server-Patches/0649-Collision-option-for-requiring-a-player-participant.patch b/Spigot-Server-Patches/0648-Collision-option-for-requiring-a-player-participant.patch
similarity index 100%
rename from Spigot-Server-Patches/0649-Collision-option-for-requiring-a-player-participant.patch
rename to Spigot-Server-Patches/0648-Collision-option-for-requiring-a-player-participant.patch
diff --git a/Spigot-Server-Patches/0650-Respect-ProjectileHitEvent-cancel-where-missing.patch b/Spigot-Server-Patches/0649-Respect-ProjectileHitEvent-cancel-where-missing.patch
similarity index 100%
rename from Spigot-Server-Patches/0650-Respect-ProjectileHitEvent-cancel-where-missing.patch
rename to Spigot-Server-Patches/0649-Respect-ProjectileHitEvent-cancel-where-missing.patch
diff --git a/Spigot-Server-Patches/0651-Return-chat-component-with-empty-text-instead-of-thr.patch b/Spigot-Server-Patches/0650-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from Spigot-Server-Patches/0651-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to Spigot-Server-Patches/0650-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/Spigot-Server-Patches/0652-Make-schedule-command-per-world.patch b/Spigot-Server-Patches/0651-Make-schedule-command-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0652-Make-schedule-command-per-world.patch
rename to Spigot-Server-Patches/0651-Make-schedule-command-per-world.patch
diff --git a/Spigot-Server-Patches/0653-Configurable-max-leash-distance.patch b/Spigot-Server-Patches/0652-Configurable-max-leash-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0653-Configurable-max-leash-distance.patch
rename to Spigot-Server-Patches/0652-Configurable-max-leash-distance.patch
diff --git a/Spigot-Server-Patches/0654-Implement-BlockPreDispenseEvent.patch b/Spigot-Server-Patches/0653-Implement-BlockPreDispenseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0654-Implement-BlockPreDispenseEvent.patch
rename to Spigot-Server-Patches/0653-Implement-BlockPreDispenseEvent.patch
diff --git a/Spigot-Server-Patches/0655-Added-Vanilla-Entity-Tags.patch b/Spigot-Server-Patches/0654-Added-Vanilla-Entity-Tags.patch
similarity index 98%
rename from Spigot-Server-Patches/0655-Added-Vanilla-Entity-Tags.patch
rename to Spigot-Server-Patches/0654-Added-Vanilla-Entity-Tags.patch
index 8459a9c081..bab60d5a2e 100644
--- a/Spigot-Server-Patches/0655-Added-Vanilla-Entity-Tags.patch
+++ b/Spigot-Server-Patches/0654-Added-Vanilla-Entity-Tags.patch
@@ -56,7 +56,7 @@ index 49d989545aa1a02ecc811a74f0283e779d2543a0..19bd420e6bf625f77bb37755ff8364e5
                  throw new IllegalArgumentException();
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 74ebd6257ca7c87bcedff831d213273e7d542612..f69b4576f05dbf763e99d5d1cbed069c55c793ed 100644
+index 36ad77a5a3987c1de5d0de7cbcb94cb6fe841d44..848a704fa100c39098a5716bb25b6a9ed85d7a8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -118,8 +118,17 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/Spigot-Server-Patches/0656-added-Wither-API.patch b/Spigot-Server-Patches/0655-added-Wither-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0656-added-Wither-API.patch
rename to Spigot-Server-Patches/0655-added-Wither-API.patch
diff --git a/Spigot-Server-Patches/0657-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/Spigot-Server-Patches/0656-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0657-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
rename to Spigot-Server-Patches/0656-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff --git a/Spigot-Server-Patches/0658-Fix-console-spam-when-removing-chests-in-water.patch b/Spigot-Server-Patches/0657-Fix-console-spam-when-removing-chests-in-water.patch
similarity index 100%
rename from Spigot-Server-Patches/0658-Fix-console-spam-when-removing-chests-in-water.patch
rename to Spigot-Server-Patches/0657-Fix-console-spam-when-removing-chests-in-water.patch
diff --git a/Spigot-Server-Patches/0659-Add-toggle-for-always-placing-the-dragon-egg.patch b/Spigot-Server-Patches/0658-Add-toggle-for-always-placing-the-dragon-egg.patch
similarity index 100%
rename from Spigot-Server-Patches/0659-Add-toggle-for-always-placing-the-dragon-egg.patch
rename to Spigot-Server-Patches/0658-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/Spigot-Server-Patches/0660-Added-PlayerStonecutterRecipeSelectEvent.patch b/Spigot-Server-Patches/0659-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0660-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to Spigot-Server-Patches/0659-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/Spigot-Server-Patches/0661-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/Spigot-Server-Patches/0660-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0661-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to Spigot-Server-Patches/0660-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/Spigot-Server-Patches/0662-Skip-distance-map-update-when-spawning-disabled.patch b/Spigot-Server-Patches/0661-Skip-distance-map-update-when-spawning-disabled.patch
similarity index 100%
rename from Spigot-Server-Patches/0662-Skip-distance-map-update-when-spawning-disabled.patch
rename to Spigot-Server-Patches/0661-Skip-distance-map-update-when-spawning-disabled.patch
diff --git a/Spigot-Server-Patches/0663-Reset-shield-blocking-on-dimension-change.patch b/Spigot-Server-Patches/0662-Reset-shield-blocking-on-dimension-change.patch
similarity index 100%
rename from Spigot-Server-Patches/0663-Reset-shield-blocking-on-dimension-change.patch
rename to Spigot-Server-Patches/0662-Reset-shield-blocking-on-dimension-change.patch
diff --git a/Spigot-Server-Patches/0664-add-DragonEggFormEvent.patch b/Spigot-Server-Patches/0663-add-DragonEggFormEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0664-add-DragonEggFormEvent.patch
rename to Spigot-Server-Patches/0663-add-DragonEggFormEvent.patch
diff --git a/Spigot-Server-Patches/0665-EntityMoveEvent.patch b/Spigot-Server-Patches/0664-EntityMoveEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0665-EntityMoveEvent.patch
rename to Spigot-Server-Patches/0664-EntityMoveEvent.patch
diff --git a/Spigot-Server-Patches/0666-added-option-to-disable-pathfinding-updates-on-block.patch b/Spigot-Server-Patches/0665-added-option-to-disable-pathfinding-updates-on-block.patch
similarity index 100%
rename from Spigot-Server-Patches/0666-added-option-to-disable-pathfinding-updates-on-block.patch
rename to Spigot-Server-Patches/0665-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/Spigot-Server-Patches/0667-Inline-shift-direction-fields.patch b/Spigot-Server-Patches/0666-Inline-shift-direction-fields.patch
similarity index 100%
rename from Spigot-Server-Patches/0667-Inline-shift-direction-fields.patch
rename to Spigot-Server-Patches/0666-Inline-shift-direction-fields.patch
diff --git a/Spigot-Server-Patches/0668-Allow-adding-items-to-BlockDropItemEvent.patch b/Spigot-Server-Patches/0667-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0668-Allow-adding-items-to-BlockDropItemEvent.patch
rename to Spigot-Server-Patches/0667-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/Spigot-Server-Patches/0669-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/Spigot-Server-Patches/0668-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from Spigot-Server-Patches/0669-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to Spigot-Server-Patches/0668-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/Spigot-Server-Patches/0670-living-entity-allow-attribute-registration.patch b/Spigot-Server-Patches/0669-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from Spigot-Server-Patches/0670-living-entity-allow-attribute-registration.patch
rename to Spigot-Server-Patches/0669-living-entity-allow-attribute-registration.patch
diff --git a/Spigot-Server-Patches/0671-fix-dead-slime-setSize-invincibility.patch b/Spigot-Server-Patches/0670-fix-dead-slime-setSize-invincibility.patch
similarity index 100%
rename from Spigot-Server-Patches/0671-fix-dead-slime-setSize-invincibility.patch
rename to Spigot-Server-Patches/0670-fix-dead-slime-setSize-invincibility.patch
diff --git a/Spigot-Server-Patches/0672-Merchant-getRecipes-should-return-an-immutable-list.patch b/Spigot-Server-Patches/0671-Merchant-getRecipes-should-return-an-immutable-list.patch
similarity index 100%
rename from Spigot-Server-Patches/0672-Merchant-getRecipes-should-return-an-immutable-list.patch
rename to Spigot-Server-Patches/0671-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/Spigot-Server-Patches/0673-misc-debugging-dumps.patch b/Spigot-Server-Patches/0672-misc-debugging-dumps.patch
similarity index 97%
rename from Spigot-Server-Patches/0673-misc-debugging-dumps.patch
rename to Spigot-Server-Patches/0672-misc-debugging-dumps.patch
index 1e707949f1..5a0eca09e5 100644
--- a/Spigot-Server-Patches/0673-misc-debugging-dumps.patch
+++ b/Spigot-Server-Patches/0672-misc-debugging-dumps.patch
@@ -66,7 +66,7 @@ index 952d5c7c3324377e0036b9d7e524484cb581e5b2..a116156236caa22d3ee13b5a56f4ed3c
              try {
                  this.serverThread.join();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bc8cb33d2d41deeeecc7b8740ef49d7f79076fcc..41d9f45908d8ef9b7d956aba14973c08832d4f1f 100644
+index 19bd420e6bf625f77bb37755ff8364e5955feb2a..e8305df0ce11bf7c297bf5f0acc95f07324e4143 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -18,6 +18,7 @@ import com.mojang.serialization.Lifecycle;
diff --git a/Spigot-Server-Patches/0674-Add-support-for-hex-color-codes-in-console.patch b/Spigot-Server-Patches/0673-Add-support-for-hex-color-codes-in-console.patch
similarity index 100%
rename from Spigot-Server-Patches/0674-Add-support-for-hex-color-codes-in-console.patch
rename to Spigot-Server-Patches/0673-Add-support-for-hex-color-codes-in-console.patch
diff --git a/Spigot-Server-Patches/0675-Clear-SyncLoadInfo.patch b/Spigot-Server-Patches/0674-Clear-SyncLoadInfo.patch
similarity index 100%
rename from Spigot-Server-Patches/0675-Clear-SyncLoadInfo.patch
rename to Spigot-Server-Patches/0674-Clear-SyncLoadInfo.patch
diff --git a/Spigot-Server-Patches/0676-Expose-Tracked-Players.patch b/Spigot-Server-Patches/0675-Expose-Tracked-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0676-Expose-Tracked-Players.patch
rename to Spigot-Server-Patches/0675-Expose-Tracked-Players.patch
diff --git a/Spigot-Server-Patches/0677-Remove-streams-from-SensorNearest.patch b/Spigot-Server-Patches/0676-Remove-streams-from-SensorNearest.patch
similarity index 100%
rename from Spigot-Server-Patches/0677-Remove-streams-from-SensorNearest.patch
rename to Spigot-Server-Patches/0676-Remove-streams-from-SensorNearest.patch
diff --git a/Spigot-Server-Patches/0678-do-not-create-unnecessary-copies-of-passenger-list.patch b/Spigot-Server-Patches/0677-do-not-create-unnecessary-copies-of-passenger-list.patch
similarity index 99%
rename from Spigot-Server-Patches/0678-do-not-create-unnecessary-copies-of-passenger-list.patch
rename to Spigot-Server-Patches/0677-do-not-create-unnecessary-copies-of-passenger-list.patch
index 1b0d5fb465..cb25f2f527 100644
--- a/Spigot-Server-Patches/0678-do-not-create-unnecessary-copies-of-passenger-list.patch
+++ b/Spigot-Server-Patches/0677-do-not-create-unnecessary-copies-of-passenger-list.patch
@@ -44,7 +44,7 @@ index 58dd349adf2bc9bac6569464ef7a7aec81729e79..1df8fb8cb3fcf8201e1c5fa8ca13f7a9
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
-index 7fec676b8c944a5599a1694a9fcd5cce87509343..5424bbc7da6a2fa57d6bda222aa82c5e0357b6c3 100644
+index 169fa174f86f8a8dc42d3b9c4954a39d0a738c06..6835401bd7863bbd655502547a9fd4ae0f298da1 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
 @@ -2315,7 +2315,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
diff --git a/Spigot-Server-Patches/0679-MC-29274-Fix-Wither-hostility-towards-players.patch b/Spigot-Server-Patches/0678-MC-29274-Fix-Wither-hostility-towards-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0679-MC-29274-Fix-Wither-hostility-towards-players.patch
rename to Spigot-Server-Patches/0678-MC-29274-Fix-Wither-hostility-towards-players.patch
diff --git a/Spigot-Server-Patches/0680-Throw-proper-exception-on-empty-JsonList-file.patch b/Spigot-Server-Patches/0679-Throw-proper-exception-on-empty-JsonList-file.patch
similarity index 100%
rename from Spigot-Server-Patches/0680-Throw-proper-exception-on-empty-JsonList-file.patch
rename to Spigot-Server-Patches/0679-Throw-proper-exception-on-empty-JsonList-file.patch
diff --git a/Spigot-Server-Patches/0681-Improve-ServerGUI.patch b/Spigot-Server-Patches/0680-Improve-ServerGUI.patch
similarity index 100%
rename from Spigot-Server-Patches/0681-Improve-ServerGUI.patch
rename to Spigot-Server-Patches/0680-Improve-ServerGUI.patch
diff --git a/Spigot-Server-Patches/0682-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/Spigot-Server-Patches/0681-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0682-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
rename to Spigot-Server-Patches/0681-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch
diff --git a/Spigot-Server-Patches/0683-fix-converting-txt-to-json-file.patch b/Spigot-Server-Patches/0682-fix-converting-txt-to-json-file.patch
similarity index 97%
rename from Spigot-Server-Patches/0683-fix-converting-txt-to-json-file.patch
rename to Spigot-Server-Patches/0682-fix-converting-txt-to-json-file.patch
index 09c02749bd..8ef92016d7 100644
--- a/Spigot-Server-Patches/0683-fix-converting-txt-to-json-file.patch
+++ b/Spigot-Server-Patches/0682-fix-converting-txt-to-json-file.patch
@@ -49,7 +49,7 @@ index c4df472050622eb2469b2ddb4d2ed917994f6e95..52bb528e75eb43156ee2bf19877bc051
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 24b3a893a2b76a4ecfbc6b2cc1eac242e5c6e9d6..92ed4938d5fe6b76e3a9ac5491d6e9c004ade843 100644
+index 1358993217e601e3bab6e0a4e8c55d555865a13e..484c7cea458dda38e4816fe5f1c05c6836fa38b9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -175,6 +175,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0684-Add-worldborder-events.patch b/Spigot-Server-Patches/0683-Add-worldborder-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0684-Add-worldborder-events.patch
rename to Spigot-Server-Patches/0683-Add-worldborder-events.patch
diff --git a/Spigot-Server-Patches/0685-added-PlayerNameEntityEvent.patch b/Spigot-Server-Patches/0684-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0685-added-PlayerNameEntityEvent.patch
rename to Spigot-Server-Patches/0684-added-PlayerNameEntityEvent.patch
diff --git a/Spigot-Server-Patches/0686-Prevent-grindstones-from-overstacking-items.patch b/Spigot-Server-Patches/0685-Prevent-grindstones-from-overstacking-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0686-Prevent-grindstones-from-overstacking-items.patch
rename to Spigot-Server-Patches/0685-Prevent-grindstones-from-overstacking-items.patch
diff --git a/Spigot-Server-Patches/0687-Add-recipe-to-cook-events.patch b/Spigot-Server-Patches/0686-Add-recipe-to-cook-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0687-Add-recipe-to-cook-events.patch
rename to Spigot-Server-Patches/0686-Add-recipe-to-cook-events.patch
diff --git a/Spigot-Server-Patches/0688-Add-Block-isValidTool.patch b/Spigot-Server-Patches/0687-Add-Block-isValidTool.patch
similarity index 100%
rename from Spigot-Server-Patches/0688-Add-Block-isValidTool.patch
rename to Spigot-Server-Patches/0687-Add-Block-isValidTool.patch
diff --git a/Spigot-Server-Patches/0689-Allow-using-signs-inside-spawn-protection.patch b/Spigot-Server-Patches/0688-Allow-using-signs-inside-spawn-protection.patch
similarity index 100%
rename from Spigot-Server-Patches/0689-Allow-using-signs-inside-spawn-protection.patch
rename to Spigot-Server-Patches/0688-Allow-using-signs-inside-spawn-protection.patch
diff --git a/Spigot-Server-Patches/0690-Implement-Keyed-on-World.patch b/Spigot-Server-Patches/0689-Implement-Keyed-on-World.patch
similarity index 100%
rename from Spigot-Server-Patches/0690-Implement-Keyed-on-World.patch
rename to Spigot-Server-Patches/0689-Implement-Keyed-on-World.patch
diff --git a/Spigot-Server-Patches/0691-Add-fast-alternative-constructor-for-Vector3f.patch b/Spigot-Server-Patches/0690-Add-fast-alternative-constructor-for-Vector3f.patch
similarity index 100%
rename from Spigot-Server-Patches/0691-Add-fast-alternative-constructor-for-Vector3f.patch
rename to Spigot-Server-Patches/0690-Add-fast-alternative-constructor-for-Vector3f.patch
diff --git a/Spigot-Server-Patches/0692-Item-Rarity-API.patch b/Spigot-Server-Patches/0691-Item-Rarity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0692-Item-Rarity-API.patch
rename to Spigot-Server-Patches/0691-Item-Rarity-API.patch
diff --git a/Spigot-Server-Patches/0693-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/Spigot-Server-Patches/0692-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from Spigot-Server-Patches/0693-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to Spigot-Server-Patches/0692-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/Spigot-Server-Patches/0694-copy-TESign-isEditable-from-snapshots.patch b/Spigot-Server-Patches/0693-copy-TESign-isEditable-from-snapshots.patch
similarity index 100%
rename from Spigot-Server-Patches/0694-copy-TESign-isEditable-from-snapshots.patch
rename to Spigot-Server-Patches/0693-copy-TESign-isEditable-from-snapshots.patch
diff --git a/Spigot-Server-Patches/0695-Drop-carried-item-when-player-has-disconnected.patch b/Spigot-Server-Patches/0694-Drop-carried-item-when-player-has-disconnected.patch
similarity index 94%
rename from Spigot-Server-Patches/0695-Drop-carried-item-when-player-has-disconnected.patch
rename to Spigot-Server-Patches/0694-Drop-carried-item-when-player-has-disconnected.patch
index 035581c26d..06a6b95c91 100644
--- a/Spigot-Server-Patches/0695-Drop-carried-item-when-player-has-disconnected.patch
+++ b/Spigot-Server-Patches/0694-Drop-carried-item-when-player-has-disconnected.patch
@@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro
 Closes #5036
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 92ed4938d5fe6b76e3a9ac5491d6e9c004ade843..2df8e914f66176e22aeddf8b94a83af5ea921d88 100644
+index 484c7cea458dda38e4816fe5f1c05c6836fa38b9..b257d58a298e82f255b09e9575ee42a56a4b7cee 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -79,6 +79,7 @@ import net.minecraft.world.entity.Entity;
diff --git a/Spigot-Server-Patches/0696-forced-whitelist-use-configurable-kick-message.patch b/Spigot-Server-Patches/0695-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from Spigot-Server-Patches/0696-forced-whitelist-use-configurable-kick-message.patch
rename to Spigot-Server-Patches/0695-forced-whitelist-use-configurable-kick-message.patch
diff --git a/Spigot-Server-Patches/0697-Make-sure-to-remove-correct-TE-during-TE-tick.patch b/Spigot-Server-Patches/0696-Make-sure-to-remove-correct-TE-during-TE-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0697-Make-sure-to-remove-correct-TE-during-TE-tick.patch
rename to Spigot-Server-Patches/0696-Make-sure-to-remove-correct-TE-during-TE-tick.patch
diff --git a/Spigot-Server-Patches/0698-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0697-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0698-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0697-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/Spigot-Server-Patches/0699-fix-cancelling-block-falling-causing-client-desync.patch b/Spigot-Server-Patches/0698-fix-cancelling-block-falling-causing-client-desync.patch
similarity index 100%
rename from Spigot-Server-Patches/0699-fix-cancelling-block-falling-causing-client-desync.patch
rename to Spigot-Server-Patches/0698-fix-cancelling-block-falling-causing-client-desync.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-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/Spigot-Server-Patches/0700-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 100%
rename from Spigot-Server-Patches/0701-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to Spigot-Server-Patches/0700-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
diff --git a/Spigot-Server-Patches/0702-Enhance-console-tab-completions-for-brigadier-comman.patch b/Spigot-Server-Patches/0701-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from Spigot-Server-Patches/0702-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to Spigot-Server-Patches/0701-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/Spigot-Server-Patches/0703-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/Spigot-Server-Patches/0702-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from Spigot-Server-Patches/0703-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to Spigot-Server-Patches/0702-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/Spigot-Server-Patches/0704-Add-bypass-host-check.patch b/Spigot-Server-Patches/0703-Add-bypass-host-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0704-Add-bypass-host-check.patch
rename to Spigot-Server-Patches/0703-Add-bypass-host-check.patch
diff --git a/Spigot-Server-Patches/0705-don-t-throw-when-loading-invalid-TEs.patch b/Spigot-Server-Patches/0704-don-t-throw-when-loading-invalid-TEs.patch
similarity index 100%
rename from Spigot-Server-Patches/0705-don-t-throw-when-loading-invalid-TEs.patch
rename to Spigot-Server-Patches/0704-don-t-throw-when-loading-invalid-TEs.patch
diff --git a/Spigot-Server-Patches/0706-Set-area-affect-cloud-rotation.patch b/Spigot-Server-Patches/0705-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from Spigot-Server-Patches/0706-Set-area-affect-cloud-rotation.patch
rename to Spigot-Server-Patches/0705-Set-area-affect-cloud-rotation.patch
diff --git a/Spigot-Server-Patches/0707-add-isDeeplySleeping-to-HumanEntity.patch b/Spigot-Server-Patches/0706-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0707-add-isDeeplySleeping-to-HumanEntity.patch
rename to Spigot-Server-Patches/0706-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/Spigot-Server-Patches/0708-Fix-duplicating-give-items-on-item-drop-cancel.patch b/Spigot-Server-Patches/0707-Fix-duplicating-give-items-on-item-drop-cancel.patch
similarity index 100%
rename from Spigot-Server-Patches/0708-Fix-duplicating-give-items-on-item-drop-cancel.patch
rename to Spigot-Server-Patches/0707-Fix-duplicating-give-items-on-item-drop-cancel.patch
diff --git a/Spigot-Server-Patches/0709-add-consumeFuel-to-FurnaceBurnEvent.patch b/Spigot-Server-Patches/0708-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0709-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to Spigot-Server-Patches/0708-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/Spigot-Server-Patches/0710-add-get-set-drop-chance-to-EntityEquipment.patch b/Spigot-Server-Patches/0709-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from Spigot-Server-Patches/0710-add-get-set-drop-chance-to-EntityEquipment.patch
rename to Spigot-Server-Patches/0709-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/Spigot-Server-Patches/0711-fix-PigZombieAngerEvent-cancellation.patch b/Spigot-Server-Patches/0710-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from Spigot-Server-Patches/0711-fix-PigZombieAngerEvent-cancellation.patch
rename to Spigot-Server-Patches/0710-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/Spigot-Server-Patches/0712-Fix-checkReach-check-for-Shulker-boxes.patch b/Spigot-Server-Patches/0711-Fix-checkReach-check-for-Shulker-boxes.patch
similarity index 100%
rename from Spigot-Server-Patches/0712-Fix-checkReach-check-for-Shulker-boxes.patch
rename to Spigot-Server-Patches/0711-Fix-checkReach-check-for-Shulker-boxes.patch
diff --git a/Spigot-Server-Patches/0713-fix-PlayerItemHeldEvent-firing-twice.patch b/Spigot-Server-Patches/0712-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from Spigot-Server-Patches/0713-fix-PlayerItemHeldEvent-firing-twice.patch
rename to Spigot-Server-Patches/0712-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/Spigot-Server-Patches/0714-Added-PlayerDeepSleepEvent.patch b/Spigot-Server-Patches/0713-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0714-Added-PlayerDeepSleepEvent.patch
rename to Spigot-Server-Patches/0713-Added-PlayerDeepSleepEvent.patch
diff --git a/Spigot-Server-Patches/0715-More-World-API.patch b/Spigot-Server-Patches/0714-More-World-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0715-More-World-API.patch
rename to Spigot-Server-Patches/0714-More-World-API.patch
diff --git a/Spigot-Server-Patches/0716-Added-PlayerBedFailEnterEvent.patch b/Spigot-Server-Patches/0715-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0716-Added-PlayerBedFailEnterEvent.patch
rename to Spigot-Server-Patches/0715-Added-PlayerBedFailEnterEvent.patch
diff --git a/Spigot-Server-Patches/0717-Implement-methods-to-convert-between-Component-and-B.patch b/Spigot-Server-Patches/0716-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from Spigot-Server-Patches/0717-Implement-methods-to-convert-between-Component-and-B.patch
rename to Spigot-Server-Patches/0716-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/Spigot-Server-Patches/0718-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/Spigot-Server-Patches/0717-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
similarity index 95%
rename from Spigot-Server-Patches/0718-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
rename to Spigot-Server-Patches/0717-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
index e6c955ba26..3d7c4fd05d 100644
--- a/Spigot-Server-Patches/0718-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
+++ b/Spigot-Server-Patches/0717-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2df8e914f66176e22aeddf8b94a83af5ea921d88..f8f0212497ad4fbb1273820a06a4ae6721053b8e 100644
+index b257d58a298e82f255b09e9575ee42a56a4b7cee..a83d8cfac8c5ed84dd5224cc3f18f55dba4741af 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -871,6 +871,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0719-add-RespawnFlags-to-PlayerRespawnEvent.patch b/Spigot-Server-Patches/0718-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0719-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to Spigot-Server-Patches/0718-add-RespawnFlags-to-PlayerRespawnEvent.patch
index f74833a611..8ab58db94c 100644
--- a/Spigot-Server-Patches/0719-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/Spigot-Server-Patches/0718-add-RespawnFlags-to-PlayerRespawnEvent.patch
@@ -18,7 +18,7 @@ index fd9f38f0bb723b3e78bd013ccb9538489a9ca43e..8c9e97bb093c0e6297397edc71d72dee
                  } else {
                      if (this.player.getHealth() > 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f8f0212497ad4fbb1273820a06a4ae6721053b8e..aaa6f3aeaf1b47275a1c8fc22ee99475e62c32a0 100644
+index a83d8cfac8c5ed84dd5224cc3f18f55dba4741af..2a76c3624c64e93509a96579f48c507e29901625 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -820,7 +820,13 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0720-Introduce-beacon-activation-deactivation-events.patch b/Spigot-Server-Patches/0719-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0720-Introduce-beacon-activation-deactivation-events.patch
rename to Spigot-Server-Patches/0719-Introduce-beacon-activation-deactivation-events.patch
diff --git a/Spigot-Server-Patches/0721-Add-Channel-initialization-listeners.patch b/Spigot-Server-Patches/0720-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from Spigot-Server-Patches/0721-Add-Channel-initialization-listeners.patch
rename to Spigot-Server-Patches/0720-Add-Channel-initialization-listeners.patch
diff --git a/Spigot-Server-Patches/0722-Send-empty-commands-if-tab-completion-is-disabled.patch b/Spigot-Server-Patches/0721-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from Spigot-Server-Patches/0722-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to Spigot-Server-Patches/0721-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/Spigot-Server-Patches/0723-Add-more-WanderingTrader-API.patch b/Spigot-Server-Patches/0722-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0723-Add-more-WanderingTrader-API.patch
rename to Spigot-Server-Patches/0722-Add-more-WanderingTrader-API.patch
diff --git a/Spigot-Server-Patches/0724-Add-EntityBlockStorage-clearEntities.patch b/Spigot-Server-Patches/0723-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0724-Add-EntityBlockStorage-clearEntities.patch
rename to Spigot-Server-Patches/0723-Add-EntityBlockStorage-clearEntities.patch
diff --git a/Spigot-Server-Patches/0725-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/Spigot-Server-Patches/0724-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0725-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to Spigot-Server-Patches/0724-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/Spigot-Server-Patches/0726-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/Spigot-Server-Patches/0725-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0726-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to Spigot-Server-Patches/0725-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/Spigot-Server-Patches/0727-Inventory-close.patch b/Spigot-Server-Patches/0726-Inventory-close.patch
similarity index 100%
rename from Spigot-Server-Patches/0727-Inventory-close.patch
rename to Spigot-Server-Patches/0726-Inventory-close.patch
diff --git a/Spigot-Server-Patches/0728-call-PortalCreateEvent-players-and-end-platform.patch b/Spigot-Server-Patches/0727-call-PortalCreateEvent-players-and-end-platform.patch
similarity index 100%
rename from Spigot-Server-Patches/0728-call-PortalCreateEvent-players-and-end-platform.patch
rename to Spigot-Server-Patches/0727-call-PortalCreateEvent-players-and-end-platform.patch
diff --git a/Spigot-Server-Patches/0729-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/Spigot-Server-Patches/0728-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from Spigot-Server-Patches/0729-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to Spigot-Server-Patches/0728-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/Spigot-Server-Patches/0730-Fix-CraftPotionBrewer-cache.patch b/Spigot-Server-Patches/0729-Fix-CraftPotionBrewer-cache.patch
similarity index 100%
rename from Spigot-Server-Patches/0730-Fix-CraftPotionBrewer-cache.patch
rename to Spigot-Server-Patches/0729-Fix-CraftPotionBrewer-cache.patch