From a0b8b886c894e14db15c6ab720d2831f83b2a848 Mon Sep 17 00:00:00 2001
From: Mariell <proximyst@proximyst.com>
Date: Sat, 12 Sep 2020 21:57:21 +0200
Subject: [PATCH] Updated Upstream (CraftBukkit/Spigot) (#4318)

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

CraftBukkit Changes:
d5a72960 SPIGOT-6063: ConsoleSender sending extra lines in Java 13+

Spigot Changes:
2740d5ae Rebuild patches
---
 Spigot-Server-Patches/0001-POM-Changes.patch  | 18 ++++----
 .../0002-Paper-config-files.patch             |  4 +-
 Spigot-Server-Patches/0004-MC-Utils.patch     |  2 +-
 Spigot-Server-Patches/0009-Timings-v2.patch   | 22 +++++----
 ...d-version-history-to-version-command.patch |  4 +-
 ...44-Ensure-commands-are-not-ran-async.patch |  2 +-
 .../0058-Complete-resource-pack-API.patch     |  2 +-
 ...0078-Add-PlayerUseUnknownEntityEvent.patch |  2 +-
 ...nilla-per-world-scoreboard-coloring-.patch |  2 +-
 .../0099-Optimize-UserCache-Thread-Safe.patch |  4 +-
 ...onfigurable-packet-in-spam-threshold.patch |  2 +-
 ...11-Configurable-flying-kick-messages.patch |  2 +-
 ...30-Properly-fix-item-duplication-bug.patch |  2 +-
 ...PI-for-Reason-Source-Triggering-play.patch |  2 +-
 ...ke-parrots-stay-on-shoulders-despite.patch |  2 +-
 ...oleAppender-for-console-improvements.patch | 20 ++++----
 ...-prefixes-using-Log4J-configuration.patch} |  2 +-
 ...ams-to-redirect-System.out-err-to-lo.patch | 46 -------------------
 ...Include-Log4J2-SLF4J-implementation.patch} |  2 +-
 ...-Log4J-Configuration-Plugin-Loggers.patch} |  0
 ...t.patch => 0170-Add-PlayerJumpEvent.patch} |  2 +-
 ...-handle-PacketPlayInKeepAlive-async.patch} |  2 +-
 ...t-protocol-version-and-virtual-host.patch} |  0
 ...t-serverside-behavior-of-keepalives.patch} |  2 +-
 ...Effects-only-to-players-who-can-see.patch} |  0
 ...maximum-exp-value-when-merging-orbs.patch} |  0
 ... => 0176-Add-PlayerArmorChangeEvent.patch} |  0
 ...om-being-processed-when-the-player-.patch} |  0
 ...-implementations-for-captured-block.patch} |  0
 ...get-a-BlockState-without-a-snapshot.patch} |  0
 ...patch => 0180-AsyncTabCompleteEvent.patch} |  2 +-
 ...81-Avoid-NPE-in-PathfinderGoalTempt.patch} |  0
 ...=> 0182-PlayerPickupExperienceEvent.patch} |  0
 ...tch => 0183-ExperienceOrbMergeEvent.patch} |  0
 ...-Ability-to-apply-mending-to-XP-API.patch} |  0
 ...max-squid-spawn-height-configurable.patch} |  0
 ...patch => 0186-PreCreatureSpawnEvent.patch} |  0
 ...-PlayerNaturallySpawnCreaturesEvent.patch} |  0
 ...Add-setPlayerProfile-API-for-Skulls.patch} |  0
 ...> 0189-Fill-Profile-Property-Events.patch} |  0
 ...layerAdvancementCriterionGrantEvent.patch} |  0
 ...ch => 0191-Add-ArmorStand-Item-Meta.patch} |  0
 ...Extend-Player-Interact-cancellation.patch} |  0
 ... 0193-Tameable-getOwnerUniqueId-API.patch} |  0
 ...-crits-helps-mitigate-hacked-client.patch} |  0
 ...ing-location-from-InventoryEnderChe.patch} |  0
 ...ted-Ice-from-loading-holding-chunks.patch} |  0
 ...e-Explicit-Network-Manager-Flushing.patch} |  0
 ...t-extended-PaperServerListPingEvent.patch} |  0
 ... 0199-Improved-Async-Task-Scheduler.patch} |  0
 ...-PlayerProfile-in-AsyncPreLoginEven.patch} |  0
 ...=> 0201-Player.setPlayerProfile-API.patch} |  0
 ...h => 0202-Fix-Dragon-Server-Crashes.patch} |  0
 ...patch => 0203-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
 ...7-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} |  2 +-
 ...t.patch => 0211-EndermanEscapeEvent.patch} |  0
 ...h => 0212-Enderman.teleportRandomly.patch} |  0
 ...213-Block-Enderpearl-Travel-Exploit.patch} |  0
 ...d.spawnParticle-API-and-add-Builder.patch} |  0
 ...h => 0215-EndermanAttackPlayerEvent.patch} |  0
 ...tch => 0216-WitchConsumePotionEvent.patch} |  0
 ...patch => 0217-WitchThrowPotionEvent.patch} |  0
 ...tem-entities-with-World.spawnEntity.patch} |  0
 ...patch => 0219-WitchReadyPotionEvent.patch} |  0
 ...220-ItemStack-getMaxItemUseDuration.patch} |  0
 ...ement-EntityTeleportEndGatewayEvent.patch} |  0
 ...d-flag-on-cancel-of-Explosion-Event.patch} |  0
 ...ch => 0223-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} |  0
 ...=> 0227-Improve-EntityShootBowEvent.patch} |  0
 ...patch => 0228-PlayerReadyArrowEvent.patch} |  0
 ...lement-EntityKnockbackByEntityEvent.patch} |  0
 ...patch => 0230-Expand-Explosions-API.patch} |  0
 ...vingEntity-Hand-Raised-Item-Use-API.patch} |  0
 ...-API.patch => 0232-RangedEntity-API.patch} |  0
 ...o-disable-ender-dragon-legacy-check.patch} |  0
 ...-Implement-World.getEntity-UUID-API.patch} |  0
 ...0235-InventoryCloseEvent-Reason-API.patch} |  2 +-
 ...I.patch => 0236-Vex-getSummoner-API.patch} |  0
 ...ventory-when-cancelling-PlayerInter.patch} |  2 +-
 ...e-the-Entity-Random-seed-for-squids.patch} |  0
 ...illa-entity-warnings-for-duplicates.patch} |  0
 ...-if-stack-size-above-max-stack-size.patch} |  0
 ...41-Use-asynchronous-Log4j-2-loggers.patch} |  6 +--
 ...more-information-to-Entity.toString.patch} |  0
 ...es-option-to-debug-dupe-uuid-issues.patch} |  0
 ...ts.patch => 0244-EnderDragon-Events.patch} |  0
 ...atch => 0245-PlayerElytraBoostEvent.patch} |  0
 ...0246-Improve-BlockPosition-inlining.patch} |  0
 ...patch => 0247-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 => 0252-SkeletonHorse-Additions.patch} |  0
 ...event-Saving-Bad-entities-to-chunks.patch} |  0
 ...n-t-call-getItemMeta-on-hasItemMeta.patch} |  0
 ...ad-Entities-in-entityList-iteration.patch} |  0
 ...6-Implement-Expanded-ArmorStand-API.patch} |  0
 ...vent.patch => 0257-AnvilDamageEvent.patch} |  0
 ...ent.patch => 0258-Add-TNTPrimeEvent.patch} |  0
 ...d-make-tab-spam-limits-configurable.patch} |  2 +-
 ...h => 0260-Add-hand-to-bucket-events.patch} |  0
 ...-Experience-should-save-as-Integers.patch} |  0
 ...ent-rendering-skulls-from-same-user.patch} |  0
 ...d-Early-Warning-Feature-to-WatchDog.patch} |  0
 ...0264-Make-EnderDragon-implement-Mob.patch} |  0
 ...5-Use-ConcurrentHashMap-in-JsonList.patch} |  0
 ...6-Use-a-Queue-for-Queueing-Commands.patch} |  6 +--
 ...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} |  0
 ...tch => 0271-Slime-Pathfinder-Events.patch} |  0
 ...e-speed-for-water-flowing-over-lava.patch} |  0
 ...73-Optimize-CraftBlockData-Creation.patch} |  0
 ... => 0274-Optimize-RegistryMaterials.patch} |  0
 ...ch => 0275-Add-PhantomPreSpawnEvent.patch} |  0
 ....patch => 0276-Add-More-Creeper-API.patch} |  0
 ...=> 0277-Inventory-removeItemAnySlot.patch} |  0
 ...oadChunk-int-int-false-load-unconve.patch} |  0
 ...ray-tracing-methods-to-LivingEntity.patch} |  0
 ...-attack-cooldown-methods-for-Player.patch} |  0
 ....patch => 0281-Improve-death-events.patch} |  0
 ...w-chests-to-be-placed-with-NBT-data.patch} |  0
 ...I.patch => 0283-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 => 0290-PreSpawnerSpawnEvent.patch} |  0
 ...rseException-in-Entity-and-TE-names.patch} |  0
 ...=> 0292-Honor-EntityAgeable.ageLock.patch} |  0
 ...le-connection-throttle-kick-message.patch} |  0
 ...> 0294-Hook-into-CB-plugin-rewrites.patch} |  0
 ...95-Allow-setting-the-vex-s-summoner.patch} |  0
 ...I.patch => 0296-Add-sun-related-API.patch} |  0
 ...Turtle-API.patch => 0297-Turtle-API.patch} |  0
 ...her-worlds-for-shooter-of-projectil.patch} |  0
 ...ator-target-events-and-improve-impl.patch} |  2 +-
 ...-Add-Velocity-IP-Forwarding-Support.patch} |  0
 ...PI.patch => 0301-Add-more-Witch-API.patch} |  0
 ...wned-for-Villager-Aggression-Config.patch} |  0
 ...-Johnny.patch => 0303-Here-s-Johnny.patch} |  0
 ...vent-players-from-moving-into-unloa.patch} |  2 +-
 ...5-Reset-players-airTicks-on-respawn.patch} |  0
 ...after-profile-lookups-if-not-needed.patch} |  0
 ...r-Thread-Pool-and-Thread-Priorities.patch} |  0
 ...=> 0308-Optimize-World-Time-Updates.patch} |  0
 ...tore-custom-InventoryHolder-support.patch} |  0
 ...=> 0310-Use-Vanilla-Minecart-Speeds.patch} |  0
 ...0311-Fix-SpongeAbsortEvent-handling.patch} |  0
 ...-allow-digging-into-unloaded-chunks.patch} |  4 +-
 ...mits.patch => 0313-Book-Size-Limits.patch} |  2 +-
 ...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 => 0318-Add-more-Zombie-API.patch} |  0
 ...0319-Add-PlayerConnectionCloseEvent.patch} |  0
 ...revent-Enderman-from-loading-chunks.patch} |  0
 ...replace-OfflinePlayer-getLastPlayed.patch} |  0
 ...tch => 0322-Fix-PlayerEditBookEvent.patch} |  2 +-
 ...ehicle-tracking-issue-on-disconnect.patch} |  0
 ...nRetractEvent-for-all-empty-pistons.patch} |  0
 ...remove-from-being-called-on-Players.patch} |  0
 ...ent.patch => 0326-BlockDestroyEvent.patch} |  0
 ...m-Shapeless-Custom-Crafting-Recipes.patch} |  0
 ...h => 0328-Fix-sign-edit-memory-leak.patch} |  2 +-
 ... 0329-Limit-Client-Sign-length-more.patch} |  2 +-
 ...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} |  0
 ...t-tick-at-start-of-drowning-process.patch} |  0
 ...35-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...ggleEvent-when-whitelist-is-toggled.patch} |  0
 ...37-Add-LivingEntity-getTargetEntity.patch} |  0
 ...ngth-when-serialising-BungeeCord-te.patch} |  0
 ...=> 0339-Entity-getEntitySpawnReason.patch} |  0
 ...ty-Metadata-for-all-tracked-players.patch} |  2 +-
 ...41-Implement-PlayerPostRespawnEvent.patch} |  0
 ...for-pickupDelay-breaks-picking-up-i.patch} |  0
 ...-and-setters-for-EntityItem-owner-a.patch} |  0
 ...ts.patch => 0344-Server-Tick-Events.patch} |  0
 ...345-PlayerDeathEvent-getItemsToKeep.patch} |  0
 ...Optimize-Captured-TileEntity-Lookup.patch} |  0
 ...API.patch => 0347-Add-Heightmap-API.patch} |  0
 ...> 0348-Mob-Spawner-API-Enhancements.patch} |  0
 ...ayer-View-Distance-API-placeholders.patch} |  0
 ...-to-changed-postToMainThread-method.patch} |  2 +-
 ...-item-frames-are-modified-MC-123450.patch} |  0
 ...sPrimaryThread-and-MinecraftServer-.patch} |  0
 ...-entity-loss-due-to-unloaded-chunks.patch} |  0
 ... 0354-Duplicate-UUID-Resolve-Option.patch} |  0
 ...55-improve-CraftWorld-isChunkLoaded.patch} |  0
 ...e-Keep-Spawn-Loaded-range-per-world.patch} |  0
 ...ityAreaEffectCloud-from-going-negat.patch} |  0
 ....patch => 0358-ChunkMapDistance-CME.patch} |  0
 ...0359-Implement-CraftBlockSoundGroup.patch} |  0
 ...d.patch => 0360-Chunk-debug-command.patch} |  0
 ...ptions-from-dispenser-entity-spawns.patch} |  0
 ...62-Fix-World-isChunkGenerated-calls.patch} |  0
 ...te-location-if-we-failed-to-read-it.patch} |  0
 ...aletteBlock-instead-of-ReentrantLoc.patch} |  0
 ...ch => 0365-incremental-chunk-saving.patch} |  0
 ...7-Anti-Xray.patch => 0366-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 => 0370-offset-item-frame-ticking.patch} |  0
 ...pper-searches-if-there-are-no-items.patch} |  0
 ...2-Asynchronous-chunk-IO-and-loading.patch} |  2 +-
 ...tChunkIfLoadedImmediately-in-places.patch} |  2 +-
 ...ads.patch => 0374-Reduce-sync-loads.patch} |  0
 ...ement-alternative-item-despawn-rate.patch} |  0
 ...f-we-have-a-custom-Bukkit-generator.patch} |  0
 ...-158900.patch => 0377-Fix-MC-158900.patch} |  0
 ...ment-optional-per-player-mob-spawns.patch} |  0
 ...event-consuming-the-wrong-itemstack.patch} |  0
 ... => 0380-Fix-nether-portal-creation.patch} |  0
 ...gs.patch => 0381-Generator-Settings.patch} |  0
 ...-161754.patch => 0382-Fix-MC-161754.patch} |  0
 ...e-improvement-for-Chunk.getEntities.patch} |  0
 ...anging-entities-that-are-not-ItemFr.patch} |  0
 ...85-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} |  2 +-
 ...=> 0389-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 => 0393-Optimize-Hoppers.patch} |  0
 ...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} |  0
 ...399-Fix-items-not-falling-correctly.patch} |  0
 ...patch => 0400-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
 ...=> 0404-Tracking-Range-Improvements.patch} |  0
 ...=> 0405-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 => 0410-Add-ThrownEggHatchEvent.patch} |  0
 ... 0411-Optimise-random-block-ticking.patch} |  0
 ...p-API.patch => 0412-Entity-Jump-API.patch} |  0
 ...-to-nerf-pigmen-from-nether-portals.patch} |  0
 ... => 0414-Make-the-GUI-graph-fancier.patch} |  0
 ...15-add-hand-to-BlockMultiPlaceEvent.patch} |  0
 ...6-Prevent-teleporting-dead-entities.patch} |  2 +-
 ...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 => 0420-Optimise-Chunk-getFluid.patch} |  0
 ...mise-TickListServer-by-rewriting-it.patch} |  0
 ...pawn-settings-and-per-player-option.patch} |  0
 ...e-Entity-is-never-double-registered.patch} |  0
 ...ring-entities-from-unloading-chunks.patch} |  0
 ...nections-shouldn-t-hold-up-shutdown.patch} |  4 +-
 ...ow-bees-to-load-chunks-for-beehives.patch} |  0
 ...PlayerChunkMap-adds-crashing-server.patch} |  0
 ...timize-Collision-to-not-load-chunks.patch} |  0
 ...tch => 0429-Don-t-tick-dead-players.patch} |  0
 ...-Player-s-shouldn-t-be-able-to-move.patch} |  0
 ...unkMap-memory-use-for-visibleChunks.patch} |  0
 ...h => 0432-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
 ...36-Expose-MinecraftServer-isRunning.patch} |  0
 ...dd-Raw-Byte-ItemStack-Serialization.patch} |  0
 ...8-Remove-streams-from-Mob-AI-System.patch} |  0
 ...ons-until-after-entity-ticking-is-d.patch} |  0
 ... => 0440-Async-command-map-building.patch} |  0
 ...h => 0441-Improved-Watchdog-Support.patch} | 10 ++--
 ....patch => 0442-Optimize-Pathfinding.patch} |  0
 ...3-Reduce-Either-Optional-allocation.patch} |  0
 ...444-Remove-streams-from-PairedQueue.patch} |  0
 ...-memory-footprint-of-NBTTagCompound.patch} |  0
 ...ent-opening-inventories-when-frozen.patch} |  0
 ...47-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} |  0
 ...ayer-is-attempted-to-be-removed-fro.patch} |  0
 ...4-Broadcast-join-message-to-console.patch} |  0
 ...-Broken-behavior-of-PlayerJoinEvent.patch} |  0
 ...oad-Chunks-for-Login-Asynchronously.patch} |  2 +-
 ...awn-point-if-spawn-in-unloaded-worl.patch} |  0
 ...layerAttackEntityCooldownResetEvent.patch} |  0
 ...llbacks-to-schedule-for-Callback-Ex.patch} |  0
 ...-fire-BlockFade-on-worldgen-threads.patch} |  0
 ...tom-creative-and-insomniac-controls.patch} |  0
 ...-duplication-issues-and-teleport-is.patch} |  0
 ...0463-Implement-Brigadier-Mojang-API.patch} |  2 +-
 ...patch => 0464-Villager-Restocks-API.patch} |  0
 ...ickItem-Packet-and-kick-for-invalid.patch} |  2 +-
 ...n.patch => 0466-Expose-game-version.patch} |  0
 ...> 0467-Optimize-Voxel-Shape-Merging.patch} |  0
 ...per-thread-native-byte-buffer-cache.patch} |  0
 ...atch => 0469-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
 ...=> 0474-Add-villager-reputation-API.patch} |  0
 ...and.patch => 0475-Fix-Light-Command.patch} |  0
 ...-Fix-PotionEffect-ignores-icon-flag.patch} |  0
 ...brigadier-child-sorting-performance.patch} |  0
 ...ock-unless-actually-showing-the-mes.patch} |  0
 ...API.patch => 0479-Potential-bed-API.patch} |  0
 ...ait-for-Async-Tasks-during-shutdown.patch} |  0
 ...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} |  0
 ...> 0486-Ensure-safe-gateway-teleport.patch} |  0
 ...-for-console-having-all-permissions.patch} |  0
 ...und-for-Client-Lag-Spikes-MC-162253.patch} |  0
 ...-Priority-Urgency-System-for-Chunks.patch} |  2 +-
 ...n-Full-Status-Chunk-NBT-Memory-Leak.patch} |  0
 ...packets-to-nearby-locations-sounds-.patch} |  0
 ...prove-Chunk-Status-Transition-Speed.patch} |  0
 ...x-villager-trading-demand-MC-163962.patch} |  0
 ... => 0494-Maps-shouldn-t-load-chunks.patch} |  0
 ...okup-for-Treasure-Maps-Fixes-lag-fr.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...patch => 0497-Optimize-Light-Engine.patch} |  0
 ...nk-Unloads-based-on-Player-Movement.patch} |  0
 ...Plugin-Tickets-to-API-Chunk-Methods.patch} |  0
 ...sing-chunks-due-to-integer-overflow.patch} |  0
 ...r-runTaskTimerAsynchronously-Plugin.patch} |  0
 ...ton-physics-inconsistency-MC-188840.patch} |  0
 ...uping.patch => 0503-Fix-sand-duping.patch} |  0
 ...desync-in-playerconnection-causing-.patch} |  2 +-
 ...ch => 0505-Fix-enderdragon-exp-dupe.patch} |  0
 ...older-method-without-block-snapshot.patch} |  0
 ...h => 0507-Expose-Arrow-getItemStack.patch} |  0
 ...mplement-PlayerRecipeBookClickEvent.patch} |  2 +-
 ...-Hide-sync-chunk-writes-behind-flag.patch} |  0
 ...it-lightning-strike-effect-distance.patch} |  0
 ...1-Add-permission-for-command-blocks.patch} |  4 +-
 ...ure-Entity-AABB-s-are-never-invalid.patch} |  0
 ...orldBorder-collision-checks-and-air.patch} |  0
 ...d-Difficulty-Remembering-Difficulty.patch} |  6 +--
 ...atch => 0515-Paper-dumpitem-command.patch} |  0
 ...16-Don-t-allow-null-UUID-s-for-chat.patch} |  0
 ...Legacy-Component-serialization-size.patch} |  0
 ...518-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
 ...0523-Support-components-in-ItemMeta.patch} |  0
 ...rgetLivingEntityEvent-for-1.16-mobs.patch} |  0
 ...patch => 0525-Add-entity-liquid-API.patch} |  0
 ...date-itemstack-legacy-name-and-lore.patch} |  0
 ...wn-player-in-correct-world-on-login.patch} |  0
 ...atch => 0528-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} |  0
 ...Vanilla-Command-permission-checking.patch} |  0
 ...ve-range-check-for-block-placing-up.patch} |  2 +-
 ...-5989.patch => 0537-Fix-SPIGOT-5989.patch} |  0
 ...-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 => 0544-Incremental-player-saving.patch} |  0
 ...tch => 0545-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
 ...urn-for-WorldServer-addAllEntitiesS.patch} |  0
 ...stake-in-CB-NBT-int-deserialization.patch} |  0
 ...rver-load-chunks-from-newer-version.patch} |  0
 ...support.patch => 0552-Brand-support.patch} |  2 +-
 ...er-Boss-Bar-doesn-t-update-until-in.patch} |  0
 ...-197271.patch => 0554-Fix-MC-197271.patch} |  0
 ...0555-MC-197883-Bandaid-decode-issue.patch} |  0
 ...patch => 0556-Add-setMaxPlayers-API.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...h => 0558-Don-t-require-FACING-data.patch} |  0
 ...eEvent-not-firing-for-all-use-cases.patch} |  0
 ...PI.patch => 0560-Add-moon-phase-API.patch} |  0
 ...headless-pistons-from-being-created.patch} |  0
 ...support.patch => 0562-Brand-support.patch} |  0
 ...ent.patch => 0563-Add-BellRingEvent.patch} |  0
 ...dd-zombie-targets-turtle-egg-config.patch} |  0
 ...patch => 0565-Buffer-joins-to-world.patch} |  0
 ...=> 0566-Optimize-redstone-algorithm.patch} |  0
 ...s-not-working-in-some-kick-messages.patch} |  0
 ...0568-Fix-NPE-in-getBedSpawnLocation.patch} |  0
 ...reateEvent-needs-to-know-its-entity.patch} |  0
 ...ch => 0570-Fix-CraftTeam-null-check.patch} |  0
 ...I.patch => 0571-Add-more-Evoker-API.patch} |  0
 ...translation-keys-for-blocks-entitie.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...ch => 0574-Cache-block-data-strings.patch} |  0
 ...rtation-and-cancel-velocity-if-tele.patch} |  2 +-
 ...tureManager-to-prevent-worldgen-dea.patch} |  0
 ...ception-when-cancelling-PortalCreat.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 431 files changed, 103 insertions(+), 147 deletions(-)
 rename Spigot-Server-Patches/{0168-Handle-plugin-prefixes-using-Log4J-configuration.patch => 0167-Handle-plugin-prefixes-using-Log4J-configuration.patch} (97%)
 delete mode 100644 Spigot-Server-Patches/0167-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
 rename Spigot-Server-Patches/{0169-Include-Log4J2-SLF4J-implementation.patch => 0168-Include-Log4J2-SLF4J-implementation.patch} (88%)
 rename Spigot-Server-Patches/{0170-Improve-Log4J-Configuration-Plugin-Loggers.patch => 0169-Improve-Log4J-Configuration-Plugin-Loggers.patch} (100%)
 rename Spigot-Server-Patches/{0171-Add-PlayerJumpEvent.patch => 0170-Add-PlayerJumpEvent.patch} (97%)
 rename Spigot-Server-Patches/{0172-handle-PacketPlayInKeepAlive-async.patch => 0171-handle-PacketPlayInKeepAlive-async.patch} (95%)
 rename Spigot-Server-Patches/{0173-Expose-client-protocol-version-and-virtual-host.patch => 0172-Expose-client-protocol-version-and-virtual-host.patch} (100%)
 rename Spigot-Server-Patches/{0174-revert-serverside-behavior-of-keepalives.patch => 0173-revert-serverside-behavior-of-keepalives.patch} (97%)
 rename Spigot-Server-Patches/{0175-Send-attack-SoundEffects-only-to-players-who-can-see.patch => 0174-Send-attack-SoundEffects-only-to-players-who-can-see.patch} (100%)
 rename Spigot-Server-Patches/{0176-Option-for-maximum-exp-value-when-merging-orbs.patch => 0175-Option-for-maximum-exp-value-when-merging-orbs.patch} (100%)
 rename Spigot-Server-Patches/{0177-Add-PlayerArmorChangeEvent.patch => 0176-Add-PlayerArmorChangeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0178-Prevent-logins-from-being-processed-when-the-player-.patch => 0177-Prevent-logins-from-being-processed-when-the-player-.patch} (100%)
 rename Spigot-Server-Patches/{0179-use-CB-BlockState-implementations-for-captured-block.patch => 0178-use-CB-BlockState-implementations-for-captured-block.patch} (100%)
 rename Spigot-Server-Patches/{0180-API-to-get-a-BlockState-without-a-snapshot.patch => 0179-API-to-get-a-BlockState-without-a-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0181-AsyncTabCompleteEvent.patch => 0180-AsyncTabCompleteEvent.patch} (98%)
 rename Spigot-Server-Patches/{0182-Avoid-NPE-in-PathfinderGoalTempt.patch => 0181-Avoid-NPE-in-PathfinderGoalTempt.patch} (100%)
 rename Spigot-Server-Patches/{0183-PlayerPickupExperienceEvent.patch => 0182-PlayerPickupExperienceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0184-ExperienceOrbMergeEvent.patch => 0183-ExperienceOrbMergeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0185-Ability-to-apply-mending-to-XP-API.patch => 0184-Ability-to-apply-mending-to-XP-API.patch} (100%)
 rename Spigot-Server-Patches/{0186-Make-max-squid-spawn-height-configurable.patch => 0185-Make-max-squid-spawn-height-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0187-PreCreatureSpawnEvent.patch => 0186-PreCreatureSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0188-PlayerNaturallySpawnCreaturesEvent.patch => 0187-PlayerNaturallySpawnCreaturesEvent.patch} (100%)
 rename Spigot-Server-Patches/{0189-Add-setPlayerProfile-API-for-Skulls.patch => 0188-Add-setPlayerProfile-API-for-Skulls.patch} (100%)
 rename Spigot-Server-Patches/{0190-Fill-Profile-Property-Events.patch => 0189-Fill-Profile-Property-Events.patch} (100%)
 rename Spigot-Server-Patches/{0191-PlayerAdvancementCriterionGrantEvent.patch => 0190-PlayerAdvancementCriterionGrantEvent.patch} (100%)
 rename Spigot-Server-Patches/{0192-Add-ArmorStand-Item-Meta.patch => 0191-Add-ArmorStand-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0193-Extend-Player-Interact-cancellation.patch => 0192-Extend-Player-Interact-cancellation.patch} (100%)
 rename Spigot-Server-Patches/{0194-Tameable-getOwnerUniqueId-API.patch => 0193-Tameable-getOwnerUniqueId-API.patch} (100%)
 rename Spigot-Server-Patches/{0195-Toggleable-player-crits-helps-mitigate-hacked-client.patch => 0194-Toggleable-player-crits-helps-mitigate-hacked-client.patch} (100%)
 rename Spigot-Server-Patches/{0196-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch => 0195-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch} (100%)
 rename Spigot-Server-Patches/{0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch => 0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0198-Disable-Explicit-Network-Manager-Flushing.patch => 0197-Disable-Explicit-Network-Manager-Flushing.patch} (100%)
 rename Spigot-Server-Patches/{0199-Implement-extended-PaperServerListPingEvent.patch => 0198-Implement-extended-PaperServerListPingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0200-Improved-Async-Task-Scheduler.patch => 0199-Improved-Async-Task-Scheduler.patch} (100%)
 rename Spigot-Server-Patches/{0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch => 0200-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch} (100%)
 rename Spigot-Server-Patches/{0202-Player.setPlayerProfile-API.patch => 0201-Player.setPlayerProfile-API.patch} (100%)
 rename Spigot-Server-Patches/{0203-Fix-Dragon-Server-Crashes.patch => 0202-Fix-Dragon-Server-Crashes.patch} (100%)
 rename Spigot-Server-Patches/{0204-getPlayerUniqueId-API.patch => 0203-getPlayerUniqueId-API.patch} (100%)
 rename Spigot-Server-Patches/{0205-Make-player-data-saving-configurable.patch => 0204-Make-player-data-saving-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0206-Make-legacy-ping-handler-more-reliable.patch => 0205-Make-legacy-ping-handler-more-reliable.patch} (100%)
 rename Spigot-Server-Patches/{0207-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0206-Call-PaperServerListPingEvent-for-legacy-pings.patch} (100%)
 rename Spigot-Server-Patches/{0208-Flag-to-disable-the-channel-limit.patch => 0207-Flag-to-disable-the-channel-limit.patch} (100%)
 rename Spigot-Server-Patches/{0209-Add-method-to-open-already-placed-sign.patch => 0208-Add-method-to-open-already-placed-sign.patch} (100%)
 rename Spigot-Server-Patches/{0210-Configurable-sprint-interruption-on-attack.patch => 0209-Configurable-sprint-interruption-on-attack.patch} (100%)
 rename Spigot-Server-Patches/{0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch => 0210-Fix-exploit-that-allowed-colored-signs-to-be-created.patch} (92%)
 rename Spigot-Server-Patches/{0212-EndermanEscapeEvent.patch => 0211-EndermanEscapeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0213-Enderman.teleportRandomly.patch => 0212-Enderman.teleportRandomly.patch} (100%)
 rename Spigot-Server-Patches/{0214-Block-Enderpearl-Travel-Exploit.patch => 0213-Block-Enderpearl-Travel-Exploit.patch} (100%)
 rename Spigot-Server-Patches/{0215-Expand-World.spawnParticle-API-and-add-Builder.patch => 0214-Expand-World.spawnParticle-API-and-add-Builder.patch} (100%)
 rename Spigot-Server-Patches/{0216-EndermanAttackPlayerEvent.patch => 0215-EndermanAttackPlayerEvent.patch} (100%)
 rename Spigot-Server-Patches/{0217-WitchConsumePotionEvent.patch => 0216-WitchConsumePotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0218-WitchThrowPotionEvent.patch => 0217-WitchThrowPotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0219-Allow-spawning-Item-entities-with-World.spawnEntity.patch => 0218-Allow-spawning-Item-entities-with-World.spawnEntity.patch} (100%)
 rename Spigot-Server-Patches/{0220-WitchReadyPotionEvent.patch => 0219-WitchReadyPotionEvent.patch} (100%)
 rename Spigot-Server-Patches/{0221-ItemStack-getMaxItemUseDuration.patch => 0220-ItemStack-getMaxItemUseDuration.patch} (100%)
 rename Spigot-Server-Patches/{0222-Implement-EntityTeleportEndGatewayEvent.patch => 0221-Implement-EntityTeleportEndGatewayEvent.patch} (100%)
 rename Spigot-Server-Patches/{0223-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch => 0222-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch} (100%)
 rename Spigot-Server-Patches/{0224-Fix-CraftEntity-hashCode.patch => 0223-Fix-CraftEntity-hashCode.patch} (100%)
 rename Spigot-Server-Patches/{0225-Configurable-Alternative-LootPool-Luck-Formula.patch => 0224-Configurable-Alternative-LootPool-Luck-Formula.patch} (100%)
 rename Spigot-Server-Patches/{0226-Print-Error-details-when-failing-to-save-player-data.patch => 0225-Print-Error-details-when-failing-to-save-player-data.patch} (100%)
 rename Spigot-Server-Patches/{0227-Make-shield-blocking-delay-configurable.patch => 0226-Make-shield-blocking-delay-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0228-Improve-EntityShootBowEvent.patch => 0227-Improve-EntityShootBowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0229-PlayerReadyArrowEvent.patch => 0228-PlayerReadyArrowEvent.patch} (100%)
 rename Spigot-Server-Patches/{0230-Implement-EntityKnockbackByEntityEvent.patch => 0229-Implement-EntityKnockbackByEntityEvent.patch} (100%)
 rename Spigot-Server-Patches/{0231-Expand-Explosions-API.patch => 0230-Expand-Explosions-API.patch} (100%)
 rename Spigot-Server-Patches/{0232-LivingEntity-Hand-Raised-Item-Use-API.patch => 0231-LivingEntity-Hand-Raised-Item-Use-API.patch} (100%)
 rename Spigot-Server-Patches/{0233-RangedEntity-API.patch => 0232-RangedEntity-API.patch} (100%)
 rename Spigot-Server-Patches/{0234-Add-config-to-disable-ender-dragon-legacy-check.patch => 0233-Add-config-to-disable-ender-dragon-legacy-check.patch} (100%)
 rename Spigot-Server-Patches/{0235-Implement-World.getEntity-UUID-API.patch => 0234-Implement-World.getEntity-UUID-API.patch} (100%)
 rename Spigot-Server-Patches/{0236-InventoryCloseEvent-Reason-API.patch => 0235-InventoryCloseEvent-Reason-API.patch} (99%)
 rename Spigot-Server-Patches/{0237-Vex-getSummoner-API.patch => 0236-Vex-getSummoner-API.patch} (100%)
 rename Spigot-Server-Patches/{0238-Refresh-player-inventory-when-cancelling-PlayerInter.patch => 0237-Refresh-player-inventory-when-cancelling-PlayerInter.patch} (93%)
 rename Spigot-Server-Patches/{0239-Don-t-change-the-Entity-Random-seed-for-squids.patch => 0238-Don-t-change-the-Entity-Random-seed-for-squids.patch} (100%)
 rename Spigot-Server-Patches/{0240-Re-add-vanilla-entity-warnings-for-duplicates.patch => 0239-Re-add-vanilla-entity-warnings-for-duplicates.patch} (100%)
 rename Spigot-Server-Patches/{0241-Avoid-item-merge-if-stack-size-above-max-stack-size.patch => 0240-Avoid-item-merge-if-stack-size-above-max-stack-size.patch} (100%)
 rename Spigot-Server-Patches/{0242-Use-asynchronous-Log4j-2-loggers.patch => 0241-Use-asynchronous-Log4j-2-loggers.patch} (92%)
 rename Spigot-Server-Patches/{0243-add-more-information-to-Entity.toString.patch => 0242-add-more-information-to-Entity.toString.patch} (100%)
 rename Spigot-Server-Patches/{0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch => 0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch} (100%)
 rename Spigot-Server-Patches/{0245-EnderDragon-Events.patch => 0244-EnderDragon-Events.patch} (100%)
 rename Spigot-Server-Patches/{0246-PlayerElytraBoostEvent.patch => 0245-PlayerElytraBoostEvent.patch} (100%)
 rename Spigot-Server-Patches/{0247-Improve-BlockPosition-inlining.patch => 0246-Improve-BlockPosition-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0248-Optimize-RegistryID.c.patch => 0247-Optimize-RegistryID.c.patch} (100%)
 rename Spigot-Server-Patches/{0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch => 0248-Option-to-prevent-armor-stands-from-doing-entity-loo.patch} (100%)
 rename Spigot-Server-Patches/{0250-Vanished-players-don-t-have-rights.patch => 0249-Vanished-players-don-t-have-rights.patch} (100%)
 rename Spigot-Server-Patches/{0251-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch => 0250-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch} (100%)
 rename Spigot-Server-Patches/{0252-Add-some-Debug-to-Chunk-Entity-slices.patch => 0251-Add-some-Debug-to-Chunk-Entity-slices.patch} (100%)
 rename Spigot-Server-Patches/{0253-SkeletonHorse-Additions.patch => 0252-SkeletonHorse-Additions.patch} (100%)
 rename Spigot-Server-Patches/{0254-Prevent-Saving-Bad-entities-to-chunks.patch => 0253-Prevent-Saving-Bad-entities-to-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0255-Don-t-call-getItemMeta-on-hasItemMeta.patch => 0254-Don-t-call-getItemMeta-on-hasItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0256-Ignore-Dead-Entities-in-entityList-iteration.patch => 0255-Ignore-Dead-Entities-in-entityList-iteration.patch} (100%)
 rename Spigot-Server-Patches/{0257-Implement-Expanded-ArmorStand-API.patch => 0256-Implement-Expanded-ArmorStand-API.patch} (100%)
 rename Spigot-Server-Patches/{0258-AnvilDamageEvent.patch => 0257-AnvilDamageEvent.patch} (100%)
 rename Spigot-Server-Patches/{0259-Add-TNTPrimeEvent.patch => 0258-Add-TNTPrimeEvent.patch} (100%)
 rename Spigot-Server-Patches/{0260-Break-up-and-make-tab-spam-limits-configurable.patch => 0259-Break-up-and-make-tab-spam-limits-configurable.patch} (97%)
 rename Spigot-Server-Patches/{0261-Add-hand-to-bucket-events.patch => 0260-Add-hand-to-bucket-events.patch} (100%)
 rename Spigot-Server-Patches/{0262-MC-135506-Experience-should-save-as-Integers.patch => 0261-MC-135506-Experience-should-save-as-Integers.patch} (100%)
 rename Spigot-Server-Patches/{0263-Fix-client-rendering-skulls-from-same-user.patch => 0262-Fix-client-rendering-skulls-from-same-user.patch} (100%)
 rename Spigot-Server-Patches/{0264-Add-Early-Warning-Feature-to-WatchDog.patch => 0263-Add-Early-Warning-Feature-to-WatchDog.patch} (100%)
 rename Spigot-Server-Patches/{0265-Make-EnderDragon-implement-Mob.patch => 0264-Make-EnderDragon-implement-Mob.patch} (100%)
 rename Spigot-Server-Patches/{0266-Use-ConcurrentHashMap-in-JsonList.patch => 0265-Use-ConcurrentHashMap-in-JsonList.patch} (100%)
 rename Spigot-Server-Patches/{0267-Use-a-Queue-for-Queueing-Commands.patch => 0266-Use-a-Queue-for-Queueing-Commands.patch} (88%)
 rename Spigot-Server-Patches/{0268-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch => 0267-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch} (100%)
 rename Spigot-Server-Patches/{0269-Allow-disabling-armour-stand-ticking.patch => 0268-Allow-disabling-armour-stand-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0270-Optimize-BlockPosition-helper-methods.patch => 0269-Optimize-BlockPosition-helper-methods.patch} (100%)
 rename Spigot-Server-Patches/{0271-Restore-vanlla-default-mob-spawn-range.patch => 0270-Restore-vanlla-default-mob-spawn-range.patch} (100%)
 rename Spigot-Server-Patches/{0272-Slime-Pathfinder-Events.patch => 0271-Slime-Pathfinder-Events.patch} (100%)
 rename Spigot-Server-Patches/{0273-Configurable-speed-for-water-flowing-over-lava.patch => 0272-Configurable-speed-for-water-flowing-over-lava.patch} (100%)
 rename Spigot-Server-Patches/{0274-Optimize-CraftBlockData-Creation.patch => 0273-Optimize-CraftBlockData-Creation.patch} (100%)
 rename Spigot-Server-Patches/{0275-Optimize-RegistryMaterials.patch => 0274-Optimize-RegistryMaterials.patch} (100%)
 rename Spigot-Server-Patches/{0276-Add-PhantomPreSpawnEvent.patch => 0275-Add-PhantomPreSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0277-Add-More-Creeper-API.patch => 0276-Add-More-Creeper-API.patch} (100%)
 rename Spigot-Server-Patches/{0278-Inventory-removeItemAnySlot.patch => 0277-Inventory-removeItemAnySlot.patch} (100%)
 rename Spigot-Server-Patches/{0279-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch => 0278-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch} (100%)
 rename Spigot-Server-Patches/{0280-Add-ray-tracing-methods-to-LivingEntity.patch => 0279-Add-ray-tracing-methods-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0281-Expose-attack-cooldown-methods-for-Player.patch => 0280-Expose-attack-cooldown-methods-for-Player.patch} (100%)
 rename Spigot-Server-Patches/{0282-Improve-death-events.patch => 0281-Improve-death-events.patch} (100%)
 rename Spigot-Server-Patches/{0283-Allow-chests-to-be-placed-with-NBT-data.patch => 0282-Allow-chests-to-be-placed-with-NBT-data.patch} (100%)
 rename Spigot-Server-Patches/{0284-Mob-Pathfinding-API.patch => 0283-Mob-Pathfinding-API.patch} (100%)
 rename Spigot-Server-Patches/{0285-Prevent-chunk-loading-from-Fluid-Flowing.patch => 0284-Prevent-chunk-loading-from-Fluid-Flowing.patch} (100%)
 rename Spigot-Server-Patches/{0286-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch => 0285-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch} (100%)
 rename Spigot-Server-Patches/{0287-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch => 0286-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0288-Prevent-mob-spawning-from-loading-generating-chunks.patch => 0287-Prevent-mob-spawning-from-loading-generating-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0289-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0288-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename Spigot-Server-Patches/{0290-Implement-furnace-cook-speed-multiplier-API.patch => 0289-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename Spigot-Server-Patches/{0291-PreSpawnerSpawnEvent.patch => 0290-PreSpawnerSpawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0292-Catch-JsonParseException-in-Entity-and-TE-names.patch => 0291-Catch-JsonParseException-in-Entity-and-TE-names.patch} (100%)
 rename Spigot-Server-Patches/{0293-Honor-EntityAgeable.ageLock.patch => 0292-Honor-EntityAgeable.ageLock.patch} (100%)
 rename Spigot-Server-Patches/{0294-Configurable-connection-throttle-kick-message.patch => 0293-Configurable-connection-throttle-kick-message.patch} (100%)
 rename Spigot-Server-Patches/{0295-Hook-into-CB-plugin-rewrites.patch => 0294-Hook-into-CB-plugin-rewrites.patch} (100%)
 rename Spigot-Server-Patches/{0296-Allow-setting-the-vex-s-summoner.patch => 0295-Allow-setting-the-vex-s-summoner.patch} (100%)
 rename Spigot-Server-Patches/{0297-Add-sun-related-API.patch => 0296-Add-sun-related-API.patch} (100%)
 rename Spigot-Server-Patches/{0298-Turtle-API.patch => 0297-Turtle-API.patch} (100%)
 rename Spigot-Server-Patches/{0299-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0298-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (100%)
 rename Spigot-Server-Patches/{0300-Call-player-spectator-target-events-and-improve-impl.patch => 0299-Call-player-spectator-target-events-and-improve-impl.patch} (98%)
 rename Spigot-Server-Patches/{0301-Add-Velocity-IP-Forwarding-Support.patch => 0300-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename Spigot-Server-Patches/{0302-Add-more-Witch-API.patch => 0301-Add-more-Witch-API.patch} (100%)
 rename Spigot-Server-Patches/{0303-Check-Drowned-for-Villager-Aggression-Config.patch => 0302-Check-Drowned-for-Villager-Aggression-Config.patch} (100%)
 rename Spigot-Server-Patches/{0304-Here-s-Johnny.patch => 0303-Here-s-Johnny.patch} (100%)
 rename Spigot-Server-Patches/{0305-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0304-Add-option-to-prevent-players-from-moving-into-unloa.patch} (97%)
 rename Spigot-Server-Patches/{0306-Reset-players-airTicks-on-respawn.patch => 0305-Reset-players-airTicks-on-respawn.patch} (100%)
 rename Spigot-Server-Patches/{0307-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0306-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch => 0307-Improve-Server-Thread-Pool-and-Thread-Priorities.patch} (100%)
 rename Spigot-Server-Patches/{0309-Optimize-World-Time-Updates.patch => 0308-Optimize-World-Time-Updates.patch} (100%)
 rename Spigot-Server-Patches/{0310-Restore-custom-InventoryHolder-support.patch => 0309-Restore-custom-InventoryHolder-support.patch} (100%)
 rename Spigot-Server-Patches/{0311-Use-Vanilla-Minecart-Speeds.patch => 0310-Use-Vanilla-Minecart-Speeds.patch} (100%)
 rename Spigot-Server-Patches/{0312-Fix-SpongeAbsortEvent-handling.patch => 0311-Fix-SpongeAbsortEvent-handling.patch} (100%)
 rename Spigot-Server-Patches/{0313-Don-t-allow-digging-into-unloaded-chunks.patch => 0312-Don-t-allow-digging-into-unloaded-chunks.patch} (95%)
 rename Spigot-Server-Patches/{0314-Book-Size-Limits.patch => 0313-Book-Size-Limits.patch} (97%)
 rename Spigot-Server-Patches/{0315-Make-the-default-permission-message-configurable.patch => 0314-Make-the-default-permission-message-configurable.patch} (100%)
 rename Spigot-Server-Patches/{0316-Prevent-rayTrace-from-loading-chunks.patch => 0315-Prevent-rayTrace-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0317-Handle-Large-Packets-disconnecting-client.patch => 0316-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename Spigot-Server-Patches/{0318-force-entity-dismount-during-teleportation.patch => 0317-force-entity-dismount-during-teleportation.patch} (100%)
 rename Spigot-Server-Patches/{0319-Add-more-Zombie-API.patch => 0318-Add-more-Zombie-API.patch} (100%)
 rename Spigot-Server-Patches/{0320-Add-PlayerConnectionCloseEvent.patch => 0319-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename Spigot-Server-Patches/{0321-Prevent-Enderman-from-loading-chunks.patch => 0320-Prevent-Enderman-from-loading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0322-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0321-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename Spigot-Server-Patches/{0323-Fix-PlayerEditBookEvent.patch => 0322-Fix-PlayerEditBookEvent.patch} (95%)
 rename Spigot-Server-Patches/{0324-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0323-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (100%)
 rename Spigot-Server-Patches/{0325-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0324-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (100%)
 rename Spigot-Server-Patches/{0326-Block-Entity-remove-from-being-called-on-Players.patch => 0325-Block-Entity-remove-from-being-called-on-Players.patch} (100%)
 rename Spigot-Server-Patches/{0327-BlockDestroyEvent.patch => 0326-BlockDestroyEvent.patch} (100%)
 rename Spigot-Server-Patches/{0328-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0327-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (100%)
 rename Spigot-Server-Patches/{0329-Fix-sign-edit-memory-leak.patch => 0328-Fix-sign-edit-memory-leak.patch} (95%)
 rename Spigot-Server-Patches/{0330-Limit-Client-Sign-length-more.patch => 0329-Limit-Client-Sign-length-more.patch} (96%)
 rename Spigot-Server-Patches/{0331-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0330-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (100%)
 rename Spigot-Server-Patches/{0332-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0331-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename Spigot-Server-Patches/{0333-Handle-Oversized-Tile-Entities-in-chunks.patch => 0332-Handle-Oversized-Tile-Entities-in-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0334-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0333-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (100%)
 rename Spigot-Server-Patches/{0335-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0334-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (100%)
 rename Spigot-Server-Patches/{0336-Allow-Saving-of-Oversized-Chunks.patch => 0335-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename Spigot-Server-Patches/{0337-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch => 0336-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch} (100%)
 rename Spigot-Server-Patches/{0338-Add-LivingEntity-getTargetEntity.patch => 0337-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename Spigot-Server-Patches/{0339-Use-proper-max-length-when-serialising-BungeeCord-te.patch => 0338-Use-proper-max-length-when-serialising-BungeeCord-te.patch} (100%)
 rename Spigot-Server-Patches/{0340-Entity-getEntitySpawnReason.patch => 0339-Entity-getEntitySpawnReason.patch} (100%)
 rename Spigot-Server-Patches/{0341-Update-entity-Metadata-for-all-tracked-players.patch => 0340-Update-entity-Metadata-for-all-tracked-players.patch} (95%)
 rename Spigot-Server-Patches/{0342-Implement-PlayerPostRespawnEvent.patch => 0341-Implement-PlayerPostRespawnEvent.patch} (100%)
 rename Spigot-Server-Patches/{0343-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch => 0342-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch} (100%)
 rename Spigot-Server-Patches/{0344-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0343-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (100%)
 rename Spigot-Server-Patches/{0345-Server-Tick-Events.patch => 0344-Server-Tick-Events.patch} (100%)
 rename Spigot-Server-Patches/{0346-PlayerDeathEvent-getItemsToKeep.patch => 0345-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename Spigot-Server-Patches/{0347-Optimize-Captured-TileEntity-Lookup.patch => 0346-Optimize-Captured-TileEntity-Lookup.patch} (100%)
 rename Spigot-Server-Patches/{0348-Add-Heightmap-API.patch => 0347-Add-Heightmap-API.patch} (100%)
 rename Spigot-Server-Patches/{0349-Mob-Spawner-API-Enhancements.patch => 0348-Mob-Spawner-API-Enhancements.patch} (100%)
 rename Spigot-Server-Patches/{0350-Per-Player-View-Distance-API-placeholders.patch => 0349-Per-Player-View-Distance-API-placeholders.patch} (100%)
 rename Spigot-Server-Patches/{0351-Fix-CB-call-to-changed-postToMainThread-method.patch => 0350-Fix-CB-call-to-changed-postToMainThread-method.patch} (89%)
 rename Spigot-Server-Patches/{0352-Fix-sounds-when-item-frames-are-modified-MC-123450.patch => 0351-Fix-sounds-when-item-frames-are-modified-MC-123450.patch} (100%)
 rename Spigot-Server-Patches/{0353-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch => 0352-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch} (100%)
 rename Spigot-Server-Patches/{0354-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch => 0353-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0355-Duplicate-UUID-Resolve-Option.patch => 0354-Duplicate-UUID-Resolve-Option.patch} (100%)
 rename Spigot-Server-Patches/{0356-improve-CraftWorld-isChunkLoaded.patch => 0355-improve-CraftWorld-isChunkLoaded.patch} (100%)
 rename Spigot-Server-Patches/{0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch => 0356-Configurable-Keep-Spawn-Loaded-range-per-world.patch} (100%)
 rename Spigot-Server-Patches/{0358-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch => 0357-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch} (100%)
 rename Spigot-Server-Patches/{0359-ChunkMapDistance-CME.patch => 0358-ChunkMapDistance-CME.patch} (100%)
 rename Spigot-Server-Patches/{0360-Implement-CraftBlockSoundGroup.patch => 0359-Implement-CraftBlockSoundGroup.patch} (100%)
 rename Spigot-Server-Patches/{0361-Chunk-debug-command.patch => 0360-Chunk-debug-command.patch} (100%)
 rename Spigot-Server-Patches/{0362-Catch-exceptions-from-dispenser-entity-spawns.patch => 0361-Catch-exceptions-from-dispenser-entity-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0363-Fix-World-isChunkGenerated-calls.patch => 0362-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename Spigot-Server-Patches/{0364-Show-blockstate-location-if-we-failed-to-read-it.patch => 0363-Show-blockstate-location-if-we-failed-to-read-it.patch} (100%)
 rename Spigot-Server-Patches/{0365-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch => 0364-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch} (100%)
 rename Spigot-Server-Patches/{0366-incremental-chunk-saving.patch => 0365-incremental-chunk-saving.patch} (100%)
 rename Spigot-Server-Patches/{0367-Anti-Xray.patch => 0366-Anti-Xray.patch} (99%)
 rename Spigot-Server-Patches/{0368-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch => 0367-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch} (100%)
 rename Spigot-Server-Patches/{0369-Configurable-projectile-relative-velocity.patch => 0368-Configurable-projectile-relative-velocity.patch} (100%)
 rename Spigot-Server-Patches/{0370-Mark-entities-as-being-ticked-when-notifying-navigat.patch => 0369-Mark-entities-as-being-ticked-when-notifying-navigat.patch} (100%)
 rename Spigot-Server-Patches/{0371-offset-item-frame-ticking.patch => 0370-offset-item-frame-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0372-Avoid-hopper-searches-if-there-are-no-items.patch => 0371-Avoid-hopper-searches-if-there-are-no-items.patch} (100%)
 rename Spigot-Server-Patches/{0373-Asynchronous-chunk-IO-and-loading.patch => 0372-Asynchronous-chunk-IO-and-loading.patch} (99%)
 rename Spigot-Server-Patches/{0374-Use-getChunkIfLoadedImmediately-in-places.patch => 0373-Use-getChunkIfLoadedImmediately-in-places.patch} (98%)
 rename Spigot-Server-Patches/{0375-Reduce-sync-loads.patch => 0374-Reduce-sync-loads.patch} (100%)
 rename Spigot-Server-Patches/{0376-Implement-alternative-item-despawn-rate.patch => 0375-Implement-alternative-item-despawn-rate.patch} (100%)
 rename Spigot-Server-Patches/{0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch => 0376-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch} (100%)
 rename Spigot-Server-Patches/{0378-Fix-MC-158900.patch => 0377-Fix-MC-158900.patch} (100%)
 rename Spigot-Server-Patches/{0379-implement-optional-per-player-mob-spawns.patch => 0378-implement-optional-per-player-mob-spawns.patch} (100%)
 rename Spigot-Server-Patches/{0380-Prevent-consuming-the-wrong-itemstack.patch => 0379-Prevent-consuming-the-wrong-itemstack.patch} (100%)
 rename Spigot-Server-Patches/{0381-Fix-nether-portal-creation.patch => 0380-Fix-nether-portal-creation.patch} (100%)
 rename Spigot-Server-Patches/{0382-Generator-Settings.patch => 0381-Generator-Settings.patch} (100%)
 rename Spigot-Server-Patches/{0383-Fix-MC-161754.patch => 0382-Fix-MC-161754.patch} (100%)
 rename Spigot-Server-Patches/{0384-Performance-improvement-for-Chunk.getEntities.patch => 0383-Performance-improvement-for-Chunk.getEntities.patch} (100%)
 rename Spigot-Server-Patches/{0385-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch => 0384-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch} (100%)
 rename Spigot-Server-Patches/{0386-Expose-the-internal-current-tick.patch => 0385-Expose-the-internal-current-tick.patch} (100%)
 rename Spigot-Server-Patches/{0387-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch => 0386-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch} (100%)
 rename Spigot-Server-Patches/{0388-Add-option-to-disable-pillager-patrols.patch => 0387-Add-option-to-disable-pillager-patrols.patch} (100%)
 rename Spigot-Server-Patches/{0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch => 0388-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch} (95%)
 rename Spigot-Server-Patches/{0390-PlayerLaunchProjectileEvent.patch => 0389-PlayerLaunchProjectileEvent.patch} (100%)
 rename Spigot-Server-Patches/{0391-Add-CraftMagicNumbers.isSupportedApiVersion.patch => 0390-Add-CraftMagicNumbers.isSupportedApiVersion.patch} (100%)
 rename Spigot-Server-Patches/{0392-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch => 0391-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch} (100%)
 rename Spigot-Server-Patches/{0393-MC-145656-Fix-Follow-Range-Initial-Target.patch => 0392-MC-145656-Fix-Follow-Range-Initial-Target.patch} (100%)
 rename Spigot-Server-Patches/{0394-Optimize-Hoppers.patch => 0393-Optimize-Hoppers.patch} (100%)
 rename Spigot-Server-Patches/{0395-PlayerDeathEvent-shouldDropExperience.patch => 0394-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename Spigot-Server-Patches/{0396-Prevent-bees-loading-chunks-checking-hive-position.patch => 0395-Prevent-bees-loading-chunks-checking-hive-position.patch} (100%)
 rename Spigot-Server-Patches/{0397-Don-t-load-Chunks-from-Hoppers-and-other-things.patch => 0396-Don-t-load-Chunks-from-Hoppers-and-other-things.patch} (100%)
 rename Spigot-Server-Patches/{0398-Guard-against-serializing-mismatching-chunk-coordina.patch => 0397-Guard-against-serializing-mismatching-chunk-coordina.patch} (100%)
 rename Spigot-Server-Patches/{0399-Optimise-IEntityAccess-getPlayerByUUID.patch => 0398-Optimise-IEntityAccess-getPlayerByUUID.patch} (100%)
 rename Spigot-Server-Patches/{0400-Fix-items-not-falling-correctly.patch => 0399-Fix-items-not-falling-correctly.patch} (100%)
 rename Spigot-Server-Patches/{0401-Lag-compensate-eating.patch => 0400-Lag-compensate-eating.patch} (100%)
 rename Spigot-Server-Patches/{0402-Optimize-call-to-getFluid-for-explosions.patch => 0401-Optimize-call-to-getFluid-for-explosions.patch} (100%)
 rename Spigot-Server-Patches/{0403-Fix-last-firework-in-stack-not-having-effects-when-d.patch => 0402-Fix-last-firework-in-stack-not-having-effects-when-d.patch} (100%)
 rename Spigot-Server-Patches/{0404-Add-effect-to-block-break-naturally.patch => 0403-Add-effect-to-block-break-naturally.patch} (100%)
 rename Spigot-Server-Patches/{0405-Tracking-Range-Improvements.patch => 0404-Tracking-Range-Improvements.patch} (100%)
 rename Spigot-Server-Patches/{0406-Entity-Activation-Range-2.0.patch => 0405-Entity-Activation-Range-2.0.patch} (100%)
 rename Spigot-Server-Patches/{0407-Fix-items-vanishing-through-end-portal.patch => 0406-Fix-items-vanishing-through-end-portal.patch} (100%)
 rename Spigot-Server-Patches/{0408-Bees-get-gravity-in-void.-Fixes-MC-167279.patch => 0407-Bees-get-gravity-in-void.-Fixes-MC-167279.patch} (100%)
 rename Spigot-Server-Patches/{0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch => 0408-Optimise-getChunkAt-calls-for-loaded-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0410-Allow-overriding-the-java-version-check.patch => 0409-Allow-overriding-the-java-version-check.patch} (100%)
 rename Spigot-Server-Patches/{0411-Add-ThrownEggHatchEvent.patch => 0410-Add-ThrownEggHatchEvent.patch} (100%)
 rename Spigot-Server-Patches/{0412-Optimise-random-block-ticking.patch => 0411-Optimise-random-block-ticking.patch} (100%)
 rename Spigot-Server-Patches/{0413-Entity-Jump-API.patch => 0412-Entity-Jump-API.patch} (100%)
 rename Spigot-Server-Patches/{0414-Add-option-to-nerf-pigmen-from-nether-portals.patch => 0413-Add-option-to-nerf-pigmen-from-nether-portals.patch} (100%)
 rename Spigot-Server-Patches/{0415-Make-the-GUI-graph-fancier.patch => 0414-Make-the-GUI-graph-fancier.patch} (100%)
 rename Spigot-Server-Patches/{0416-add-hand-to-BlockMultiPlaceEvent.patch => 0415-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename Spigot-Server-Patches/{0417-Prevent-teleporting-dead-entities.patch => 0416-Prevent-teleporting-dead-entities.patch} (90%)
 rename Spigot-Server-Patches/{0418-Validate-tripwire-hook-placement-before-update.patch => 0417-Validate-tripwire-hook-placement-before-update.patch} (100%)
 rename Spigot-Server-Patches/{0419-Add-option-to-allow-iron-golems-to-spawn-in-air.patch => 0418-Add-option-to-allow-iron-golems-to-spawn-in-air.patch} (100%)
 rename Spigot-Server-Patches/{0420-Configurable-chance-of-villager-zombie-infection.patch => 0419-Configurable-chance-of-villager-zombie-infection.patch} (100%)
 rename Spigot-Server-Patches/{0421-Optimise-Chunk-getFluid.patch => 0420-Optimise-Chunk-getFluid.patch} (100%)
 rename Spigot-Server-Patches/{0422-Optimise-TickListServer-by-rewriting-it.patch => 0421-Optimise-TickListServer-by-rewriting-it.patch} (100%)
 rename Spigot-Server-Patches/{0423-Pillager-patrol-spawn-settings-and-per-player-option.patch => 0422-Pillager-patrol-spawn-settings-and-per-player-option.patch} (100%)
 rename Spigot-Server-Patches/{0424-Ensure-Entity-is-never-double-registered.patch => 0423-Ensure-Entity-is-never-double-registered.patch} (100%)
 rename Spigot-Server-Patches/{0425-Fix-unregistering-entities-from-unloading-chunks.patch => 0424-Fix-unregistering-entities-from-unloading-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0426-Remote-Connections-shouldn-t-hold-up-shutdown.patch => 0425-Remote-Connections-shouldn-t-hold-up-shutdown.patch} (86%)
 rename Spigot-Server-Patches/{0427-Do-not-allow-bees-to-load-chunks-for-beehives.patch => 0426-Do-not-allow-bees-to-load-chunks-for-beehives.patch} (100%)
 rename Spigot-Server-Patches/{0428-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch => 0427-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch} (100%)
 rename Spigot-Server-Patches/{0429-Optimize-Collision-to-not-load-chunks.patch => 0428-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0430-Don-t-tick-dead-players.patch => 0429-Don-t-tick-dead-players.patch} (100%)
 rename Spigot-Server-Patches/{0431-Dead-Player-s-shouldn-t-be-able-to-move.patch => 0430-Dead-Player-s-shouldn-t-be-able-to-move.patch} (100%)
 rename Spigot-Server-Patches/{0432-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch => 0431-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch} (100%)
 rename Spigot-Server-Patches/{0433-Increase-Light-Queue-Size.patch => 0432-Increase-Light-Queue-Size.patch} (100%)
 rename Spigot-Server-Patches/{0434-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch => 0433-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch} (100%)
 rename Spigot-Server-Patches/{0435-Don-t-move-existing-players-to-world-spawn.patch => 0434-Don-t-move-existing-players-to-world-spawn.patch} (100%)
 rename Spigot-Server-Patches/{0436-Add-tick-times-API-and-mspt-command.patch => 0435-Add-tick-times-API-and-mspt-command.patch} (100%)
 rename Spigot-Server-Patches/{0437-Expose-MinecraftServer-isRunning.patch => 0436-Expose-MinecraftServer-isRunning.patch} (100%)
 rename Spigot-Server-Patches/{0438-Add-Raw-Byte-ItemStack-Serialization.patch => 0437-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename Spigot-Server-Patches/{0439-Remove-streams-from-Mob-AI-System.patch => 0438-Remove-streams-from-Mob-AI-System.patch} (100%)
 rename Spigot-Server-Patches/{0440-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch => 0439-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch} (100%)
 rename Spigot-Server-Patches/{0441-Async-command-map-building.patch => 0440-Async-command-map-building.patch} (100%)
 rename Spigot-Server-Patches/{0442-Improved-Watchdog-Support.patch => 0441-Improved-Watchdog-Support.patch} (98%)
 rename Spigot-Server-Patches/{0443-Optimize-Pathfinding.patch => 0442-Optimize-Pathfinding.patch} (100%)
 rename Spigot-Server-Patches/{0444-Reduce-Either-Optional-allocation.patch => 0443-Reduce-Either-Optional-allocation.patch} (100%)
 rename Spigot-Server-Patches/{0445-Remove-streams-from-PairedQueue.patch => 0444-Remove-streams-from-PairedQueue.patch} (100%)
 rename Spigot-Server-Patches/{0446-Reduce-memory-footprint-of-NBTTagCompound.patch => 0445-Reduce-memory-footprint-of-NBTTagCompound.patch} (100%)
 rename Spigot-Server-Patches/{0447-Prevent-opening-inventories-when-frozen.patch => 0446-Prevent-opening-inventories-when-frozen.patch} (100%)
 rename Spigot-Server-Patches/{0448-Optimise-ArraySetSorted-removeIf.patch => 0447-Optimise-ArraySetSorted-removeIf.patch} (100%)
 rename Spigot-Server-Patches/{0449-Don-t-run-entity-collision-code-if-not-needed.patch => 0448-Don-t-run-entity-collision-code-if-not-needed.patch} (100%)
 rename Spigot-Server-Patches/{0450-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch => 0449-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch} (100%)
 rename Spigot-Server-Patches/{0451-Restrict-vanilla-teleport-command-to-valid-locations.patch => 0450-Restrict-vanilla-teleport-command-to-valid-locations.patch} (100%)
 rename Spigot-Server-Patches/{0452-Implement-Player-Client-Options-API.patch => 0451-Implement-Player-Client-Options-API.patch} (100%)
 rename Spigot-Server-Patches/{0453-Fix-Chunk-Post-Processing-deadlock-risk.patch => 0452-Fix-Chunk-Post-Processing-deadlock-risk.patch} (100%)
 rename Spigot-Server-Patches/{0454-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch => 0453-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch} (100%)
 rename Spigot-Server-Patches/{0455-Broadcast-join-message-to-console.patch => 0454-Broadcast-join-message-to-console.patch} (100%)
 rename Spigot-Server-Patches/{0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch => 0455-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch} (100%)
 rename Spigot-Server-Patches/{0457-Load-Chunks-for-Login-Asynchronously.patch => 0456-Load-Chunks-for-Login-Asynchronously.patch} (99%)
 rename Spigot-Server-Patches/{0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch => 0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch} (100%)
 rename Spigot-Server-Patches/{0459-Add-PlayerAttackEntityCooldownResetEvent.patch => 0458-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename Spigot-Server-Patches/{0460-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch => 0459-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch} (100%)
 rename Spigot-Server-Patches/{0461-Don-t-fire-BlockFade-on-worldgen-threads.patch => 0460-Don-t-fire-BlockFade-on-worldgen-threads.patch} (100%)
 rename Spigot-Server-Patches/{0462-Add-phantom-creative-and-insomniac-controls.patch => 0461-Add-phantom-creative-and-insomniac-controls.patch} (100%)
 rename Spigot-Server-Patches/{0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch => 0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch} (100%)
 rename Spigot-Server-Patches/{0464-Implement-Brigadier-Mojang-API.patch => 0463-Implement-Brigadier-Mojang-API.patch} (98%)
 rename Spigot-Server-Patches/{0465-Villager-Restocks-API.patch => 0464-Villager-Restocks-API.patch} (100%)
 rename Spigot-Server-Patches/{0466-Validate-PickItem-Packet-and-kick-for-invalid.patch => 0465-Validate-PickItem-Packet-and-kick-for-invalid.patch} (94%)
 rename Spigot-Server-Patches/{0467-Expose-game-version.patch => 0466-Expose-game-version.patch} (100%)
 rename Spigot-Server-Patches/{0468-Optimize-Voxel-Shape-Merging.patch => 0467-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename Spigot-Server-Patches/{0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch => 0468-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch} (100%)
 rename Spigot-Server-Patches/{0470-Implement-Mob-Goal-API.patch => 0469-Implement-Mob-Goal-API.patch} (99%)
 rename Spigot-Server-Patches/{0471-Use-distance-map-to-optimise-entity-tracker.patch => 0470-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0472-Optimize-isOutsideRange-to-use-distance-maps.patch => 0471-Optimize-isOutsideRange-to-use-distance-maps.patch} (100%)
 rename Spigot-Server-Patches/{0473-Stop-copy-on-write-operations-for-updating-light-dat.patch => 0472-Stop-copy-on-write-operations-for-updating-light-dat.patch} (100%)
 rename Spigot-Server-Patches/{0474-No-Tick-view-distance-implementation.patch => 0473-No-Tick-view-distance-implementation.patch} (100%)
 rename Spigot-Server-Patches/{0475-Add-villager-reputation-API.patch => 0474-Add-villager-reputation-API.patch} (100%)
 rename Spigot-Server-Patches/{0476-Fix-Light-Command.patch => 0475-Fix-Light-Command.patch} (100%)
 rename Spigot-Server-Patches/{0477-Fix-PotionEffect-ignores-icon-flag.patch => 0476-Fix-PotionEffect-ignores-icon-flag.patch} (100%)
 rename Spigot-Server-Patches/{0478-Optimize-brigadier-child-sorting-performance.patch => 0477-Optimize-brigadier-child-sorting-performance.patch} (100%)
 rename Spigot-Server-Patches/{0479-Don-t-toString-block-unless-actually-showing-the-mes.patch => 0478-Don-t-toString-block-unless-actually-showing-the-mes.patch} (100%)
 rename Spigot-Server-Patches/{0480-Potential-bed-API.patch => 0479-Potential-bed-API.patch} (100%)
 rename Spigot-Server-Patches/{0481-Wait-for-Async-Tasks-during-shutdown.patch => 0480-Wait-for-Async-Tasks-during-shutdown.patch} (100%)
 rename Spigot-Server-Patches/{0482-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch => 0481-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch} (100%)
 rename Spigot-Server-Patches/{0483-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0482-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename Spigot-Server-Patches/{0484-Optimize-NibbleArray-to-use-pooled-buffers.patch => 0483-Optimize-NibbleArray-to-use-pooled-buffers.patch} (100%)
 rename Spigot-Server-Patches/{0485-Reduce-MutableInt-allocations-from-light-engine.patch => 0484-Reduce-MutableInt-allocations-from-light-engine.patch} (100%)
 rename Spigot-Server-Patches/{0486-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0485-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename Spigot-Server-Patches/{0487-Ensure-safe-gateway-teleport.patch => 0486-Ensure-safe-gateway-teleport.patch} (100%)
 rename Spigot-Server-Patches/{0488-Add-option-for-console-having-all-permissions.patch => 0487-Add-option-for-console-having-all-permissions.patch} (100%)
 rename Spigot-Server-Patches/{0489-Workaround-for-Client-Lag-Spikes-MC-162253.patch => 0488-Workaround-for-Client-Lag-Spikes-MC-162253.patch} (100%)
 rename Spigot-Server-Patches/{0490-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch => 0489-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch} (99%)
 rename Spigot-Server-Patches/{0491-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch => 0490-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch} (100%)
 rename Spigot-Server-Patches/{0492-Optimize-sending-packets-to-nearby-locations-sounds-.patch => 0491-Optimize-sending-packets-to-nearby-locations-sounds-.patch} (100%)
 rename Spigot-Server-Patches/{0493-Improve-Chunk-Status-Transition-Speed.patch => 0492-Improve-Chunk-Status-Transition-Speed.patch} (100%)
 rename Spigot-Server-Patches/{0494-Fix-villager-trading-demand-MC-163962.patch => 0493-Fix-villager-trading-demand-MC-163962.patch} (100%)
 rename Spigot-Server-Patches/{0495-Maps-shouldn-t-load-chunks.patch => 0494-Maps-shouldn-t-load-chunks.patch} (100%)
 rename Spigot-Server-Patches/{0496-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch => 0495-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch} (100%)
 rename Spigot-Server-Patches/{0497-Optimize-Bit-Operations-by-inlining.patch => 0496-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename Spigot-Server-Patches/{0498-Optimize-Light-Engine.patch => 0497-Optimize-Light-Engine.patch} (100%)
 rename Spigot-Server-Patches/{0499-Delay-Chunk-Unloads-based-on-Player-Movement.patch => 0498-Delay-Chunk-Unloads-based-on-Player-Movement.patch} (100%)
 rename Spigot-Server-Patches/{0500-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0499-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%)
 rename Spigot-Server-Patches/{0501-Fix-missing-chunks-due-to-integer-overflow.patch => 0500-Fix-missing-chunks-due-to-integer-overflow.patch} (100%)
 rename Spigot-Server-Patches/{0502-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch => 0501-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch} (100%)
 rename Spigot-Server-Patches/{0503-Fix-piston-physics-inconsistency-MC-188840.patch => 0502-Fix-piston-physics-inconsistency-MC-188840.patch} (100%)
 rename Spigot-Server-Patches/{0504-Fix-sand-duping.patch => 0503-Fix-sand-duping.patch} (100%)
 rename Spigot-Server-Patches/{0505-Prevent-position-desync-in-playerconnection-causing-.patch => 0504-Prevent-position-desync-in-playerconnection-causing-.patch} (94%)
 rename Spigot-Server-Patches/{0506-Fix-enderdragon-exp-dupe.patch => 0505-Fix-enderdragon-exp-dupe.patch} (100%)
 rename Spigot-Server-Patches/{0507-Inventory-getHolder-method-without-block-snapshot.patch => 0506-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename Spigot-Server-Patches/{0508-Expose-Arrow-getItemStack.patch => 0507-Expose-Arrow-getItemStack.patch} (100%)
 rename Spigot-Server-Patches/{0509-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0508-Add-and-implement-PlayerRecipeBookClickEvent.patch} (95%)
 rename Spigot-Server-Patches/{0510-Hide-sync-chunk-writes-behind-flag.patch => 0509-Hide-sync-chunk-writes-behind-flag.patch} (100%)
 rename Spigot-Server-Patches/{0511-Limit-lightning-strike-effect-distance.patch => 0510-Limit-lightning-strike-effect-distance.patch} (100%)
 rename Spigot-Server-Patches/{0512-Add-permission-for-command-blocks.patch => 0511-Add-permission-for-command-blocks.patch} (97%)
 rename Spigot-Server-Patches/{0513-Ensure-Entity-AABB-s-are-never-invalid.patch => 0512-Ensure-Entity-AABB-s-are-never-invalid.patch} (100%)
 rename Spigot-Server-Patches/{0514-Optimize-WorldBorder-collision-checks-and-air.patch => 0513-Optimize-WorldBorder-collision-checks-and-air.patch} (100%)
 rename Spigot-Server-Patches/{0515-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0514-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (94%)
 rename Spigot-Server-Patches/{0516-Paper-dumpitem-command.patch => 0515-Paper-dumpitem-command.patch} (100%)
 rename Spigot-Server-Patches/{0517-Don-t-allow-null-UUID-s-for-chat.patch => 0516-Don-t-allow-null-UUID-s-for-chat.patch} (100%)
 rename Spigot-Server-Patches/{0518-Improve-Legacy-Component-serialization-size.patch => 0517-Improve-Legacy-Component-serialization-size.patch} (100%)
 rename Spigot-Server-Patches/{0519-Support-old-UUID-format-for-NBT.patch => 0518-Support-old-UUID-format-for-NBT.patch} (100%)
 rename Spigot-Server-Patches/{0520-Clean-up-duplicated-GameProfile-Properties.patch => 0519-Clean-up-duplicated-GameProfile-Properties.patch} (100%)
 rename Spigot-Server-Patches/{0521-Convert-legacy-attributes-in-Item-Meta.patch => 0520-Convert-legacy-attributes-in-Item-Meta.patch} (100%)
 rename Spigot-Server-Patches/{0522-Remove-some-streams-from-structures.patch => 0521-Remove-some-streams-from-structures.patch} (100%)
 rename Spigot-Server-Patches/{0523-Remove-streams-from-classes-related-villager-gossip.patch => 0522-Remove-streams-from-classes-related-villager-gossip.patch} (100%)
 rename Spigot-Server-Patches/{0524-Support-components-in-ItemMeta.patch => 0523-Support-components-in-ItemMeta.patch} (100%)
 rename Spigot-Server-Patches/{0525-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch => 0524-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch} (100%)
 rename Spigot-Server-Patches/{0526-Add-entity-liquid-API.patch => 0525-Add-entity-liquid-API.patch} (100%)
 rename Spigot-Server-Patches/{0527-Update-itemstack-legacy-name-and-lore.patch => 0526-Update-itemstack-legacy-name-and-lore.patch} (100%)
 rename Spigot-Server-Patches/{0528-Spawn-player-in-correct-world-on-login.patch => 0527-Spawn-player-in-correct-world-on-login.patch} (100%)
 rename Spigot-Server-Patches/{0529-Add-PrepareResultEvent.patch => 0528-Add-PrepareResultEvent.patch} (100%)
 rename Spigot-Server-Patches/{0530-Allow-delegation-to-vanilla-chunk-gen.patch => 0529-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename Spigot-Server-Patches/{0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0530-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%)
 rename Spigot-Server-Patches/{0532-Optimize-NetworkManager-Exception-Handling.patch => 0531-Optimize-NetworkManager-Exception-Handling.patch} (100%)
 rename Spigot-Server-Patches/{0533-Fix-Concurrency-issue-in-WeightedList.patch => 0532-Fix-Concurrency-issue-in-WeightedList.patch} (100%)
 rename Spigot-Server-Patches/{0534-Optimize-the-advancement-data-player-iteration-to-be.patch => 0533-Optimize-the-advancement-data-player-iteration-to-be.patch} (100%)
 rename Spigot-Server-Patches/{0535-Fix-arrows-never-despawning-MC-125757.patch => 0534-Fix-arrows-never-despawning-MC-125757.patch} (100%)
 rename Spigot-Server-Patches/{0536-Thread-Safe-Vanilla-Command-permission-checking.patch => 0535-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%)
 rename Spigot-Server-Patches/{0537-Move-range-check-for-block-placing-up.patch => 0536-Move-range-check-for-block-placing-up.patch} (96%)
 rename Spigot-Server-Patches/{0538-Fix-SPIGOT-5989.patch => 0537-Fix-SPIGOT-5989.patch} (100%)
 rename Spigot-Server-Patches/{0539-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0538-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%)
 rename Spigot-Server-Patches/{0540-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0539-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%)
 rename Spigot-Server-Patches/{0541-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0540-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%)
 rename Spigot-Server-Patches/{0542-Add-missing-strikeLighting-call-to-World-spigot-stri.patch => 0541-Add-missing-strikeLighting-call-to-World-spigot-stri.patch} (100%)
 rename Spigot-Server-Patches/{0543-Fix-some-rails-connecting-improperly.patch => 0542-Fix-some-rails-connecting-improperly.patch} (100%)
 rename Spigot-Server-Patches/{0544-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename Spigot-Server-Patches/{0545-Incremental-player-saving.patch => 0544-Incremental-player-saving.patch} (100%)
 rename Spigot-Server-Patches/{0546-Import-fastutil-classes.patch => 0545-Import-fastutil-classes.patch} (100%)
 rename Spigot-Server-Patches/{0547-Don-t-mark-null-chunk-sections-for-block-updates.patch => 0546-Don-t-mark-null-chunk-sections-for-block-updates.patch} (100%)
 rename Spigot-Server-Patches/{0548-Remove-armour-stand-double-add-to-world.patch => 0547-Remove-armour-stand-double-add-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0549-Fix-MC-187716-Use-configured-height.patch => 0548-Fix-MC-187716-Use-configured-height.patch} (100%)
 rename Spigot-Server-Patches/{0550-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch => 0549-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch} (100%)
 rename Spigot-Server-Patches/{0551-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0550-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%)
 rename Spigot-Server-Patches/{0552-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0551-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%)
 rename Spigot-Server-Patches/{0553-Brand-support.patch => 0552-Brand-support.patch} (97%)
 rename Spigot-Server-Patches/{0554-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch => 0553-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch} (100%)
 rename Spigot-Server-Patches/{0555-Fix-MC-197271.patch => 0554-Fix-MC-197271.patch} (100%)
 rename Spigot-Server-Patches/{0556-MC-197883-Bandaid-decode-issue.patch => 0555-MC-197883-Bandaid-decode-issue.patch} (100%)
 rename Spigot-Server-Patches/{0557-Add-setMaxPlayers-API.patch => 0556-Add-setMaxPlayers-API.patch} (100%)
 rename Spigot-Server-Patches/{0558-Add-playPickupItemAnimation-to-LivingEntity.patch => 0557-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename Spigot-Server-Patches/{0559-Don-t-require-FACING-data.patch => 0558-Don-t-require-FACING-data.patch} (100%)
 rename Spigot-Server-Patches/{0560-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0559-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%)
 rename Spigot-Server-Patches/{0561-Add-moon-phase-API.patch => 0560-Add-moon-phase-API.patch} (100%)
 rename Spigot-Server-Patches/{0562-Prevent-headless-pistons-from-being-created.patch => 0561-Prevent-headless-pistons-from-being-created.patch} (100%)
 rename Spigot-Server-Patches/{0563-Brand-support.patch => 0562-Brand-support.patch} (100%)
 rename Spigot-Server-Patches/{0564-Add-BellRingEvent.patch => 0563-Add-BellRingEvent.patch} (100%)
 rename Spigot-Server-Patches/{0565-Add-zombie-targets-turtle-egg-config.patch => 0564-Add-zombie-targets-turtle-egg-config.patch} (100%)
 rename Spigot-Server-Patches/{0566-Buffer-joins-to-world.patch => 0565-Buffer-joins-to-world.patch} (100%)
 rename Spigot-Server-Patches/{0567-Optimize-redstone-algorithm.patch => 0566-Optimize-redstone-algorithm.patch} (100%)
 rename Spigot-Server-Patches/{0568-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0567-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%)
 rename Spigot-Server-Patches/{0569-Fix-NPE-in-getBedSpawnLocation.patch => 0568-Fix-NPE-in-getBedSpawnLocation.patch} (100%)
 rename Spigot-Server-Patches/{0570-PortalCreateEvent-needs-to-know-its-entity.patch => 0569-PortalCreateEvent-needs-to-know-its-entity.patch} (100%)
 rename Spigot-Server-Patches/{0571-Fix-CraftTeam-null-check.patch => 0570-Fix-CraftTeam-null-check.patch} (100%)
 rename Spigot-Server-Patches/{0572-Add-more-Evoker-API.patch => 0571-Add-more-Evoker-API.patch} (100%)
 rename Spigot-Server-Patches/{0573-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0572-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%)
 rename Spigot-Server-Patches/{0574-Create-HoverEvent-from-ItemStack-Entity.patch => 0573-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename Spigot-Server-Patches/{0575-Cache-block-data-strings.patch => 0574-Cache-block-data-strings.patch} (100%)
 rename Spigot-Server-Patches/{0576-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (97%)
 rename Spigot-Server-Patches/{0577-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch => 0576-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch} (100%)
 rename Spigot-Server-Patches/{0578-Fix-block-data-exception-when-cancelling-PortalCreat.patch => 0577-Fix-block-data-exception-when-cancelling-PortalCreat.patch} (100%)
 rename Spigot-Server-Patches/{0579-Add-additional-open-container-api-to-HumanEntity.patch => 0578-Add-additional-open-container-api-to-HumanEntity.patch} (100%)

diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index ad89209fc7..8a6dfe76a8 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60e13e769c 100644
+index 1374fe3d7007977cf7513a7a91b4509dfc881e65..e954b100ea0c038c2e2aaba2a0937a6a9ef81f3d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -61,7 +61,7 @@ index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60
              <artifactId>minecraft-server</artifactId>
              <version>${minecraft.version}-SNAPSHOT</version>
              <scope>compile</scope>
-@@ -50,6 +55,17 @@
+@@ -56,6 +61,17 @@
              <version>8.0.1</version>
              <scope>compile</scope>
          </dependency>
@@ -79,7 +79,7 @@ index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60
          <!-- deprecated API depend -->
          <dependency>
              <groupId>com.googlecode.json-simple</groupId>
-@@ -106,34 +122,22 @@
+@@ -112,34 +128,22 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -125,7 +125,7 @@ index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60
                          </goals>
                      </execution>
                  </executions>
-@@ -143,6 +147,7 @@
+@@ -149,6 +153,7 @@
                  <artifactId>maven-jar-plugin</artifactId>
                  <version>3.2.0</version>
                  <configuration>
@@ -133,7 +133,7 @@ index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60
                      <archive>
                          <manifest>
                              <addDefaultEntries>false</addDefaultEntries>
-@@ -150,8 +155,9 @@
+@@ -156,8 +161,9 @@
                          <manifestEntries>
                              <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
                              <Implementation-Title>CraftBukkit</Implementation-Title>
@@ -145,7 +145,7 @@ index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
                              <Specification-Vendor>Bukkit Team</Specification-Vendor>
-@@ -190,6 +196,7 @@
+@@ -196,6 +202,7 @@
                              <goal>shade</goal>
                          </goals>
                          <configuration>
@@ -153,7 +153,7 @@ index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60
                              <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
                              <filters>
                                  <filter>
-@@ -198,6 +205,14 @@
+@@ -204,6 +211,14 @@
                                          <exclude>com/google/common/**</exclude>
                                          <exclude>com/google/gson/**</exclude>
                                          <exclude>com/google/thirdparty/**</exclude>
@@ -168,7 +168,7 @@ index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60
                                      </excludes>
                                  </filter>
                              </filters>
-@@ -213,10 +228,11 @@
+@@ -219,10 +234,11 @@
                                      <pattern>jline</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
                                  </relocation>
@@ -184,7 +184,7 @@ index 4bb337765331da509dd00ddebfaae5cb2b52db65..78c26572ab2ecdd554da38898f1c6c60
                                  <relocation>
                                      <pattern>org.apache.commons.codec</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.org.apache.commons.codec</shadedPattern>
-@@ -258,10 +274,6 @@
+@@ -264,10 +280,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.8.1</version>
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index 60626978af..14b2185c58 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -556,10 +556,10 @@ index f6335ed3eba55e939aa24b1eeb83026e61d92235..94b8cda9ce78aa22c14e88f3500bb981
      }
  
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 94a41f3f9ca90f28aefdecc38db0b853f983baf1..a48d17b18414aed3987041705615464bbe064d89 100644
+index 87045e72d097a4eb006654ea41f58ac803bbab3e..468d0cce2208bc21ec3d62590ac6e050a2037518 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -148,6 +148,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -145,6 +145,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          org.spigotmc.SpigotConfig.init((java.io.File) options.valueOf("spigot-settings"));
          org.spigotmc.SpigotConfig.registerCommands();
          // Spigot end
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index f8a278a833..cd2465ca20 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -4190,7 +4190,7 @@ index 43168f3836eb8823f3b2046882664ba45f1be678..127c03c321e1414e0d174c8d81a7851c
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4791b59fc2740bdc81b62748d3edbf2b2a83e043..c7a7e2cf54b4ca7fd65fca63c0f102f479a0f3e5 100644
+index 46d33c6f548f1cf0b863e2e67d46aa5e905103f3..c455d0b2dc806d7c26235e6c89c58311548177ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 884e75ee56..0f0778c0e8 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -923,19 +923,21 @@ index 11891990d90b789192d9081787c1e844646121ae..2a48d85f0490991eb323ef550cb6148d
                  int k = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f04c819d3a 100644
+index 468d0cce2208bc21ec3d62590ac6e050a2037518..b5d1dbf889138699c877f13382557ce377e70e72 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -28,7 +28,7 @@ import org.apache.logging.log4j.Level;
- 
+@@ -26,8 +26,9 @@ import org.apache.logging.log4j.Logger;
+ import org.apache.logging.log4j.Level;
+ import org.apache.logging.log4j.io.IoBuilder;
  import org.bukkit.command.CommandSender;
- import org.bukkit.craftbukkit.LoggerOutputStream;
 -import org.bukkit.craftbukkit.SpigotTimings; // Spigot
 +import co.aikar.timings.MinecraftTimings; // Paper
  import org.bukkit.event.server.ServerCommandEvent;
- import org.bukkit.craftbukkit.util.Waitable;
++import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.server.RemoteServerCommandEvent;
-@@ -379,7 +379,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+ // CraftBukkit end
+ 
+@@ -376,7 +377,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      }
  
      public void handleCommandQueue() {
@@ -944,7 +946,7 @@ index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f0
          while (!this.serverCommandQueue.isEmpty()) {
              ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
  
-@@ -394,7 +394,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -391,7 +392,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              // CraftBukkit end
          }
  
@@ -953,7 +955,7 @@ index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f0
      }
  
      @Override
-@@ -630,6 +630,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -627,6 +628,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
      @Override
      public String executeRemoteCommand(String s) {
@@ -961,7 +963,7 @@ index a48d17b18414aed3987041705615464bbe064d89..c9da9af05377a996048418c1bcb0b2f0
          this.remoteControlCommandListener.clearMessages();
          this.executeSync(() -> {
              // CraftBukkit start - fire RemoteServerCommandEvent
-@@ -638,10 +639,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -635,10 +637,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              if (event.isCancelled()) {
                  return;
              }
@@ -1457,7 +1459,7 @@ index 127c03c321e1414e0d174c8d81a7851c9da03574..d98b6ef44e1836920956754dfcb6654f
  
      protected void broadcast(Entity entity, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c7a7e2cf54b4ca7fd65fca63c0f102f479a0f3e5..89c36a5ad2a74a2bf4c86ad108a43e97fa88e793 100644
+index c455d0b2dc806d7c26235e6c89c58311548177ec..fd1860e3a83dec60362997ac6e1225270260cf38 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
index 5eb753a14c..66e5b62334 100644
--- a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
+++ b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch
@@ -192,10 +192,10 @@ index 0000000000000000000000000000000000000000..aac3f66cb23d260729c2a48d8710a9de
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index c9da9af05377a996048418c1bcb0b2f04c819d3a..ef226a9a9e1fbd729cf6349eb3ff63bf4b4a2d08 100644
+index 5f49ab337ffb02b2d77f1722a30821564f86657a..aade5e291b80c5362c8fd8cf09faca8e631e0554 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -156,6 +156,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -154,6 +154,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }
          com.destroystokyo.paper.PaperConfig.registerCommands();
diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
index a6406253c3..17ce9702c7 100644
--- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 89c36a5ad2a74a2bf4c86ad108a43e97fa88e793..090bce8c24e08c0af6f71d64568514f2c9675aa5 100644
+index fd1860e3a83dec60362997ac6e1225270260cf38..7493d7ce48a9c5875bce01252b4d958ab3b9ec7d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1609,6 +1609,29 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
index 69c32e2198..0ee18f4c22 100644
--- a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 090bce8c24e08c0af6f71d64568514f2c9675aa5..c3f2575fb40e82ee4b70301b7655698388b6ae05 100644
+index 7493d7ce48a9c5875bce01252b4d958ab3b9ec7d..535e24a54a22f59b165e5043653eef5ca8f0d5e0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1375,7 +1375,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
index 359d9b177a..9adb97ff0c 100644
--- a/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0078-Add-PlayerUseUnknownEntityEvent.patch
@@ -18,7 +18,7 @@ index 49c911e54eb3b20d820f3e1895c057eead6d312b..09c757a3bb1d9a49343cf58e18f736e1
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c3f2575fb40e82ee4b70301b7655698388b6ae05..28febcc22bc931e4e89f274275853ceaeab9ce0a 100644
+index 535e24a54a22f59b165e5043653eef5ca8f0d5e0..7afb8b6ec1cc52d7dae77afab44f8f47bc30fa57 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1950,6 +1950,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index 63d24d26ef..b3f6e73f73 100644
--- a/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -26,7 +26,7 @@ index fe2c8001897dc6d66ce0d24ddb1a5d3b79810294..538e6751f3bda77ba32256158d2a6a25
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 28febcc22bc931e4e89f274275853ceaeab9ce0a..6a9b673929a934e37d2abb83cc8efcb91f1fd92a 100644
+index 7afb8b6ec1cc52d7dae77afab44f8f47bc30fa57..575825af6500bb7be669fec700a4ccd8f95dd90e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1687,7 +1687,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch
index e1f79da739..7b2987392b 100644
--- a/Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0099-Optimize-UserCache-Thread-Safe.patch
@@ -10,10 +10,10 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index ef226a9a9e1fbd729cf6349eb3ff63bf4b4a2d08..5745c6aa86a0411be8bc49ff8e9dd655e91fd68e 100644
+index aade5e291b80c5362c8fd8cf09faca8e631e0554..2d74d14385c7e705cb210bcfc0780f4c9c6a1cda 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -212,7 +212,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -210,7 +210,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          }
  
          if (this.convertNames()) {
diff --git a/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch
index a98b60384f..6e804749ff 100644
--- a/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0110-Configurable-packet-in-spam-threshold.patch
@@ -23,7 +23,7 @@ index 5827ef1e3eb35a11867ee4f92f301e1b0245c0fa..23c9e0f317073bb9c327ec49e0b0586d
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6a9b673929a934e37d2abb83cc8efcb91f1fd92a..146dd4dd194a79a5c99218cc776c46ed83f63dc1 100644
+index 575825af6500bb7be669fec700a4ccd8f95dd90e..fe1a6b5b2a432805830e651be5f98fc4709b8883 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1235,13 +1235,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch
index 460f206ff8..3d00d6ec13 100644
--- a/Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0111-Configurable-flying-kick-messages.patch
@@ -21,7 +21,7 @@ index 23c9e0f317073bb9c327ec49e0b0586d2123e4e9..c4086de778cc2ccc958b1a94dd6e9cdb
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 146dd4dd194a79a5c99218cc776c46ed83f63dc1..f31d8d8253ddcde645b805dd809e0a0c39403c8b 100644
+index fe1a6b5b2a432805830e651be5f98fc4709b8883..2f5ffd261208f726b4eedb5ac2830162741fcb43 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -147,7 +147,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
index d0d6a01720..c85a2f4440 100644
--- a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch
@@ -19,7 +19,7 @@ index 9d0af9bcdc91996d09db9472fca6682368091efa..3d4ae2f7e6dbc10f38329d89027eea9c
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f31d8d8253ddcde645b805dd809e0a0c39403c8b..cadeb30ef8f31fcc0d626c2cc7f079c3e778704d 100644
+index 2f5ffd261208f726b4eedb5ac2830162741fcb43..c98766717dc45539227cf2a2ab7efd2f8faa5c4a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2564,7 +2564,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index bb0be6b60e..1d9c7fa4a9 100644
--- a/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -239,7 +239,7 @@ index c830b3c2145effc16314c6216be8af935416cb58..f1a509063c09e603140c74255a3fb901
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 136bb85aace4efc34e1fe804bbccc78bf7495b41..ee59d76d31b8b8cfd39d612b1e6040891f2256f4 100644
+index 1ebc0fcca6d22e0d6f4d8dac0b305a00437c82b2..d9ee5f7fd6a405547da0b162f11886d7b96dd622 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -377,7 +377,7 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
index e81fe40e70..6a87383739 100644
--- a/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0144-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@@ -39,7 +39,7 @@ index 485b69140f72a22b3eae53be74bcad003dd92e8f..196d1a7fa8ac9249ca061a704b2403c7
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cadeb30ef8f31fcc0d626c2cc7f079c3e778704d..bc084ade77cff987c41d148ce85fc61d6efb5feb 100644
+index c98766717dc45539227cf2a2ab7efd2f8faa5c4a..29b620bce44e3508dd7870347df4bbf02cef2662 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1812,6 +1812,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
index e8ee942ccd..a50097633d 100644
--- a/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 78c26572ab2ecdd554da38898f1c6c60e13e769c..a1b4f01782c896347c821af93606ed5d3b501c8d 100644
+index e954b100ea0c038c2e2aaba2a0937a6a9ef81f3d..2781d908fc9fcaa902fff1f86e7dffd86bd4c772 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -44,10 +44,27 @@
@@ -53,8 +53,8 @@ index 78c26572ab2ecdd554da38898f1c6c60e13e769c..a1b4f01782c896347c821af93606ed5d
 +            <scope>runtime</scope>
          </dependency>
          <dependency>
-             <groupId>org.ow2.asm</groupId>
-@@ -265,10 +282,18 @@
+             <groupId>org.apache.logging.log4j</groupId>
+@@ -271,10 +288,18 @@
                                  <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                      <resource>META-INF/services/java.sql.Driver</resource>
                                  </transformer>
@@ -144,10 +144,10 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 5745c6aa86a0411be8bc49ff8e9dd655e91fd68e..6e19b41f41137de8379eb6e0c8650441445e0f2e 100644
+index 2d74d14385c7e705cb210bcfc0780f4c9c6a1cda..4b5da3bf52dc55b7da3109da42c190d4e0d55e36 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -62,6 +62,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -60,6 +60,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
                  if (!org.bukkit.craftbukkit.Main.useConsole) {
                      return;
                  }
@@ -157,7 +157,7 @@ index 5745c6aa86a0411be8bc49ff8e9dd655e91fd68e..6e19b41f41137de8379eb6e0c8650441
                  jline.console.ConsoleReader bufferedreader = reader;
  
                  // MC-33041, SPIGOT-5538: if System.in is not valid due to javaw, then return
-@@ -101,6 +104,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -99,6 +102,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
                      DedicatedServer.LOGGER.error("Exception handling console input", ioexception);
                  }
  
@@ -166,7 +166,7 @@ index 5745c6aa86a0411be8bc49ff8e9dd655e91fd68e..6e19b41f41137de8379eb6e0c8650441
              }
          };
  
-@@ -112,6 +117,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -110,6 +115,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          }
          global.addHandler(new org.bukkit.craftbukkit.util.ForwardLogHandler());
  
@@ -176,15 +176,15 @@ index 5745c6aa86a0411be8bc49ff8e9dd655e91fd68e..6e19b41f41137de8379eb6e0c8650441
          final org.apache.logging.log4j.core.Logger logger = ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger());
          for (org.apache.logging.log4j.core.Appender appender : logger.getAppenders().values()) {
              if (appender instanceof org.apache.logging.log4j.core.appender.ConsoleAppender) {
-@@ -120,6 +128,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -118,6 +126,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          }
  
          new org.bukkit.craftbukkit.util.TerminalConsoleWriterThread(System.out, this.reader).start();
 +        */
 +        // Paper end
  
-         System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
-         System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
+         System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
+         System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 3f1ab69ac09c0c5ab50a99961a705254f3749f18..08708a42737ce66794083116f55ea209dbf81dcf 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
diff --git a/Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch
similarity index 97%
rename from Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch
rename to Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch
index c948d80388..1b952fa7a8 100644
--- a/Spigot-Server-Patches/0168-Handle-plugin-prefixes-using-Log4J-configuration.patch
+++ b/Spigot-Server-Patches/0167-Handle-plugin-prefixes-using-Log4J-configuration.patch
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index ca6f4c4363189af1292898035cbb7a1e722d52e1..ef710ae3524032287aa2d2cad065b4b5973eb319 100644
+index 2781d908fc9fcaa902fff1f86e7dffd86bd4c772..ee5747efddbbff3ed11caa6cca326e6c55b60fc8 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -64,7 +64,7 @@
diff --git a/Spigot-Server-Patches/0167-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0167-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
deleted file mode 100644
index f1400e90d4..0000000000
--- a/Spigot-Server-Patches/0167-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Minecrell <minecrell@minecrell.net>
-Date: Mon, 18 Sep 2017 12:00:03 +0200
-Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
-
-Log4j2 provides an optimized implementation of PrintStream that
-redirects its output to a logger. Use it instead of a custom
-implementation for minor performance improvements and some fixes.
-
-With the old implementation, each call to System.print()
-results in a separate line, even though it should not result in
-a line break. Log4j's implementation handles it correctly.
-
-diff --git a/pom.xml b/pom.xml
-index a1b4f01782c896347c821af93606ed5d3b501c8d..ca6f4c4363189af1292898035cbb7a1e722d52e1 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -66,6 +66,11 @@
-             <version>2.8.1</version>
-             <scope>runtime</scope>
-         </dependency>
-+        <dependency>
-+            <groupId>org.apache.logging.log4j</groupId>
-+            <artifactId>log4j-iostreams</artifactId>
-+            <version>2.8.1</version>
-+        </dependency>
-         <dependency>
-             <groupId>org.ow2.asm</groupId>
-             <artifactId>asm</artifactId>
-diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 6e19b41f41137de8379eb6e0c8650441445e0f2e..822933c4a9e1cc8297ab70f62d50a8e2a0756c0a 100644
---- a/src/main/java/net/minecraft/server/DedicatedServer.java
-+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -131,8 +131,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
-         */
-         // Paper end
- 
--        System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
--        System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
-+        // Paper start - Use Log4j IOStreams
-+        System.setOut(org.apache.logging.log4j.io.IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream());
-+        System.setErr(org.apache.logging.log4j.io.IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream());
-+        // Paper end
-         // CraftBukkit end
- 
-         thread.setDaemon(true);
diff --git a/Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
similarity index 88%
rename from Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch
rename to Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
index a7358dccbb..922b455be6 100644
--- a/Spigot-Server-Patches/0169-Include-Log4J2-SLF4J-implementation.patch
+++ b/Spigot-Server-Patches/0168-Include-Log4J2-SLF4J-implementation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index ef710ae3524032287aa2d2cad065b4b5973eb319..d4676c4711942e414890e7fb5f12e596337b62e2 100644
+index ee5747efddbbff3ed11caa6cca326e6c55b60fc8..e3630cd3847c6a5d5b3c8a37fe6f101f938b8700 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -66,6 +66,12 @@
diff --git a/Spigot-Server-Patches/0170-Improve-Log4J-Configuration-Plugin-Loggers.patch b/Spigot-Server-Patches/0169-Improve-Log4J-Configuration-Plugin-Loggers.patch
similarity index 100%
rename from Spigot-Server-Patches/0170-Improve-Log4J-Configuration-Plugin-Loggers.patch
rename to Spigot-Server-Patches/0169-Improve-Log4J-Configuration-Plugin-Loggers.patch
diff --git a/Spigot-Server-Patches/0171-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
similarity index 97%
rename from Spigot-Server-Patches/0171-Add-PlayerJumpEvent.patch
rename to Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
index 05f39172a5..e1f7033635 100644
--- a/Spigot-Server-Patches/0171-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0170-Add-PlayerJumpEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bc084ade77cff987c41d148ce85fc61d6efb5feb..3290e50440dc22f5530272c2817c594028d3432e 100644
+index 29b620bce44e3508dd7870347df4bbf02cef2662..3ab384f09f8b309fe204ac052db7ecaf70ba14a6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/Spigot-Server-Patches/0172-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch
similarity index 95%
rename from Spigot-Server-Patches/0172-handle-PacketPlayInKeepAlive-async.patch
rename to Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch
index 5342981e8c..8febba94f0 100644
--- a/Spigot-Server-Patches/0172-handle-PacketPlayInKeepAlive-async.patch
+++ b/Spigot-Server-Patches/0171-handle-PacketPlayInKeepAlive-async.patch
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3290e50440dc22f5530272c2817c594028d3432e..01747ea997a68f55803553c330287b1bbe866c29 100644
+index 3ab384f09f8b309fe204ac052db7ecaf70ba14a6..e272691a8f44eba88a344ea24bfcf5874f03bc1d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2525,14 +2525,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch
similarity index 100%
rename from Spigot-Server-Patches/0173-Expose-client-protocol-version-and-virtual-host.patch
rename to Spigot-Server-Patches/0172-Expose-client-protocol-version-and-virtual-host.patch
diff --git a/Spigot-Server-Patches/0174-revert-serverside-behavior-of-keepalives.patch b/Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch
similarity index 97%
rename from Spigot-Server-Patches/0174-revert-serverside-behavior-of-keepalives.patch
rename to Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch
index cfe42a288a..3dd554e6ab 100644
--- a/Spigot-Server-Patches/0174-revert-serverside-behavior-of-keepalives.patch
+++ b/Spigot-Server-Patches/0173-revert-serverside-behavior-of-keepalives.patch
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 01747ea997a68f55803553c330287b1bbe866c29..2eb2ddcb4456437bb449a86c18fb24c8629870a7 100644
+index e272691a8f44eba88a344ea24bfcf5874f03bc1d..a3710f23d4ef254cda3fae83d8547507aa2a8696 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0175-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0174-Send-attack-SoundEffects-only-to-players-who-can-see.patch
similarity index 100%
rename from Spigot-Server-Patches/0175-Send-attack-SoundEffects-only-to-players-who-can-see.patch
rename to Spigot-Server-Patches/0174-Send-attack-SoundEffects-only-to-players-who-can-see.patch
diff --git a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0175-Option-for-maximum-exp-value-when-merging-orbs.patch
similarity index 100%
rename from Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
rename to Spigot-Server-Patches/0175-Option-for-maximum-exp-value-when-merging-orbs.patch
diff --git a/Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0177-Add-PlayerArmorChangeEvent.patch
rename to Spigot-Server-Patches/0176-Add-PlayerArmorChangeEvent.patch
diff --git a/Spigot-Server-Patches/0178-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0177-Prevent-logins-from-being-processed-when-the-player-.patch
similarity index 100%
rename from Spigot-Server-Patches/0178-Prevent-logins-from-being-processed-when-the-player-.patch
rename to Spigot-Server-Patches/0177-Prevent-logins-from-being-processed-when-the-player-.patch
diff --git a/Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch
similarity index 100%
rename from Spigot-Server-Patches/0179-use-CB-BlockState-implementations-for-captured-block.patch
rename to Spigot-Server-Patches/0178-use-CB-BlockState-implementations-for-captured-block.patch
diff --git a/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0179-API-to-get-a-BlockState-without-a-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch
rename to Spigot-Server-Patches/0179-API-to-get-a-BlockState-without-a-snapshot.patch
diff --git a/Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch
rename to Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch
index 3d3f9c2481..f1cd91245a 100644
--- a/Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2eb2ddcb4456437bb449a86c18fb24c8629870a7..4452a6e7f550f362145ce6533e6cc77c367793eb 100644
+index a3710f23d4ef254cda3fae83d8547507aa2a8696..4dc0b3a6054ef82ad675c30d30b6a7ad5acea400 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -521,10 +521,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0182-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch
similarity index 100%
rename from Spigot-Server-Patches/0182-Avoid-NPE-in-PathfinderGoalTempt.patch
rename to Spigot-Server-Patches/0181-Avoid-NPE-in-PathfinderGoalTempt.patch
diff --git a/Spigot-Server-Patches/0183-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0183-PlayerPickupExperienceEvent.patch
rename to Spigot-Server-Patches/0182-PlayerPickupExperienceEvent.patch
diff --git a/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
rename to Spigot-Server-Patches/0183-ExperienceOrbMergeEvent.patch
diff --git a/Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0185-Ability-to-apply-mending-to-XP-API.patch
rename to Spigot-Server-Patches/0184-Ability-to-apply-mending-to-XP-API.patch
diff --git a/Spigot-Server-Patches/0186-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0185-Make-max-squid-spawn-height-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0186-Make-max-squid-spawn-height-configurable.patch
rename to Spigot-Server-Patches/0185-Make-max-squid-spawn-height-configurable.patch
diff --git a/Spigot-Server-Patches/0187-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0187-PreCreatureSpawnEvent.patch
rename to Spigot-Server-Patches/0186-PreCreatureSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0188-PlayerNaturallySpawnCreaturesEvent.patch
rename to Spigot-Server-Patches/0187-PlayerNaturallySpawnCreaturesEvent.patch
diff --git a/Spigot-Server-Patches/0189-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch
similarity index 100%
rename from Spigot-Server-Patches/0189-Add-setPlayerProfile-API-for-Skulls.patch
rename to Spigot-Server-Patches/0188-Add-setPlayerProfile-API-for-Skulls.patch
diff --git a/Spigot-Server-Patches/0190-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0189-Fill-Profile-Property-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0190-Fill-Profile-Property-Events.patch
rename to Spigot-Server-Patches/0189-Fill-Profile-Property-Events.patch
diff --git a/Spigot-Server-Patches/0191-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0190-PlayerAdvancementCriterionGrantEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0191-PlayerAdvancementCriterionGrantEvent.patch
rename to Spigot-Server-Patches/0190-PlayerAdvancementCriterionGrantEvent.patch
diff --git a/Spigot-Server-Patches/0192-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0191-Add-ArmorStand-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0192-Add-ArmorStand-Item-Meta.patch
rename to Spigot-Server-Patches/0191-Add-ArmorStand-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch
similarity index 100%
rename from Spigot-Server-Patches/0193-Extend-Player-Interact-cancellation.patch
rename to Spigot-Server-Patches/0192-Extend-Player-Interact-cancellation.patch
diff --git a/Spigot-Server-Patches/0194-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0193-Tameable-getOwnerUniqueId-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0194-Tameable-getOwnerUniqueId-API.patch
rename to Spigot-Server-Patches/0193-Tameable-getOwnerUniqueId-API.patch
diff --git a/Spigot-Server-Patches/0195-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0194-Toggleable-player-crits-helps-mitigate-hacked-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0195-Toggleable-player-crits-helps-mitigate-hacked-client.patch
rename to Spigot-Server-Patches/0194-Toggleable-player-crits-helps-mitigate-hacked-client.patch
diff --git a/Spigot-Server-Patches/0196-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0195-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
similarity index 100%
rename from Spigot-Server-Patches/0196-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
rename to Spigot-Server-Patches/0195-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch
diff --git a/Spigot-Server-Patches/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
rename to Spigot-Server-Patches/0196-Prevent-Frosted-Ice-from-loading-holding-chunks.patch
diff --git a/Spigot-Server-Patches/0198-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0197-Disable-Explicit-Network-Manager-Flushing.patch
similarity index 100%
rename from Spigot-Server-Patches/0198-Disable-Explicit-Network-Manager-Flushing.patch
rename to Spigot-Server-Patches/0197-Disable-Explicit-Network-Manager-Flushing.patch
diff --git a/Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0198-Implement-extended-PaperServerListPingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0199-Implement-extended-PaperServerListPingEvent.patch
rename to Spigot-Server-Patches/0198-Implement-extended-PaperServerListPingEvent.patch
diff --git a/Spigot-Server-Patches/0200-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0199-Improved-Async-Task-Scheduler.patch
similarity index 100%
rename from Spigot-Server-Patches/0200-Improved-Async-Task-Scheduler.patch
rename to Spigot-Server-Patches/0199-Improved-Async-Task-Scheduler.patch
diff --git a/Spigot-Server-Patches/0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0200-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
similarity index 100%
rename from Spigot-Server-Patches/0201-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
rename to Spigot-Server-Patches/0200-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
diff --git a/Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0201-Player.setPlayerProfile-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0202-Player.setPlayerProfile-API.patch
rename to Spigot-Server-Patches/0201-Player.setPlayerProfile-API.patch
diff --git a/Spigot-Server-Patches/0203-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0202-Fix-Dragon-Server-Crashes.patch
similarity index 100%
rename from Spigot-Server-Patches/0203-Fix-Dragon-Server-Crashes.patch
rename to Spigot-Server-Patches/0202-Fix-Dragon-Server-Crashes.patch
diff --git a/Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0203-getPlayerUniqueId-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0204-getPlayerUniqueId-API.patch
rename to Spigot-Server-Patches/0203-getPlayerUniqueId-API.patch
diff --git a/Spigot-Server-Patches/0205-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0204-Make-player-data-saving-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0205-Make-player-data-saving-configurable.patch
rename to Spigot-Server-Patches/0204-Make-player-data-saving-configurable.patch
diff --git a/Spigot-Server-Patches/0206-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0205-Make-legacy-ping-handler-more-reliable.patch
similarity index 100%
rename from Spigot-Server-Patches/0206-Make-legacy-ping-handler-more-reliable.patch
rename to Spigot-Server-Patches/0205-Make-legacy-ping-handler-more-reliable.patch
diff --git a/Spigot-Server-Patches/0207-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0206-Call-PaperServerListPingEvent-for-legacy-pings.patch
similarity index 100%
rename from Spigot-Server-Patches/0207-Call-PaperServerListPingEvent-for-legacy-pings.patch
rename to Spigot-Server-Patches/0206-Call-PaperServerListPingEvent-for-legacy-pings.patch
diff --git a/Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0207-Flag-to-disable-the-channel-limit.patch
similarity index 100%
rename from Spigot-Server-Patches/0208-Flag-to-disable-the-channel-limit.patch
rename to Spigot-Server-Patches/0207-Flag-to-disable-the-channel-limit.patch
diff --git a/Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0208-Add-method-to-open-already-placed-sign.patch
similarity index 100%
rename from Spigot-Server-Patches/0209-Add-method-to-open-already-placed-sign.patch
rename to Spigot-Server-Patches/0208-Add-method-to-open-already-placed-sign.patch
diff --git a/Spigot-Server-Patches/0210-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0209-Configurable-sprint-interruption-on-attack.patch
similarity index 100%
rename from Spigot-Server-Patches/0210-Configurable-sprint-interruption-on-attack.patch
rename to Spigot-Server-Patches/0209-Configurable-sprint-interruption-on-attack.patch
diff --git a/Spigot-Server-Patches/0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0210-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
similarity index 92%
rename from Spigot-Server-Patches/0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
rename to Spigot-Server-Patches/0210-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
index 11517edabd..b6f4102a94 100644
--- a/Spigot-Server-Patches/0211-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
+++ b/Spigot-Server-Patches/0210-Fix-exploit-that-allowed-colored-signs-to-be-created.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4452a6e7f550f362145ce6533e6cc77c367793eb..f6d650ca21cef8961e88e07d767478eeb5ec15d1 100644
+index 4dc0b3a6054ef82ad675c30d30b6a7ad5acea400..c79db4e81883ce8635e91304b288f32e7bc2c763 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2537,7 +2537,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0212-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0211-EndermanEscapeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0212-EndermanEscapeEvent.patch
rename to Spigot-Server-Patches/0211-EndermanEscapeEvent.patch
diff --git a/Spigot-Server-Patches/0213-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0212-Enderman.teleportRandomly.patch
similarity index 100%
rename from Spigot-Server-Patches/0213-Enderman.teleportRandomly.patch
rename to Spigot-Server-Patches/0212-Enderman.teleportRandomly.patch
diff --git a/Spigot-Server-Patches/0214-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0213-Block-Enderpearl-Travel-Exploit.patch
similarity index 100%
rename from Spigot-Server-Patches/0214-Block-Enderpearl-Travel-Exploit.patch
rename to Spigot-Server-Patches/0213-Block-Enderpearl-Travel-Exploit.patch
diff --git a/Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0214-Expand-World.spawnParticle-API-and-add-Builder.patch
similarity index 100%
rename from Spigot-Server-Patches/0215-Expand-World.spawnParticle-API-and-add-Builder.patch
rename to Spigot-Server-Patches/0214-Expand-World.spawnParticle-API-and-add-Builder.patch
diff --git a/Spigot-Server-Patches/0216-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0215-EndermanAttackPlayerEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0216-EndermanAttackPlayerEvent.patch
rename to Spigot-Server-Patches/0215-EndermanAttackPlayerEvent.patch
diff --git a/Spigot-Server-Patches/0217-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0216-WitchConsumePotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0217-WitchConsumePotionEvent.patch
rename to Spigot-Server-Patches/0216-WitchConsumePotionEvent.patch
diff --git a/Spigot-Server-Patches/0218-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0217-WitchThrowPotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0218-WitchThrowPotionEvent.patch
rename to Spigot-Server-Patches/0217-WitchThrowPotionEvent.patch
diff --git a/Spigot-Server-Patches/0219-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0218-Allow-spawning-Item-entities-with-World.spawnEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0219-Allow-spawning-Item-entities-with-World.spawnEntity.patch
rename to Spigot-Server-Patches/0218-Allow-spawning-Item-entities-with-World.spawnEntity.patch
diff --git a/Spigot-Server-Patches/0220-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0219-WitchReadyPotionEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0220-WitchReadyPotionEvent.patch
rename to Spigot-Server-Patches/0219-WitchReadyPotionEvent.patch
diff --git a/Spigot-Server-Patches/0221-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0220-ItemStack-getMaxItemUseDuration.patch
similarity index 100%
rename from Spigot-Server-Patches/0221-ItemStack-getMaxItemUseDuration.patch
rename to Spigot-Server-Patches/0220-ItemStack-getMaxItemUseDuration.patch
diff --git a/Spigot-Server-Patches/0222-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0221-Implement-EntityTeleportEndGatewayEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0222-Implement-EntityTeleportEndGatewayEvent.patch
rename to Spigot-Server-Patches/0221-Implement-EntityTeleportEndGatewayEvent.patch
diff --git a/Spigot-Server-Patches/0223-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0222-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
similarity index 100%
rename from Spigot-Server-Patches/0223-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
rename to Spigot-Server-Patches/0222-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
diff --git a/Spigot-Server-Patches/0224-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0223-Fix-CraftEntity-hashCode.patch
similarity index 100%
rename from Spigot-Server-Patches/0224-Fix-CraftEntity-hashCode.patch
rename to Spigot-Server-Patches/0223-Fix-CraftEntity-hashCode.patch
diff --git a/Spigot-Server-Patches/0225-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0224-Configurable-Alternative-LootPool-Luck-Formula.patch
similarity index 100%
rename from Spigot-Server-Patches/0225-Configurable-Alternative-LootPool-Luck-Formula.patch
rename to Spigot-Server-Patches/0224-Configurable-Alternative-LootPool-Luck-Formula.patch
diff --git a/Spigot-Server-Patches/0226-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0225-Print-Error-details-when-failing-to-save-player-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0226-Print-Error-details-when-failing-to-save-player-data.patch
rename to Spigot-Server-Patches/0225-Print-Error-details-when-failing-to-save-player-data.patch
diff --git a/Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0226-Make-shield-blocking-delay-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch
rename to Spigot-Server-Patches/0226-Make-shield-blocking-delay-configurable.patch
diff --git a/Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/0227-Improve-EntityShootBowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch
rename to Spigot-Server-Patches/0227-Improve-EntityShootBowEvent.patch
diff --git a/Spigot-Server-Patches/0229-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0228-PlayerReadyArrowEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0229-PlayerReadyArrowEvent.patch
rename to Spigot-Server-Patches/0228-PlayerReadyArrowEvent.patch
diff --git a/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0229-Implement-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0229-Implement-EntityKnockbackByEntityEvent.patch
diff --git a/Spigot-Server-Patches/0231-Expand-Explosions-API.patch b/Spigot-Server-Patches/0230-Expand-Explosions-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0231-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0230-Expand-Explosions-API.patch
diff --git a/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0231-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0231-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/Spigot-Server-Patches/0233-RangedEntity-API.patch b/Spigot-Server-Patches/0232-RangedEntity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0233-RangedEntity-API.patch
rename to Spigot-Server-Patches/0232-RangedEntity-API.patch
diff --git a/Spigot-Server-Patches/0234-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0233-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0234-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0233-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/Spigot-Server-Patches/0235-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0234-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0235-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0234-Implement-World.getEntity-UUID-API.patch
diff --git a/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0235-InventoryCloseEvent-Reason-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0235-InventoryCloseEvent-Reason-API.patch
index 63293f6e77..910078dd98 100644
--- a/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0235-InventoryCloseEvent-Reason-API.patch
@@ -88,7 +88,7 @@ index 6a8327379e7520d31e5eb0a61893e6d9f23a6814..7ac4e006c76373d2aedb37adf22bbb30
          this.o();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f6d650ca21cef8961e88e07d767478eeb5ec15d1..e1dcdfe3b498f4c0642921dd31b5e255cc7fc4c3 100644
+index c79db4e81883ce8635e91304b288f32e7bc2c763..19524eb45c313be977e8fd68fd3dd5e470067542 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -37,6 +37,7 @@ import org.bukkit.event.inventory.ClickType;
diff --git a/Spigot-Server-Patches/0237-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0236-Vex-getSummoner-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0237-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0236-Vex-getSummoner-API.patch
diff --git a/Spigot-Server-Patches/0238-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0237-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 93%
rename from Spigot-Server-Patches/0238-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0237-Refresh-player-inventory-when-cancelling-PlayerInter.patch
index 1bba3d346c..45f3b0c76a 100644
--- a/Spigot-Server-Patches/0238-Refresh-player-inventory-when-cancelling-PlayerInter.patch
+++ b/Spigot-Server-Patches/0237-Refresh-player-inventory-when-cancelling-PlayerInter.patch
@@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is
 cancelled to avoid this problem.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e1dcdfe3b498f4c0642921dd31b5e255cc7fc4c3..0512f3a2df406cc18083883e2689945067dabb71 100644
+index 19524eb45c313be977e8fd68fd3dd5e470067542..7be8745df9a7481e48e873b5595b8848b3e5c494 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1985,6 +1985,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0239-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0238-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 100%
rename from Spigot-Server-Patches/0239-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0238-Don-t-change-the-Entity-Random-seed-for-squids.patch
diff --git a/Spigot-Server-Patches/0240-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0239-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 100%
rename from Spigot-Server-Patches/0240-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0239-Re-add-vanilla-entity-warnings-for-duplicates.patch
diff --git a/Spigot-Server-Patches/0241-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0240-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0241-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0240-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
diff --git a/Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0241-Use-asynchronous-Log4j-2-loggers.patch
similarity index 92%
rename from Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0241-Use-asynchronous-Log4j-2-loggers.patch
index 5788797ea7..7b18c2a963 100644
--- a/Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch
+++ b/Spigot-Server-Patches/0241-Use-asynchronous-Log4j-2-loggers.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index d4676c4711942e414890e7fb5f12e596337b62e2..b67b01c5af49b948fc0642a8caa6d5df5c1ed13e 100644
+index e3630cd3847c6a5d5b3c8a37fe6f101f938b8700..c10888b862541e244c9c9c60d45ef9fee59ae3e8 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -77,6 +77,13 @@
-             <artifactId>log4j-iostreams</artifactId>
+@@ -78,6 +78,13 @@
              <version>2.8.1</version>
+             <scope>compile</scope>
          </dependency>
 +        <!-- Paper - Async loggers -->
 +        <dependency>
diff --git a/Spigot-Server-Patches/0243-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0242-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from Spigot-Server-Patches/0243-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0242-add-more-information-to-Entity.toString.patch
diff --git a/Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 100%
rename from Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0243-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
diff --git a/Spigot-Server-Patches/0245-EnderDragon-Events.patch b/Spigot-Server-Patches/0244-EnderDragon-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0245-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0244-EnderDragon-Events.patch
diff --git a/Spigot-Server-Patches/0246-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0245-PlayerElytraBoostEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0246-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0245-PlayerElytraBoostEvent.patch
diff --git a/Spigot-Server-Patches/0247-Improve-BlockPosition-inlining.patch b/Spigot-Server-Patches/0246-Improve-BlockPosition-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0247-Improve-BlockPosition-inlining.patch
rename to Spigot-Server-Patches/0246-Improve-BlockPosition-inlining.patch
diff --git a/Spigot-Server-Patches/0248-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0247-Optimize-RegistryID.c.patch
similarity index 100%
rename from Spigot-Server-Patches/0248-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0247-Optimize-RegistryID.c.patch
diff --git a/Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0248-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 100%
rename from Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0248-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
diff --git a/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0249-Vanished-players-don-t-have-rights.patch
similarity index 100%
rename from Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0249-Vanished-players-don-t-have-rights.patch
diff --git a/Spigot-Server-Patches/0251-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0250-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 100%
rename from Spigot-Server-Patches/0251-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0250-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
diff --git a/Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0251-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 100%
rename from Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0251-Add-some-Debug-to-Chunk-Entity-slices.patch
diff --git a/Spigot-Server-Patches/0253-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0252-SkeletonHorse-Additions.patch
similarity index 100%
rename from Spigot-Server-Patches/0253-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0252-SkeletonHorse-Additions.patch
diff --git a/Spigot-Server-Patches/0254-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0253-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0254-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0253-Prevent-Saving-Bad-entities-to-chunks.patch
diff --git a/Spigot-Server-Patches/0255-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0254-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0255-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0254-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0255-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 100%
rename from Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0255-Ignore-Dead-Entities-in-entityList-iteration.patch
diff --git a/Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0256-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0256-Implement-Expanded-ArmorStand-API.patch
diff --git a/Spigot-Server-Patches/0258-AnvilDamageEvent.patch b/Spigot-Server-Patches/0257-AnvilDamageEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0258-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0257-AnvilDamageEvent.patch
diff --git a/Spigot-Server-Patches/0259-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0259-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0258-Add-TNTPrimeEvent.patch
diff --git a/Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0259-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 97%
rename from Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0259-Break-up-and-make-tab-spam-limits-configurable.patch
index 9e464d9ffe..4a23cb2c6e 100644
--- a/Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch
+++ b/Spigot-Server-Patches/0259-Break-up-and-make-tab-spam-limits-configurable.patch
@@ -45,7 +45,7 @@ index c8a7d8092a2849b62a8d83d7970756fd76100025..2e5c71d6b7d120a308076d95a3d5b73c
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0512f3a2df406cc18083883e2689945067dabb71..754d4eead6960fda7b45a6466f9b4c18c7e89210 100644
+index 7be8745df9a7481e48e873b5595b8848b3e5c494..d7a62e63ea1cdc7436ee1b5d57c72bc7dec04182 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -77,6 +77,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0260-Add-hand-to-bucket-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0260-Add-hand-to-bucket-events.patch
diff --git a/Spigot-Server-Patches/0262-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0261-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from Spigot-Server-Patches/0262-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0261-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/Spigot-Server-Patches/0263-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0262-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from Spigot-Server-Patches/0263-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0262-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/Spigot-Server-Patches/0264-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0263-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from Spigot-Server-Patches/0264-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0263-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/Spigot-Server-Patches/0265-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0264-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from Spigot-Server-Patches/0265-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0264-Make-EnderDragon-implement-Mob.patch
diff --git a/Spigot-Server-Patches/0266-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0265-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 100%
rename from Spigot-Server-Patches/0266-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0265-Use-ConcurrentHashMap-in-JsonList.patch
diff --git a/Spigot-Server-Patches/0267-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0266-Use-a-Queue-for-Queueing-Commands.patch
similarity index 88%
rename from Spigot-Server-Patches/0267-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0266-Use-a-Queue-for-Queueing-Commands.patch
index 27c276d441..69d2966bc2 100644
--- a/Spigot-Server-Patches/0267-Use-a-Queue-for-Queueing-Commands.patch
+++ b/Spigot-Server-Patches/0266-Use-a-Queue-for-Queueing-Commands.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 822933c4a9e1cc8297ab70f62d50a8e2a0756c0a..0463e5977f7a4add517ed710886dc372e7c7521e 100644
+index 3bdde27a52c88b5f0621bdaf30ccd1ac00160b64..54ef6eeb8866915f03fb16413c8b5f36a7501f82 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -38,7 +38,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -36,7 +36,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
      private static final Logger LOGGER = LogManager.getLogger();
      private static final Pattern k = Pattern.compile("^[a-fA-F0-9]{40}$");
@@ -18,7 +18,7 @@ index 822933c4a9e1cc8297ab70f62d50a8e2a0756c0a..0463e5977f7a4add517ed710886dc372
      private RemoteStatusListener remoteStatusListener;
      public final RemoteControlCommandListener remoteControlCommandListener;
      private RemoteControlListener remoteControlListener;
-@@ -393,8 +393,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -389,8 +389,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
      public void handleCommandQueue() {
          MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
diff --git a/Spigot-Server-Patches/0268-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0267-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from Spigot-Server-Patches/0268-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0267-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0268-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0268-Allow-disabling-armour-stand-ticking.patch
diff --git a/Spigot-Server-Patches/0270-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0269-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0270-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0269-Optimize-BlockPosition-helper-methods.patch
diff --git a/Spigot-Server-Patches/0271-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0270-Restore-vanlla-default-mob-spawn-range.patch
similarity index 100%
rename from Spigot-Server-Patches/0271-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0270-Restore-vanlla-default-mob-spawn-range.patch
diff --git a/Spigot-Server-Patches/0272-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0271-Slime-Pathfinder-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0272-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0271-Slime-Pathfinder-Events.patch
diff --git a/Spigot-Server-Patches/0273-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0272-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from Spigot-Server-Patches/0273-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0272-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/Spigot-Server-Patches/0274-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0273-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0274-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0273-Optimize-CraftBlockData-Creation.patch
diff --git a/Spigot-Server-Patches/0275-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0274-Optimize-RegistryMaterials.patch
similarity index 100%
rename from Spigot-Server-Patches/0275-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0274-Optimize-RegistryMaterials.patch
diff --git a/Spigot-Server-Patches/0276-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0275-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0276-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0275-Add-PhantomPreSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0277-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0276-Add-More-Creeper-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0277-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0276-Add-More-Creeper-API.patch
diff --git a/Spigot-Server-Patches/0278-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0277-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from Spigot-Server-Patches/0278-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0277-Inventory-removeItemAnySlot.patch
diff --git a/Spigot-Server-Patches/0279-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0278-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from Spigot-Server-Patches/0279-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0278-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0279-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0279-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0281-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0280-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from Spigot-Server-Patches/0281-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0280-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/Spigot-Server-Patches/0282-Improve-death-events.patch b/Spigot-Server-Patches/0281-Improve-death-events.patch
similarity index 100%
rename from Spigot-Server-Patches/0282-Improve-death-events.patch
rename to Spigot-Server-Patches/0281-Improve-death-events.patch
diff --git a/Spigot-Server-Patches/0283-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0282-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0283-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0282-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/Spigot-Server-Patches/0284-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0283-Mob-Pathfinding-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0284-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0283-Mob-Pathfinding-API.patch
diff --git a/Spigot-Server-Patches/0285-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0284-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from Spigot-Server-Patches/0285-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0284-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/Spigot-Server-Patches/0286-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0285-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from Spigot-Server-Patches/0286-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0285-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/Spigot-Server-Patches/0287-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0286-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0287-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0286-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/Spigot-Server-Patches/0288-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0287-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0288-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0287-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/Spigot-Server-Patches/0289-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0288-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from Spigot-Server-Patches/0289-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0288-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/Spigot-Server-Patches/0290-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0289-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0290-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0289-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/Spigot-Server-Patches/0291-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0290-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0291-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0290-PreSpawnerSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0292-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0291-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from Spigot-Server-Patches/0292-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0291-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/Spigot-Server-Patches/0293-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0292-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from Spigot-Server-Patches/0293-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0292-Honor-EntityAgeable.ageLock.patch
diff --git a/Spigot-Server-Patches/0294-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0293-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from Spigot-Server-Patches/0294-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0293-Configurable-connection-throttle-kick-message.patch
diff --git a/Spigot-Server-Patches/0295-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0294-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from Spigot-Server-Patches/0295-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0294-Hook-into-CB-plugin-rewrites.patch
diff --git a/Spigot-Server-Patches/0296-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0295-Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from Spigot-Server-Patches/0296-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0295-Allow-setting-the-vex-s-summoner.patch
diff --git a/Spigot-Server-Patches/0297-Add-sun-related-API.patch b/Spigot-Server-Patches/0296-Add-sun-related-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0297-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0296-Add-sun-related-API.patch
diff --git a/Spigot-Server-Patches/0298-Turtle-API.patch b/Spigot-Server-Patches/0297-Turtle-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0298-Turtle-API.patch
rename to Spigot-Server-Patches/0297-Turtle-API.patch
diff --git a/Spigot-Server-Patches/0299-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0298-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from Spigot-Server-Patches/0299-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0298-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0299-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 98%
rename from Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch
rename to Spigot-Server-Patches/0299-Call-player-spectator-target-events-and-improve-impl.patch
index 1ad1ce8be2..db0e78a06a 100644
--- a/Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch
+++ b/Spigot-Server-Patches/0299-Call-player-spectator-target-events-and-improve-impl.patch
@@ -88,7 +88,7 @@ index 246de149254a6303b36ba1e2441499497c09bc5b..868dcb4b43a7d82f9df58742da6d5cd7
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 754d4eead6960fda7b45a6466f9b4c18c7e89210..dbfaa37dae64b01c99f5a3144693298132cb7676 100644
+index d7a62e63ea1cdc7436ee1b5d57c72bc7dec04182..441cdb07db49c32c56134c0eb6f66e2992223308 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1128,6 +1128,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0300-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0300-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/Spigot-Server-Patches/0302-Add-more-Witch-API.patch b/Spigot-Server-Patches/0301-Add-more-Witch-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0302-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0301-Add-more-Witch-API.patch
diff --git a/Spigot-Server-Patches/0303-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0302-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from Spigot-Server-Patches/0303-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0302-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/Spigot-Server-Patches/0304-Here-s-Johnny.patch b/Spigot-Server-Patches/0303-Here-s-Johnny.patch
similarity index 100%
rename from Spigot-Server-Patches/0304-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0303-Here-s-Johnny.patch
diff --git a/Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0304-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 97%
rename from Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0304-Add-option-to-prevent-players-from-moving-into-unloa.patch
index 84d2216013..5808d1f35a 100644
--- a/Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0304-Add-option-to-prevent-players-from-moving-into-unloa.patch
@@ -20,7 +20,7 @@ index 098c99793c68ac916b52776f9a1cc2c6510c0057..15e1f9f65280043853544d3bf796f991
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dbfaa37dae64b01c99f5a3144693298132cb7676..1141bfc55a8aed4f2a519ab753d1ba0c9cadb465 100644
+index 441cdb07db49c32c56134c0eb6f66e2992223308..1ec968d871d00e6589c8572eabda9d0fb8f8f226 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0306-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0305-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0306-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0305-Reset-players-airTicks-on-respawn.patch
diff --git a/Spigot-Server-Patches/0307-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0306-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0307-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0306-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0307-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from Spigot-Server-Patches/0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to Spigot-Server-Patches/0307-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/Spigot-Server-Patches/0309-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0308-Optimize-World-Time-Updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0309-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0308-Optimize-World-Time-Updates.patch
diff --git a/Spigot-Server-Patches/0310-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0309-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0310-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0309-Restore-custom-InventoryHolder-support.patch
diff --git a/Spigot-Server-Patches/0311-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0310-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from Spigot-Server-Patches/0311-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0310-Use-Vanilla-Minecart-Speeds.patch
diff --git a/Spigot-Server-Patches/0312-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0311-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0312-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0311-Fix-SpongeAbsortEvent-handling.patch
diff --git a/Spigot-Server-Patches/0313-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0312-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 95%
rename from Spigot-Server-Patches/0313-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0312-Don-t-allow-digging-into-unloaded-chunks.patch
index 53c5dd4ef7..477927be96 100644
--- a/Spigot-Server-Patches/0313-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0312-Don-t-allow-digging-into-unloaded-chunks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow digging into unloaded chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1141bfc55a8aed4f2a519ab753d1ba0c9cadb465..e0e377812ef0a1a1ff1dd2ec3197d565fbe25159 100644
+index 1ec968d871d00e6589c8572eabda9d0fb8f8f226..4861666aa091554dea8aa6f8563547eceb26041e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1292,6 +1292,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -21,7 +21,7 @@ index 1141bfc55a8aed4f2a519ab753d1ba0c9cadb465..e0e377812ef0a1a1ff1dd2ec3197d565
                  return;
              default:
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 36cf4c332054a350ae193637f895a45a8b04da9b..a32490f0eb754b065ee34c41465176db78b1625d 100644
+index 0aa9b3a0d2aec8072fe32e43ed16946f22b29fab..b129d650c940d5b98f7dd04542c293e3f3045569 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -80,8 +80,8 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0314-Book-Size-Limits.patch b/Spigot-Server-Patches/0313-Book-Size-Limits.patch
similarity index 97%
rename from Spigot-Server-Patches/0314-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0313-Book-Size-Limits.patch
index cd941e6d13..7b2fb5cf7d 100644
--- a/Spigot-Server-Patches/0314-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0313-Book-Size-Limits.patch
@@ -22,7 +22,7 @@ index 478856f190a8d0177dee39dab4692fc54f9c8ed4..01d48da8b2f89ad3a615ad10c044c5f0
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e0e377812ef0a1a1ff1dd2ec3197d565fbe25159..22b7cbca00f93457920930b3a5880d55fec5e2c3 100644
+index 4861666aa091554dea8aa6f8563547eceb26041e..b6db6b7980e3d90b0b5f9bc3758adebc9625c8dc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -14,6 +14,7 @@ import java.util.Optional;
diff --git a/Spigot-Server-Patches/0315-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0314-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0315-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0314-Make-the-default-permission-message-configurable.patch
diff --git a/Spigot-Server-Patches/0316-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0315-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0316-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0315-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0317-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0316-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0317-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0316-Handle-Large-Packets-disconnecting-client.patch
diff --git a/Spigot-Server-Patches/0318-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0317-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from Spigot-Server-Patches/0318-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0317-force-entity-dismount-during-teleportation.patch
diff --git a/Spigot-Server-Patches/0319-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0318-Add-more-Zombie-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0319-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0318-Add-more-Zombie-API.patch
diff --git a/Spigot-Server-Patches/0320-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0319-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0320-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0319-Add-PlayerConnectionCloseEvent.patch
diff --git a/Spigot-Server-Patches/0321-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0320-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0321-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0320-Prevent-Enderman-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0322-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0321-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from Spigot-Server-Patches/0322-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0321-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/Spigot-Server-Patches/0323-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0322-Fix-PlayerEditBookEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0323-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0322-Fix-PlayerEditBookEvent.patch
index cdbfe535f2..0fb21fd2db 100644
--- a/Spigot-Server-Patches/0323-Fix-PlayerEditBookEvent.patch
+++ b/Spigot-Server-Patches/0322-Fix-PlayerEditBookEvent.patch
@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 22b7cbca00f93457920930b3a5880d55fec5e2c3..d9814329c9276de1bbc0e234d1f4d137063849eb 100644
+index b6db6b7980e3d90b0b5f9bc3758adebc9625c8dc..5fa1d0756d6e47a360dbdac89235941be67c4692 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -885,9 +885,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0324-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0323-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from Spigot-Server-Patches/0324-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0323-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/Spigot-Server-Patches/0325-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0324-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from Spigot-Server-Patches/0325-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0324-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/Spigot-Server-Patches/0326-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0325-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0326-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0325-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/Spigot-Server-Patches/0327-BlockDestroyEvent.patch b/Spigot-Server-Patches/0326-BlockDestroyEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0327-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0326-BlockDestroyEvent.patch
diff --git a/Spigot-Server-Patches/0328-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0327-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from Spigot-Server-Patches/0328-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0327-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/Spigot-Server-Patches/0329-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0328-Fix-sign-edit-memory-leak.patch
similarity index 95%
rename from Spigot-Server-Patches/0329-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0328-Fix-sign-edit-memory-leak.patch
index ea6b90b2f4..d6e0be5552 100644
--- a/Spigot-Server-Patches/0329-Fix-sign-edit-memory-leak.patch
+++ b/Spigot-Server-Patches/0328-Fix-sign-edit-memory-leak.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d9814329c9276de1bbc0e234d1f4d137063849eb..98f3c0faaeb6fcf2665a02b047beae9e84d4f894 100644
+index 5fa1d0756d6e47a360dbdac89235941be67c4692..ca0f14a34e5167c544cef47f675a48baef44294b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2588,7 +2588,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0330-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0329-Limit-Client-Sign-length-more.patch
similarity index 96%
rename from Spigot-Server-Patches/0330-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0329-Limit-Client-Sign-length-more.patch
index fc1343cbf7..a1f517ecf8 100644
--- a/Spigot-Server-Patches/0330-Limit-Client-Sign-length-more.patch
+++ b/Spigot-Server-Patches/0329-Limit-Client-Sign-length-more.patch
@@ -22,7 +22,7 @@ it only impacts data sent from the client.
 Set -DPaper.maxSignLength=XX to change limit or -1 to disable
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 98f3c0faaeb6fcf2665a02b047beae9e84d4f894..691f3354637f84d0a5b2a0c1c0f493f7de3b61af 100644
+index ca0f14a34e5167c544cef47f675a48baef44294b..9fbc498f58ff96323aa705e4b47cdf523256d6ce 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -104,6 +104,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0331-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0330-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from Spigot-Server-Patches/0331-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0330-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/Spigot-Server-Patches/0332-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0331-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from Spigot-Server-Patches/0332-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to Spigot-Server-Patches/0331-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/Spigot-Server-Patches/0333-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0332-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0333-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to Spigot-Server-Patches/0332-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/Spigot-Server-Patches/0334-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0333-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from Spigot-Server-Patches/0334-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0333-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/Spigot-Server-Patches/0335-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0334-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from Spigot-Server-Patches/0335-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0334-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/Spigot-Server-Patches/0336-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0335-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0336-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0335-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/Spigot-Server-Patches/0337-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0336-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from Spigot-Server-Patches/0337-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0336-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/Spigot-Server-Patches/0338-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0337-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0338-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0337-Add-LivingEntity-getTargetEntity.patch
diff --git a/Spigot-Server-Patches/0339-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0338-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from Spigot-Server-Patches/0339-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0338-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/Spigot-Server-Patches/0340-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0339-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from Spigot-Server-Patches/0340-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0339-Entity-getEntitySpawnReason.patch
diff --git a/Spigot-Server-Patches/0341-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0340-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 95%
rename from Spigot-Server-Patches/0341-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0340-Update-entity-Metadata-for-all-tracked-players.patch
index 1b36dcd0ea..d541af1f1e 100644
--- a/Spigot-Server-Patches/0341-Update-entity-Metadata-for-all-tracked-players.patch
+++ b/Spigot-Server-Patches/0340-Update-entity-Metadata-for-all-tracked-players.patch
@@ -22,7 +22,7 @@ index 216445778ce8432fe2506cd7ac4312f43f42ba33..e9bc1d22825850a1f1ef3267428c1984
          this.f.accept(packet);
          if (this.tracker instanceof EntityPlayer) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 691f3354637f84d0a5b2a0c1c0f493f7de3b61af..1c00f28ff41e236f684a055928c54069719ab2ac 100644
+index 9fbc498f58ff96323aa705e4b47cdf523256d6ce..759419a9d96072082f008c3a98da861c8c6c0fa3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2042,7 +2042,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0342-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0341-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0342-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0341-Implement-PlayerPostRespawnEvent.patch
diff --git a/Spigot-Server-Patches/0343-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0342-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 100%
rename from Spigot-Server-Patches/0343-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0342-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
diff --git a/Spigot-Server-Patches/0344-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0343-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 100%
rename from Spigot-Server-Patches/0344-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0343-Implement-getters-and-setters-for-EntityItem-owner-a.patch
diff --git a/Spigot-Server-Patches/0345-Server-Tick-Events.patch b/Spigot-Server-Patches/0344-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0345-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0344-Server-Tick-Events.patch
diff --git a/Spigot-Server-Patches/0346-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0345-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from Spigot-Server-Patches/0346-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0345-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/Spigot-Server-Patches/0347-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0346-Optimize-Captured-TileEntity-Lookup.patch
similarity index 100%
rename from Spigot-Server-Patches/0347-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0346-Optimize-Captured-TileEntity-Lookup.patch
diff --git a/Spigot-Server-Patches/0348-Add-Heightmap-API.patch b/Spigot-Server-Patches/0347-Add-Heightmap-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0348-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0347-Add-Heightmap-API.patch
diff --git a/Spigot-Server-Patches/0349-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0348-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0349-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0348-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-Server-Patches/0350-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0349-Per-Player-View-Distance-API-placeholders.patch
similarity index 100%
rename from Spigot-Server-Patches/0350-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0349-Per-Player-View-Distance-API-placeholders.patch
diff --git a/Spigot-Server-Patches/0351-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0350-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 89%
rename from Spigot-Server-Patches/0351-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0350-Fix-CB-call-to-changed-postToMainThread-method.patch
index e61ac6ec11..0b360fda3a 100644
--- a/Spigot-Server-Patches/0351-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/Spigot-Server-Patches/0350-Fix-CB-call-to-changed-postToMainThread-method.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1c00f28ff41e236f684a055928c54069719ab2ac..db2f4841ddec97f73882b16bc10af491f2471f86 100644
+index 759419a9d96072082f008c3a98da861c8c6c0fa3..0018a59c15a4753c805bfdcc3f3989fc270dd32d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -286,7 +286,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0352-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0351-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from Spigot-Server-Patches/0352-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0351-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/Spigot-Server-Patches/0353-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0352-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from Spigot-Server-Patches/0353-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0352-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/Spigot-Server-Patches/0354-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0353-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0354-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0353-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0355-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0354-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from Spigot-Server-Patches/0355-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0354-Duplicate-UUID-Resolve-Option.patch
diff --git a/Spigot-Server-Patches/0356-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0355-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from Spigot-Server-Patches/0356-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0355-improve-CraftWorld-isChunkLoaded.patch
diff --git a/Spigot-Server-Patches/0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0356-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0356-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/Spigot-Server-Patches/0358-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0357-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 100%
rename from Spigot-Server-Patches/0358-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0357-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
diff --git a/Spigot-Server-Patches/0359-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0358-ChunkMapDistance-CME.patch
similarity index 100%
rename from Spigot-Server-Patches/0359-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0358-ChunkMapDistance-CME.patch
diff --git a/Spigot-Server-Patches/0360-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0359-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from Spigot-Server-Patches/0360-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0359-Implement-CraftBlockSoundGroup.patch
diff --git a/Spigot-Server-Patches/0361-Chunk-debug-command.patch b/Spigot-Server-Patches/0360-Chunk-debug-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0361-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0360-Chunk-debug-command.patch
diff --git a/Spigot-Server-Patches/0362-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0361-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0362-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0361-Catch-exceptions-from-dispenser-entity-spawns.patch
diff --git a/Spigot-Server-Patches/0363-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0362-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0363-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0362-Fix-World-isChunkGenerated-calls.patch
diff --git a/Spigot-Server-Patches/0364-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0363-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0364-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0363-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/Spigot-Server-Patches/0365-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch b/Spigot-Server-Patches/0364-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
similarity index 100%
rename from Spigot-Server-Patches/0365-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
rename to Spigot-Server-Patches/0364-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
diff --git a/Spigot-Server-Patches/0366-incremental-chunk-saving.patch b/Spigot-Server-Patches/0365-incremental-chunk-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0366-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0365-incremental-chunk-saving.patch
diff --git a/Spigot-Server-Patches/0367-Anti-Xray.patch b/Spigot-Server-Patches/0366-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0367-Anti-Xray.patch
rename to Spigot-Server-Patches/0366-Anti-Xray.patch
index 0239f86253..694617c4f0 100644
--- a/Spigot-Server-Patches/0367-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0366-Anti-Xray.patch
@@ -1303,7 +1303,7 @@ index c4ed4d58f7b344626acb13baeb14288970a7bb90..8e79200b23f2dee612b0cbdcd6359a25
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index a32490f0eb754b065ee34c41465176db78b1625d..734855c1db3215d90b2743988f64af68aacb388e 100644
+index b129d650c940d5b98f7dd04542c293e3f3045569..dec20939ae312f24f13f02c4a275f45974467cb0 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -275,6 +275,8 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0368-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0367-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from Spigot-Server-Patches/0368-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0367-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/Spigot-Server-Patches/0369-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0368-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from Spigot-Server-Patches/0369-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0368-Configurable-projectile-relative-velocity.patch
diff --git a/Spigot-Server-Patches/0370-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0369-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 100%
rename from Spigot-Server-Patches/0370-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0369-Mark-entities-as-being-ticked-when-notifying-navigat.patch
diff --git a/Spigot-Server-Patches/0371-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0370-offset-item-frame-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0371-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0370-offset-item-frame-ticking.patch
diff --git a/Spigot-Server-Patches/0372-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0371-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 100%
rename from Spigot-Server-Patches/0372-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0371-Avoid-hopper-searches-if-there-are-no-items.patch
diff --git a/Spigot-Server-Patches/0373-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0372-Asynchronous-chunk-IO-and-loading.patch
similarity index 99%
rename from Spigot-Server-Patches/0373-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0372-Asynchronous-chunk-IO-and-loading.patch
index 798c523c94..999a732af9 100644
--- a/Spigot-Server-Patches/0373-Asynchronous-chunk-IO-and-loading.patch
+++ b/Spigot-Server-Patches/0372-Asynchronous-chunk-IO-and-loading.patch
@@ -3505,7 +3505,7 @@ index 8e79200b23f2dee612b0cbdcd6359a25dc2323cb..e7d9674e25c06090d57bba6c8229bc3b
          return this.m;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index db2f4841ddec97f73882b16bc10af491f2471f86..53fe54354ee8a9e9c31bf97272d70c181e0776f1 100644
+index 0018a59c15a4753c805bfdcc3f3989fc270dd32d..4abfbd86bed491f157f29234f739e4429a4efa8f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -539,6 +539,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0373-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 98%
rename from Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0373-Use-getChunkIfLoadedImmediately-in-places.patch
index 6f97bca2cd..5e205e5875 100644
--- a/Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/Spigot-Server-Patches/0373-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/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 53fe54354ee8a9e9c31bf97272d70c181e0776f1..66f86db4b04bf7059603b308cfd909f95ca7b94d 100644
+index 4abfbd86bed491f157f29234f739e4429a4efa8f..342d519ad8df0c781b592af0c39c0b8043607474 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1010,7 +1010,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0375-Reduce-sync-loads.patch b/Spigot-Server-Patches/0374-Reduce-sync-loads.patch
similarity index 100%
rename from Spigot-Server-Patches/0375-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0374-Reduce-sync-loads.patch
diff --git a/Spigot-Server-Patches/0376-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0375-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from Spigot-Server-Patches/0376-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0375-Implement-alternative-item-despawn-rate.patch
diff --git a/Spigot-Server-Patches/0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0376-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from Spigot-Server-Patches/0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0376-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/Spigot-Server-Patches/0378-Fix-MC-158900.patch b/Spigot-Server-Patches/0377-Fix-MC-158900.patch
similarity index 100%
rename from Spigot-Server-Patches/0378-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0377-Fix-MC-158900.patch
diff --git a/Spigot-Server-Patches/0379-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0378-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0379-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0378-implement-optional-per-player-mob-spawns.patch
diff --git a/Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0379-Prevent-consuming-the-wrong-itemstack.patch
similarity index 100%
rename from Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0379-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/Spigot-Server-Patches/0381-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0380-Fix-nether-portal-creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0381-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0380-Fix-nether-portal-creation.patch
diff --git a/Spigot-Server-Patches/0382-Generator-Settings.patch b/Spigot-Server-Patches/0381-Generator-Settings.patch
similarity index 100%
rename from Spigot-Server-Patches/0382-Generator-Settings.patch
rename to Spigot-Server-Patches/0381-Generator-Settings.patch
diff --git a/Spigot-Server-Patches/0383-Fix-MC-161754.patch b/Spigot-Server-Patches/0382-Fix-MC-161754.patch
similarity index 100%
rename from Spigot-Server-Patches/0383-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0382-Fix-MC-161754.patch
diff --git a/Spigot-Server-Patches/0384-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0383-Performance-improvement-for-Chunk.getEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0384-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0383-Performance-improvement-for-Chunk.getEntities.patch
diff --git a/Spigot-Server-Patches/0385-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0384-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from Spigot-Server-Patches/0385-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0384-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/Spigot-Server-Patches/0386-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0385-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0386-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0385-Expose-the-internal-current-tick.patch
diff --git a/Spigot-Server-Patches/0387-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0386-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from Spigot-Server-Patches/0387-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0386-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/Spigot-Server-Patches/0388-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0387-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from Spigot-Server-Patches/0388-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0387-Add-option-to-disable-pillager-patrols.patch
diff --git a/Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0388-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 95%
rename from Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0388-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
index c7bab55219..b5034ab70e 100644
--- a/Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
+++ b/Spigot-Server-Patches/0388-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
@@ -19,7 +19,7 @@ index 04b3af834457c4f210122cebc5bff5aa85ad3f47..ae3443aef2040fd2d3d214617c1b8993
          if (enumhand == EnumHand.MAIN_HAND) {
              return this.getEquipment(EnumItemSlot.MAINHAND);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 66f86db4b04bf7059603b308cfd909f95ca7b94d..2b3baee3e6cda70f4c6d1428c47f140c674421a8 100644
+index 342d519ad8df0c781b592af0c39c0b8043607474..7dc2c389fba46867807d76f75fea9fd7264d82e3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1473,6 +1473,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0390-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0389-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0390-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0389-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-Server-Patches/0391-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0390-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from Spigot-Server-Patches/0391-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0390-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/Spigot-Server-Patches/0392-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0391-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from Spigot-Server-Patches/0392-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0391-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/Spigot-Server-Patches/0393-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0392-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from Spigot-Server-Patches/0393-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0392-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/Spigot-Server-Patches/0394-Optimize-Hoppers.patch b/Spigot-Server-Patches/0393-Optimize-Hoppers.patch
similarity index 100%
rename from Spigot-Server-Patches/0394-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0393-Optimize-Hoppers.patch
diff --git a/Spigot-Server-Patches/0395-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0394-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from Spigot-Server-Patches/0395-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0394-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/Spigot-Server-Patches/0396-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0395-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from Spigot-Server-Patches/0396-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0395-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/Spigot-Server-Patches/0397-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0396-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from Spigot-Server-Patches/0397-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0396-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/Spigot-Server-Patches/0398-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0397-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from Spigot-Server-Patches/0398-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0397-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/Spigot-Server-Patches/0399-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0398-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from Spigot-Server-Patches/0399-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0398-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/Spigot-Server-Patches/0400-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0399-Fix-items-not-falling-correctly.patch
similarity index 100%
rename from Spigot-Server-Patches/0400-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0399-Fix-items-not-falling-correctly.patch
diff --git a/Spigot-Server-Patches/0401-Lag-compensate-eating.patch b/Spigot-Server-Patches/0400-Lag-compensate-eating.patch
similarity index 100%
rename from Spigot-Server-Patches/0401-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0400-Lag-compensate-eating.patch
diff --git a/Spigot-Server-Patches/0402-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0401-Optimize-call-to-getFluid-for-explosions.patch
similarity index 100%
rename from Spigot-Server-Patches/0402-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0401-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/Spigot-Server-Patches/0403-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0402-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0403-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0402-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/Spigot-Server-Patches/0404-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0403-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-Server-Patches/0404-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0403-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-Server-Patches/0405-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0404-Tracking-Range-Improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0405-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0404-Tracking-Range-Improvements.patch
diff --git a/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0405-Entity-Activation-Range-2.0.patch
diff --git a/Spigot-Server-Patches/0407-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0406-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from Spigot-Server-Patches/0407-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0406-Fix-items-vanishing-through-end-portal.patch
diff --git a/Spigot-Server-Patches/0408-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0407-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from Spigot-Server-Patches/0408-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0407-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0408-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0408-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/Spigot-Server-Patches/0410-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0409-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0410-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0409-Allow-overriding-the-java-version-check.patch
diff --git a/Spigot-Server-Patches/0411-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0410-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0411-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0410-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0411-Optimise-random-block-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0411-Optimise-random-block-ticking.patch
diff --git a/Spigot-Server-Patches/0413-Entity-Jump-API.patch b/Spigot-Server-Patches/0412-Entity-Jump-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0413-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0412-Entity-Jump-API.patch
diff --git a/Spigot-Server-Patches/0414-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0413-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0414-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0413-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/Spigot-Server-Patches/0415-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0414-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from Spigot-Server-Patches/0415-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0414-Make-the-GUI-graph-fancier.patch
diff --git a/Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0415-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0415-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/Spigot-Server-Patches/0417-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0416-Prevent-teleporting-dead-entities.patch
similarity index 90%
rename from Spigot-Server-Patches/0417-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0416-Prevent-teleporting-dead-entities.patch
index fb9effb322..49a655f3e7 100644
--- a/Spigot-Server-Patches/0417-Prevent-teleporting-dead-entities.patch
+++ b/Spigot-Server-Patches/0416-Prevent-teleporting-dead-entities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2b3baee3e6cda70f4c6d1428c47f140c674421a8..0a08705bebce75888806ecd35b53de4397ae0bac 100644
+index 7dc2c389fba46867807d76f75fea9fd7264d82e3..d92b2bbfa1e2b284b624efd261d8803db1c4de2c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1235,6 +1235,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0418-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0417-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from Spigot-Server-Patches/0418-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0417-Validate-tripwire-hook-placement-before-update.patch
diff --git a/Spigot-Server-Patches/0419-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0418-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0419-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0418-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/Spigot-Server-Patches/0420-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0419-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from Spigot-Server-Patches/0420-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0419-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/Spigot-Server-Patches/0421-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0420-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from Spigot-Server-Patches/0421-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0420-Optimise-Chunk-getFluid.patch
diff --git a/Spigot-Server-Patches/0422-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0421-Optimise-TickListServer-by-rewriting-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0422-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0421-Optimise-TickListServer-by-rewriting-it.patch
diff --git a/Spigot-Server-Patches/0423-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0422-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 100%
rename from Spigot-Server-Patches/0423-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0422-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/Spigot-Server-Patches/0424-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0423-Ensure-Entity-is-never-double-registered.patch
similarity index 100%
rename from Spigot-Server-Patches/0424-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0423-Ensure-Entity-is-never-double-registered.patch
diff --git a/Spigot-Server-Patches/0425-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0424-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0425-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0424-Fix-unregistering-entities-from-unloading-chunks.patch
diff --git a/Spigot-Server-Patches/0426-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0425-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 86%
rename from Spigot-Server-Patches/0426-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0425-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index e162039849..39edde9e60 100644
--- a/Spigot-Server-Patches/0426-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/Spigot-Server-Patches/0425-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 0463e5977f7a4add517ed710886dc372e7c7521e..85f15f48abf3199ce3fd9a3ebef1eb7863115ba0 100644
+index 54ef6eeb8866915f03fb16413c8b5f36a7501f82..fa72eae6befb9d05244b65bcaaed35e9fb492027 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -359,11 +359,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -355,11 +355,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          }
  
          if (this.remoteControlListener != null) {
diff --git a/Spigot-Server-Patches/0427-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0426-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from Spigot-Server-Patches/0427-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0426-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/Spigot-Server-Patches/0428-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0427-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0428-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0427-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/Spigot-Server-Patches/0429-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0428-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0429-Optimize-Collision-to-not-load-chunks.patch
rename to Spigot-Server-Patches/0428-Optimize-Collision-to-not-load-chunks.patch
diff --git a/Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0429-Don-t-tick-dead-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0429-Don-t-tick-dead-players.patch
diff --git a/Spigot-Server-Patches/0431-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0430-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0431-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0430-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/Spigot-Server-Patches/0432-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0431-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0432-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0431-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/Spigot-Server-Patches/0433-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0432-Increase-Light-Queue-Size.patch
similarity index 100%
rename from Spigot-Server-Patches/0433-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0432-Increase-Light-Queue-Size.patch
diff --git a/Spigot-Server-Patches/0434-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0433-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 100%
rename from Spigot-Server-Patches/0434-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0433-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
diff --git a/Spigot-Server-Patches/0435-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0434-Don-t-move-existing-players-to-world-spawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0435-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0434-Don-t-move-existing-players-to-world-spawn.patch
diff --git a/Spigot-Server-Patches/0436-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0435-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0436-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0435-Add-tick-times-API-and-mspt-command.patch
diff --git a/Spigot-Server-Patches/0437-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0436-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-Server-Patches/0437-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0436-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-Server-Patches/0438-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0437-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0438-Add-Raw-Byte-ItemStack-Serialization.patch
rename to Spigot-Server-Patches/0437-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/Spigot-Server-Patches/0439-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0438-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from Spigot-Server-Patches/0439-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0438-Remove-streams-from-Mob-AI-System.patch
diff --git a/Spigot-Server-Patches/0440-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0439-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0440-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0439-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
diff --git a/Spigot-Server-Patches/0441-Async-command-map-building.patch b/Spigot-Server-Patches/0440-Async-command-map-building.patch
similarity index 100%
rename from Spigot-Server-Patches/0441-Async-command-map-building.patch
rename to Spigot-Server-Patches/0440-Async-command-map-building.patch
diff --git a/Spigot-Server-Patches/0442-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0441-Improved-Watchdog-Support.patch
similarity index 98%
rename from Spigot-Server-Patches/0442-Improved-Watchdog-Support.patch
rename to Spigot-Server-Patches/0441-Improved-Watchdog-Support.patch
index 4921002deb..23c80f61ee 100644
--- a/Spigot-Server-Patches/0442-Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/0441-Improved-Watchdog-Support.patch
@@ -67,10 +67,10 @@ index 95e6a6de7ccfc4445d0ac19c5f874c0d533b1712..cc6e6f245ee5e73bd570cf42381bf55e
              throwable = throwable.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 85f15f48abf3199ce3fd9a3ebef1eb7863115ba0..4aba1ca82638b05e072ec16635b890c1b5c67de8 100644
+index fa72eae6befb9d05244b65bcaaed35e9fb492027..03b38e2c53376db25864a0c6f00f786c4dae215d 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -242,7 +242,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -238,7 +238,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              long j = SystemUtils.getMonotonicNanos() - i;
              String s = String.format(Locale.ROOT, "%.3fs", (double) j / 1.0E9D);
  
@@ -79,7 +79,7 @@ index 85f15f48abf3199ce3fd9a3ebef1eb7863115ba0..4aba1ca82638b05e072ec16635b890c1
              if (dedicatedserverproperties.announcePlayerAchievements != null) {
                  ((GameRules.GameRuleBoolean) this.getGameRules().get(GameRules.ANNOUNCE_ADVANCEMENTS)).a(dedicatedserverproperties.announcePlayerAchievements, (MinecraftServer) this);
              }
-@@ -366,6 +366,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -362,6 +362,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              //this.remoteStatusListener.b(); // Paper - don't wait for remote connections
          }
  
@@ -87,7 +87,7 @@ index 85f15f48abf3199ce3fd9a3ebef1eb7863115ba0..4aba1ca82638b05e072ec16635b890c1
          System.exit(0); // CraftBukkit
      }
  
-@@ -699,7 +700,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -695,7 +696,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      @Override
      public void stop() {
          super.stop();
@@ -292,7 +292,7 @@ index bf8df178256e5eebbdadfd53e2f0edbfced0aba3..f76bbac925aef6d1e917195ed2f2b4da
  
          // Paper start - Remove from collideRule team if needed
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 391eca025b69ea96f16403459c7908378cf48eff..e3f6e17fb1f670fcb1096314b801c018ef0966a7 100644
+index 1fe1df445ba56b2f176ee25502a774aa0a7bd00b..916a6a1fc1ccc73e4fb974ad77310d16fd8bd7e6 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -123,6 +123,7 @@ public class SystemUtils {
diff --git a/Spigot-Server-Patches/0443-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0442-Optimize-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0443-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0442-Optimize-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0444-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0443-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0444-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0443-Reduce-Either-Optional-allocation.patch
diff --git a/Spigot-Server-Patches/0445-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0444-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0445-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0444-Remove-streams-from-PairedQueue.patch
diff --git a/Spigot-Server-Patches/0446-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0445-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from Spigot-Server-Patches/0446-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0445-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/Spigot-Server-Patches/0447-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0446-Prevent-opening-inventories-when-frozen.patch
similarity index 100%
rename from Spigot-Server-Patches/0447-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0446-Prevent-opening-inventories-when-frozen.patch
diff --git a/Spigot-Server-Patches/0448-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0447-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from Spigot-Server-Patches/0448-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0447-Optimise-ArraySetSorted-removeIf.patch
diff --git a/Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0448-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0448-Don-t-run-entity-collision-code-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0450-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0449-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 100%
rename from Spigot-Server-Patches/0450-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0449-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
diff --git a/Spigot-Server-Patches/0451-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0450-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from Spigot-Server-Patches/0451-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0450-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/Spigot-Server-Patches/0452-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0451-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0452-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0451-Implement-Player-Client-Options-API.patch
diff --git a/Spigot-Server-Patches/0453-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0452-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from Spigot-Server-Patches/0453-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0452-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/Spigot-Server-Patches/0454-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0453-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0454-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0453-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/Spigot-Server-Patches/0455-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0454-Broadcast-join-message-to-console.patch
similarity index 100%
rename from Spigot-Server-Patches/0455-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0454-Broadcast-join-message-to-console.patch
diff --git a/Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0455-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0455-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
diff --git a/Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch
similarity index 99%
rename from Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch
index e65420df6b..fbb4c6ea80 100644
--- a/Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch
+++ b/Spigot-Server-Patches/0456-Load-Chunks-for-Login-Asynchronously.patch
@@ -73,7 +73,7 @@ index 0cb8f5a4a5cc5e302815af4c1ed325dfbc75235b..456cb9feebc8afef50cefb85b4d4c1da
              if (entityplayer != null) {
                  this.g = LoginListener.EnumProtocolState.DELAY_ACCEPT;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0a08705bebce75888806ecd35b53de4397ae0bac..c7d88d9c190f0604189e6bfabc0250453b1a68c9 100644
+index d92b2bbfa1e2b284b624efd261d8803db1c4de2c..507c844e7aa43b6bdf5d2fff08c271ab025ba926 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -70,6 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0457-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0458-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0458-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/Spigot-Server-Patches/0460-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0459-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from Spigot-Server-Patches/0460-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0459-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/Spigot-Server-Patches/0461-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0460-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0461-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0460-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0461-Add-phantom-creative-and-insomniac-controls.patch
similarity index 100%
rename from Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0461-Add-phantom-creative-and-insomniac-controls.patch
diff --git a/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 100%
rename from Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0462-Fix-numerous-item-duplication-issues-and-teleport-is.patch
diff --git a/Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0463-Implement-Brigadier-Mojang-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0463-Implement-Brigadier-Mojang-API.patch
index b044bee64a..18940d3854 100644
--- a/Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch
+++ b/Spigot-Server-Patches/0463-Implement-Brigadier-Mojang-API.patch
@@ -69,7 +69,7 @@ index 54a1988341a4a6e80ab40624280b7c92532d5db6..7073d697a5d35b9b72ea05d5608438ac
      public boolean hasPermission(int i) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c7d88d9c190f0604189e6bfabc0250453b1a68c9..256ee3f8d8ef5a8e5b2a833b66c10e906de75b2c 100644
+index 507c844e7aa43b6bdf5d2fff08c271ab025ba926..48d72cd722e1d8207c9eaa2d4d7970af299b8d0d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -579,8 +579,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0465-Villager-Restocks-API.patch b/Spigot-Server-Patches/0464-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0465-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0464-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0465-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 94%
rename from Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0465-Validate-PickItem-Packet-and-kick-for-invalid.patch
index fe5bc6ed97..26bac0983e 100644
--- a/Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/Spigot-Server-Patches/0465-Validate-PickItem-Packet-and-kick-for-invalid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 256ee3f8d8ef5a8e5b2a833b66c10e906de75b2c..6b7894a712abf435df028b4036a88b9acea148e6 100644
+index 48d72cd722e1d8207c9eaa2d4d7970af299b8d0d..a19ef358baa4daff6753d034e7c8aab81cd14aa4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -692,7 +692,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0467-Expose-game-version.patch b/Spigot-Server-Patches/0466-Expose-game-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0467-Expose-game-version.patch
rename to Spigot-Server-Patches/0466-Expose-game-version.patch
diff --git a/Spigot-Server-Patches/0468-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0467-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0467-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0468-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0468-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0469-Implement-Mob-Goal-API.patch
similarity index 99%
rename from Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0469-Implement-Mob-Goal-API.patch
index 8e02dc3f19..ca323b7920 100644
--- a/Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0469-Implement-Mob-Goal-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/pom.xml b/pom.xml
-index b67b01c5af49b948fc0642a8caa6d5df5c1ed13e..838f199b69d97fd7029837b4205c864325d113b1 100644
+index c10888b862541e244c9c9c60d45ef9fee59ae3e8..add3a9c1a9ea823a62783351cfb4cf4269752c26 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -133,6 +133,13 @@
+@@ -134,6 +134,13 @@
              <version>1.3</version>
              <scope>test</scope>
          </dependency>
diff --git a/Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0470-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0470-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0472-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0471-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 100%
rename from Spigot-Server-Patches/0472-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0471-Optimize-isOutsideRange-to-use-distance-maps.patch
diff --git a/Spigot-Server-Patches/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0474-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0473-No-Tick-view-distance-implementation.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0473-No-Tick-view-distance-implementation.patch
diff --git a/Spigot-Server-Patches/0475-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0474-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0475-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0474-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0476-Fix-Light-Command.patch b/Spigot-Server-Patches/0475-Fix-Light-Command.patch
similarity index 100%
rename from Spigot-Server-Patches/0476-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0475-Fix-Light-Command.patch
diff --git a/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0476-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0476-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0478-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0477-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0477-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0479-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0478-Don-t-toString-block-unless-actually-showing-the-mes.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Don-t-toString-block-unless-actually-showing-the-mes.patch
rename to Spigot-Server-Patches/0478-Don-t-toString-block-unless-actually-showing-the-mes.patch
diff --git a/Spigot-Server-Patches/0480-Potential-bed-API.patch b/Spigot-Server-Patches/0479-Potential-bed-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0480-Potential-bed-API.patch
rename to Spigot-Server-Patches/0479-Potential-bed-API.patch
diff --git a/Spigot-Server-Patches/0481-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0480-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0481-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0480-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/Spigot-Server-Patches/0482-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0481-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0481-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0483-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0482-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0482-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/Spigot-Server-Patches/0484-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0483-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0484-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0483-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0485-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0484-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0484-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0486-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0485-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from Spigot-Server-Patches/0486-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0485-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/Spigot-Server-Patches/0487-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0486-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0487-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0486-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0488-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0487-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0487-Add-option-for-console-having-all-permissions.patch
diff --git a/Spigot-Server-Patches/0489-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0488-Workaround-for-Client-Lag-Spikes-MC-162253.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Workaround-for-Client-Lag-Spikes-MC-162253.patch
rename to Spigot-Server-Patches/0488-Workaround-for-Client-Lag-Spikes-MC-162253.patch
diff --git a/Spigot-Server-Patches/0490-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0489-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 99%
rename from Spigot-Server-Patches/0490-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0489-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
index 881e0b2d2a..38ceebb5df 100644
--- a/Spigot-Server-Patches/0490-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
+++ b/Spigot-Server-Patches/0489-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
@@ -1146,7 +1146,7 @@ index fba7c9b5724114eab35a3d24febdee3cd3e30aa0..753d67c8a711d293bd70eb913c47ec81
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6b7894a712abf435df028b4036a88b9acea148e6..def198c58892299f29a55ec99e94dfd2f0ab0b16 100644
+index a19ef358baa4daff6753d034e7c8aab81cd14aa4..d2e1f086d25213549c813555464a8aeea28cee0f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1295,6 +1295,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0491-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0490-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0490-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0492-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0491-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0491-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/Spigot-Server-Patches/0493-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0492-Improve-Chunk-Status-Transition-Speed.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0492-Improve-Chunk-Status-Transition-Speed.patch
diff --git a/Spigot-Server-Patches/0494-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0493-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0494-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0493-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0495-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0494-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0494-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0496-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0495-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0495-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/Spigot-Server-Patches/0497-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0496-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0496-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0498-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0497-Optimize-Light-Engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0498-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0497-Optimize-Light-Engine.patch
diff --git a/Spigot-Server-Patches/0499-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0498-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from Spigot-Server-Patches/0499-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0498-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/Spigot-Server-Patches/0500-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0499-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0500-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0499-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/Spigot-Server-Patches/0501-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0500-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0500-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0502-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0501-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0501-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0503-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0502-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0502-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/Spigot-Server-Patches/0504-Fix-sand-duping.patch b/Spigot-Server-Patches/0503-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0503-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0505-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0504-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 94%
rename from Spigot-Server-Patches/0505-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0504-Prevent-position-desync-in-playerconnection-causing-.patch
index 14130dacdd..f51696e2d6 100644
--- a/Spigot-Server-Patches/0505-Prevent-position-desync-in-playerconnection-causing-.patch
+++ b/Spigot-Server-Patches/0504-Prevent-position-desync-in-playerconnection-causing-.patch
@@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside
 of the move call and into an appropriate place in the tick method.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index def198c58892299f29a55ec99e94dfd2f0ab0b16..f8826f53a3e7c44e50041516e83b92f609a53cb0 100644
+index d2e1f086d25213549c813555464a8aeea28cee0f..24a442f2ef4fd8b5ea4cd25d7be1a7dbe2429cec 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1092,6 +1092,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0506-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0505-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0505-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0507-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0506-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0507-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0506-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0508-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0507-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0507-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0509-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0508-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0509-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0508-Add-and-implement-PlayerRecipeBookClickEvent.patch
index a84b84ef31..365faeda39 100644
--- a/Spigot-Server-Patches/0509-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/Spigot-Server-Patches/0508-Add-and-implement-PlayerRecipeBookClickEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f8826f53a3e7c44e50041516e83b92f609a53cb0..ccf3ffaee04b00e9b508a1e3c7f39bf178173d56 100644
+index 24a442f2ef4fd8b5ea4cd25d7be1a7dbe2429cec..20e423267d03b5fa032925c8214e1e33dbfcfede 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2515,9 +2515,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0510-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0509-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0510-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0509-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0511-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0510-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0510-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0512-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0511-Add-permission-for-command-blocks.patch
similarity index 97%
rename from Spigot-Server-Patches/0512-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0511-Add-permission-for-command-blocks.patch
index 950d1e3292..00d6df4da2 100644
--- a/Spigot-Server-Patches/0512-Add-permission-for-command-blocks.patch
+++ b/Spigot-Server-Patches/0511-Add-permission-for-command-blocks.patch
@@ -31,7 +31,7 @@ index 7e13b1cf6d92c3e0f2dab1ba1d42bd4f250e256c..3820acd65f3cd488dba964e6d9c45885
          } else {
              if (entityhuman.getWorld().isClientSide) {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ccf3ffaee04b00e9b508a1e3c7f39bf178173d56..1a16dfff50920eb041d4a91486d02281fe1f52bd 100644
+index 20e423267d03b5fa032925c8214e1e33dbfcfede..5b7f6f5504be294e4d5ff5a891644c8b45222ae2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -607,7 +607,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -53,7 +53,7 @@ index ccf3ffaee04b00e9b508a1e3c7f39bf178173d56..1a16dfff50920eb041d4a91486d02281
          } else {
              CommandBlockListenerAbstract commandblocklistenerabstract = packetplayinsetcommandminecart.a(this.player.world);
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 734855c1db3215d90b2743988f64af68aacb388e..6d192b27440ddfd34555005dafefbce6bbb67236 100644
+index dec20939ae312f24f13f02c4a275f45974467cb0..300fad4b4a2950e7e613f0ef97ac9e8740c09243 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -353,7 +353,7 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/0513-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0512-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0513-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0512-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/Spigot-Server-Patches/0514-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0513-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0513-Optimize-WorldBorder-collision-checks-and-air.patch
diff --git a/Spigot-Server-Patches/0515-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0514-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 94%
rename from Spigot-Server-Patches/0515-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0514-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 888d8d3ac7..fc81ffc6ed 100644
--- a/Spigot-Server-Patches/0515-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/Spigot-Server-Patches/0514-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -26,10 +26,10 @@ index bc71070c670d1a64c60b9f19711a5e8a50ace56e..9efc743e028650ccc9cda5a2c9deb183
              return 0;
          }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 4aba1ca82638b05e072ec16635b890c1b5c67de8..0eabd62adbc34a2d39a613c3eb580b86628a194c 100644
+index 03b38e2c53376db25864a0c6f00f786c4dae215d..f55dc28f3e220966199ec718a437e50ef4b76027 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -325,7 +325,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -321,7 +321,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
  
      @Override
      public void updateWorldSettings() {
@@ -63,7 +63,7 @@ index fa64622f78399b934b9246b03d747ad0997354a9..474b1a3d4e09489d18a9b2b07131af3d
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1a16dfff50920eb041d4a91486d02281fe1f52bd..eb461d328349689a7ae1a905ff3e891830f28b47 100644
+index 5b7f6f5504be294e4d5ff5a891644c8b45222ae2..c5f9d472d631e54c61e886e9b5915640ed4dcdba 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2779,7 +2779,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0516-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0515-Paper-dumpitem-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Paper-dumpitem-command.patch
rename to Spigot-Server-Patches/0515-Paper-dumpitem-command.patch
diff --git a/Spigot-Server-Patches/0517-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0516-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Don-t-allow-null-UUID-s-for-chat.patch
rename to Spigot-Server-Patches/0516-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0518-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0517-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Improve-Legacy-Component-serialization-size.patch
rename to Spigot-Server-Patches/0517-Improve-Legacy-Component-serialization-size.patch
diff --git a/Spigot-Server-Patches/0519-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0518-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Support-old-UUID-format-for-NBT.patch
rename to Spigot-Server-Patches/0518-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0520-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0519-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0520-Clean-up-duplicated-GameProfile-Properties.patch
rename to Spigot-Server-Patches/0519-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0521-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0520-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0521-Convert-legacy-attributes-in-Item-Meta.patch
rename to Spigot-Server-Patches/0520-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0522-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0521-Remove-some-streams-from-structures.patch
similarity index 100%
rename from Spigot-Server-Patches/0522-Remove-some-streams-from-structures.patch
rename to Spigot-Server-Patches/0521-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0523-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0522-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from Spigot-Server-Patches/0523-Remove-streams-from-classes-related-villager-gossip.patch
rename to Spigot-Server-Patches/0522-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0524-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0523-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Support-components-in-ItemMeta.patch
rename to Spigot-Server-Patches/0523-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0525-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0524-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from Spigot-Server-Patches/0525-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to Spigot-Server-Patches/0524-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0526-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0525-Add-entity-liquid-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0526-Add-entity-liquid-API.patch
rename to Spigot-Server-Patches/0525-Add-entity-liquid-API.patch
diff --git a/Spigot-Server-Patches/0527-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0526-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from Spigot-Server-Patches/0527-Update-itemstack-legacy-name-and-lore.patch
rename to Spigot-Server-Patches/0526-Update-itemstack-legacy-name-and-lore.patch
diff --git a/Spigot-Server-Patches/0528-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0527-Spawn-player-in-correct-world-on-login.patch
similarity index 100%
rename from Spigot-Server-Patches/0528-Spawn-player-in-correct-world-on-login.patch
rename to Spigot-Server-Patches/0527-Spawn-player-in-correct-world-on-login.patch
diff --git a/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0528-Add-PrepareResultEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch
rename to Spigot-Server-Patches/0528-Add-PrepareResultEvent.patch
diff --git a/Spigot-Server-Patches/0530-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0529-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from Spigot-Server-Patches/0530-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-Server-Patches/0529-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0530-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 100%
rename from Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to Spigot-Server-Patches/0530-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
diff --git a/Spigot-Server-Patches/0532-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0531-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0532-Optimize-NetworkManager-Exception-Handling.patch
rename to Spigot-Server-Patches/0531-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0533-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0532-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from Spigot-Server-Patches/0533-Fix-Concurrency-issue-in-WeightedList.patch
rename to Spigot-Server-Patches/0532-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0534-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0533-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0534-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to Spigot-Server-Patches/0533-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0535-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0534-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from Spigot-Server-Patches/0535-Fix-arrows-never-despawning-MC-125757.patch
rename to Spigot-Server-Patches/0534-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/Spigot-Server-Patches/0536-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0535-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0536-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to Spigot-Server-Patches/0535-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0537-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0536-Move-range-check-for-block-placing-up.patch
similarity index 96%
rename from Spigot-Server-Patches/0537-Move-range-check-for-block-placing-up.patch
rename to Spigot-Server-Patches/0536-Move-range-check-for-block-placing-up.patch
index dd0664a10b..20d4b9b49c 100644
--- a/Spigot-Server-Patches/0537-Move-range-check-for-block-placing-up.patch
+++ b/Spigot-Server-Patches/0536-Move-range-check-for-block-placing-up.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eb461d328349689a7ae1a905ff3e891830f28b47..2ac264d0b4946d22877f002a86b39e11593c8c90 100644
+index c5f9d472d631e54c61e886e9b5915640ed4dcdba..45cf34c35af9d2ae9a60ff81af5bea3495d4621f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1428,15 +1428,19 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0538-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0537-Fix-SPIGOT-5989.patch
similarity index 100%
rename from Spigot-Server-Patches/0538-Fix-SPIGOT-5989.patch
rename to Spigot-Server-Patches/0537-Fix-SPIGOT-5989.patch
diff --git a/Spigot-Server-Patches/0539-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0538-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from Spigot-Server-Patches/0539-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to Spigot-Server-Patches/0538-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/Spigot-Server-Patches/0540-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0539-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0540-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to Spigot-Server-Patches/0539-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/Spigot-Server-Patches/0541-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0540-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from Spigot-Server-Patches/0541-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to Spigot-Server-Patches/0540-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0542-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0541-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from Spigot-Server-Patches/0542-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to Spigot-Server-Patches/0541-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/Spigot-Server-Patches/0543-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0542-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from Spigot-Server-Patches/0543-Fix-some-rails-connecting-improperly.patch
rename to Spigot-Server-Patches/0542-Fix-some-rails-connecting-improperly.patch
diff --git a/Spigot-Server-Patches/0544-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from Spigot-Server-Patches/0544-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to Spigot-Server-Patches/0543-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/Spigot-Server-Patches/0545-Incremental-player-saving.patch b/Spigot-Server-Patches/0544-Incremental-player-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0545-Incremental-player-saving.patch
rename to Spigot-Server-Patches/0544-Incremental-player-saving.patch
diff --git a/Spigot-Server-Patches/0546-Import-fastutil-classes.patch b/Spigot-Server-Patches/0545-Import-fastutil-classes.patch
similarity index 100%
rename from Spigot-Server-Patches/0546-Import-fastutil-classes.patch
rename to Spigot-Server-Patches/0545-Import-fastutil-classes.patch
diff --git a/Spigot-Server-Patches/0547-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0546-Don-t-mark-null-chunk-sections-for-block-updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0547-Don-t-mark-null-chunk-sections-for-block-updates.patch
rename to Spigot-Server-Patches/0546-Don-t-mark-null-chunk-sections-for-block-updates.patch
diff --git a/Spigot-Server-Patches/0548-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0547-Remove-armour-stand-double-add-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Remove-armour-stand-double-add-to-world.patch
rename to Spigot-Server-Patches/0547-Remove-armour-stand-double-add-to-world.patch
diff --git a/Spigot-Server-Patches/0549-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0548-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from Spigot-Server-Patches/0549-Fix-MC-187716-Use-configured-height.patch
rename to Spigot-Server-Patches/0548-Fix-MC-187716-Use-configured-height.patch
diff --git a/Spigot-Server-Patches/0550-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch b/Spigot-Server-Patches/0549-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
similarity index 100%
rename from Spigot-Server-Patches/0550-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
rename to Spigot-Server-Patches/0549-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
diff --git a/Spigot-Server-Patches/0551-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0550-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0551-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to Spigot-Server-Patches/0550-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/Spigot-Server-Patches/0552-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0551-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0552-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to Spigot-Server-Patches/0551-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/Spigot-Server-Patches/0553-Brand-support.patch b/Spigot-Server-Patches/0552-Brand-support.patch
similarity index 97%
rename from Spigot-Server-Patches/0553-Brand-support.patch
rename to Spigot-Server-Patches/0552-Brand-support.patch
index 4bb0299721..3fb2edae2f 100644
--- a/Spigot-Server-Patches/0553-Brand-support.patch
+++ b/Spigot-Server-Patches/0552-Brand-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Brand support
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2ac264d0b4946d22877f002a86b39e11593c8c90..3aa56d5246660aa49fa881f0b3c80c986cb4a27f 100644
+index 45cf34c35af9d2ae9a60ff81af5bea3495d4621f..16664a446192c77903ff1f10989c7afab703eb49 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -4,6 +4,7 @@ import com.google.common.primitives.Doubles;
diff --git a/Spigot-Server-Patches/0554-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0553-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
similarity index 100%
rename from Spigot-Server-Patches/0554-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
rename to Spigot-Server-Patches/0553-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
diff --git a/Spigot-Server-Patches/0555-Fix-MC-197271.patch b/Spigot-Server-Patches/0554-Fix-MC-197271.patch
similarity index 100%
rename from Spigot-Server-Patches/0555-Fix-MC-197271.patch
rename to Spigot-Server-Patches/0554-Fix-MC-197271.patch
diff --git a/Spigot-Server-Patches/0556-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0555-MC-197883-Bandaid-decode-issue.patch
similarity index 100%
rename from Spigot-Server-Patches/0556-MC-197883-Bandaid-decode-issue.patch
rename to Spigot-Server-Patches/0555-MC-197883-Bandaid-decode-issue.patch
diff --git a/Spigot-Server-Patches/0557-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0556-Add-setMaxPlayers-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0557-Add-setMaxPlayers-API.patch
rename to Spigot-Server-Patches/0556-Add-setMaxPlayers-API.patch
diff --git a/Spigot-Server-Patches/0558-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0557-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0558-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-Server-Patches/0557-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0559-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0558-Don-t-require-FACING-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0559-Don-t-require-FACING-data.patch
rename to Spigot-Server-Patches/0558-Don-t-require-FACING-data.patch
diff --git a/Spigot-Server-Patches/0560-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0559-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from Spigot-Server-Patches/0560-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to Spigot-Server-Patches/0559-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/Spigot-Server-Patches/0561-Add-moon-phase-API.patch b/Spigot-Server-Patches/0560-Add-moon-phase-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0561-Add-moon-phase-API.patch
rename to Spigot-Server-Patches/0560-Add-moon-phase-API.patch
diff --git a/Spigot-Server-Patches/0562-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0561-Prevent-headless-pistons-from-being-created.patch
similarity index 100%
rename from Spigot-Server-Patches/0562-Prevent-headless-pistons-from-being-created.patch
rename to Spigot-Server-Patches/0561-Prevent-headless-pistons-from-being-created.patch
diff --git a/Spigot-Server-Patches/0563-Brand-support.patch b/Spigot-Server-Patches/0562-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0563-Brand-support.patch
rename to Spigot-Server-Patches/0562-Brand-support.patch
diff --git a/Spigot-Server-Patches/0564-Add-BellRingEvent.patch b/Spigot-Server-Patches/0563-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0564-Add-BellRingEvent.patch
rename to Spigot-Server-Patches/0563-Add-BellRingEvent.patch
diff --git a/Spigot-Server-Patches/0565-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0564-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from Spigot-Server-Patches/0565-Add-zombie-targets-turtle-egg-config.patch
rename to Spigot-Server-Patches/0564-Add-zombie-targets-turtle-egg-config.patch
diff --git a/Spigot-Server-Patches/0566-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0565-Buffer-joins-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0566-Buffer-joins-to-world.patch
rename to Spigot-Server-Patches/0565-Buffer-joins-to-world.patch
diff --git a/Spigot-Server-Patches/0567-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0566-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0567-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0566-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0568-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0567-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0568-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to Spigot-Server-Patches/0567-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/Spigot-Server-Patches/0569-Fix-NPE-in-getBedSpawnLocation.patch b/Spigot-Server-Patches/0568-Fix-NPE-in-getBedSpawnLocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0569-Fix-NPE-in-getBedSpawnLocation.patch
rename to Spigot-Server-Patches/0568-Fix-NPE-in-getBedSpawnLocation.patch
diff --git a/Spigot-Server-Patches/0570-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0570-PortalCreateEvent-needs-to-know-its-entity.patch
rename to Spigot-Server-Patches/0569-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/Spigot-Server-Patches/0571-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0570-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0571-Fix-CraftTeam-null-check.patch
rename to Spigot-Server-Patches/0570-Fix-CraftTeam-null-check.patch
diff --git a/Spigot-Server-Patches/0572-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0571-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0572-Add-more-Evoker-API.patch
rename to Spigot-Server-Patches/0571-Add-more-Evoker-API.patch
diff --git a/Spigot-Server-Patches/0573-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0572-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-Server-Patches/0573-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-Server-Patches/0572-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-Server-Patches/0574-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0573-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0574-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-Server-Patches/0573-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/Spigot-Server-Patches/0575-Cache-block-data-strings.patch b/Spigot-Server-Patches/0574-Cache-block-data-strings.patch
similarity index 100%
rename from Spigot-Server-Patches/0575-Cache-block-data-strings.patch
rename to Spigot-Server-Patches/0574-Cache-block-data-strings.patch
diff --git a/Spigot-Server-Patches/0576-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
similarity index 97%
rename from Spigot-Server-Patches/0576-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
rename to Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index d564e28cb3..1a0c5783bd 100644
--- a/Spigot-Server-Patches/0576-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/Spigot-Server-Patches/0575-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -21,7 +21,7 @@ index f9f6a57e4e07d94c01d6b559e8138404b78d31f3..cfb14c54d648e6b8f83382601bd63905
          this.yaw = f;
          this.pitch = f1;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3aa56d5246660aa49fa881f0b3c80c986cb4a27f..b067f3b7031509bb94e617785e5a4d19b9d5d3e1 100644
+index 16664a446192c77903ff1f10989c7afab703eb49..05b3a7478195037927cd1a902b603862d9747e61 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -501,7 +501,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
diff --git a/Spigot-Server-Patches/0577-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch b/Spigot-Server-Patches/0576-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch
similarity index 100%
rename from Spigot-Server-Patches/0577-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch
rename to Spigot-Server-Patches/0576-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch
diff --git a/Spigot-Server-Patches/0578-Fix-block-data-exception-when-cancelling-PortalCreat.patch b/Spigot-Server-Patches/0577-Fix-block-data-exception-when-cancelling-PortalCreat.patch
similarity index 100%
rename from Spigot-Server-Patches/0578-Fix-block-data-exception-when-cancelling-PortalCreat.patch
rename to Spigot-Server-Patches/0577-Fix-block-data-exception-when-cancelling-PortalCreat.patch
diff --git a/Spigot-Server-Patches/0579-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0578-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0579-Add-additional-open-container-api-to-HumanEntity.patch
rename to Spigot-Server-Patches/0578-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6f55306c44..d5a7296002 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6f55306c444c3356c4ae394dd708a97451b06fa2
+Subproject commit d5a72960028deccea210ec9883403fd01e37b09e
diff --git a/work/Spigot b/work/Spigot
index 3a70bd92b9..2740d5aebd 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 3a70bd92b96d836dd046576a57deb7c8573c88a7
+Subproject commit 2740d5aebd99bc6b79dc65e2491ae1fd85b64480