From 1ab021ddca9dc2bd48ce4308cccb7440528af25a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 31 Aug 2020 08:30:51 -0400
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent

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

diff --git a/Spigot-API-Patches/0107-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0107-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
index b8ffc57f65..71a82a8eae 100644
--- a/Spigot-API-Patches/0107-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ b/Spigot-API-Patches/0107-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
@@ -6,45 +6,39 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
 Adds ability to get what arrow was shot, and control if it should be consumed.
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-index 18c5e31abcdc24320bb6c01e85ba85c848956bd4..37dbc12eb47060ebf0f6a18960d036bd27ce3740 100644
+index d4d7ad9c3c953680342c121f39ddaef476549047..719d0d878320c1903b44076053989ba99fa0e92a 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java
-@@ -2,6 +2,7 @@ package org.bukkit.event.entity;
- 
- import org.bukkit.entity.Entity;
- import org.bukkit.entity.LivingEntity;
-+import org.bukkit.entity.Projectile; // Paper
- import org.bukkit.event.Cancellable;
- import org.bukkit.event.HandlerList;
- import org.bukkit.inventory.ItemStack;
-@@ -17,9 +18,30 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
-     private Entity projectile;
+@@ -22,7 +22,32 @@ public class EntityShootBowEvent extends EntityEvent implements Cancellable {
      private final float force;
+     private boolean consumeItem;
      private boolean cancelled;
 +    // Paper start
-+    private boolean consumeArrow = true;
-+    private final ItemStack arrowItem;
++    @Deprecated
 +    public void setConsumeArrow(boolean consumeArrow) {
-+        this.consumeArrow = consumeArrow;
-+    }
-+    public boolean getConsumeArrow() {
-+        return consumeArrow;
-+    }
- 
-+    @NotNull
-+    public ItemStack getArrowItem() {
-+        return arrowItem;
++        this.setConsumeItem(consumeArrow);
 +    }
 +
 +    @Deprecated
-     public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Entity projectile, final float force) {
-+        this(shooter, bow, new ItemStack(org.bukkit.Material.AIR), projectile, force);
++    public boolean getConsumeArrow() {
++        return this.shouldConsumeItem();
 +    }
 +
++    @NotNull @Deprecated
++    public ItemStack getArrowItem() {
++        return this.getConsumable();
++    }
++
++    @Deprecated
++    public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull final Entity projectile, final float force) {
++        this(shooter, bow, new ItemStack(org.bukkit.Material.AIR), projectile, force);
++    }
+ 
++    @Deprecated
 +    public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @NotNull ItemStack arrowItem, @NotNull final Entity projectile, final float force) {
++        this(shooter, bow, arrowItem, projectile, EquipmentSlot.HAND, force, true);
++    }
++    // Paper end
+     public EntityShootBowEvent(@NotNull final LivingEntity shooter, @Nullable final ItemStack bow, @Nullable final ItemStack consumable, @NotNull final Entity projectile, @NotNull final EquipmentSlot hand, final float force, final boolean consumeItem) {
          super(shooter);
-+        this.arrowItem = arrowItem;
-+        // Paper end
          this.bow = bow;
-         this.projectile = projectile;
-         this.force = force;
diff --git a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
index a72cc27487..76aee754b8 100644
--- a/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0116-Add-EntityZapEvent.patch
@@ -38,10 +38,10 @@ index 0182836a801da077ca0e6fcc75e7095454fb2349..17ae6530bda22144866e94e8449220d1
              entitywitch.prepare(worldserver, worldserver.getDamageScaler(entitywitch.getChunkCoordinates()), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null);
              entitywitch.setNoAI(this.isNoAI());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fb30199e4dc93057941a05e7ae426ec17ced196e..46e808d55cc33abebae387d6ecceef927eab0094 100644
+index 3f1edffa421524ef7646e70d8311e9161ed776a7..9ae73eab4a484731bf4b36fdf16d01ae7c364947 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1081,6 +1081,14 @@ public class CraftEventFactory {
+@@ -1083,6 +1083,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
index 2d9a73678d..3d20d446b1 100644
--- a/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0121-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,7 +18,7 @@ index 23d5b7cb1a5cbe3409a0741af08b2fac8d1a58c1..604bdc5ab98071db88ac3e93ebf11869
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 46e808d55cc33abebae387d6ecceef927eab0094..e2b7886e63ab60110af9d01f2b8b86b7a9f79bc6 100644
+index 9ae73eab4a484731bf4b36fdf16d01ae7c364947..331b3e8df03eb737964def18ab4267f6a71315e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -123,6 +123,7 @@ import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index 46e808d55cc33abebae387d6ecceef927eab0094..e2b7886e63ab60110af9d01f2b8b86b7
  import org.bukkit.event.Cancellable;
  import org.bukkit.event.Event;
  import org.bukkit.event.Event.Result;
-@@ -1040,6 +1041,17 @@ public class CraftEventFactory {
+@@ -1042,6 +1043,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
index 291246a15d..5b255351ce 100644
--- a/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0123-Add-ProjectileCollideEvent.patch
@@ -71,10 +71,10 @@ index 7391fd31148dbde60e34955841a296f454ac768e..53a8ea7d1eff84abe6c49464d556aa27
  
          this.checkBlockCollisions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e2b7886e63ab60110af9d01f2b8b86b7a9f79bc6..848fc157dc8f22c793a523975066523424a92273 100644
+index 331b3e8df03eb737964def18ab4267f6a71315e2..de3565ec373066af1715e8e11117d22ae57e3c93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1185,6 +1185,16 @@ public class CraftEventFactory {
+@@ -1187,6 +1187,16 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
diff --git a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
index 98e1293f7a..cd09035fd0 100644
--- a/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
+++ b/Spigot-Server-Patches/0176-Option-for-maximum-exp-value-when-merging-orbs.patch
@@ -20,10 +20,10 @@ index e30f48caf2ce4f48f371b2594b765c27bc9e9778..2d8b354d707e8b5b0e7cd644fb93bc8f
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index dc8186b38930bf32f140a2da822cf359b6004a12..a96d6259f60dc5bfe477de54e837de5af066cca0 100644
+index de3565ec373066af1715e8e11117d22ae57e3c93..de207045cb007ca0b464d9f57f7f95ddeeb9bf6b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -582,16 +582,32 @@ public class CraftEventFactory {
+@@ -584,16 +584,32 @@ public class CraftEventFactory {
              EntityExperienceOrb xp = (EntityExperienceOrb) entity;
              double radius = world.spigotConfig.expMerge;
              if (radius > 0) {
diff --git a/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
index 6c6e1be7ba..f81d7bf2cb 100644
--- a/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
+++ b/Spigot-Server-Patches/0184-ExperienceOrbMergeEvent.patch
@@ -8,10 +8,10 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a96d6259f60dc5bfe477de54e837de5af066cca0..6b67e509e8a714cdee69c20f4456c9a08574c848 100644
+index de207045cb007ca0b464d9f57f7f95ddeeb9bf6b..8964687af2c86d4226c9c13c2d0a23bdaa7c4dae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -592,7 +592,7 @@ public class CraftEventFactory {
+@@ -594,7 +594,7 @@ public class CraftEventFactory {
                      if (e instanceof EntityExperienceOrb) {
                          EntityExperienceOrb loopItem = (EntityExperienceOrb) e;
                          // Paper start
diff --git a/Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
deleted file mode 100644
index 765dfa9d49..0000000000
--- a/Spigot-Server-Patches/0228-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 15 Jun 2013 19:51:17 -0400
-Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
-
-Adds ability to get what arrow was shot, and control if it should be consumed.
-
-diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-index 3f4805af98aa5d27049ac12edd17455d78bf1827..1f7b50b559504d2e0b141525ef8c84c1ebd2225b 100644
---- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
-@@ -155,7 +155,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
- 
-         entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4));
-         // CraftBukkit start
--        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), entityarrow, 0.8F);
-+        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), this.getItemInOffHand(), entityarrow, 0.8F); // Paper
-         if (event.isCancelled()) {
-             event.getProjectile().remove();
-             return;
-diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java
-index 987b59dfcd3a69886e2722477300d313340690bb..b3cb832be6db70922c5495476e89124d75c9ed6d 100644
---- a/src/main/java/net/minecraft/server/ItemBow.java
-+++ b/src/main/java/net/minecraft/server/ItemBow.java
-@@ -26,6 +26,7 @@ public class ItemBow extends ItemProjectileWeapon implements ItemVanishable {
-                 if ((double) f >= 0.1D) {
-                     boolean flag1 = flag && itemstack1.getItem() == Items.ARROW;
- 
-+                    boolean consumeArrow = true; // Paper
-                     if (!world.isClientSide) {
-                         ItemArrow itemarrow = (ItemArrow) ((ItemArrow) (itemstack1.getItem() instanceof ItemArrow ? itemstack1.getItem() : Items.ARROW));
-                         EntityArrow entityarrow = itemarrow.a(world, itemstack1, (EntityLiving) entityhuman);
-@@ -51,7 +52,7 @@ public class ItemBow extends ItemProjectileWeapon implements ItemVanishable {
-                             entityarrow.setOnFire(100);
-                         }
-                         // CraftBukkit start
--                        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityhuman, itemstack, entityarrow, f);
-+                        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityhuman, itemstack, itemstack1, entityarrow, f); // Paper
-                         if (event.isCancelled()) {
-                             event.getProjectile().remove();
-                             return;
-@@ -61,7 +62,8 @@ public class ItemBow extends ItemProjectileWeapon implements ItemVanishable {
-                         itemstack.damage(1, entityhuman, (entityhuman1) -> {
-                             entityhuman1.broadcastItemBreak(entityhuman.getRaisedHand());
-                         });
--                        if (flag1 || entityhuman.abilities.canInstantlyBuild && (itemstack1.getItem() == Items.SPECTRAL_ARROW || itemstack1.getItem() == Items.TIPPED_ARROW)) {
-+                        consumeArrow = event.getConsumeArrow(); // Paper
-+                        if (!consumeArrow || flag1 || (entityhuman.abilities.canInstantlyBuild && ((itemstack1.getItem() == Items.SPECTRAL_ARROW) || (itemstack1.getItem() == Items.TIPPED_ARROW)))) { // Paper - add
-                             entityarrow.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
-                         }
- 
-@@ -78,7 +80,7 @@ public class ItemBow extends ItemProjectileWeapon implements ItemVanishable {
-                     }
- 
-                     world.playSound((EntityHuman) null, entityhuman.locX(), entityhuman.locY(), entityhuman.locZ(), SoundEffects.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 1.0F, 1.0F / (ItemBow.RANDOM.nextFloat() * 0.4F + 1.2F) + f * 0.5F);
--                    if (!flag1 && !entityhuman.abilities.canInstantlyBuild) {
-+                    if (!flag1 && !entityhuman.abilities.canInstantlyBuild && consumeArrow) { // Paper
-                         itemstack1.subtract(1);
-                         if (itemstack1.isEmpty()) {
-                             entityhuman.inventory.f(itemstack1);
-diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 1592e94c78611a4b968bfb24daf68570e778fadd..31c80bb0a2e403c34fb9cd4b3ee4e903d90dc356 100644
---- a/src/main/java/net/minecraft/server/ItemCrossbow.java
-+++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
-@@ -205,7 +205,7 @@ public class ItemCrossbow extends ItemProjectileWeapon implements ItemVanishable
-                 ((IProjectile) object).shoot((double) vector3fa.a(), (double) vector3fa.b(), (double) vector3fa.c(), f1, f2);
-             }
-             // CraftBukkit start
--            org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityliving, itemstack, (Entity) object, f);
-+            org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(entityliving, itemstack, itemstack1, (IProjectile) object, f); // Paper // TODO: consume??
-             if (event.isCancelled()) {
-                 event.getProjectile().remove();
-                 return;
-diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6b67e509e8a714cdee69c20f4456c9a08574c848..0be27ad341ef59184d6c9f171e5e9f5a23d81f15 100644
---- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -510,16 +510,16 @@ public class CraftEventFactory {
-     /**
-      * EntityShootBowEvent
-      */
--    public static EntityShootBowEvent callEntityShootBowEvent(EntityLiving who, ItemStack itemstack, Entity entityArrow, float force) {
-+    public static EntityShootBowEvent callEntityShootBowEvent(EntityLiving who, ItemStack itemstack, ItemStack arrowItem, IProjectile entityArrow, float force) { // paper
-         LivingEntity shooter = (LivingEntity) who.getBukkitEntity();
-         CraftItemStack itemInHand = CraftItemStack.asCraftMirror(itemstack);
--        org.bukkit.entity.Entity arrow = entityArrow.getBukkitEntity();
-+        org.bukkit.entity.Entity arrow = ((Entity) entityArrow).getBukkitEntity(); // Paper
- 
-         if (itemInHand != null && (itemInHand.getType() == Material.AIR || itemInHand.getAmount() == 0)) {
-             itemInHand = null;
-         }
- 
--        EntityShootBowEvent event = new EntityShootBowEvent(shooter, itemInHand, arrow, force);
-+        EntityShootBowEvent event = new EntityShootBowEvent(shooter, itemInHand, CraftItemStack.asCraftMirror(arrowItem), arrow, force); // Paper
-         Bukkit.getPluginManager().callEvent(event);
- 
-         return event;
diff --git a/Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch b/Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch
new file mode 100644
index 0000000000..7961820bf8
--- /dev/null
+++ b/Spigot-Server-Patches/0228-Improve-EntityShootBowEvent.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Sat, 15 Jun 2013 19:51:17 -0400
+Subject: [PATCH] Improve EntityShootBowEvent
+
+Adds missing call to Illagers and also adds Arrow ItemStack to skeltons
+
+diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+index 2e03ddee685437061f123ede7c194b03d18076ee..73ac27913102f810a30bc704479b382f08a91132 100644
+--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
++++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+@@ -134,8 +134,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
+         double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2);
+ 
+         entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4));
++        // Paper start
++        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), entityarrow.getOriginalItemStack(), entityarrow, entityliving.getRaisedHand(), 0.8F, true);
++        if (event.isCancelled()) {
++            event.getProjectile().remove();
++            return;
++        }
++
++        if (event.getProjectile() == entityarrow.getBukkitEntity()) {
++            this.world.addEntity(entityarrow);
++        }
+         this.playSound(SoundEffects.ENTITY_SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
+-        this.world.addEntity(entityarrow);
++        // Paper end
+     }
+ 
+     class a extends EntityIllagerWizard.c {
+diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+index ac013d55c5df502d8a8cdf18237a0ca956a444c4..513bb3087ea8e81d36dcc8f78e22b6c63b26f582 100644
+--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
++++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+@@ -155,7 +155,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
+ 
+         entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4));
+         // CraftBukkit start
+-        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), null, entityarrow, EnumHand.MAIN_HAND, 0.8F, true);
++        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), entityarrow.getOriginalItemStack(), entityarrow, EnumHand.MAIN_HAND, 0.8F, true); // Paper
+         if (event.isCancelled()) {
+             event.getProjectile().remove();
+             return;
diff --git a/Spigot-Server-Patches/0230-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0230-Fire-EntityShootBowEvent-for-Illusioner.patch
deleted file mode 100644
index f57b41edb1..0000000000
--- a/Spigot-Server-Patches/0230-Fire-EntityShootBowEvent-for-Illusioner.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 18 Jun 2018 22:19:36 -0400
-Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-index 2e03ddee685437061f123ede7c194b03d18076ee..1c82316208f83d539cb61b20abbeb46db66a8c0b 100644
---- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
-@@ -134,8 +134,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
-         double d3 = (double) MathHelper.sqrt(d0 * d0 + d2 * d2);
- 
-         entityarrow.shoot(d0, d1 + d3 * 0.20000000298023224D, d2, 1.6F, (float) (14 - this.world.getDifficulty().a() * 4));
-+        // Paper start
-+        org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), this.getItemInOffHand(), entityarrow,0.8F);
-+        if (event.isCancelled()) {
-+            event.getProjectile().remove();
-+            return;
-+        }
-+
-+        if (event.getProjectile() == entityarrow.getBukkitEntity()) {
-+            this.world.addEntity(entityarrow);
-+        }
-         this.playSound(SoundEffects.ENTITY_SKELETON_SHOOT, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
--        this.world.addEntity(entityarrow);
-+        // Paper end
-     }
- 
-     class a extends EntityIllagerWizard.c {
diff --git a/Spigot-Server-Patches/0231-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0231-Implement-EntityKnockbackByEntityEvent.patch
rename to Spigot-Server-Patches/0230-Implement-EntityKnockbackByEntityEvent.patch
diff --git a/Spigot-Server-Patches/0232-Expand-Explosions-API.patch b/Spigot-Server-Patches/0231-Expand-Explosions-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0232-Expand-Explosions-API.patch
rename to Spigot-Server-Patches/0231-Expand-Explosions-API.patch
diff --git a/Spigot-Server-Patches/0233-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0233-LivingEntity-Hand-Raised-Item-Use-API.patch
rename to Spigot-Server-Patches/0232-LivingEntity-Hand-Raised-Item-Use-API.patch
diff --git a/Spigot-Server-Patches/0234-RangedEntity-API.patch b/Spigot-Server-Patches/0233-RangedEntity-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0234-RangedEntity-API.patch
rename to Spigot-Server-Patches/0233-RangedEntity-API.patch
diff --git a/Spigot-Server-Patches/0235-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0234-Add-config-to-disable-ender-dragon-legacy-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0235-Add-config-to-disable-ender-dragon-legacy-check.patch
rename to Spigot-Server-Patches/0234-Add-config-to-disable-ender-dragon-legacy-check.patch
diff --git a/Spigot-Server-Patches/0236-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0235-Implement-World.getEntity-UUID-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0236-Implement-World.getEntity-UUID-API.patch
rename to Spigot-Server-Patches/0235-Implement-World.getEntity-UUID-API.patch
diff --git a/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch
similarity index 98%
rename from Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
rename to Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch
index 31c2a46d0b..bf7ed128fb 100644
--- a/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0236-InventoryCloseEvent-Reason-API.patch
@@ -193,10 +193,10 @@ index 23889ce169baf956cfb39f1ec21a8369f80c5555..25175230583bbd6fcfc864dcbae4111d
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 81fc5bcb24e94500bea1a78a369f6fd58865700e..68d9cbfcecffd3eeff38c1fc8a0bd19a251cdec9 100644
+index 8964687af2c86d4226c9c13c2d0a23bdaa7c4dae..db916dc8fb4375392080e7a9d54b996991be865f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1170,7 +1170,7 @@ public class CraftEventFactory {
+@@ -1172,7 +1172,7 @@ public class CraftEventFactory {
  
      public static Container callInventoryOpenEvent(EntityPlayer player, Container container, boolean cancelled) {
          if (player.activeContainer != player.defaultContainer) { // fire INVENTORY_CLOSE if one already open
@@ -205,7 +205,7 @@ index 81fc5bcb24e94500bea1a78a369f6fd58865700e..68d9cbfcecffd3eeff38c1fc8a0bd19a
          }
  
          CraftServer server = player.world.getServer();
-@@ -1335,12 +1335,22 @@ public class CraftEventFactory {
+@@ -1337,12 +1337,22 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0238-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0237-Vex-getSummoner-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0238-Vex-getSummoner-API.patch
rename to Spigot-Server-Patches/0237-Vex-getSummoner-API.patch
diff --git a/Spigot-Server-Patches/0239-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0238-Refresh-player-inventory-when-cancelling-PlayerInter.patch
similarity index 100%
rename from Spigot-Server-Patches/0239-Refresh-player-inventory-when-cancelling-PlayerInter.patch
rename to Spigot-Server-Patches/0238-Refresh-player-inventory-when-cancelling-PlayerInter.patch
diff --git a/Spigot-Server-Patches/0240-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0239-Don-t-change-the-Entity-Random-seed-for-squids.patch
similarity index 100%
rename from Spigot-Server-Patches/0240-Don-t-change-the-Entity-Random-seed-for-squids.patch
rename to Spigot-Server-Patches/0239-Don-t-change-the-Entity-Random-seed-for-squids.patch
diff --git a/Spigot-Server-Patches/0241-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0240-Re-add-vanilla-entity-warnings-for-duplicates.patch
similarity index 100%
rename from Spigot-Server-Patches/0241-Re-add-vanilla-entity-warnings-for-duplicates.patch
rename to Spigot-Server-Patches/0240-Re-add-vanilla-entity-warnings-for-duplicates.patch
diff --git a/Spigot-Server-Patches/0242-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0241-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
similarity index 91%
rename from Spigot-Server-Patches/0242-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
rename to Spigot-Server-Patches/0241-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
index 8fd9abc479..95a78b89a1 100644
--- a/Spigot-Server-Patches/0242-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
+++ b/Spigot-Server-Patches/0241-Avoid-item-merge-if-stack-size-above-max-stack-size.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 8eab278382a937da80b97a7dea212ca960d42289..d8f8d04d6cc25d468bee04e2cbcc02c6f8202a1d 100644
+index 6d9a03a1ccc78ae9eeb654dd7fab9f23fcce74b8..78a2e28c9fe93cdbb2a7326a5d6fcb596724ad30 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -182,6 +182,10 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0243-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch
similarity index 100%
rename from Spigot-Server-Patches/0243-Use-asynchronous-Log4j-2-loggers.patch
rename to Spigot-Server-Patches/0242-Use-asynchronous-Log4j-2-loggers.patch
diff --git a/Spigot-Server-Patches/0244-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0243-add-more-information-to-Entity.toString.patch
similarity index 100%
rename from Spigot-Server-Patches/0244-add-more-information-to-Entity.toString.patch
rename to Spigot-Server-Patches/0243-add-more-information-to-Entity.toString.patch
diff --git a/Spigot-Server-Patches/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
similarity index 97%
rename from Spigot-Server-Patches/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
rename to Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
index be9d6f8377..7c376c3d88 100644
--- a/Spigot-Server-Patches/0245-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
+++ b/Spigot-Server-Patches/0244-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d62d25af15dee1457df85dbc4db6f7f0a632ecba..b1d7c30690e09f60075b9d2cff47d6a53115118b 100644
+index f5c285909af563b91bb81638a3bcdf9f25584913..38a0a9313e46ce1f53fa48e99ad501b65deb1342 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -78,6 +78,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -40,7 +40,7 @@ index 8862bbd73b627e37709d46e6aeeee70c89cbd821..4bbcd00950405a4bf3ce391b557049a3
  
      protected void g() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 275442e07743e4e4e3f1468f58c50bb38ab7537a..b6af67e7625dd6e24fad5812d4b563b6ce91bede 100644
+index aefdcbeb1a452871a5a7376b4c259b3284f10d75..ae389806f62960816e6a8d0ab1bd8351c858546e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -68,6 +68,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0246-EnderDragon-Events.patch b/Spigot-Server-Patches/0245-EnderDragon-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0246-EnderDragon-Events.patch
rename to Spigot-Server-Patches/0245-EnderDragon-Events.patch
diff --git a/Spigot-Server-Patches/0247-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0246-PlayerElytraBoostEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0247-PlayerElytraBoostEvent.patch
rename to Spigot-Server-Patches/0246-PlayerElytraBoostEvent.patch
diff --git a/Spigot-Server-Patches/0248-Improve-BlockPosition-inlining.patch b/Spigot-Server-Patches/0247-Improve-BlockPosition-inlining.patch
similarity index 97%
rename from Spigot-Server-Patches/0248-Improve-BlockPosition-inlining.patch
rename to Spigot-Server-Patches/0247-Improve-BlockPosition-inlining.patch
index 6e0a810ec9..eaf3fa863a 100644
--- a/Spigot-Server-Patches/0248-Improve-BlockPosition-inlining.patch
+++ b/Spigot-Server-Patches/0247-Improve-BlockPosition-inlining.patch
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index e126f9d1d03de085f2d09d53fe8bcc1972aedeff..4d574f83aff9fc295fb03c83cdb640a29fb40942 100644
+index 63a9ce32fb8b98695e104f7d820cd9b1a8f230b1..6b655b744d31d9660c7521ab596b27bcd92f4d58 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -39,7 +39,7 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
diff --git a/Spigot-Server-Patches/0249-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0248-Optimize-RegistryID.c.patch
similarity index 100%
rename from Spigot-Server-Patches/0249-Optimize-RegistryID.c.patch
rename to Spigot-Server-Patches/0248-Optimize-RegistryID.c.patch
diff --git a/Spigot-Server-Patches/0250-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
similarity index 95%
rename from Spigot-Server-Patches/0250-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
rename to Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
index c401592747..a06416f090 100644
--- a/Spigot-Server-Patches/0250-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0249-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@@ -19,7 +19,7 @@ index 6352051ab937d4d365e823a7112e76dc3ec34225..92ddf96f7db08a2b390ef3f49b0643f9
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b6af67e7625dd6e24fad5812d4b563b6ce91bede..6202788306bea557c4699698a61c9336eb63a55d 100644
+index ae389806f62960816e6a8d0ab1bd8351c858546e..7cacffaab40d47f6fdd53bb526e9146a33f2ebc4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -802,6 +802,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0251-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch
similarity index 98%
rename from Spigot-Server-Patches/0251-Vanished-players-don-t-have-rights.patch
rename to Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch
index a0b523c023..ed1255a9da 100644
--- a/Spigot-Server-Patches/0251-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0250-Vanished-players-don-t-have-rights.patch
@@ -147,10 +147,10 @@ index 7cacffaab40d47f6fdd53bb526e9146a33f2ebc4..b7380f2ef554dc5f562340b7c59fd23c
      public boolean s_() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index fe88f7e62e547b9aa4ff273341aaee9209aed82b..fe8f149ad376b737c798d296ec77beef2362f7e3 100644
+index db916dc8fb4375392080e7a9d54b996991be865f..ee0212645425d70f4f5279f08d12bd75688eb6b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1206,6 +1206,14 @@ public class CraftEventFactory {
+@@ -1208,6 +1208,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/Spigot-Server-Patches/0252-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0251-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
similarity index 100%
rename from Spigot-Server-Patches/0252-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
rename to Spigot-Server-Patches/0251-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
diff --git a/Spigot-Server-Patches/0253-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch
similarity index 97%
rename from Spigot-Server-Patches/0253-Add-some-Debug-to-Chunk-Entity-slices.patch
rename to Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch
index e1d2957add..8b50078dc3 100644
--- a/Spigot-Server-Patches/0253-Add-some-Debug-to-Chunk-Entity-slices.patch
+++ b/Spigot-Server-Patches/0252-Add-some-Debug-to-Chunk-Entity-slices.patch
@@ -58,7 +58,7 @@ index bc249e399befa84cdf07cc58cd0072bb9cb5cced..3b3cae92513a85ba842d403c68f5a1fb
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 90f5d8c9d04463d65bf8ab936b07d829b2b9f55d..5e96d7a8adc043ff7e1451d4ecdacb2cfc9d08c6 100644
+index 003f2a3bca8db71d25101b555ada81544e319425..174329b9adbfa9de61f76ee92c85f6c77d65d3dc 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0254-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0253-SkeletonHorse-Additions.patch
similarity index 100%
rename from Spigot-Server-Patches/0254-SkeletonHorse-Additions.patch
rename to Spigot-Server-Patches/0253-SkeletonHorse-Additions.patch
diff --git a/Spigot-Server-Patches/0255-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0254-Prevent-Saving-Bad-entities-to-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0255-Prevent-Saving-Bad-entities-to-chunks.patch
rename to Spigot-Server-Patches/0254-Prevent-Saving-Bad-entities-to-chunks.patch
diff --git a/Spigot-Server-Patches/0256-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0255-Don-t-call-getItemMeta-on-hasItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0256-Don-t-call-getItemMeta-on-hasItemMeta.patch
rename to Spigot-Server-Patches/0255-Don-t-call-getItemMeta-on-hasItemMeta.patch
diff --git a/Spigot-Server-Patches/0257-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch
similarity index 98%
rename from Spigot-Server-Patches/0257-Ignore-Dead-Entities-in-entityList-iteration.patch
rename to Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch
index 5a865aa927..e32672d472 100644
--- a/Spigot-Server-Patches/0257-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0256-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -51,7 +51,7 @@ index 3b3cae92513a85ba842d403c68f5a1fb8fde785d..5ee581d1634f44a98756c5d11def9c3d
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5e96d7a8adc043ff7e1451d4ecdacb2cfc9d08c6..1a05de09824360c451a4b0354d1a8f486432ec7b 100644
+index 174329b9adbfa9de61f76ee92c85f6c77d65d3dc..2e1214c9ebf7915aa25aa4d405ec75f73d8e0594 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -192,6 +192,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0258-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0258-Implement-Expanded-ArmorStand-API.patch
rename to Spigot-Server-Patches/0257-Implement-Expanded-ArmorStand-API.patch
diff --git a/Spigot-Server-Patches/0259-AnvilDamageEvent.patch b/Spigot-Server-Patches/0258-AnvilDamageEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0259-AnvilDamageEvent.patch
rename to Spigot-Server-Patches/0258-AnvilDamageEvent.patch
diff --git a/Spigot-Server-Patches/0260-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0259-Add-TNTPrimeEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0260-Add-TNTPrimeEvent.patch
rename to Spigot-Server-Patches/0259-Add-TNTPrimeEvent.patch
diff --git a/Spigot-Server-Patches/0261-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0261-Break-up-and-make-tab-spam-limits-configurable.patch
rename to Spigot-Server-Patches/0260-Break-up-and-make-tab-spam-limits-configurable.patch
diff --git a/Spigot-Server-Patches/0262-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0262-Add-hand-to-bucket-events.patch
rename to Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch
index 1724bad964..2ebc04a2d2 100644
--- a/Spigot-Server-Patches/0262-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0261-Add-hand-to-bucket-events.patch
@@ -73,7 +73,7 @@ index 48958308a89cbe39e1b4dddcdd8d1d0b5ece6339..120bf8436fd82294c339add2e7bff1cd
                  int i = blockposition.getX();
                  int j = blockposition.getY();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5e6aa9cd63a103b9460c221a3e6c1e431d209d36..b46c6f7f5e8bf586235b3144dee4e4ce64e89947 100644
+index b7380f2ef554dc5f562340b7c59fd23cd1f271c1..8bb5f35dd211ef0267f55678bb568a7d3b9980ec 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -218,6 +218,17 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -126,7 +126,7 @@ index 13370a4a0d210bd3b14a26f60b1cd9a9a3a6c941..0b7047863bb3a3f3d61491bb1924b94a
      public float v() {
          return this.worldData.d();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 108289ba7ac5fdf08229bb23059847a178910695..c40004cc3a9583c9ece058ff8eb059731385c415 100644
+index ee0212645425d70f4f5279f08d12bd75688eb6b1..b9dae2166f235b279a4d2a211177a1e00c5c4f31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -233,7 +233,7 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0263-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0262-MC-135506-Experience-should-save-as-Integers.patch
similarity index 100%
rename from Spigot-Server-Patches/0263-MC-135506-Experience-should-save-as-Integers.patch
rename to Spigot-Server-Patches/0262-MC-135506-Experience-should-save-as-Integers.patch
diff --git a/Spigot-Server-Patches/0264-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0263-Fix-client-rendering-skulls-from-same-user.patch
similarity index 100%
rename from Spigot-Server-Patches/0264-Fix-client-rendering-skulls-from-same-user.patch
rename to Spigot-Server-Patches/0263-Fix-client-rendering-skulls-from-same-user.patch
diff --git a/Spigot-Server-Patches/0265-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0264-Add-Early-Warning-Feature-to-WatchDog.patch
similarity index 100%
rename from Spigot-Server-Patches/0265-Add-Early-Warning-Feature-to-WatchDog.patch
rename to Spigot-Server-Patches/0264-Add-Early-Warning-Feature-to-WatchDog.patch
diff --git a/Spigot-Server-Patches/0266-Make-EnderDragon-implement-Mob.patch b/Spigot-Server-Patches/0265-Make-EnderDragon-implement-Mob.patch
similarity index 100%
rename from Spigot-Server-Patches/0266-Make-EnderDragon-implement-Mob.patch
rename to Spigot-Server-Patches/0265-Make-EnderDragon-implement-Mob.patch
diff --git a/Spigot-Server-Patches/0267-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0266-Use-ConcurrentHashMap-in-JsonList.patch
similarity index 98%
rename from Spigot-Server-Patches/0267-Use-ConcurrentHashMap-in-JsonList.patch
rename to Spigot-Server-Patches/0266-Use-ConcurrentHashMap-in-JsonList.patch
index 143d413f65..56353aeae3 100644
--- a/Spigot-Server-Patches/0267-Use-ConcurrentHashMap-in-JsonList.patch
+++ b/Spigot-Server-Patches/0266-Use-ConcurrentHashMap-in-JsonList.patch
@@ -122,7 +122,7 @@ index 5b01e4edb3c0f8bc785b70128cbe31b14356e4fb..9213bfb78e92b838189161045e394558
  
          this.d.values().stream().map((jsonlistentry) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8c77970d848b9628ddc4c66679d7ba8044641173..3501588adf539a05a5056c9a4f45d49d9d656a37 100644
+index df8a92b082139c84afc32cf02541faa82c914d4f..bc31e882e77f5b8657107db1e3a830df4cf561e1 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -543,7 +543,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0268-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0267-Use-a-Queue-for-Queueing-Commands.patch
similarity index 100%
rename from Spigot-Server-Patches/0268-Use-a-Queue-for-Queueing-Commands.patch
rename to Spigot-Server-Patches/0267-Use-a-Queue-for-Queueing-Commands.patch
diff --git a/Spigot-Server-Patches/0269-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0268-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
similarity index 100%
rename from Spigot-Server-Patches/0269-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
rename to Spigot-Server-Patches/0268-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch
diff --git a/Spigot-Server-Patches/0270-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0270-Allow-disabling-armour-stand-ticking.patch
rename to Spigot-Server-Patches/0269-Allow-disabling-armour-stand-ticking.patch
diff --git a/Spigot-Server-Patches/0271-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0270-Optimize-BlockPosition-helper-methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0271-Optimize-BlockPosition-helper-methods.patch
rename to Spigot-Server-Patches/0270-Optimize-BlockPosition-helper-methods.patch
diff --git a/Spigot-Server-Patches/0272-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0271-Restore-vanlla-default-mob-spawn-range.patch
similarity index 100%
rename from Spigot-Server-Patches/0272-Restore-vanlla-default-mob-spawn-range.patch
rename to Spigot-Server-Patches/0271-Restore-vanlla-default-mob-spawn-range.patch
diff --git a/Spigot-Server-Patches/0273-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0272-Slime-Pathfinder-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0273-Slime-Pathfinder-Events.patch
rename to Spigot-Server-Patches/0272-Slime-Pathfinder-Events.patch
diff --git a/Spigot-Server-Patches/0274-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0273-Configurable-speed-for-water-flowing-over-lava.patch
similarity index 100%
rename from Spigot-Server-Patches/0274-Configurable-speed-for-water-flowing-over-lava.patch
rename to Spigot-Server-Patches/0273-Configurable-speed-for-water-flowing-over-lava.patch
diff --git a/Spigot-Server-Patches/0275-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0274-Optimize-CraftBlockData-Creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0275-Optimize-CraftBlockData-Creation.patch
rename to Spigot-Server-Patches/0274-Optimize-CraftBlockData-Creation.patch
diff --git a/Spigot-Server-Patches/0276-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0275-Optimize-RegistryMaterials.patch
similarity index 100%
rename from Spigot-Server-Patches/0276-Optimize-RegistryMaterials.patch
rename to Spigot-Server-Patches/0275-Optimize-RegistryMaterials.patch
diff --git a/Spigot-Server-Patches/0277-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0276-Add-PhantomPreSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0277-Add-PhantomPreSpawnEvent.patch
rename to Spigot-Server-Patches/0276-Add-PhantomPreSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0278-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0277-Add-More-Creeper-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0278-Add-More-Creeper-API.patch
rename to Spigot-Server-Patches/0277-Add-More-Creeper-API.patch
diff --git a/Spigot-Server-Patches/0279-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0278-Inventory-removeItemAnySlot.patch
similarity index 100%
rename from Spigot-Server-Patches/0279-Inventory-removeItemAnySlot.patch
rename to Spigot-Server-Patches/0278-Inventory-removeItemAnySlot.patch
diff --git a/Spigot-Server-Patches/0280-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0279-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
similarity index 100%
rename from Spigot-Server-Patches/0280-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
rename to Spigot-Server-Patches/0279-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
diff --git a/Spigot-Server-Patches/0281-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0281-Add-ray-tracing-methods-to-LivingEntity.patch
rename to Spigot-Server-Patches/0280-Add-ray-tracing-methods-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0282-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0281-Expose-attack-cooldown-methods-for-Player.patch
similarity index 100%
rename from Spigot-Server-Patches/0282-Expose-attack-cooldown-methods-for-Player.patch
rename to Spigot-Server-Patches/0281-Expose-attack-cooldown-methods-for-Player.patch
diff --git a/Spigot-Server-Patches/0283-Improve-death-events.patch b/Spigot-Server-Patches/0282-Improve-death-events.patch
similarity index 98%
rename from Spigot-Server-Patches/0283-Improve-death-events.patch
rename to Spigot-Server-Patches/0282-Improve-death-events.patch
index e487017f45..e66c5c06b1 100644
--- a/Spigot-Server-Patches/0283-Improve-death-events.patch
+++ b/Spigot-Server-Patches/0282-Improve-death-events.patch
@@ -373,10 +373,10 @@ index b90b35c08cdc9bb44aaf9f4824289fd0824c937f..28a04cb8a90ad82b86f658ad17675ab5
  
      public void injectScaledMaxHealth(Collection<AttributeModifiable> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index c40004cc3a9583c9ece058ff8eb059731385c415..be7e98dc6f8faf4ebfd24df035ade809a3e4c918 100644
+index b9dae2166f235b279a4d2a211177a1e00c5c4f31..90ab1c85f9b9055172e01fe4ba899c9eda6f5cfa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -788,9 +788,16 @@ public class CraftEventFactory {
+@@ -790,9 +790,16 @@ public class CraftEventFactory {
      public static EntityDeathEvent callEntityDeathEvent(EntityLiving victim, List<org.bukkit.inventory.ItemStack> drops) {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          EntityDeathEvent event = new EntityDeathEvent(entity, drops, victim.getExpReward());
@@ -393,7 +393,7 @@ index c40004cc3a9583c9ece058ff8eb059731385c415..be7e98dc6f8faf4ebfd24df035ade809
          victim.expToDrop = event.getDroppedExp();
  
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
-@@ -806,8 +813,15 @@ public class CraftEventFactory {
+@@ -808,8 +815,15 @@ public class CraftEventFactory {
          CraftPlayer entity = victim.getBukkitEntity();
          PlayerDeathEvent event = new PlayerDeathEvent(entity, drops, victim.getExpReward(), 0, deathMessage);
          event.setKeepInventory(keepInventory);
@@ -409,7 +409,7 @@ index c40004cc3a9583c9ece058ff8eb059731385c415..be7e98dc6f8faf4ebfd24df035ade809
  
          victim.keepLevel = event.getKeepLevel();
          victim.newLevel = event.getNewLevel();
-@@ -824,6 +838,31 @@ public class CraftEventFactory {
+@@ -826,6 +840,31 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0284-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0283-Allow-chests-to-be-placed-with-NBT-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0284-Allow-chests-to-be-placed-with-NBT-data.patch
rename to Spigot-Server-Patches/0283-Allow-chests-to-be-placed-with-NBT-data.patch
diff --git a/Spigot-Server-Patches/0285-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0284-Mob-Pathfinding-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0285-Mob-Pathfinding-API.patch
rename to Spigot-Server-Patches/0284-Mob-Pathfinding-API.patch
diff --git a/Spigot-Server-Patches/0286-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0285-Prevent-chunk-loading-from-Fluid-Flowing.patch
similarity index 100%
rename from Spigot-Server-Patches/0286-Prevent-chunk-loading-from-Fluid-Flowing.patch
rename to Spigot-Server-Patches/0285-Prevent-chunk-loading-from-Fluid-Flowing.patch
diff --git a/Spigot-Server-Patches/0287-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0286-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
similarity index 100%
rename from Spigot-Server-Patches/0287-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
rename to Spigot-Server-Patches/0286-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
diff --git a/Spigot-Server-Patches/0288-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0287-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0288-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
rename to Spigot-Server-Patches/0287-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch
diff --git a/Spigot-Server-Patches/0289-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0288-Prevent-mob-spawning-from-loading-generating-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0289-Prevent-mob-spawning-from-loading-generating-chunks.patch
rename to Spigot-Server-Patches/0288-Prevent-mob-spawning-from-loading-generating-chunks.patch
diff --git a/Spigot-Server-Patches/0290-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0289-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from Spigot-Server-Patches/0290-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to Spigot-Server-Patches/0289-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/Spigot-Server-Patches/0291-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0290-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0291-Implement-furnace-cook-speed-multiplier-API.patch
rename to Spigot-Server-Patches/0290-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/Spigot-Server-Patches/0292-PreSpawnerSpawnEvent.patch b/Spigot-Server-Patches/0291-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0292-PreSpawnerSpawnEvent.patch
rename to Spigot-Server-Patches/0291-PreSpawnerSpawnEvent.patch
diff --git a/Spigot-Server-Patches/0293-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0292-Catch-JsonParseException-in-Entity-and-TE-names.patch
similarity index 100%
rename from Spigot-Server-Patches/0293-Catch-JsonParseException-in-Entity-and-TE-names.patch
rename to Spigot-Server-Patches/0292-Catch-JsonParseException-in-Entity-and-TE-names.patch
diff --git a/Spigot-Server-Patches/0294-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0293-Honor-EntityAgeable.ageLock.patch
similarity index 100%
rename from Spigot-Server-Patches/0294-Honor-EntityAgeable.ageLock.patch
rename to Spigot-Server-Patches/0293-Honor-EntityAgeable.ageLock.patch
diff --git a/Spigot-Server-Patches/0295-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0294-Configurable-connection-throttle-kick-message.patch
similarity index 100%
rename from Spigot-Server-Patches/0295-Configurable-connection-throttle-kick-message.patch
rename to Spigot-Server-Patches/0294-Configurable-connection-throttle-kick-message.patch
diff --git a/Spigot-Server-Patches/0296-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0295-Hook-into-CB-plugin-rewrites.patch
similarity index 100%
rename from Spigot-Server-Patches/0296-Hook-into-CB-plugin-rewrites.patch
rename to Spigot-Server-Patches/0295-Hook-into-CB-plugin-rewrites.patch
diff --git a/Spigot-Server-Patches/0297-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0296-Allow-setting-the-vex-s-summoner.patch
similarity index 100%
rename from Spigot-Server-Patches/0297-Allow-setting-the-vex-s-summoner.patch
rename to Spigot-Server-Patches/0296-Allow-setting-the-vex-s-summoner.patch
diff --git a/Spigot-Server-Patches/0298-Add-sun-related-API.patch b/Spigot-Server-Patches/0297-Add-sun-related-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0298-Add-sun-related-API.patch
rename to Spigot-Server-Patches/0297-Add-sun-related-API.patch
diff --git a/Spigot-Server-Patches/0299-Turtle-API.patch b/Spigot-Server-Patches/0298-Turtle-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0299-Turtle-API.patch
rename to Spigot-Server-Patches/0298-Turtle-API.patch
diff --git a/Spigot-Server-Patches/0300-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0299-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
similarity index 100%
rename from Spigot-Server-Patches/0300-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
rename to Spigot-Server-Patches/0299-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch
diff --git a/Spigot-Server-Patches/0301-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch
similarity index 100%
rename from Spigot-Server-Patches/0301-Call-player-spectator-target-events-and-improve-impl.patch
rename to Spigot-Server-Patches/0300-Call-player-spectator-target-events-and-improve-impl.patch
diff --git a/Spigot-Server-Patches/0302-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from Spigot-Server-Patches/0302-Add-Velocity-IP-Forwarding-Support.patch
rename to Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch
index 4c8c1231dc..26be8a6f74 100644
--- a/Spigot-Server-Patches/0302-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0301-Add-Velocity-IP-Forwarding-Support.patch
@@ -130,7 +130,7 @@ index 0000000000000000000000000000000000000000..fdd8708f974700c7cde6e436c2f189d9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index f2ab2f7f81b95546294debaf1f0395b0c094ab44..44054552a1e0efaba0f69573bfb67f4a126507c6 100644
+index a3555dd251af5dd4b320428aadaffe7063ecd356..afbe6defdffd967a841ebe51d260c418dcd23590 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -25,6 +25,7 @@ import org.bukkit.craftbukkit.util.Waitable;
diff --git a/Spigot-Server-Patches/0303-Add-more-Witch-API.patch b/Spigot-Server-Patches/0302-Add-more-Witch-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0303-Add-more-Witch-API.patch
rename to Spigot-Server-Patches/0302-Add-more-Witch-API.patch
diff --git a/Spigot-Server-Patches/0304-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0303-Check-Drowned-for-Villager-Aggression-Config.patch
similarity index 100%
rename from Spigot-Server-Patches/0304-Check-Drowned-for-Villager-Aggression-Config.patch
rename to Spigot-Server-Patches/0303-Check-Drowned-for-Villager-Aggression-Config.patch
diff --git a/Spigot-Server-Patches/0305-Here-s-Johnny.patch b/Spigot-Server-Patches/0304-Here-s-Johnny.patch
similarity index 100%
rename from Spigot-Server-Patches/0305-Here-s-Johnny.patch
rename to Spigot-Server-Patches/0304-Here-s-Johnny.patch
diff --git a/Spigot-Server-Patches/0306-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch
similarity index 100%
rename from Spigot-Server-Patches/0306-Add-option-to-prevent-players-from-moving-into-unloa.patch
rename to Spigot-Server-Patches/0305-Add-option-to-prevent-players-from-moving-into-unloa.patch
diff --git a/Spigot-Server-Patches/0307-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0306-Reset-players-airTicks-on-respawn.patch
similarity index 100%
rename from Spigot-Server-Patches/0307-Reset-players-airTicks-on-respawn.patch
rename to Spigot-Server-Patches/0306-Reset-players-airTicks-on-respawn.patch
diff --git a/Spigot-Server-Patches/0308-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0307-Don-t-sleep-after-profile-lookups-if-not-needed.patch
similarity index 100%
rename from Spigot-Server-Patches/0308-Don-t-sleep-after-profile-lookups-if-not-needed.patch
rename to Spigot-Server-Patches/0307-Don-t-sleep-after-profile-lookups-if-not-needed.patch
diff --git a/Spigot-Server-Patches/0309-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/Spigot-Server-Patches/0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
similarity index 100%
rename from Spigot-Server-Patches/0309-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
rename to Spigot-Server-Patches/0308-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
diff --git a/Spigot-Server-Patches/0310-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0309-Optimize-World-Time-Updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0310-Optimize-World-Time-Updates.patch
rename to Spigot-Server-Patches/0309-Optimize-World-Time-Updates.patch
diff --git a/Spigot-Server-Patches/0311-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0310-Restore-custom-InventoryHolder-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0311-Restore-custom-InventoryHolder-support.patch
rename to Spigot-Server-Patches/0310-Restore-custom-InventoryHolder-support.patch
diff --git a/Spigot-Server-Patches/0312-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0311-Use-Vanilla-Minecart-Speeds.patch
similarity index 100%
rename from Spigot-Server-Patches/0312-Use-Vanilla-Minecart-Speeds.patch
rename to Spigot-Server-Patches/0311-Use-Vanilla-Minecart-Speeds.patch
diff --git a/Spigot-Server-Patches/0313-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0312-Fix-SpongeAbsortEvent-handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0313-Fix-SpongeAbsortEvent-handling.patch
rename to Spigot-Server-Patches/0312-Fix-SpongeAbsortEvent-handling.patch
diff --git a/Spigot-Server-Patches/0314-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0313-Don-t-allow-digging-into-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0314-Don-t-allow-digging-into-unloaded-chunks.patch
rename to Spigot-Server-Patches/0313-Don-t-allow-digging-into-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0315-Book-Size-Limits.patch b/Spigot-Server-Patches/0314-Book-Size-Limits.patch
similarity index 100%
rename from Spigot-Server-Patches/0315-Book-Size-Limits.patch
rename to Spigot-Server-Patches/0314-Book-Size-Limits.patch
diff --git a/Spigot-Server-Patches/0316-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0315-Make-the-default-permission-message-configurable.patch
similarity index 100%
rename from Spigot-Server-Patches/0316-Make-the-default-permission-message-configurable.patch
rename to Spigot-Server-Patches/0315-Make-the-default-permission-message-configurable.patch
diff --git a/Spigot-Server-Patches/0317-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0316-Prevent-rayTrace-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0317-Prevent-rayTrace-from-loading-chunks.patch
rename to Spigot-Server-Patches/0316-Prevent-rayTrace-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0318-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0317-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from Spigot-Server-Patches/0318-Handle-Large-Packets-disconnecting-client.patch
rename to Spigot-Server-Patches/0317-Handle-Large-Packets-disconnecting-client.patch
diff --git a/Spigot-Server-Patches/0319-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0318-force-entity-dismount-during-teleportation.patch
similarity index 100%
rename from Spigot-Server-Patches/0319-force-entity-dismount-during-teleportation.patch
rename to Spigot-Server-Patches/0318-force-entity-dismount-during-teleportation.patch
diff --git a/Spigot-Server-Patches/0320-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0319-Add-more-Zombie-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0320-Add-more-Zombie-API.patch
rename to Spigot-Server-Patches/0319-Add-more-Zombie-API.patch
diff --git a/Spigot-Server-Patches/0321-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0320-Add-PlayerConnectionCloseEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0321-Add-PlayerConnectionCloseEvent.patch
rename to Spigot-Server-Patches/0320-Add-PlayerConnectionCloseEvent.patch
index 54d2ab96fe..b628cec61c 100644
--- a/Spigot-Server-Patches/0321-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0320-Add-PlayerConnectionCloseEvent.patch
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 44054552a1e0efaba0f69573bfb67f4a126507c6..c053c40a940bbfebbae48464d5f9e263f54af523 100644
+index afbe6defdffd967a841ebe51d260c418dcd23590..0cb8f5a4a5cc5e302815af4c1ed325dfbc75235b 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener {
diff --git a/Spigot-Server-Patches/0322-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0321-Prevent-Enderman-from-loading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0322-Prevent-Enderman-from-loading-chunks.patch
rename to Spigot-Server-Patches/0321-Prevent-Enderman-from-loading-chunks.patch
diff --git a/Spigot-Server-Patches/0323-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0322-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 97%
rename from Spigot-Server-Patches/0323-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to Spigot-Server-Patches/0322-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index 566b08c3b6..024f189f4f 100644
--- a/Spigot-Server-Patches/0323-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/Spigot-Server-Patches/0322-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f68d5931a3d2df5f69032c49a4b2b80a0783f504..ce43462b9a9a393b51a2c4b96467ebd007fd7126 100644
+index d27868d71af20579dff1109e78029b19347da058..ed82053bdf27cc8dbef03565f27e27516bd42d08 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -82,6 +82,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index f68d5931a3d2df5f69032c49a4b2b80a0783f504..ce43462b9a9a393b51a2c4b96467ebd0
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3501588adf539a05a5056c9a4f45d49d9d656a37..fdc541c6867a7b7c03d622bddeb55f528086407b 100644
+index bc31e882e77f5b8657107db1e3a830df4cf561e1..9a56f83e12c65cafe3d1fb00379b78e5ea59b3f1 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -97,6 +97,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0324-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0323-Fix-PlayerEditBookEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0324-Fix-PlayerEditBookEvent.patch
rename to Spigot-Server-Patches/0323-Fix-PlayerEditBookEvent.patch
diff --git a/Spigot-Server-Patches/0325-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0324-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
similarity index 100%
rename from Spigot-Server-Patches/0325-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
rename to Spigot-Server-Patches/0324-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
diff --git a/Spigot-Server-Patches/0326-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0325-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
similarity index 100%
rename from Spigot-Server-Patches/0326-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
rename to Spigot-Server-Patches/0325-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch
diff --git a/Spigot-Server-Patches/0327-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0326-Block-Entity-remove-from-being-called-on-Players.patch
similarity index 100%
rename from Spigot-Server-Patches/0327-Block-Entity-remove-from-being-called-on-Players.patch
rename to Spigot-Server-Patches/0326-Block-Entity-remove-from-being-called-on-Players.patch
diff --git a/Spigot-Server-Patches/0328-BlockDestroyEvent.patch b/Spigot-Server-Patches/0327-BlockDestroyEvent.patch
similarity index 95%
rename from Spigot-Server-Patches/0328-BlockDestroyEvent.patch
rename to Spigot-Server-Patches/0327-BlockDestroyEvent.patch
index 12eae33a12..d5eb13835b 100644
--- a/Spigot-Server-Patches/0328-BlockDestroyEvent.patch
+++ b/Spigot-Server-Patches/0327-BlockDestroyEvent.patch
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b46c6f7f5e8bf586235b3144dee4e4ce64e89947..12ea2c5f6e282f4732890188ef6501b7053ba008 100644
+index 8bb5f35dd211ef0267f55678bb568a7d3b9980ec..f6c785c1368c1bc1d626a90ffe64638f42775607 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -500,8 +500,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0329-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0328-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
similarity index 100%
rename from Spigot-Server-Patches/0329-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
rename to Spigot-Server-Patches/0328-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch
diff --git a/Spigot-Server-Patches/0330-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0329-Fix-sign-edit-memory-leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0330-Fix-sign-edit-memory-leak.patch
rename to Spigot-Server-Patches/0329-Fix-sign-edit-memory-leak.patch
diff --git a/Spigot-Server-Patches/0331-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0330-Limit-Client-Sign-length-more.patch
similarity index 100%
rename from Spigot-Server-Patches/0331-Limit-Client-Sign-length-more.patch
rename to Spigot-Server-Patches/0330-Limit-Client-Sign-length-more.patch
diff --git a/Spigot-Server-Patches/0332-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0331-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
similarity index 100%
rename from Spigot-Server-Patches/0332-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
rename to Spigot-Server-Patches/0331-Don-t-check-ConvertSigns-boolean-every-sign-save.patch
diff --git a/Spigot-Server-Patches/0333-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/Spigot-Server-Patches/0332-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from Spigot-Server-Patches/0333-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to Spigot-Server-Patches/0332-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/Spigot-Server-Patches/0334-Handle-Oversized-Tile-Entities-in-chunks.patch b/Spigot-Server-Patches/0333-Handle-Oversized-Tile-Entities-in-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0334-Handle-Oversized-Tile-Entities-in-chunks.patch
rename to Spigot-Server-Patches/0333-Handle-Oversized-Tile-Entities-in-chunks.patch
diff --git a/Spigot-Server-Patches/0335-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0334-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
similarity index 100%
rename from Spigot-Server-Patches/0335-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
rename to Spigot-Server-Patches/0334-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch
diff --git a/Spigot-Server-Patches/0336-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0335-Set-Zombie-last-tick-at-start-of-drowning-process.patch
similarity index 100%
rename from Spigot-Server-Patches/0336-Set-Zombie-last-tick-at-start-of-drowning-process.patch
rename to Spigot-Server-Patches/0335-Set-Zombie-last-tick-at-start-of-drowning-process.patch
diff --git a/Spigot-Server-Patches/0337-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0336-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0337-Allow-Saving-of-Oversized-Chunks.patch
rename to Spigot-Server-Patches/0336-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/Spigot-Server-Patches/0338-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0337-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
similarity index 100%
rename from Spigot-Server-Patches/0338-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
rename to Spigot-Server-Patches/0337-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch
diff --git a/Spigot-Server-Patches/0339-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0338-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0339-Add-LivingEntity-getTargetEntity.patch
rename to Spigot-Server-Patches/0338-Add-LivingEntity-getTargetEntity.patch
diff --git a/Spigot-Server-Patches/0340-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0339-Use-proper-max-length-when-serialising-BungeeCord-te.patch
similarity index 100%
rename from Spigot-Server-Patches/0340-Use-proper-max-length-when-serialising-BungeeCord-te.patch
rename to Spigot-Server-Patches/0339-Use-proper-max-length-when-serialising-BungeeCord-te.patch
diff --git a/Spigot-Server-Patches/0341-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0340-Entity-getEntitySpawnReason.patch
similarity index 98%
rename from Spigot-Server-Patches/0341-Entity-getEntitySpawnReason.patch
rename to Spigot-Server-Patches/0340-Entity-getEntitySpawnReason.patch
index 889ce97a49..9d368fd70a 100644
--- a/Spigot-Server-Patches/0341-Entity-getEntitySpawnReason.patch
+++ b/Spigot-Server-Patches/0340-Entity-getEntitySpawnReason.patch
@@ -71,7 +71,7 @@ index 1aecc84479b00a019a5b68f5e726d1c2965ae0f7..c3a5db97fd85b31c6b4bce93527b9d0e
                              // Spigot Start
                              if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 81a808c05ecc4262d9c5d1db26f649c4e709a0e5..77262daa02b52e4f3e44f770060a4a56494f642c 100644
+index cb04de23dd8b506ebfd07d60acd082d6b7e14528..fbed3c1012c5b6fe61598ae6fae64edc2ad2e490 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -262,7 +262,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0342-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0341-Update-entity-Metadata-for-all-tracked-players.patch
similarity index 100%
rename from Spigot-Server-Patches/0342-Update-entity-Metadata-for-all-tracked-players.patch
rename to Spigot-Server-Patches/0341-Update-entity-Metadata-for-all-tracked-players.patch
diff --git a/Spigot-Server-Patches/0343-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0342-Implement-PlayerPostRespawnEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0343-Implement-PlayerPostRespawnEvent.patch
rename to Spigot-Server-Patches/0342-Implement-PlayerPostRespawnEvent.patch
diff --git a/Spigot-Server-Patches/0344-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0343-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
similarity index 94%
rename from Spigot-Server-Patches/0344-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
rename to Spigot-Server-Patches/0343-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
index 1a5b3c1005..052fbb7f26 100644
--- a/Spigot-Server-Patches/0344-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ b/Spigot-Server-Patches/0343-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
 vanilla checks for == 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index d8f8d04d6cc25d468bee04e2cbcc02c6f8202a1d..42f020be9c954e2c58896520c99be546f7b8531e 100644
+index 78a2e28c9fe93cdbb2a7326a5d6fcb596724ad30..43654872d30fac44d3aeda0d4ab190c8bdfed0b8 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -60,6 +60,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0345-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0344-Implement-getters-and-setters-for-EntityItem-owner-a.patch
similarity index 100%
rename from Spigot-Server-Patches/0345-Implement-getters-and-setters-for-EntityItem-owner-a.patch
rename to Spigot-Server-Patches/0344-Implement-getters-and-setters-for-EntityItem-owner-a.patch
diff --git a/Spigot-Server-Patches/0346-Server-Tick-Events.patch b/Spigot-Server-Patches/0345-Server-Tick-Events.patch
similarity index 100%
rename from Spigot-Server-Patches/0346-Server-Tick-Events.patch
rename to Spigot-Server-Patches/0345-Server-Tick-Events.patch
diff --git a/Spigot-Server-Patches/0347-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-Server-Patches/0346-PlayerDeathEvent-getItemsToKeep.patch
similarity index 96%
rename from Spigot-Server-Patches/0347-PlayerDeathEvent-getItemsToKeep.patch
rename to Spigot-Server-Patches/0346-PlayerDeathEvent-getItemsToKeep.patch
index 940e5a33cc..71d22a3e7d 100644
--- a/Spigot-Server-Patches/0347-PlayerDeathEvent-getItemsToKeep.patch
+++ b/Spigot-Server-Patches/0346-PlayerDeathEvent-getItemsToKeep.patch
@@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death
 Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 717786be86f76c384b4a1f56169b948e2297de38..8f9f1bb7f30632edcba4feae414a11d795610e05 100644
+index 7c4fb3585d2813974cdaf24fc653a0f562e38398..bd79a9464618972305139566b21c8aaa0a5e23db 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -560,6 +560,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0348-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0347-Optimize-Captured-TileEntity-Lookup.patch
similarity index 93%
rename from Spigot-Server-Patches/0348-Optimize-Captured-TileEntity-Lookup.patch
rename to Spigot-Server-Patches/0347-Optimize-Captured-TileEntity-Lookup.patch
index f13a358191..e5dbeedd15 100644
--- a/Spigot-Server-Patches/0348-Optimize-Captured-TileEntity-Lookup.patch
+++ b/Spigot-Server-Patches/0347-Optimize-Captured-TileEntity-Lookup.patch
@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 12ea2c5f6e282f4732890188ef6501b7053ba008..61dff39b610cb8cfd24db98025d74cd97367ad83 100644
+index f6c785c1368c1bc1d626a90ffe64638f42775607..5900b1a9cb67f6d449907fda067619f604442bf2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -905,12 +905,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0349-Add-Heightmap-API.patch b/Spigot-Server-Patches/0348-Add-Heightmap-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0349-Add-Heightmap-API.patch
rename to Spigot-Server-Patches/0348-Add-Heightmap-API.patch
index d8f8bb5858..d4d7ef5a79 100644
--- a/Spigot-Server-Patches/0349-Add-Heightmap-API.patch
+++ b/Spigot-Server-Patches/0348-Add-Heightmap-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 61dff39b610cb8cfd24db98025d74cd97367ad83..7c7c038dde32c2acd10cd653c6c85bca466d3a6c 100644
+index 5900b1a9cb67f6d449907fda067619f604442bf2..9c3f6a82646b82979331fa9f9d9fc102e042d661 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -610,8 +610,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0350-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0349-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0350-Mob-Spawner-API-Enhancements.patch
rename to Spigot-Server-Patches/0349-Mob-Spawner-API-Enhancements.patch
diff --git a/Spigot-Server-Patches/0351-Per-Player-View-Distance-API-placeholders.patch b/Spigot-Server-Patches/0350-Per-Player-View-Distance-API-placeholders.patch
similarity index 100%
rename from Spigot-Server-Patches/0351-Per-Player-View-Distance-API-placeholders.patch
rename to Spigot-Server-Patches/0350-Per-Player-View-Distance-API-placeholders.patch
diff --git a/Spigot-Server-Patches/0352-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0351-Fix-CB-call-to-changed-postToMainThread-method.patch
similarity index 100%
rename from Spigot-Server-Patches/0352-Fix-CB-call-to-changed-postToMainThread-method.patch
rename to Spigot-Server-Patches/0351-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/Spigot-Server-Patches/0353-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0352-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
similarity index 100%
rename from Spigot-Server-Patches/0353-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
rename to Spigot-Server-Patches/0352-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/Spigot-Server-Patches/0354-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0353-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
similarity index 100%
rename from Spigot-Server-Patches/0354-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
rename to Spigot-Server-Patches/0353-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
diff --git a/Spigot-Server-Patches/0355-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch b/Spigot-Server-Patches/0354-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0355-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
rename to Spigot-Server-Patches/0354-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch
diff --git a/Spigot-Server-Patches/0356-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0355-Duplicate-UUID-Resolve-Option.patch
similarity index 100%
rename from Spigot-Server-Patches/0356-Duplicate-UUID-Resolve-Option.patch
rename to Spigot-Server-Patches/0355-Duplicate-UUID-Resolve-Option.patch
diff --git a/Spigot-Server-Patches/0357-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0356-improve-CraftWorld-isChunkLoaded.patch
similarity index 100%
rename from Spigot-Server-Patches/0357-improve-CraftWorld-isChunkLoaded.patch
rename to Spigot-Server-Patches/0356-improve-CraftWorld-isChunkLoaded.patch
diff --git a/Spigot-Server-Patches/0358-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0358-Configurable-Keep-Spawn-Loaded-range-per-world.patch
rename to Spigot-Server-Patches/0357-Configurable-Keep-Spawn-Loaded-range-per-world.patch
diff --git a/Spigot-Server-Patches/0359-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0358-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
similarity index 100%
rename from Spigot-Server-Patches/0359-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
rename to Spigot-Server-Patches/0358-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch
diff --git a/Spigot-Server-Patches/0360-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0359-ChunkMapDistance-CME.patch
similarity index 100%
rename from Spigot-Server-Patches/0360-ChunkMapDistance-CME.patch
rename to Spigot-Server-Patches/0359-ChunkMapDistance-CME.patch
diff --git a/Spigot-Server-Patches/0361-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0360-Implement-CraftBlockSoundGroup.patch
similarity index 100%
rename from Spigot-Server-Patches/0361-Implement-CraftBlockSoundGroup.patch
rename to Spigot-Server-Patches/0360-Implement-CraftBlockSoundGroup.patch
diff --git a/Spigot-Server-Patches/0362-Chunk-debug-command.patch b/Spigot-Server-Patches/0361-Chunk-debug-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0362-Chunk-debug-command.patch
rename to Spigot-Server-Patches/0361-Chunk-debug-command.patch
diff --git a/Spigot-Server-Patches/0363-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0362-Catch-exceptions-from-dispenser-entity-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0363-Catch-exceptions-from-dispenser-entity-spawns.patch
rename to Spigot-Server-Patches/0362-Catch-exceptions-from-dispenser-entity-spawns.patch
diff --git a/Spigot-Server-Patches/0364-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0363-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from Spigot-Server-Patches/0364-Fix-World-isChunkGenerated-calls.patch
rename to Spigot-Server-Patches/0363-Fix-World-isChunkGenerated-calls.patch
diff --git a/Spigot-Server-Patches/0365-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0364-Show-blockstate-location-if-we-failed-to-read-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0365-Show-blockstate-location-if-we-failed-to-read-it.patch
rename to Spigot-Server-Patches/0364-Show-blockstate-location-if-we-failed-to-read-it.patch
diff --git a/Spigot-Server-Patches/0366-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch b/Spigot-Server-Patches/0365-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
similarity index 100%
rename from Spigot-Server-Patches/0366-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
rename to Spigot-Server-Patches/0365-Synchronize-DataPaletteBlock-instead-of-ReentrantLoc.patch
diff --git a/Spigot-Server-Patches/0367-incremental-chunk-saving.patch b/Spigot-Server-Patches/0366-incremental-chunk-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0367-incremental-chunk-saving.patch
rename to Spigot-Server-Patches/0366-incremental-chunk-saving.patch
diff --git a/Spigot-Server-Patches/0368-Anti-Xray.patch b/Spigot-Server-Patches/0367-Anti-Xray.patch
similarity index 99%
rename from Spigot-Server-Patches/0368-Anti-Xray.patch
rename to Spigot-Server-Patches/0367-Anti-Xray.patch
index fc43360225..74ab157472 100644
--- a/Spigot-Server-Patches/0368-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0367-Anti-Xray.patch
@@ -1315,7 +1315,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 6250afbb7a9669aa3e402409e2f5da68f54b8970..2aa43bc2c6645297750d628d714136e1b4ac8133 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 {
@@ -1382,7 +1382,7 @@ index 09da0cc8f02c504191dfec8be93e6cf67c6afb78..9ee7e1e93659beb747b8fe2b926522b1
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7c7c038dde32c2acd10cd653c6c85bca466d3a6c..fa134406c7d0132971ad5d75f1e0f46667f94a01 100644
+index 9c3f6a82646b82979331fa9f9d9fc102e042d661..dd956f5892bd79b5c614f3a85611e1238e679aed 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/0369-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0368-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
similarity index 100%
rename from Spigot-Server-Patches/0369-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
rename to Spigot-Server-Patches/0368-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/Spigot-Server-Patches/0370-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0369-Configurable-projectile-relative-velocity.patch
similarity index 100%
rename from Spigot-Server-Patches/0370-Configurable-projectile-relative-velocity.patch
rename to Spigot-Server-Patches/0369-Configurable-projectile-relative-velocity.patch
diff --git a/Spigot-Server-Patches/0371-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0370-Mark-entities-as-being-ticked-when-notifying-navigat.patch
similarity index 100%
rename from Spigot-Server-Patches/0371-Mark-entities-as-being-ticked-when-notifying-navigat.patch
rename to Spigot-Server-Patches/0370-Mark-entities-as-being-ticked-when-notifying-navigat.patch
diff --git a/Spigot-Server-Patches/0372-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0371-offset-item-frame-ticking.patch
similarity index 100%
rename from Spigot-Server-Patches/0372-offset-item-frame-ticking.patch
rename to Spigot-Server-Patches/0371-offset-item-frame-ticking.patch
diff --git a/Spigot-Server-Patches/0373-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0372-Avoid-hopper-searches-if-there-are-no-items.patch
similarity index 98%
rename from Spigot-Server-Patches/0373-Avoid-hopper-searches-if-there-are-no-items.patch
rename to Spigot-Server-Patches/0372-Avoid-hopper-searches-if-there-are-no-items.patch
index 8d625255e8..76068ef395 100644
--- a/Spigot-Server-Patches/0373-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0372-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -100,7 +100,7 @@ index 8dea2c50529478cf8473a53b7f760546812aa7ff..a6cd89e0850c11ab6dd7f77842583c45
                  T t0 = (T) iterator.next(); // CraftBukkit - decompile error
                  if (t0.shouldBeRemoved) continue; // Paper
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index c13bb708ccd14c3848afbc9afaf6439c1a574f22..3c296c81845c295c66854cb365f2061a7a7bbf23 100644
+index 50f342c5f6e1ee5865646af0327567d7005a9ca5..7ba071a5cc14ef89dc005f4b9cebdc4cdef52532 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -11,6 +11,7 @@ public final class IEntitySelector {
diff --git a/Spigot-Server-Patches/0374-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0373-Asynchronous-chunk-IO-and-loading.patch
similarity index 100%
rename from Spigot-Server-Patches/0374-Asynchronous-chunk-IO-and-loading.patch
rename to Spigot-Server-Patches/0373-Asynchronous-chunk-IO-and-loading.patch
diff --git a/Spigot-Server-Patches/0375-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from Spigot-Server-Patches/0375-Use-getChunkIfLoadedImmediately-in-places.patch
rename to Spigot-Server-Patches/0374-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/Spigot-Server-Patches/0376-Reduce-sync-loads.patch b/Spigot-Server-Patches/0375-Reduce-sync-loads.patch
similarity index 99%
rename from Spigot-Server-Patches/0376-Reduce-sync-loads.patch
rename to Spigot-Server-Patches/0375-Reduce-sync-loads.patch
index 0362a5868c..8e3f7e3809 100644
--- a/Spigot-Server-Patches/0376-Reduce-sync-loads.patch
+++ b/Spigot-Server-Patches/0375-Reduce-sync-loads.patch
@@ -298,7 +298,7 @@ index 032464901e02392df4966c68cce8d06f2bd6b6f8..55feb186e4f3f7985efdf7c4410ed423
              this.serverThreadQueue.awaitTasks(completablefuture::isDone);
                  com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 48d4b0314eb0934fdaa445800eceed481a662c63..ab5bf1ea0413cd947204794017b02a52cb601507 100644
+index 6e2e5d7636c25c8fbb37cc96aac83f8b37828c1f..58c030976f36c20808fcec6d922f5a1d4727a372 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1067,7 +1067,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0377-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0376-Implement-alternative-item-despawn-rate.patch
similarity index 100%
rename from Spigot-Server-Patches/0377-Implement-alternative-item-despawn-rate.patch
rename to Spigot-Server-Patches/0376-Implement-alternative-item-despawn-rate.patch
diff --git a/Spigot-Server-Patches/0378-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
similarity index 100%
rename from Spigot-Server-Patches/0378-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
rename to Spigot-Server-Patches/0377-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch
diff --git a/Spigot-Server-Patches/0379-Fix-MC-158900.patch b/Spigot-Server-Patches/0378-Fix-MC-158900.patch
similarity index 94%
rename from Spigot-Server-Patches/0379-Fix-MC-158900.patch
rename to Spigot-Server-Patches/0378-Fix-MC-158900.patch
index 174f5ee289..b184aa3910 100644
--- a/Spigot-Server-Patches/0379-Fix-MC-158900.patch
+++ b/Spigot-Server-Patches/0378-Fix-MC-158900.patch
@@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it
 was expired at that point, then it would be null.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 531b64e96b30b4f5ae80ecc0b2fb3d656ca4ade9..978cda5490c9348fe02c1b1b90a1bb4988a3045b 100644
+index e6b7f1d0e864b32dd670547609c103cf7b6831c5..8104c335870aac88d9db6fec567360415ff69f99 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -531,8 +531,10 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0380-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0379-implement-optional-per-player-mob-spawns.patch
similarity index 100%
rename from Spigot-Server-Patches/0380-implement-optional-per-player-mob-spawns.patch
rename to Spigot-Server-Patches/0379-implement-optional-per-player-mob-spawns.patch
diff --git a/Spigot-Server-Patches/0381-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch
similarity index 95%
rename from Spigot-Server-Patches/0381-Prevent-consuming-the-wrong-itemstack.patch
rename to Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch
index d26dbc6684..6a0e6489f5 100644
--- a/Spigot-Server-Patches/0381-Prevent-consuming-the-wrong-itemstack.patch
+++ b/Spigot-Server-Patches/0380-Prevent-consuming-the-wrong-itemstack.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index aecb5ca746be20e31f047a68f729d5c5a3699140..1de120fc11cdcd6ea38ab51a7d9c69b71a132507 100644
+index f0202dcb31fe637caa6bd998edec4cbc1def8324..cf2850e21ac93ccc5ec95122f715be78bfdabb99 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3077,10 +3077,13 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0382-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0381-Fix-nether-portal-creation.patch
similarity index 100%
rename from Spigot-Server-Patches/0382-Fix-nether-portal-creation.patch
rename to Spigot-Server-Patches/0381-Fix-nether-portal-creation.patch
diff --git a/Spigot-Server-Patches/0383-Generator-Settings.patch b/Spigot-Server-Patches/0382-Generator-Settings.patch
similarity index 100%
rename from Spigot-Server-Patches/0383-Generator-Settings.patch
rename to Spigot-Server-Patches/0382-Generator-Settings.patch
diff --git a/Spigot-Server-Patches/0384-Fix-MC-161754.patch b/Spigot-Server-Patches/0383-Fix-MC-161754.patch
similarity index 100%
rename from Spigot-Server-Patches/0384-Fix-MC-161754.patch
rename to Spigot-Server-Patches/0383-Fix-MC-161754.patch
diff --git a/Spigot-Server-Patches/0385-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0384-Performance-improvement-for-Chunk.getEntities.patch
similarity index 100%
rename from Spigot-Server-Patches/0385-Performance-improvement-for-Chunk.getEntities.patch
rename to Spigot-Server-Patches/0384-Performance-improvement-for-Chunk.getEntities.patch
diff --git a/Spigot-Server-Patches/0386-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0385-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
similarity index 100%
rename from Spigot-Server-Patches/0386-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
rename to Spigot-Server-Patches/0385-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
diff --git a/Spigot-Server-Patches/0387-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0386-Expose-the-internal-current-tick.patch
similarity index 100%
rename from Spigot-Server-Patches/0387-Expose-the-internal-current-tick.patch
rename to Spigot-Server-Patches/0386-Expose-the-internal-current-tick.patch
diff --git a/Spigot-Server-Patches/0388-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0387-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
similarity index 100%
rename from Spigot-Server-Patches/0388-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
rename to Spigot-Server-Patches/0387-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch
diff --git a/Spigot-Server-Patches/0389-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0388-Add-option-to-disable-pillager-patrols.patch
similarity index 100%
rename from Spigot-Server-Patches/0389-Add-option-to-disable-pillager-patrols.patch
rename to Spigot-Server-Patches/0388-Add-option-to-disable-pillager-patrols.patch
diff --git a/Spigot-Server-Patches/0390-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
similarity index 100%
rename from Spigot-Server-Patches/0390-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
rename to Spigot-Server-Patches/0389-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
diff --git a/Spigot-Server-Patches/0391-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0390-PlayerLaunchProjectileEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0391-PlayerLaunchProjectileEvent.patch
rename to Spigot-Server-Patches/0390-PlayerLaunchProjectileEvent.patch
diff --git a/Spigot-Server-Patches/0392-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0391-Add-CraftMagicNumbers.isSupportedApiVersion.patch
similarity index 100%
rename from Spigot-Server-Patches/0392-Add-CraftMagicNumbers.isSupportedApiVersion.patch
rename to Spigot-Server-Patches/0391-Add-CraftMagicNumbers.isSupportedApiVersion.patch
diff --git a/Spigot-Server-Patches/0393-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0392-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
similarity index 100%
rename from Spigot-Server-Patches/0393-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
rename to Spigot-Server-Patches/0392-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/Spigot-Server-Patches/0394-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0393-MC-145656-Fix-Follow-Range-Initial-Target.patch
similarity index 100%
rename from Spigot-Server-Patches/0394-MC-145656-Fix-Follow-Range-Initial-Target.patch
rename to Spigot-Server-Patches/0393-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/Spigot-Server-Patches/0395-Optimize-Hoppers.patch b/Spigot-Server-Patches/0394-Optimize-Hoppers.patch
similarity index 99%
rename from Spigot-Server-Patches/0395-Optimize-Hoppers.patch
rename to Spigot-Server-Patches/0394-Optimize-Hoppers.patch
index 81223b2e8d..70ce55c128 100644
--- a/Spigot-Server-Patches/0395-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0394-Optimize-Hoppers.patch
@@ -85,7 +85,7 @@ index bdcbc2a05714c37fc034ddbfd0166efbeff1c4ac..9290d6c84e764bf691d9222723d73209
              this.methodProfiler.a(() -> {
                  return worldserver + " " + worldserver.getDimensionKey().a();
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6edd5b7ab68572746056e35e5f3a0825eb5224c5..a1bb45a5754b5455082a6ccc6d6b6cf3b62aa63d 100644
+index 338cf8c896a6fc869eb9c54d39ad5713f6fcc377..d32540c88bb902e9c191142a2b75a05b63218e52 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -63,6 +63,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -485,7 +485,7 @@ index c6e6c54a3eb5d725b71f2ec2bb27dd8e2aceabde..c79ebe2343cc14f113c0cc6496c20e7d
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ab5bf1ea0413cd947204794017b02a52cb601507..3db488d602dde2ba5dcd324ad38b19edd24e9285 100644
+index 58c030976f36c20808fcec6d922f5a1d4727a372..930e41935e0ef1af37eafca005d4e492c3b72a6f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1099,8 +1099,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0396-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0395-PlayerDeathEvent-shouldDropExperience.patch
similarity index 90%
rename from Spigot-Server-Patches/0396-PlayerDeathEvent-shouldDropExperience.patch
rename to Spigot-Server-Patches/0395-PlayerDeathEvent-shouldDropExperience.patch
index e98fc8e6ce..742f04ae33 100644
--- a/Spigot-Server-Patches/0396-PlayerDeathEvent-shouldDropExperience.patch
+++ b/Spigot-Server-Patches/0395-PlayerDeathEvent-shouldDropExperience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e82d4b4ef55f981ea653e53424a5a8c746fa70d3..04e402275de6797dcd25d2497faf6a258dc26112 100644
+index 256677a48d1eebff89fa24dfbdc76a5003e4397d..68a2c1f287beb3f9987e32951a81e89c73f95cce 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -692,7 +692,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0397-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0396-Prevent-bees-loading-chunks-checking-hive-position.patch
similarity index 100%
rename from Spigot-Server-Patches/0397-Prevent-bees-loading-chunks-checking-hive-position.patch
rename to Spigot-Server-Patches/0396-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/Spigot-Server-Patches/0398-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0397-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
similarity index 100%
rename from Spigot-Server-Patches/0398-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
rename to Spigot-Server-Patches/0397-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/Spigot-Server-Patches/0399-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0398-Guard-against-serializing-mismatching-chunk-coordina.patch
similarity index 100%
rename from Spigot-Server-Patches/0399-Guard-against-serializing-mismatching-chunk-coordina.patch
rename to Spigot-Server-Patches/0398-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/Spigot-Server-Patches/0400-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0399-Optimise-IEntityAccess-getPlayerByUUID.patch
similarity index 100%
rename from Spigot-Server-Patches/0400-Optimise-IEntityAccess-getPlayerByUUID.patch
rename to Spigot-Server-Patches/0399-Optimise-IEntityAccess-getPlayerByUUID.patch
diff --git a/Spigot-Server-Patches/0401-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0400-Fix-items-not-falling-correctly.patch
similarity index 93%
rename from Spigot-Server-Patches/0401-Fix-items-not-falling-correctly.patch
rename to Spigot-Server-Patches/0400-Fix-items-not-falling-correctly.patch
index 87fbda3115..fb50da6b95 100644
--- a/Spigot-Server-Patches/0401-Fix-items-not-falling-correctly.patch
+++ b/Spigot-Server-Patches/0400-Fix-items-not-falling-correctly.patch
@@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's
 move method from Spigot's entity activation range check.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index d8f55884a60df39b099ec71a97cbc69855f96ed7..cfb31c412cc6507c31e4de11592e95ea54bbc4d6 100644
+index 574e2cce9b821e36bd0efee6d5fb79dde36246cb..bc4f84c8857aab45a69c915104de8d70b758698c 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -89,7 +89,7 @@ public class EntityItem extends Entity {
diff --git a/Spigot-Server-Patches/0402-Lag-compensate-eating.patch b/Spigot-Server-Patches/0401-Lag-compensate-eating.patch
similarity index 97%
rename from Spigot-Server-Patches/0402-Lag-compensate-eating.patch
rename to Spigot-Server-Patches/0401-Lag-compensate-eating.patch
index 170408738a..b2beb049c5 100644
--- a/Spigot-Server-Patches/0402-Lag-compensate-eating.patch
+++ b/Spigot-Server-Patches/0401-Lag-compensate-eating.patch
@@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
 Change to also use a time check instead if it passes.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 56fe1bfd2a1eabc531087b9bd34848f5e960f19b..228edf1beb04649ddca0726d90f41ce5506c253b 100644
+index ad0203c9d61d9651fc81783ea223f161f1a782e4..d022948861c00c022864b5d2071c1956885a1dc7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -119,7 +119,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0403-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0402-Optimize-call-to-getFluid-for-explosions.patch
similarity index 91%
rename from Spigot-Server-Patches/0403-Optimize-call-to-getFluid-for-explosions.patch
rename to Spigot-Server-Patches/0402-Optimize-call-to-getFluid-for-explosions.patch
index 7b75139061..1c0d4d9dac 100644
--- a/Spigot-Server-Patches/0403-Optimize-call-to-getFluid-for-explosions.patch
+++ b/Spigot-Server-Patches/0402-Optimize-call-to-getFluid-for-explosions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize call to getFluid for explosions
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 7b6c3a667ea67b25f9f12d4049dfc51b1c9fb69d..005ab6dd65b9c50cb07048a69613e425a369b69f 100644
+index b7d635ca2cbe9bf7e2e3a2ae5fa7a20f39dd913b..9823fb5eebbfee026d3173c81368cf6e3e901f92 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -125,7 +125,7 @@ public class Explosion {
diff --git a/Spigot-Server-Patches/0404-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0403-Fix-last-firework-in-stack-not-having-effects-when-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0404-Fix-last-firework-in-stack-not-having-effects-when-d.patch
rename to Spigot-Server-Patches/0403-Fix-last-firework-in-stack-not-having-effects-when-d.patch
diff --git a/Spigot-Server-Patches/0405-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0404-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from Spigot-Server-Patches/0405-Add-effect-to-block-break-naturally.patch
rename to Spigot-Server-Patches/0404-Add-effect-to-block-break-naturally.patch
diff --git a/Spigot-Server-Patches/0406-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0405-Tracking-Range-Improvements.patch
similarity index 100%
rename from Spigot-Server-Patches/0406-Tracking-Range-Improvements.patch
rename to Spigot-Server-Patches/0405-Tracking-Range-Improvements.patch
diff --git a/Spigot-Server-Patches/0407-Entity-Activation-Range-2.0.patch b/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch
similarity index 99%
rename from Spigot-Server-Patches/0407-Entity-Activation-Range-2.0.patch
rename to Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch
index a541042f7a..eb628880c9 100644
--- a/Spigot-Server-Patches/0407-Entity-Activation-Range-2.0.patch
+++ b/Spigot-Server-Patches/0406-Entity-Activation-Range-2.0.patch
@@ -77,7 +77,7 @@ index 68f1a101174f4a2f7ab5556a5b733f75f3a7802f..4757e5a92c9cf04fa52d62bac6dae782
      protected EntityCreature(EntityTypes<? extends EntityCreature> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 6279f00bc8ca0334d34305590b8eed0637ccdf46..36df27024c0486a1c3c9d72f366d689a94b89749 100644
+index f5203a0058974de7f1e3e9e291908ff37d54dbd0..9cf496b5e59b228ed65dca7b6b2fea725fd361d9 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -47,7 +47,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -108,7 +108,7 @@ index 6279f00bc8ca0334d34305590b8eed0637ccdf46..36df27024c0486a1c3c9d72f366d689a
          if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) {
              EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle();
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 228edf1beb04649ddca0726d90f41ce5506c253b..fede5e527a6f19243a25567e378ceebf79e118d6 100644
+index d022948861c00c022864b5d2071c1956885a1dc7..0442bb347ffbfb9e2102cd490717579b9aafdcd0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -97,7 +97,7 @@ public abstract class EntityLiving extends Entity {
@@ -326,7 +326,7 @@ index 182cd7e9110408fff9909ef362d368d055a2b167..f3df10587e652d3a26d15deb09304b97
          return this.c;
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3db488d602dde2ba5dcd324ad38b19edd24e9285..08ad1e6034fe484a65faacd6b8e63d664720f395 100644
+index 930e41935e0ef1af37eafca005d4e492c3b72a6f..8afacfb8d5f4efd2ad6f95fbb7b0d62e68c51503 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -82,6 +82,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0408-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0407-Fix-items-vanishing-through-end-portal.patch
similarity index 100%
rename from Spigot-Server-Patches/0408-Fix-items-vanishing-through-end-portal.patch
rename to Spigot-Server-Patches/0407-Fix-items-vanishing-through-end-portal.patch
diff --git a/Spigot-Server-Patches/0409-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0408-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
similarity index 100%
rename from Spigot-Server-Patches/0409-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
rename to Spigot-Server-Patches/0408-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/Spigot-Server-Patches/0410-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch
similarity index 97%
rename from Spigot-Server-Patches/0410-Optimise-getChunkAt-calls-for-loaded-chunks.patch
rename to Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index 21be124c86..b26f839020 100644
--- a/Spigot-Server-Patches/0410-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/Spigot-Server-Patches/0409-Optimise-getChunkAt-calls-for-loaded-chunks.patch
@@ -65,7 +65,7 @@ index dce9c62c0cf37a37994537b74dfdc2286c60fae2..f7055ee0f2d497502f6a8b03544a5595
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 08ad1e6034fe484a65faacd6b8e63d664720f395..31f27db84e15664bb5aa81da73916e65bbffb62f 100644
+index 8afacfb8d5f4efd2ad6f95fbb7b0d62e68c51503..b68ffde49d9f49a2c5e47b524d1db720b9d7f4eb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -286,6 +286,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0411-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0410-Allow-overriding-the-java-version-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0411-Allow-overriding-the-java-version-check.patch
rename to Spigot-Server-Patches/0410-Allow-overriding-the-java-version-check.patch
diff --git a/Spigot-Server-Patches/0412-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0411-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0412-Add-ThrownEggHatchEvent.patch
rename to Spigot-Server-Patches/0411-Add-ThrownEggHatchEvent.patch
diff --git a/Spigot-Server-Patches/0413-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch
similarity index 99%
rename from Spigot-Server-Patches/0413-Optimise-random-block-ticking.patch
rename to Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch
index 096a8ed42b..d447d89a2d 100644
--- a/Spigot-Server-Patches/0413-Optimise-random-block-ticking.patch
+++ b/Spigot-Server-Patches/0412-Optimise-random-block-ticking.patch
@@ -243,7 +243,7 @@ index 1fd2a41050de39b47a0fe6e52f7a6727a8475757..430f9d23a24f6d28af91719f8ca81ad1
  
      public BlockPosition getHomePos() { // Paper - public
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 31f27db84e15664bb5aa81da73916e65bbffb62f..c3f524a3b1ce20d61e3f6b5a0897cf6bb9b2460c 100644
+index b68ffde49d9f49a2c5e47b524d1db720b9d7f4eb..6f0001afbc0f6cef00a9dda50e5d9b2254f64659 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1417,10 +1417,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0414-Entity-Jump-API.patch b/Spigot-Server-Patches/0413-Entity-Jump-API.patch
similarity index 96%
rename from Spigot-Server-Patches/0414-Entity-Jump-API.patch
rename to Spigot-Server-Patches/0413-Entity-Jump-API.patch
index b907ccacf0..d6dda87309 100644
--- a/Spigot-Server-Patches/0414-Entity-Jump-API.patch
+++ b/Spigot-Server-Patches/0413-Entity-Jump-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fede5e527a6f19243a25567e378ceebf79e118d6..0cce4dabcfc6bd2ad99d59597d4cddd98276bb8d 100644
+index 0442bb347ffbfb9e2102cd490717579b9aafdcd0..4ecb5076aacd7d779742dc47d5da5a68f58d7c73 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2752,8 +2752,10 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0415-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0414-Add-option-to-nerf-pigmen-from-nether-portals.patch
similarity index 100%
rename from Spigot-Server-Patches/0415-Add-option-to-nerf-pigmen-from-nether-portals.patch
rename to Spigot-Server-Patches/0414-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/Spigot-Server-Patches/0416-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0415-Make-the-GUI-graph-fancier.patch
similarity index 100%
rename from Spigot-Server-Patches/0416-Make-the-GUI-graph-fancier.patch
rename to Spigot-Server-Patches/0415-Make-the-GUI-graph-fancier.patch
diff --git a/Spigot-Server-Patches/0417-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 93%
rename from Spigot-Server-Patches/0417-add-hand-to-BlockMultiPlaceEvent.patch
rename to Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch
index 60300eb740..c7d07ec000 100644
--- a/Spigot-Server-Patches/0417-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/Spigot-Server-Patches/0416-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index be7e98dc6f8faf4ebfd24df035ade809a3e4c918..6bd2b47151a3abfd0b96641272ecc9fe2d2421b2 100644
+index 90ab1c85f9b9055172e01fe4ba899c9eda6f5cfa..18981022242cdab6a3d1b17a0f0d1ff988fa8e08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -335,13 +335,18 @@ public class CraftEventFactory {
diff --git a/Spigot-Server-Patches/0418-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0417-Prevent-teleporting-dead-entities.patch
similarity index 100%
rename from Spigot-Server-Patches/0418-Prevent-teleporting-dead-entities.patch
rename to Spigot-Server-Patches/0417-Prevent-teleporting-dead-entities.patch
diff --git a/Spigot-Server-Patches/0419-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0418-Validate-tripwire-hook-placement-before-update.patch
similarity index 100%
rename from Spigot-Server-Patches/0419-Validate-tripwire-hook-placement-before-update.patch
rename to Spigot-Server-Patches/0418-Validate-tripwire-hook-placement-before-update.patch
diff --git a/Spigot-Server-Patches/0420-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0419-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
similarity index 100%
rename from Spigot-Server-Patches/0420-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
rename to Spigot-Server-Patches/0419-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/Spigot-Server-Patches/0421-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0420-Configurable-chance-of-villager-zombie-infection.patch
similarity index 100%
rename from Spigot-Server-Patches/0421-Configurable-chance-of-villager-zombie-infection.patch
rename to Spigot-Server-Patches/0420-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/Spigot-Server-Patches/0422-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0421-Optimise-Chunk-getFluid.patch
similarity index 100%
rename from Spigot-Server-Patches/0422-Optimise-Chunk-getFluid.patch
rename to Spigot-Server-Patches/0421-Optimise-Chunk-getFluid.patch
diff --git a/Spigot-Server-Patches/0423-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0422-Optimise-TickListServer-by-rewriting-it.patch
similarity index 100%
rename from Spigot-Server-Patches/0423-Optimise-TickListServer-by-rewriting-it.patch
rename to Spigot-Server-Patches/0422-Optimise-TickListServer-by-rewriting-it.patch
diff --git a/Spigot-Server-Patches/0424-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0423-Pillager-patrol-spawn-settings-and-per-player-option.patch
similarity index 98%
rename from Spigot-Server-Patches/0424-Pillager-patrol-spawn-settings-and-per-player-option.patch
rename to Spigot-Server-Patches/0423-Pillager-patrol-spawn-settings-and-per-player-option.patch
index 57789c3048..722f6dcf20 100644
--- a/Spigot-Server-Patches/0424-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/Spigot-Server-Patches/0423-Pillager-patrol-spawn-settings-and-per-player-option.patch
@@ -36,7 +36,7 @@ index b633d74450c40bcc8831836f79a7a2daa43e3d35..6c80906d0cf3594a30aa201793a16a29
      private void entitiesTargetWithFollowRange() {
          entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange);
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 04e402275de6797dcd25d2497faf6a258dc26112..4fd7be1029bb69abfce3ad8d939031c574e19e9c 100644
+index 68a2c1f287beb3f9987e32951a81e89c73f95cce..d2a5491116cbe81de97e7f7c87f4409e7ac451c6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -83,6 +83,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0425-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0424-Ensure-Entity-is-never-double-registered.patch
similarity index 97%
rename from Spigot-Server-Patches/0425-Ensure-Entity-is-never-double-registered.patch
rename to Spigot-Server-Patches/0424-Ensure-Entity-is-never-double-registered.patch
index 57c5535952..e2ae81fe2d 100644
--- a/Spigot-Server-Patches/0425-Ensure-Entity-is-never-double-registered.patch
+++ b/Spigot-Server-Patches/0424-Ensure-Entity-is-never-double-registered.patch
@@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state.
 We will now simply log a warning when this happens instead of crashing the server.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6b525e813034cb43403f9b116b5d661eb3be49aa..78d2b48385bcb2090058d617599ef2b639fecbcf 100644
+index 14b860e6ba4cde37aa0a6d854187be5765acfa91..6eebc30671f419f337b9c872cca7b75d10943c2c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -61,6 +61,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0426-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0425-Fix-unregistering-entities-from-unloading-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0426-Fix-unregistering-entities-from-unloading-chunks.patch
rename to Spigot-Server-Patches/0425-Fix-unregistering-entities-from-unloading-chunks.patch
diff --git a/Spigot-Server-Patches/0427-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0426-Remote-Connections-shouldn-t-hold-up-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0427-Remote-Connections-shouldn-t-hold-up-shutdown.patch
rename to Spigot-Server-Patches/0426-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/Spigot-Server-Patches/0428-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0427-Do-not-allow-bees-to-load-chunks-for-beehives.patch
similarity index 100%
rename from Spigot-Server-Patches/0428-Do-not-allow-bees-to-load-chunks-for-beehives.patch
rename to Spigot-Server-Patches/0427-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/Spigot-Server-Patches/0429-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0428-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
similarity index 100%
rename from Spigot-Server-Patches/0429-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
rename to Spigot-Server-Patches/0428-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/Spigot-Server-Patches/0430-Optimize-Collision-to-not-load-chunks.patch b/Spigot-Server-Patches/0429-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0430-Optimize-Collision-to-not-load-chunks.patch
rename to Spigot-Server-Patches/0429-Optimize-Collision-to-not-load-chunks.patch
diff --git a/Spigot-Server-Patches/0431-Don-t-tick-dead-players.patch b/Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch
similarity index 91%
rename from Spigot-Server-Patches/0431-Don-t-tick-dead-players.patch
rename to Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch
index 65e5951a74..45599578c8 100644
--- a/Spigot-Server-Patches/0431-Don-t-tick-dead-players.patch
+++ b/Spigot-Server-Patches/0430-Don-t-tick-dead-players.patch
@@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else.
 This is safe because Spectators are skipped in unloaded chunks too in vanilla.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4fd7be1029bb69abfce3ad8d939031c574e19e9c..32fb4938bd73ad2be24bd7bd856275f6a1b7cafd 100644
+index d2a5491116cbe81de97e7f7c87f4409e7ac451c6..62fef5579b689a6cfe0679764ea22803e0d35388 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -473,7 +473,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/Spigot-Server-Patches/0432-Dead-Player-s-shouldn-t-be-able-to-move.patch b/Spigot-Server-Patches/0431-Dead-Player-s-shouldn-t-be-able-to-move.patch
similarity index 100%
rename from Spigot-Server-Patches/0432-Dead-Player-s-shouldn-t-be-able-to-move.patch
rename to Spigot-Server-Patches/0431-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/Spigot-Server-Patches/0433-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/Spigot-Server-Patches/0432-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0433-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
rename to Spigot-Server-Patches/0432-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
diff --git a/Spigot-Server-Patches/0434-Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/0433-Increase-Light-Queue-Size.patch
similarity index 100%
rename from Spigot-Server-Patches/0434-Increase-Light-Queue-Size.patch
rename to Spigot-Server-Patches/0433-Increase-Light-Queue-Size.patch
diff --git a/Spigot-Server-Patches/0435-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/Spigot-Server-Patches/0434-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
similarity index 100%
rename from Spigot-Server-Patches/0435-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
rename to Spigot-Server-Patches/0434-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch
diff --git a/Spigot-Server-Patches/0436-Don-t-move-existing-players-to-world-spawn.patch b/Spigot-Server-Patches/0435-Don-t-move-existing-players-to-world-spawn.patch
similarity index 93%
rename from Spigot-Server-Patches/0436-Don-t-move-existing-players-to-world-spawn.patch
rename to Spigot-Server-Patches/0435-Don-t-move-existing-players-to-world-spawn.patch
index 36da13e503..5468522cfa 100644
--- a/Spigot-Server-Patches/0436-Don-t-move-existing-players-to-world-spawn.patch
+++ b/Spigot-Server-Patches/0435-Don-t-move-existing-players-to-world-spawn.patch
@@ -10,7 +10,7 @@ larger than the keep loaded range.
 By skipping this, we avoid potential for a large spike on server start.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 32fb4938bd73ad2be24bd7bd856275f6a1b7cafd..2f1f57dc347e37c2b2be0cc7930174aa66bf9d67 100644
+index 62fef5579b689a6cfe0679764ea22803e0d35388..cc7710ab19e4805dff4336a22e0b29af564f8955 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -120,7 +120,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -40,7 +40,7 @@ index 32fb4938bd73ad2be24bd7bd856275f6a1b7cafd..2f1f57dc347e37c2b2be0cc7930174aa
          this.playerInteractManager.a((WorldServer) world);
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c0625090f7c36d42112c2e50785d860aeaecb60e..6cbbb4817a921dc7c811259e34f19e538c107226 100644
+index f08de96267ca3bdc7fe4ed1f024b39df3facf0ed..bf8df178256e5eebbdadfd53e2f0edbfced0aba3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -134,6 +134,8 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0437-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0436-Add-tick-times-API-and-mspt-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0437-Add-tick-times-API-and-mspt-command.patch
rename to Spigot-Server-Patches/0436-Add-tick-times-API-and-mspt-command.patch
diff --git a/Spigot-Server-Patches/0438-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0437-Expose-MinecraftServer-isRunning.patch
similarity index 100%
rename from Spigot-Server-Patches/0438-Expose-MinecraftServer-isRunning.patch
rename to Spigot-Server-Patches/0437-Expose-MinecraftServer-isRunning.patch
diff --git a/Spigot-Server-Patches/0439-Add-Raw-Byte-ItemStack-Serialization.patch b/Spigot-Server-Patches/0438-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0439-Add-Raw-Byte-ItemStack-Serialization.patch
rename to Spigot-Server-Patches/0438-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/Spigot-Server-Patches/0440-Remove-streams-from-Mob-AI-System.patch b/Spigot-Server-Patches/0439-Remove-streams-from-Mob-AI-System.patch
similarity index 100%
rename from Spigot-Server-Patches/0440-Remove-streams-from-Mob-AI-System.patch
rename to Spigot-Server-Patches/0439-Remove-streams-from-Mob-AI-System.patch
diff --git a/Spigot-Server-Patches/0441-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch b/Spigot-Server-Patches/0440-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
similarity index 100%
rename from Spigot-Server-Patches/0441-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
rename to Spigot-Server-Patches/0440-Delay-unsafe-actions-until-after-entity-ticking-is-d.patch
diff --git a/Spigot-Server-Patches/0442-Async-command-map-building.patch b/Spigot-Server-Patches/0441-Async-command-map-building.patch
similarity index 100%
rename from Spigot-Server-Patches/0442-Async-command-map-building.patch
rename to Spigot-Server-Patches/0441-Async-command-map-building.patch
diff --git a/Spigot-Server-Patches/0443-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0442-Improved-Watchdog-Support.patch
similarity index 99%
rename from Spigot-Server-Patches/0443-Improved-Watchdog-Support.patch
rename to Spigot-Server-Patches/0442-Improved-Watchdog-Support.patch
index fa5dfb579e..679dfa75fb 100644
--- a/Spigot-Server-Patches/0443-Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/0442-Improved-Watchdog-Support.patch
@@ -279,7 +279,7 @@ index d3a597d878de4cb625484cbf3a9838961d38ada0..16e4acdb0f834883a480829a864ef757
                  list.stream().map((playerchunk) -> {
                      CompletableFuture completablefuture;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6cbbb4817a921dc7c811259e34f19e538c107226..7baad991689d9f9fd55176028569095a8daa94af 100644
+index bf8df178256e5eebbdadfd53e2f0edbfced0aba3..f76bbac925aef6d1e917195ed2f2b4da1d3d7b52 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -429,7 +429,7 @@ public abstract class PlayerList {
@@ -304,7 +304,7 @@ index 391eca025b69ea96f16403459c7908378cf48eff..e3f6e17fb1f670fcb1096314b801c018
          a(SystemUtils.e);
          a(SystemUtils.f);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c3f524a3b1ce20d61e3f6b5a0897cf6bb9b2460c..34e425854541333b3042f9ec4abb80f186fb67d6 100644
+index 6f0001afbc0f6cef00a9dda50e5d9b2254f64659..8d1bc49e0fd7f0c3da1d6a8c29ddd4be9370e5a7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -806,6 +806,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0444-Optimize-Pathfinding.patch b/Spigot-Server-Patches/0443-Optimize-Pathfinding.patch
similarity index 100%
rename from Spigot-Server-Patches/0444-Optimize-Pathfinding.patch
rename to Spigot-Server-Patches/0443-Optimize-Pathfinding.patch
diff --git a/Spigot-Server-Patches/0445-Reduce-Either-Optional-allocation.patch b/Spigot-Server-Patches/0444-Reduce-Either-Optional-allocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0445-Reduce-Either-Optional-allocation.patch
rename to Spigot-Server-Patches/0444-Reduce-Either-Optional-allocation.patch
diff --git a/Spigot-Server-Patches/0446-Remove-streams-from-PairedQueue.patch b/Spigot-Server-Patches/0445-Remove-streams-from-PairedQueue.patch
similarity index 100%
rename from Spigot-Server-Patches/0446-Remove-streams-from-PairedQueue.patch
rename to Spigot-Server-Patches/0445-Remove-streams-from-PairedQueue.patch
diff --git a/Spigot-Server-Patches/0447-Reduce-memory-footprint-of-NBTTagCompound.patch b/Spigot-Server-Patches/0446-Reduce-memory-footprint-of-NBTTagCompound.patch
similarity index 100%
rename from Spigot-Server-Patches/0447-Reduce-memory-footprint-of-NBTTagCompound.patch
rename to Spigot-Server-Patches/0446-Reduce-memory-footprint-of-NBTTagCompound.patch
diff --git a/Spigot-Server-Patches/0448-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0447-Prevent-opening-inventories-when-frozen.patch
similarity index 97%
rename from Spigot-Server-Patches/0448-Prevent-opening-inventories-when-frozen.patch
rename to Spigot-Server-Patches/0447-Prevent-opening-inventories-when-frozen.patch
index 0d9f38d178..6018cf3c94 100644
--- a/Spigot-Server-Patches/0448-Prevent-opening-inventories-when-frozen.patch
+++ b/Spigot-Server-Patches/0447-Prevent-opening-inventories-when-frozen.patch
@@ -36,7 +36,7 @@ index cc7710ab19e4805dff4336a22e0b29af564f8955..4d117ed0de75672fe95341832ec032b6
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index af95aff8b0252917dd324faadf0dbc773cb38ba6..867443784d685d8f200d00b50e4b11474cee5ebe 100644
+index ebcd2d043b3e6cf90b62eda1ea7a2d8c01f1c7a8..c3a51843a58138270bd24e51b5bead2c43e2cbe3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -319,7 +319,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0449-Optimise-ArraySetSorted-removeIf.patch b/Spigot-Server-Patches/0448-Optimise-ArraySetSorted-removeIf.patch
similarity index 100%
rename from Spigot-Server-Patches/0449-Optimise-ArraySetSorted-removeIf.patch
rename to Spigot-Server-Patches/0448-Optimise-ArraySetSorted-removeIf.patch
diff --git a/Spigot-Server-Patches/0450-Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch
similarity index 93%
rename from Spigot-Server-Patches/0450-Don-t-run-entity-collision-code-if-not-needed.patch
rename to Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch
index d42bee442f..c2112a5d80 100644
--- a/Spigot-Server-Patches/0450-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/Spigot-Server-Patches/0449-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -7,7 +7,7 @@ Will not run if max entity craming is disabled and
 the max collisions per entity is less than or equal to 0
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0cce4dabcfc6bd2ad99d59597d4cddd98276bb8d..ab03bca06ebd6474ef41266b366b7f0176e477c3 100644
+index 4ecb5076aacd7d779742dc47d5da5a68f58d7c73..4001510337a0a0b6f464b799c434f5ff10549225 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2820,10 +2820,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0451-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/Spigot-Server-Patches/0450-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
similarity index 100%
rename from Spigot-Server-Patches/0451-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
rename to Spigot-Server-Patches/0450-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch
diff --git a/Spigot-Server-Patches/0452-Restrict-vanilla-teleport-command-to-valid-locations.patch b/Spigot-Server-Patches/0451-Restrict-vanilla-teleport-command-to-valid-locations.patch
similarity index 100%
rename from Spigot-Server-Patches/0452-Restrict-vanilla-teleport-command-to-valid-locations.patch
rename to Spigot-Server-Patches/0451-Restrict-vanilla-teleport-command-to-valid-locations.patch
diff --git a/Spigot-Server-Patches/0453-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0452-Implement-Player-Client-Options-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0453-Implement-Player-Client-Options-API.patch
rename to Spigot-Server-Patches/0452-Implement-Player-Client-Options-API.patch
diff --git a/Spigot-Server-Patches/0454-Fix-Chunk-Post-Processing-deadlock-risk.patch b/Spigot-Server-Patches/0453-Fix-Chunk-Post-Processing-deadlock-risk.patch
similarity index 100%
rename from Spigot-Server-Patches/0454-Fix-Chunk-Post-Processing-deadlock-risk.patch
rename to Spigot-Server-Patches/0453-Fix-Chunk-Post-Processing-deadlock-risk.patch
diff --git a/Spigot-Server-Patches/0455-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/Spigot-Server-Patches/0454-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
similarity index 100%
rename from Spigot-Server-Patches/0455-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
rename to Spigot-Server-Patches/0454-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/Spigot-Server-Patches/0456-Broadcast-join-message-to-console.patch b/Spigot-Server-Patches/0455-Broadcast-join-message-to-console.patch
similarity index 92%
rename from Spigot-Server-Patches/0456-Broadcast-join-message-to-console.patch
rename to Spigot-Server-Patches/0455-Broadcast-join-message-to-console.patch
index bdfe3cbbaf..84ce751921 100644
--- a/Spigot-Server-Patches/0456-Broadcast-join-message-to-console.patch
+++ b/Spigot-Server-Patches/0455-Broadcast-join-message-to-console.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Broadcast join message to console
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7baad991689d9f9fd55176028569095a8daa94af..2b8ee11bee76671875b9ca2316181ccd2c0088e6 100644
+index f76bbac925aef6d1e917195ed2f2b4da1d3d7b52..7e63e062bafb838e5c817bf5eb794cee522b369b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -211,9 +211,9 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0457-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
similarity index 96%
rename from Spigot-Server-Patches/0457-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
rename to Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
index 1934ffa37d..4c811913a2 100644
--- a/Spigot-Server-Patches/0457-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
+++ b/Spigot-Server-Patches/0456-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch
@@ -28,7 +28,7 @@ receives a deterministic result, and should no longer require 1 tick
 delays anymore.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b22eb32199de78730bc6db5d803fadde5fd3b7c1..5d7be3c9841949a11a3207d0ff355b78e2e28e81 100644
+index a5e3ba2ed7369473f61d0e5ceca58ac2b44ea3ee..7f9bd9a35e5164294a0cfedaf540544c70d0df09 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -106,6 +106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -52,7 +52,7 @@ index 842f5ebad2a4d040b9912ec4841de426667cd91d..c2abf8dca89f3a4f3671e21b2cbfe9c7
          if (!(entity instanceof EntityComplexPart)) {
              EntityTypes<?> entitytypes = entity.getEntityType();
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 2b8ee11bee76671875b9ca2316181ccd2c0088e6..a38b0f5dbc76214853034b0a4663d985e62111bf 100644
+index 7e63e062bafb838e5c817bf5eb794cee522b369b..4995fa3fda87dfb47c8050e57ca29a895b809482 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -200,6 +200,12 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0458-Load-Chunks-for-Login-Asynchronously.patch b/Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch
similarity index 100%
rename from Spigot-Server-Patches/0458-Load-Chunks-for-Login-Asynchronously.patch
rename to Spigot-Server-Patches/0457-Load-Chunks-for-Login-Asynchronously.patch
diff --git a/Spigot-Server-Patches/0459-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/Spigot-Server-Patches/0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
similarity index 100%
rename from Spigot-Server-Patches/0459-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
rename to Spigot-Server-Patches/0458-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
diff --git a/Spigot-Server-Patches/0460-Add-PlayerAttackEntityCooldownResetEvent.patch b/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 94%
rename from Spigot-Server-Patches/0460-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch
index 256734fb73..81737fb159 100644
--- a/Spigot-Server-Patches/0460-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/Spigot-Server-Patches/0459-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ab03bca06ebd6474ef41266b366b7f0176e477c3..01de9a9c965ce156f53577d19f1ca9a138657720 100644
+index 4001510337a0a0b6f464b799c434f5ff10549225..3fbe27fd980cba07acc793077e80a3053e7cb2d8 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1823,7 +1823,16 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0461-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/Spigot-Server-Patches/0460-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
similarity index 100%
rename from Spigot-Server-Patches/0461-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
rename to Spigot-Server-Patches/0460-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch
diff --git a/Spigot-Server-Patches/0462-Don-t-fire-BlockFade-on-worldgen-threads.patch b/Spigot-Server-Patches/0461-Don-t-fire-BlockFade-on-worldgen-threads.patch
similarity index 100%
rename from Spigot-Server-Patches/0462-Don-t-fire-BlockFade-on-worldgen-threads.patch
rename to Spigot-Server-Patches/0461-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/Spigot-Server-Patches/0463-Add-phantom-creative-and-insomniac-controls.patch b/Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch
similarity index 97%
rename from Spigot-Server-Patches/0463-Add-phantom-creative-and-insomniac-controls.patch
rename to Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch
index 7c83c9e38c..e80eb0b0b9 100644
--- a/Spigot-Server-Patches/0463-Add-phantom-creative-and-insomniac-controls.patch
+++ b/Spigot-Server-Patches/0462-Add-phantom-creative-and-insomniac-controls.patch
@@ -33,7 +33,7 @@ index 0605cb3e9873f92835e9f121b18c35e8eca5ccbb..550f80bfdbc8048c23789a2a89ecc946
                              return true;
                          }
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index b06f61639e52e6e5d2942f685cb3e3984a3eaec1..12cf4326594e1a13fa4f48903a7676a9dbb0aa87 100644
+index 7ba071a5cc14ef89dc005f4b9cebdc4cdef52532..a9b0c78d6dba8c6ff7d524e2828f0ee7832e059e 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -25,6 +25,7 @@ public final class IEntitySelector {
diff --git a/Spigot-Server-Patches/0464-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch
similarity index 97%
rename from Spigot-Server-Patches/0464-Fix-numerous-item-duplication-issues-and-teleport-is.patch
rename to Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch
index 965ab8bd63..d84b4ac423 100644
--- a/Spigot-Server-Patches/0464-Fix-numerous-item-duplication-issues-and-teleport-is.patch
+++ b/Spigot-Server-Patches/0463-Fix-numerous-item-duplication-issues-and-teleport-is.patch
@@ -88,10 +88,10 @@ index 587e8e582dfe9c3127ca2b298c4e1db79c2d6c8e..81df71b7e165b8702575176550a587cd
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6bd2b47151a3abfd0b96641272ecc9fe2d2421b2..32202eb92207995b621d151481aa44bd3817e808 100644
+index 18981022242cdab6a3d1b17a0f0d1ff988fa8e08..5e0040078c85daa975568539d8d9a3641ccdd8fb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -808,7 +808,8 @@ public class CraftEventFactory {
+@@ -810,7 +810,8 @@ public class CraftEventFactory {
          for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
              if (stack == null || stack.getType() == Material.AIR || stack.getAmount() == 0) continue;
  
diff --git a/Spigot-Server-Patches/0465-Implement-Brigadier-Mojang-API.patch b/Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0465-Implement-Brigadier-Mojang-API.patch
rename to Spigot-Server-Patches/0464-Implement-Brigadier-Mojang-API.patch
diff --git a/Spigot-Server-Patches/0466-Villager-Restocks-API.patch b/Spigot-Server-Patches/0465-Villager-Restocks-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0466-Villager-Restocks-API.patch
rename to Spigot-Server-Patches/0465-Villager-Restocks-API.patch
diff --git a/Spigot-Server-Patches/0467-Validate-PickItem-Packet-and-kick-for-invalid.patch b/Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0467-Validate-PickItem-Packet-and-kick-for-invalid.patch
rename to Spigot-Server-Patches/0466-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/Spigot-Server-Patches/0468-Expose-game-version.patch b/Spigot-Server-Patches/0467-Expose-game-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0468-Expose-game-version.patch
rename to Spigot-Server-Patches/0467-Expose-game-version.patch
diff --git a/Spigot-Server-Patches/0469-Optimize-Voxel-Shape-Merging.patch b/Spigot-Server-Patches/0468-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from Spigot-Server-Patches/0469-Optimize-Voxel-Shape-Merging.patch
rename to Spigot-Server-Patches/0468-Optimize-Voxel-Shape-Merging.patch
diff --git a/Spigot-Server-Patches/0470-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
similarity index 100%
rename from Spigot-Server-Patches/0470-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
rename to Spigot-Server-Patches/0469-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/Spigot-Server-Patches/0471-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0471-Implement-Mob-Goal-API.patch
rename to Spigot-Server-Patches/0470-Implement-Mob-Goal-API.patch
diff --git a/Spigot-Server-Patches/0472-Use-distance-map-to-optimise-entity-tracker.patch b/Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 99%
rename from Spigot-Server-Patches/0472-Use-distance-map-to-optimise-entity-tracker.patch
rename to Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch
index d2fe9ce3fd..7427f1920e 100644
--- a/Spigot-Server-Patches/0472-Use-distance-map-to-optimise-entity-tracker.patch
+++ b/Spigot-Server-Patches/0471-Use-distance-map-to-optimise-entity-tracker.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use distance map to optimise entity tracker
 Use the distance map to find candidate players for tracking.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 63fddf52b5736ee88f47e7f987c52114a3d7df97..f41c91c0f27e6df8181fafe4c4332ce57b952ea9 100644
+index 112eb6e2568e535ae83cfb832d3b0fc1e46bef65..105fe1f32270bda3343a75b46b6eb89102174ca6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -208,6 +208,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0473-Optimize-isOutsideRange-to-use-distance-maps.patch b/Spigot-Server-Patches/0472-Optimize-isOutsideRange-to-use-distance-maps.patch
similarity index 99%
rename from Spigot-Server-Patches/0473-Optimize-isOutsideRange-to-use-distance-maps.patch
rename to Spigot-Server-Patches/0472-Optimize-isOutsideRange-to-use-distance-maps.patch
index d27e32cdcb..6e7bb6842b 100644
--- a/Spigot-Server-Patches/0473-Optimize-isOutsideRange-to-use-distance-maps.patch
+++ b/Spigot-Server-Patches/0472-Optimize-isOutsideRange-to-use-distance-maps.patch
@@ -148,7 +148,7 @@ index 893a835593af2ea95a50607c8c2f2cdb9af6c944..c54175eaad6230a1098e9b912e0b4788
                              }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4860f84999b22aca6267efd42d920ff8bb868ca5..6d72bdfc4be2fefa465a29f6333390173209bcd2 100644
+index 824f074740ad063815ca80dce679ceb532c8edc2..474bb8ee2548a90c74b458c9952ddf1e465a11ef 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -115,6 +115,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -192,7 +192,7 @@ index 844f5b204b0f8c4474b4b9ffdc9cb7f3564b1336..4074c1f8f8b71544df9aa6e8d59c5703
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 33f5ec0552641e5e979f9a1f3e0d97b23798799b..6abbea108ef4d5b6fac9449336dc2b0c6d4bfd6e 100644
+index 21a9a0364ec6cfd28fcfc0a62d3465993dac1a1c..b4067657eefe6a418b76b599b4c8ffb8359c3f89 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -160,6 +160,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0474-Stop-copy-on-write-operations-for-updating-light-dat.patch b/Spigot-Server-Patches/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch
similarity index 100%
rename from Spigot-Server-Patches/0474-Stop-copy-on-write-operations-for-updating-light-dat.patch
rename to Spigot-Server-Patches/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch
diff --git a/Spigot-Server-Patches/0475-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0474-No-Tick-view-distance-implementation.patch
similarity index 99%
rename from Spigot-Server-Patches/0475-No-Tick-view-distance-implementation.patch
rename to Spigot-Server-Patches/0474-No-Tick-view-distance-implementation.patch
index 6cd1d1fc30..c60fe20013 100644
--- a/Spigot-Server-Patches/0475-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0474-No-Tick-view-distance-implementation.patch
@@ -598,7 +598,7 @@ index 40f2984e5ba7627ef4ce87133bed5df51a68fd65..4c16da52f4402b21be2df3fdf5999427
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 34e425854541333b3042f9ec4abb80f186fb67d6..b4bb84088d5932f92715776d9a62aa26a90122ba 100644
+index 8d1bc49e0fd7f0c3da1d6a8c29ddd4be9370e5a7..08ae4d4fc4e61120d0c68fa534d487140f4e21be 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -473,8 +473,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0476-Add-villager-reputation-API.patch b/Spigot-Server-Patches/0475-Add-villager-reputation-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0476-Add-villager-reputation-API.patch
rename to Spigot-Server-Patches/0475-Add-villager-reputation-API.patch
diff --git a/Spigot-Server-Patches/0477-Fix-Light-Command.patch b/Spigot-Server-Patches/0476-Fix-Light-Command.patch
similarity index 98%
rename from Spigot-Server-Patches/0477-Fix-Light-Command.patch
rename to Spigot-Server-Patches/0476-Fix-Light-Command.patch
index d5d273ae0b..64336b3ba5 100644
--- a/Spigot-Server-Patches/0477-Fix-Light-Command.patch
+++ b/Spigot-Server-Patches/0476-Fix-Light-Command.patch
@@ -136,7 +136,7 @@ index 2784ea71b9f5ee93f6de8e5a3a135457f1be17a3..874bf7d3ddd22ddc4ea08dac1f548d24
          // Paper start - per player view distance
          // there can be potential desync with player's last mapped section and the view distance map, so use the
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 65ff262e99d2270c332d63f1bef85d40c6e557e1..18cde447a983da69ed6deb079ff372004619c903 100644
+index 3e73ef8059139b09518075bb6dc89a67f46be51a..56a2d028040bb77bffee72330bc2a19986b45d00 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -97,6 +97,12 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0478-Fix-PotionEffect-ignores-icon-flag.patch b/Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0478-Fix-PotionEffect-ignores-icon-flag.patch
rename to Spigot-Server-Patches/0477-Fix-PotionEffect-ignores-icon-flag.patch
diff --git a/Spigot-Server-Patches/0479-Optimize-brigadier-child-sorting-performance.patch b/Spigot-Server-Patches/0478-Optimize-brigadier-child-sorting-performance.patch
similarity index 100%
rename from Spigot-Server-Patches/0479-Optimize-brigadier-child-sorting-performance.patch
rename to Spigot-Server-Patches/0478-Optimize-brigadier-child-sorting-performance.patch
diff --git a/Spigot-Server-Patches/0480-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0479-Don-t-toString-block-unless-actually-showing-the-mes.patch
similarity index 100%
rename from Spigot-Server-Patches/0480-Don-t-toString-block-unless-actually-showing-the-mes.patch
rename to Spigot-Server-Patches/0479-Don-t-toString-block-unless-actually-showing-the-mes.patch
diff --git a/Spigot-Server-Patches/0481-Potential-bed-API.patch b/Spigot-Server-Patches/0480-Potential-bed-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0481-Potential-bed-API.patch
rename to Spigot-Server-Patches/0480-Potential-bed-API.patch
index 1ba42230f4..715a488b0b 100644
--- a/Spigot-Server-Patches/0481-Potential-bed-API.patch
+++ b/Spigot-Server-Patches/0480-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 867443784d685d8f200d00b50e4b11474cee5ebe..98768b5df93fd1bf94858149e15a8c9a16439695 100644
+index c3a51843a58138270bd24e51b5bead2c43e2cbe3..9c142fddbfcbff7433c199dbaa679625233db866 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -127,6 +127,22 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0482-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0481-Wait-for-Async-Tasks-during-shutdown.patch
similarity index 100%
rename from Spigot-Server-Patches/0482-Wait-for-Async-Tasks-during-shutdown.patch
rename to Spigot-Server-Patches/0481-Wait-for-Async-Tasks-during-shutdown.patch
diff --git a/Spigot-Server-Patches/0483-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0482-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
similarity index 100%
rename from Spigot-Server-Patches/0483-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
rename to Spigot-Server-Patches/0482-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/Spigot-Server-Patches/0484-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0483-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 98%
rename from Spigot-Server-Patches/0484-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to Spigot-Server-Patches/0483-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index e2a77f8b3a..958ff84056 100644
--- a/Spigot-Server-Patches/0484-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/Spigot-Server-Patches/0483-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
@@ -136,7 +136,7 @@ index 417d1a6c3dbd23905672a847939d92a953bbc91c..0bab7dfb053c1aa92f5417c25fed5484
  
              world.playSound((EntityHuman) null, blockposition, SoundEffects.BLOCK_PISTON_CONTRACT, SoundCategory.BLOCKS, 0.5F, world.random.nextFloat() * 0.15F + 0.6F);
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 005ab6dd65b9c50cb07048a69613e425a369b69f..766ec660fa8c59f02a5299c4770cc658fdf4b075 100644
+index 9823fb5eebbfee026d3173c81368cf6e3e901f92..f263177e3d41fd5720c430be3dcb1b5e2adb0134 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -125,6 +125,7 @@ public class Explosion {
@@ -157,7 +157,7 @@ index 005ab6dd65b9c50cb07048a69613e425a369b69f..766ec660fa8c59f02a5299c4770cc658
  
                      this.world.getMethodProfiler().enter("explosion_blocks");
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b4bb84088d5932f92715776d9a62aa26a90122ba..287db5203f3a4995c2b09bfd9fe17734538e7466 100644
+index 08ae4d4fc4e61120d0c68fa534d487140f4e21be..edda0ddf1c44d6d1177760a92dc483cff20c762c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -371,6 +371,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/Spigot-Server-Patches/0485-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0484-Optimize-NibbleArray-to-use-pooled-buffers.patch
similarity index 100%
rename from Spigot-Server-Patches/0485-Optimize-NibbleArray-to-use-pooled-buffers.patch
rename to Spigot-Server-Patches/0484-Optimize-NibbleArray-to-use-pooled-buffers.patch
diff --git a/Spigot-Server-Patches/0486-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0485-Reduce-MutableInt-allocations-from-light-engine.patch
similarity index 100%
rename from Spigot-Server-Patches/0486-Reduce-MutableInt-allocations-from-light-engine.patch
rename to Spigot-Server-Patches/0485-Reduce-MutableInt-allocations-from-light-engine.patch
diff --git a/Spigot-Server-Patches/0487-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0486-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 97%
rename from Spigot-Server-Patches/0487-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to Spigot-Server-Patches/0486-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index ff87448a7f..d7f6bff788 100644
--- a/Spigot-Server-Patches/0487-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/Spigot-Server-Patches/0486-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
@@ -39,7 +39,7 @@ index 8fecf1172c50669604ac097c8e5d81f83087a063..831298e3bb0de4ef1bec933cf378889c
  
                      if (!flag4 && this.o <= 400 && !this.q && this.r == this.tracker.isOnGround()) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 18cde447a983da69ed6deb079ff372004619c903..8de089ebf56d25c7799f822cdd26511a4651223d 100644
+index 56a2d028040bb77bffee72330bc2a19986b45d00..21aba92fe1b5036a4df3add7688019446a1d5fe5 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -2134,9 +2134,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0488-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0487-Ensure-safe-gateway-teleport.patch
similarity index 100%
rename from Spigot-Server-Patches/0488-Ensure-safe-gateway-teleport.patch
rename to Spigot-Server-Patches/0487-Ensure-safe-gateway-teleport.patch
diff --git a/Spigot-Server-Patches/0489-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0488-Add-option-for-console-having-all-permissions.patch
similarity index 100%
rename from Spigot-Server-Patches/0489-Add-option-for-console-having-all-permissions.patch
rename to Spigot-Server-Patches/0488-Add-option-for-console-having-all-permissions.patch
diff --git a/Spigot-Server-Patches/0490-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0489-Workaround-for-Client-Lag-Spikes-MC-162253.patch
similarity index 98%
rename from Spigot-Server-Patches/0490-Workaround-for-Client-Lag-Spikes-MC-162253.patch
rename to Spigot-Server-Patches/0489-Workaround-for-Client-Lag-Spikes-MC-162253.patch
index cb38ad4829..cee63e8ec2 100644
--- a/Spigot-Server-Patches/0490-Workaround-for-Client-Lag-Spikes-MC-162253.patch
+++ b/Spigot-Server-Patches/0489-Workaround-for-Client-Lag-Spikes-MC-162253.patch
@@ -37,7 +37,7 @@ index 39572cdce691a459cb9df0cc064fbf7bde83a99e..e52df8096e399c84ff8a2637fdd65ea5
          return chunksection == Chunk.a || chunksection.c();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 8de089ebf56d25c7799f822cdd26511a4651223d..12c4868b3d7643330ee5b3b2232dd58e0369839f 100644
+index 21aba92fe1b5036a4df3add7688019446a1d5fe5..fba7c9b5724114eab35a3d24febdee3cd3e30aa0 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1959,12 +1959,112 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0491-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0490-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0491-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
rename to Spigot-Server-Patches/0490-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
diff --git a/Spigot-Server-Patches/0492-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0491-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
similarity index 100%
rename from Spigot-Server-Patches/0492-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
rename to Spigot-Server-Patches/0491-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch
diff --git a/Spigot-Server-Patches/0493-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0492-Optimize-sending-packets-to-nearby-locations-sounds-.patch
similarity index 100%
rename from Spigot-Server-Patches/0493-Optimize-sending-packets-to-nearby-locations-sounds-.patch
rename to Spigot-Server-Patches/0492-Optimize-sending-packets-to-nearby-locations-sounds-.patch
diff --git a/Spigot-Server-Patches/0494-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0493-Improve-Chunk-Status-Transition-Speed.patch
similarity index 98%
rename from Spigot-Server-Patches/0494-Improve-Chunk-Status-Transition-Speed.patch
rename to Spigot-Server-Patches/0493-Improve-Chunk-Status-Transition-Speed.patch
index 2bd5191ec5..c848fcb71b 100644
--- a/Spigot-Server-Patches/0494-Improve-Chunk-Status-Transition-Speed.patch
+++ b/Spigot-Server-Patches/0493-Improve-Chunk-Status-Transition-Speed.patch
@@ -54,7 +54,7 @@ index b629afa7e6f046f1a09237f3355ec193c24e02d8..27c4dc6caf7b6303766dd8eee4812209
      // Paper start - no-tick view distance
      public final Chunk getSendingChunk() {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index ddc2d2eff1ba05bd4174c5137f7750db6749306a..13c2da8000b22a4be98bbdd723fc06b04834b02d 100644
+index 753d67c8a711d293bd70eb913c47ec817e2718e3..7c7b23590735d31cefda5cced96d4e874c06c8f2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -741,7 +741,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0495-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0494-Fix-villager-trading-demand-MC-163962.patch
similarity index 100%
rename from Spigot-Server-Patches/0495-Fix-villager-trading-demand-MC-163962.patch
rename to Spigot-Server-Patches/0494-Fix-villager-trading-demand-MC-163962.patch
diff --git a/Spigot-Server-Patches/0496-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0495-Maps-shouldn-t-load-chunks.patch
similarity index 100%
rename from Spigot-Server-Patches/0496-Maps-shouldn-t-load-chunks.patch
rename to Spigot-Server-Patches/0495-Maps-shouldn-t-load-chunks.patch
diff --git a/Spigot-Server-Patches/0497-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0496-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
similarity index 100%
rename from Spigot-Server-Patches/0497-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
rename to Spigot-Server-Patches/0496-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/Spigot-Server-Patches/0498-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0497-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from Spigot-Server-Patches/0498-Optimize-Bit-Operations-by-inlining.patch
rename to Spigot-Server-Patches/0497-Optimize-Bit-Operations-by-inlining.patch
diff --git a/Spigot-Server-Patches/0499-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0498-Optimize-Light-Engine.patch
similarity index 99%
rename from Spigot-Server-Patches/0499-Optimize-Light-Engine.patch
rename to Spigot-Server-Patches/0498-Optimize-Light-Engine.patch
index 1ff9900fb3..c36c45dff9 100644
--- a/Spigot-Server-Patches/0499-Optimize-Light-Engine.patch
+++ b/Spigot-Server-Patches/0498-Optimize-Light-Engine.patch
@@ -1350,7 +1350,7 @@ index 27c4dc6caf7b6303766dd8eee4812209600cd728..676f0d28b0c8a590c6429a9390295363
          if (getCurrentPriority() != priority) {
              this.u.a(this.location, this::getCurrentPriority, priority, this::setPriority); // use preferred priority
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 13c2da8000b22a4be98bbdd723fc06b04834b02d..8a069cfcbf60f4ef409299cff59232c0cfd7db54 100644
+index 7c7b23590735d31cefda5cced96d4e874c06c8f2..fcd3388d88aad6e897b73e2c823267ada327cbda 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -277,6 +277,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
diff --git a/Spigot-Server-Patches/0500-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0499-Delay-Chunk-Unloads-based-on-Player-Movement.patch
similarity index 100%
rename from Spigot-Server-Patches/0500-Delay-Chunk-Unloads-based-on-Player-Movement.patch
rename to Spigot-Server-Patches/0499-Delay-Chunk-Unloads-based-on-Player-Movement.patch
diff --git a/Spigot-Server-Patches/0501-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0500-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
similarity index 100%
rename from Spigot-Server-Patches/0501-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
rename to Spigot-Server-Patches/0500-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
diff --git a/Spigot-Server-Patches/0502-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0501-Fix-missing-chunks-due-to-integer-overflow.patch
similarity index 100%
rename from Spigot-Server-Patches/0502-Fix-missing-chunks-due-to-integer-overflow.patch
rename to Spigot-Server-Patches/0501-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/Spigot-Server-Patches/0503-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0502-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
similarity index 100%
rename from Spigot-Server-Patches/0503-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
rename to Spigot-Server-Patches/0502-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/Spigot-Server-Patches/0504-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0503-Fix-piston-physics-inconsistency-MC-188840.patch
similarity index 100%
rename from Spigot-Server-Patches/0504-Fix-piston-physics-inconsistency-MC-188840.patch
rename to Spigot-Server-Patches/0503-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/Spigot-Server-Patches/0505-Fix-sand-duping.patch b/Spigot-Server-Patches/0504-Fix-sand-duping.patch
similarity index 100%
rename from Spigot-Server-Patches/0505-Fix-sand-duping.patch
rename to Spigot-Server-Patches/0504-Fix-sand-duping.patch
diff --git a/Spigot-Server-Patches/0506-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0505-Prevent-position-desync-in-playerconnection-causing-.patch
similarity index 100%
rename from Spigot-Server-Patches/0506-Prevent-position-desync-in-playerconnection-causing-.patch
rename to Spigot-Server-Patches/0505-Prevent-position-desync-in-playerconnection-causing-.patch
diff --git a/Spigot-Server-Patches/0507-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0506-Fix-enderdragon-exp-dupe.patch
similarity index 100%
rename from Spigot-Server-Patches/0507-Fix-enderdragon-exp-dupe.patch
rename to Spigot-Server-Patches/0506-Fix-enderdragon-exp-dupe.patch
diff --git a/Spigot-Server-Patches/0508-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0507-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from Spigot-Server-Patches/0508-Inventory-getHolder-method-without-block-snapshot.patch
rename to Spigot-Server-Patches/0507-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/Spigot-Server-Patches/0509-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0508-Expose-Arrow-getItemStack.patch
similarity index 100%
rename from Spigot-Server-Patches/0509-Expose-Arrow-getItemStack.patch
rename to Spigot-Server-Patches/0508-Expose-Arrow-getItemStack.patch
diff --git a/Spigot-Server-Patches/0510-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0509-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0510-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to Spigot-Server-Patches/0509-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/Spigot-Server-Patches/0511-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0510-Hide-sync-chunk-writes-behind-flag.patch
similarity index 100%
rename from Spigot-Server-Patches/0511-Hide-sync-chunk-writes-behind-flag.patch
rename to Spigot-Server-Patches/0510-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/Spigot-Server-Patches/0512-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0511-Limit-lightning-strike-effect-distance.patch
similarity index 100%
rename from Spigot-Server-Patches/0512-Limit-lightning-strike-effect-distance.patch
rename to Spigot-Server-Patches/0511-Limit-lightning-strike-effect-distance.patch
diff --git a/Spigot-Server-Patches/0513-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0512-Add-permission-for-command-blocks.patch
similarity index 100%
rename from Spigot-Server-Patches/0513-Add-permission-for-command-blocks.patch
rename to Spigot-Server-Patches/0512-Add-permission-for-command-blocks.patch
diff --git a/Spigot-Server-Patches/0514-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0513-Ensure-Entity-AABB-s-are-never-invalid.patch
similarity index 100%
rename from Spigot-Server-Patches/0514-Ensure-Entity-AABB-s-are-never-invalid.patch
rename to Spigot-Server-Patches/0513-Ensure-Entity-AABB-s-are-never-invalid.patch
diff --git a/Spigot-Server-Patches/0515-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0514-Optimize-WorldBorder-collision-checks-and-air.patch
similarity index 97%
rename from Spigot-Server-Patches/0515-Optimize-WorldBorder-collision-checks-and-air.patch
rename to Spigot-Server-Patches/0514-Optimize-WorldBorder-collision-checks-and-air.patch
index f4287c6c27..5cadf4fe9d 100644
--- a/Spigot-Server-Patches/0515-Optimize-WorldBorder-collision-checks-and-air.patch
+++ b/Spigot-Server-Patches/0514-Optimize-WorldBorder-collision-checks-and-air.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7f33bcfe79a4fc8466f2b111cda4ec6c0290ca2d..ad521f95aba0e82e3280351419ad23acfa283f9a 100644
+index 3190ed02f56587b565fe3f5b151ef44bd60401ff..f3ba97f58b8953e3bafd9f2c9d6541a1b5b13700 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -819,7 +819,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0516-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0515-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
similarity index 100%
rename from Spigot-Server-Patches/0516-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
rename to Spigot-Server-Patches/0515-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
diff --git a/Spigot-Server-Patches/0517-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0516-Paper-dumpitem-command.patch
similarity index 100%
rename from Spigot-Server-Patches/0517-Paper-dumpitem-command.patch
rename to Spigot-Server-Patches/0516-Paper-dumpitem-command.patch
diff --git a/Spigot-Server-Patches/0518-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0517-Don-t-allow-null-UUID-s-for-chat.patch
similarity index 100%
rename from Spigot-Server-Patches/0518-Don-t-allow-null-UUID-s-for-chat.patch
rename to Spigot-Server-Patches/0517-Don-t-allow-null-UUID-s-for-chat.patch
diff --git a/Spigot-Server-Patches/0519-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0518-Improve-Legacy-Component-serialization-size.patch
similarity index 100%
rename from Spigot-Server-Patches/0519-Improve-Legacy-Component-serialization-size.patch
rename to Spigot-Server-Patches/0518-Improve-Legacy-Component-serialization-size.patch
diff --git a/Spigot-Server-Patches/0520-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0519-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from Spigot-Server-Patches/0520-Support-old-UUID-format-for-NBT.patch
rename to Spigot-Server-Patches/0519-Support-old-UUID-format-for-NBT.patch
diff --git a/Spigot-Server-Patches/0521-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0520-Clean-up-duplicated-GameProfile-Properties.patch
similarity index 100%
rename from Spigot-Server-Patches/0521-Clean-up-duplicated-GameProfile-Properties.patch
rename to Spigot-Server-Patches/0520-Clean-up-duplicated-GameProfile-Properties.patch
diff --git a/Spigot-Server-Patches/0522-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0521-Convert-legacy-attributes-in-Item-Meta.patch
similarity index 100%
rename from Spigot-Server-Patches/0522-Convert-legacy-attributes-in-Item-Meta.patch
rename to Spigot-Server-Patches/0521-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/Spigot-Server-Patches/0523-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0522-Remove-some-streams-from-structures.patch
similarity index 100%
rename from Spigot-Server-Patches/0523-Remove-some-streams-from-structures.patch
rename to Spigot-Server-Patches/0522-Remove-some-streams-from-structures.patch
diff --git a/Spigot-Server-Patches/0524-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0523-Remove-streams-from-classes-related-villager-gossip.patch
similarity index 100%
rename from Spigot-Server-Patches/0524-Remove-streams-from-classes-related-villager-gossip.patch
rename to Spigot-Server-Patches/0523-Remove-streams-from-classes-related-villager-gossip.patch
diff --git a/Spigot-Server-Patches/0525-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0524-Support-components-in-ItemMeta.patch
similarity index 100%
rename from Spigot-Server-Patches/0525-Support-components-in-ItemMeta.patch
rename to Spigot-Server-Patches/0524-Support-components-in-ItemMeta.patch
diff --git a/Spigot-Server-Patches/0526-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0525-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
similarity index 100%
rename from Spigot-Server-Patches/0526-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
rename to Spigot-Server-Patches/0525-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch
diff --git a/Spigot-Server-Patches/0527-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0526-Add-entity-liquid-API.patch
similarity index 97%
rename from Spigot-Server-Patches/0527-Add-entity-liquid-API.patch
rename to Spigot-Server-Patches/0526-Add-entity-liquid-API.patch
index faa0fbe2d6..f7d91e7579 100644
--- a/Spigot-Server-Patches/0527-Add-entity-liquid-API.patch
+++ b/Spigot-Server-Patches/0526-Add-entity-liquid-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ad521f95aba0e82e3280351419ad23acfa283f9a..97e61dae7927d7da18fcb23d9e4bf639234af4a5 100644
+index f3ba97f58b8953e3bafd9f2c9d6541a1b5b13700..45e7e30892d031df42ae72de28ba4bbe8e1a6cd5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1076,12 +1076,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/Spigot-Server-Patches/0528-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0527-Update-itemstack-legacy-name-and-lore.patch
similarity index 100%
rename from Spigot-Server-Patches/0528-Update-itemstack-legacy-name-and-lore.patch
rename to Spigot-Server-Patches/0527-Update-itemstack-legacy-name-and-lore.patch
diff --git a/Spigot-Server-Patches/0529-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0528-Spawn-player-in-correct-world-on-login.patch
similarity index 94%
rename from Spigot-Server-Patches/0529-Spawn-player-in-correct-world-on-login.patch
rename to Spigot-Server-Patches/0528-Spawn-player-in-correct-world-on-login.patch
index 6288d9fe79..6805ba6a55 100644
--- a/Spigot-Server-Patches/0529-Spawn-player-in-correct-world-on-login.patch
+++ b/Spigot-Server-Patches/0528-Spawn-player-in-correct-world-on-login.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn player in correct world on login
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 3b20dd067c6b10f2e5ffad65e5abda7a7008b1c0..46be525624209e4b89f96adcb464389e853a261a 100644
+index 3e11c9ca6efde2347a963177f325b1efa67eb4f8..3a38e3fc1f59cee5505c6ad7174c7014ec8efc25 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -119,7 +119,18 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0530-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch
similarity index 98%
rename from Spigot-Server-Patches/0530-Add-PrepareResultEvent.patch
rename to Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch
index 8c10749fdf..ee33b31190 100644
--- a/Spigot-Server-Patches/0530-Add-PrepareResultEvent.patch
+++ b/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch
@@ -106,10 +106,10 @@ index c9505513e7e34637f8eebd68d756834479c1ca0c..5351bf137623a8909fea672c96a6057c
  
      private void a(IInventory iinventory, ItemStack itemstack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 5dfd474e425d5a41cbb12ccf4567b44c32e114b3..035e9d466bdaf40d07ac2e4a2d5da66c740c3a76 100644
+index 5e0040078c85daa975568539d8d9a3641ccdd8fb..8193b317bfd16f33873ddf5cd298c98ad0875cf6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1549,19 +1549,44 @@ public class CraftEventFactory {
+@@ -1551,19 +1551,44 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/Spigot-Server-Patches/0531-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0530-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from Spigot-Server-Patches/0531-Allow-delegation-to-vanilla-chunk-gen.patch
rename to Spigot-Server-Patches/0530-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/Spigot-Server-Patches/0532-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
similarity index 90%
rename from Spigot-Server-Patches/0532-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
rename to Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index fd92f37204..8dceb6bdb3 100644
--- a/Spigot-Server-Patches/0532-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/Spigot-Server-Patches/0531-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 01de9a9c965ce156f53577d19f1ca9a138657720..b92e74349b402b6a8687876073f974128fe242a4 100644
+index 3fbe27fd980cba07acc793077e80a3053e7cb2d8..f4ea14d66320e6799f0d1a91de9a3c63423a6c3e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2917,7 +2917,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/Spigot-Server-Patches/0533-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0532-Optimize-NetworkManager-Exception-Handling.patch
similarity index 100%
rename from Spigot-Server-Patches/0533-Optimize-NetworkManager-Exception-Handling.patch
rename to Spigot-Server-Patches/0532-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/Spigot-Server-Patches/0534-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0533-Fix-Concurrency-issue-in-WeightedList.patch
similarity index 100%
rename from Spigot-Server-Patches/0534-Fix-Concurrency-issue-in-WeightedList.patch
rename to Spigot-Server-Patches/0533-Fix-Concurrency-issue-in-WeightedList.patch
diff --git a/Spigot-Server-Patches/0535-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0534-Optimize-the-advancement-data-player-iteration-to-be.patch
similarity index 100%
rename from Spigot-Server-Patches/0535-Optimize-the-advancement-data-player-iteration-to-be.patch
rename to Spigot-Server-Patches/0534-Optimize-the-advancement-data-player-iteration-to-be.patch
diff --git a/Spigot-Server-Patches/0536-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0535-Fix-arrows-never-despawning-MC-125757.patch
similarity index 100%
rename from Spigot-Server-Patches/0536-Fix-arrows-never-despawning-MC-125757.patch
rename to Spigot-Server-Patches/0535-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/Spigot-Server-Patches/0537-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0536-Thread-Safe-Vanilla-Command-permission-checking.patch
similarity index 100%
rename from Spigot-Server-Patches/0537-Thread-Safe-Vanilla-Command-permission-checking.patch
rename to Spigot-Server-Patches/0536-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/Spigot-Server-Patches/0538-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0537-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from Spigot-Server-Patches/0538-Move-range-check-for-block-placing-up.patch
rename to Spigot-Server-Patches/0537-Move-range-check-for-block-placing-up.patch
diff --git a/Spigot-Server-Patches/0539-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0538-Fix-SPIGOT-5989.patch
similarity index 100%
rename from Spigot-Server-Patches/0539-Fix-SPIGOT-5989.patch
rename to Spigot-Server-Patches/0538-Fix-SPIGOT-5989.patch
diff --git a/Spigot-Server-Patches/0540-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0539-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
similarity index 100%
rename from Spigot-Server-Patches/0540-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
rename to Spigot-Server-Patches/0539-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/Spigot-Server-Patches/0541-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0540-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
similarity index 100%
rename from Spigot-Server-Patches/0541-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
rename to Spigot-Server-Patches/0540-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/Spigot-Server-Patches/0542-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0541-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
similarity index 100%
rename from Spigot-Server-Patches/0542-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
rename to Spigot-Server-Patches/0541-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/Spigot-Server-Patches/0543-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0542-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
similarity index 100%
rename from Spigot-Server-Patches/0543-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
rename to Spigot-Server-Patches/0542-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
diff --git a/Spigot-Server-Patches/0544-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0543-Fix-some-rails-connecting-improperly.patch
similarity index 100%
rename from Spigot-Server-Patches/0544-Fix-some-rails-connecting-improperly.patch
rename to Spigot-Server-Patches/0543-Fix-some-rails-connecting-improperly.patch
diff --git a/Spigot-Server-Patches/0545-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0544-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from Spigot-Server-Patches/0545-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to Spigot-Server-Patches/0544-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/Spigot-Server-Patches/0546-Incremental-player-saving.patch b/Spigot-Server-Patches/0545-Incremental-player-saving.patch
similarity index 100%
rename from Spigot-Server-Patches/0546-Incremental-player-saving.patch
rename to Spigot-Server-Patches/0545-Incremental-player-saving.patch
diff --git a/Spigot-Server-Patches/0547-Import-fastutil-classes.patch b/Spigot-Server-Patches/0546-Import-fastutil-classes.patch
similarity index 100%
rename from Spigot-Server-Patches/0547-Import-fastutil-classes.patch
rename to Spigot-Server-Patches/0546-Import-fastutil-classes.patch
diff --git a/Spigot-Server-Patches/0548-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0547-Don-t-mark-null-chunk-sections-for-block-updates.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Don-t-mark-null-chunk-sections-for-block-updates.patch
rename to Spigot-Server-Patches/0547-Don-t-mark-null-chunk-sections-for-block-updates.patch
diff --git a/Spigot-Server-Patches/0549-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0548-Remove-armour-stand-double-add-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0549-Remove-armour-stand-double-add-to-world.patch
rename to Spigot-Server-Patches/0548-Remove-armour-stand-double-add-to-world.patch
diff --git a/Spigot-Server-Patches/0550-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0549-Fix-MC-187716-Use-configured-height.patch
similarity index 100%
rename from Spigot-Server-Patches/0550-Fix-MC-187716-Use-configured-height.patch
rename to Spigot-Server-Patches/0549-Fix-MC-187716-Use-configured-height.patch
diff --git a/Spigot-Server-Patches/0551-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch b/Spigot-Server-Patches/0550-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
similarity index 100%
rename from Spigot-Server-Patches/0551-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
rename to Spigot-Server-Patches/0550-Fix-incorrect-return-for-WorldServer-addAllEntitiesS.patch
diff --git a/Spigot-Server-Patches/0552-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0551-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
similarity index 100%
rename from Spigot-Server-Patches/0552-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
rename to Spigot-Server-Patches/0551-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/Spigot-Server-Patches/0553-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0552-Do-not-let-the-server-load-chunks-from-newer-version.patch
similarity index 100%
rename from Spigot-Server-Patches/0553-Do-not-let-the-server-load-chunks-from-newer-version.patch
rename to Spigot-Server-Patches/0552-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/Spigot-Server-Patches/0554-Brand-support.patch b/Spigot-Server-Patches/0553-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0554-Brand-support.patch
rename to Spigot-Server-Patches/0553-Brand-support.patch
diff --git a/Spigot-Server-Patches/0555-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0554-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
similarity index 100%
rename from Spigot-Server-Patches/0555-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
rename to Spigot-Server-Patches/0554-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch
diff --git a/Spigot-Server-Patches/0556-Fix-MC-197271.patch b/Spigot-Server-Patches/0555-Fix-MC-197271.patch
similarity index 100%
rename from Spigot-Server-Patches/0556-Fix-MC-197271.patch
rename to Spigot-Server-Patches/0555-Fix-MC-197271.patch
diff --git a/Spigot-Server-Patches/0557-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0556-MC-197883-Bandaid-decode-issue.patch
similarity index 100%
rename from Spigot-Server-Patches/0557-MC-197883-Bandaid-decode-issue.patch
rename to Spigot-Server-Patches/0556-MC-197883-Bandaid-decode-issue.patch
diff --git a/Spigot-Server-Patches/0558-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0557-Add-setMaxPlayers-API.patch
similarity index 94%
rename from Spigot-Server-Patches/0558-Add-setMaxPlayers-API.patch
rename to Spigot-Server-Patches/0557-Add-setMaxPlayers-API.patch
index f8fd039b9b..9fdab2ebe8 100644
--- a/Spigot-Server-Patches/0558-Add-setMaxPlayers-API.patch
+++ b/Spigot-Server-Patches/0557-Add-setMaxPlayers-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f9eb17cb6eda0b343240240720495751cf605385..33915eeb0229c0739d69b0ee2cb2251c9d99f87a 100644
+index 2ae926d9a2ad99a46409dfa000c6f895600a2616..787e80c50a61d6bd80efd8bd0d4b5140908aaeed 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -67,7 +67,7 @@ public abstract class PlayerList {
diff --git a/Spigot-Server-Patches/0559-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0558-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from Spigot-Server-Patches/0559-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to Spigot-Server-Patches/0558-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/Spigot-Server-Patches/0560-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0559-Don-t-require-FACING-data.patch
similarity index 100%
rename from Spigot-Server-Patches/0560-Don-t-require-FACING-data.patch
rename to Spigot-Server-Patches/0559-Don-t-require-FACING-data.patch
diff --git a/Spigot-Server-Patches/0561-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0560-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 100%
rename from Spigot-Server-Patches/0561-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to Spigot-Server-Patches/0560-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/Spigot-Server-Patches/0562-Add-moon-phase-API.patch b/Spigot-Server-Patches/0561-Add-moon-phase-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0562-Add-moon-phase-API.patch
rename to Spigot-Server-Patches/0561-Add-moon-phase-API.patch
diff --git a/Spigot-Server-Patches/0563-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0562-Prevent-headless-pistons-from-being-created.patch
similarity index 97%
rename from Spigot-Server-Patches/0563-Prevent-headless-pistons-from-being-created.patch
rename to Spigot-Server-Patches/0562-Prevent-headless-pistons-from-being-created.patch
index 4517ea2bd9..a2839249da 100644
--- a/Spigot-Server-Patches/0563-Prevent-headless-pistons-from-being-created.patch
+++ b/Spigot-Server-Patches/0562-Prevent-headless-pistons-from-being-created.patch
@@ -23,7 +23,7 @@ index 60f03502a7fd622d2de3b2da9fe8014b289f3d31..9fc12595a566f216620a7fb296d2d30e
      public static int maxPlayerAutoSavePerTick = 10;
      private static void playerAutoSaveRate() {
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 766ec660fa8c59f02a5299c4770cc658fdf4b075..3ecbce7a5a2f125d1495f86c661a96159774d4a4 100644
+index f263177e3d41fd5720c430be3dcb1b5e2adb0134..b7cfa6fb188d36ecbad0389bb51e5f1016b9eabd 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -135,6 +135,15 @@ public class Explosion {
diff --git a/Spigot-Server-Patches/0564-Brand-support.patch b/Spigot-Server-Patches/0563-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0564-Brand-support.patch
rename to Spigot-Server-Patches/0563-Brand-support.patch
diff --git a/Spigot-Server-Patches/0565-Add-BellRingEvent.patch b/Spigot-Server-Patches/0564-Add-BellRingEvent.patch
similarity index 100%
rename from Spigot-Server-Patches/0565-Add-BellRingEvent.patch
rename to Spigot-Server-Patches/0564-Add-BellRingEvent.patch
diff --git a/Spigot-Server-Patches/0566-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0565-Add-zombie-targets-turtle-egg-config.patch
similarity index 100%
rename from Spigot-Server-Patches/0566-Add-zombie-targets-turtle-egg-config.patch
rename to Spigot-Server-Patches/0565-Add-zombie-targets-turtle-egg-config.patch
diff --git a/Spigot-Server-Patches/0567-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0566-Buffer-joins-to-world.patch
similarity index 100%
rename from Spigot-Server-Patches/0567-Buffer-joins-to-world.patch
rename to Spigot-Server-Patches/0566-Buffer-joins-to-world.patch
diff --git a/Spigot-Server-Patches/0568-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0567-Optimize-redstone-algorithm.patch
similarity index 100%
rename from Spigot-Server-Patches/0568-Optimize-redstone-algorithm.patch
rename to Spigot-Server-Patches/0567-Optimize-redstone-algorithm.patch
diff --git a/Spigot-Server-Patches/0569-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0568-Fix-hex-colors-not-working-in-some-kick-messages.patch
similarity index 100%
rename from Spigot-Server-Patches/0569-Fix-hex-colors-not-working-in-some-kick-messages.patch
rename to Spigot-Server-Patches/0568-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/Spigot-Server-Patches/0570-Fix-NPE-in-getBedSpawnLocation.patch b/Spigot-Server-Patches/0569-Fix-NPE-in-getBedSpawnLocation.patch
similarity index 100%
rename from Spigot-Server-Patches/0570-Fix-NPE-in-getBedSpawnLocation.patch
rename to Spigot-Server-Patches/0569-Fix-NPE-in-getBedSpawnLocation.patch
diff --git a/Spigot-Server-Patches/0571-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0570-PortalCreateEvent-needs-to-know-its-entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0571-PortalCreateEvent-needs-to-know-its-entity.patch
rename to Spigot-Server-Patches/0570-PortalCreateEvent-needs-to-know-its-entity.patch
diff --git a/Spigot-Server-Patches/0572-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0571-Fix-CraftTeam-null-check.patch
similarity index 100%
rename from Spigot-Server-Patches/0572-Fix-CraftTeam-null-check.patch
rename to Spigot-Server-Patches/0571-Fix-CraftTeam-null-check.patch
diff --git a/Spigot-Server-Patches/0573-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0572-Add-more-Evoker-API.patch
similarity index 100%
rename from Spigot-Server-Patches/0573-Add-more-Evoker-API.patch
rename to Spigot-Server-Patches/0572-Add-more-Evoker-API.patch
diff --git a/Spigot-Server-Patches/0574-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0573-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
similarity index 100%
rename from Spigot-Server-Patches/0574-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
rename to Spigot-Server-Patches/0573-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
diff --git a/Spigot-Server-Patches/0575-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0574-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from Spigot-Server-Patches/0575-Create-HoverEvent-from-ItemStack-Entity.patch
rename to Spigot-Server-Patches/0574-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/work/Bukkit b/work/Bukkit
index 6ff6e03305..565a57274a 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 6ff6e0330578458e7e0f869a8b7e7e09a63361e1
+Subproject commit 565a57274a4c8259ffdd9792b70c0a9fe5adb214
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6008e6660a..927200a961 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6008e6660a7be1c06522bc13b52578cb9f1e2dfe
+Subproject commit 927200a96161a3cbfb0eaff1ba4474abe608298a